adapt to new CVS updates.

[privoxy.git] / debian / patches / 05_defaut_action.dpatch

diff --git a/debian/patches/05_defaut_action.dpatch b/debian/patches/05_defaut_action.dpatch
index cf779e0..6c29ef3 100644 (file)
--- a/debian/patches/05_defaut_action.dpatch
+++ b/debian/patches/05_defaut_action.dpatch
@@ -6,32 +6,23 @@
 
 @DPATCH@
 diff -urNad privoxy~/default.action.master privoxy/default.action.master
---- privoxy~/default.action.master     2006-02-05 16:23:12.000000000 +0100
-+++ privoxy/default.action.master      2006-02-05 16:25:47.000000000 +0100
-@@ -1444,6 +1444,8 @@
- .microsoft.com
- #MASTER# PROBLEM-URL: http://javabog.dk/ijk/
- javabog.dk/ijk/
-+#MASTER# PROBLEM-URL: http://validator.w3.org/
-+/valid-
+--- privoxy~/default.action.master
++++ privoxy/default.action.master
+@@ -959,6 +959,8 @@
+ stats.surfaid.ihost.com/(crc/)?images/(bounce/)?uc.GIF
+ #MASTER# BLOCK-REFERRER: http://www.planetgamecube.com/
+ .imrworldwide.com
++#MASTER# BLOCK-REFERRER: http://www.google.com/analytics/
++www.google-analytics.com/urchin.js
  
  #----------------------------------------------------------------------------
- # These don't work without the referrer information:
-@@ -1464,6 +1466,8 @@
- #MASTER# PROBLEM-URL: http://www.mandrakelinux.com/en/ftp.php3
- #MASTER# REMARKS: Link to download page breaks
- www.mandrakelinux.com/en/ftp.php3
-+#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:
-@@ -1601,6 +1605,8 @@
- 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/
- 
- {+fast-redirects -block}
- #MASTER# PROBLEM-URL: http://isbn.nu/0596001088/price/2.html
+ # Specific counters (see above for generic patterns)
+@@ -1786,3 +1788,8 @@
+ { +filter{js-events} }
+ #MASTER# PROBLEM-URL: http://www.pharmcast.com/WarningLetters/Yr2002/December2002/J&J1202.htm
+ www.pharmcast.com/
++
++# Allow %01 and %02 in URLs as they are used in Amazon's multi-page results
++# see http://bugs.debian.org/243245:
++{-filter{ie-exploits}}
++.amazon.de