X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=debian%2Fpatches%2F05_defaut_action.dpatch;h=87e731b76cd6574ef0a522058c05220e6fbf5582;hb=6dd911d7de3d68ed50c2b95081ac2f09d076ab14;hp=716d81c6d6b1a710ad79ebfb6fbaffc2f93cce7d;hpb=ffbf7b982b3446ab0d2ac6db5e244f785882db7e;p=privoxy.git

diff --git a/debian/patches/05_defaut_action.dpatch b/debian/patches/05_defaut_action.dpatch
index 716d81c6..87e731b7 100644
--- a/debian/patches/05_defaut_action.dpatch
+++ b/debian/patches/05_defaut_action.dpatch
@@ -5,39 +5,28 @@
 ## DP: Serveral changes/additons to default.action.
 
 @DPATCH@
-diff -urNad privoxy~/default.action.master privoxy/default.action.master
+diff -urNad '--exclude=CVS' '--exclude=.svn' privoxy~/default.action.master privoxy/default.action.master
 --- privoxy~/default.action.master
 +++ privoxy/default.action.master
-@@ -1593,6 +1593,8 @@
- www.mandrakelinux.com/en/ftp.php3
- #MASTER# REMARKS: Actions Tracker 1313157
- validator.w3.org/check\?uri=referer
-+#MASTER# PROBLEM-URL: http://www.petitiononline.com/mod_perl/signed.cgi?eldred&2901
-+www.petitiononline.com/mod_perl/signed.cgi
- 
- #----------------------------------------------------------------------------
- # These animated gifs are either useful or nice:
-@@ -1714,6 +1716,10 @@
- #MASTER# PROBLEM-URL: http://www.nasa.gov
- #MASTER# REMARKS: No progress past main page without js-annoyances
- .nasa.gov
-+#MASTER# PROBLEM-URL: http://www2.cnrs.fr/presse/communique/900.htm
-+.cnrs.fr
-+#MASTER# PROBLEM-URL: http://blogs.msdn.com/wga/archive/2006/07/16/667063.aspx
-+blogs.msdn.com
+@@ -2259,6 +2259,9 @@
+ #MASTER# REMARKS: Exclude per Debian bug report #377843
+ # URL = http://blogs.msdn.com/wga/archive/2006/07/16/667063.aspx
+ blogs.msdn.com
++#MASTER# REMARKS: Exclude per Debian bug report #441256
++#MASTER# PROBLEM-URL: http://www.memo.de/
++www.memo.de
  
  {-filter{unsolicited-popups}}
- #MASTER# DONT-VERIFY
-@@ -1733,6 +1739,12 @@
- cf.nbc4.com/
- #MASTER# PROBLEM-URL: http://www.hh.schule.de/ak/nt/
- www.hh.schule.de/ak/nt/
-+#MASTER# PROBLEM-URL: http://www.perl.com/language/newdocs/pod/perlop.html#Regexp_Quote_Like_Operators
-+www.perl.com/language/newdocs/pod/
-+#MASTER# PROBLEM-URL: http://www2.cnrs.fr/presse/communique/900.htm
-+.cnrs.fr
-+#MASTER# PROBLEM-URL: http://blogs.msdn.com/wga/archive/2006/07/16/667063.aspx
-+blogs.msdn.com
+ # Sticky Actions = -filter{unsolicited-popups}
+@@ -2312,6 +2315,11 @@
+ {+filter{tiny-textforms}}
+ .sourceforge.net/tracker
  
- {+fast-redirects{check-decoded-url} -block}
- #MASTER# PROBLEM-URL: http://isbn.nu/0596001088/price/2.html
++{-filter{ie-exploits}}
++#MASTER# REMARKS: Allow %01 and %02 in URLs as they are used in Amazon's 
++#MASTER# REMARKS: multi-page results see http://bugs.debian.org/243245
++.amazon.de
++
+ {+downgrade-http-version}
+ #MASTER# COMMENTS: This section not checked 10/17/06 HB
+ #MASTER# REMARKS: This is work-around for CUPS http configuration.