adapt to new CVS updates.

diff --git a/debian/changelog b/debian/changelog
index 816d32f..88e2fad 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,20 +3,21 @@ privoxy (3.0.4.cvs20060910-1) UNRELEASED; urgency=low
   * New upstream CVS snapshot as of 2006-09-10.
   * hide-referrer{foo} now allows everything as a forged referrer not 
     only http/https URLs and ignoring invalid URLs (Closes: #258193).  
   * New upstream CVS snapshot as of 2006-09-10.
   * hide-referrer{foo} now allows everything as a forged referrer not 
     only http/https URLs and ignoring invalid URLs (Closes: #258193).  

+  * Fixes the name of the filter from "popups" to "all-popups" in
+    user.action. (Closes: #385886).

   * Adapted all patches to this version.
   * The following patches are incorporated upstream now, so they are no
   * Adapted all patches to this version.
   * The following patches are incorporated upstream now, so they are no

-    longer needed: 01_local_usermanual.dpatch, 08_log_pthread.dpatch,
-    09_no_identity.dpatch, 12_multiple-filters.dpatch, 13_memory.dpatch,
-    18_dns_retry.dpatch.
+    longer needed: 01_local_usermanual.dpatch, 04_nomultiproxy.dpatch,
+    08_log_pthread.dpatch, 09_no_identity.dpatch,
+    12_multiple-filters.dpatch, 13_memory.dpatch, 18_dns_retry.dpatch.

   * 20_makefile_fixup.dpatch: Fix a syntax error in the GNUmakefile.in.
   * 20_makefile_fixup.dpatch: Fix a syntax error in the GNUmakefile.in.

+  * 05_default_action.dpatch: main parts are incorporated upstream now.

   * 05_default_action.dpatch: disable filter ie-eploits for amazon.de,
     cause they use %01 and %02 as delimiters for multipage results
     (Closes: #243245).
   * 05_default_action.dpatch: block http://www.google-analytics.com/urchin.js
     because this is used for cross site user tracking according to 
     http://www.google.com/analytics/ (Closes: #340913).
   * 05_default_action.dpatch: disable filter ie-eploits for amazon.de,
     cause they use %01 and %02 as delimiters for multipage results
     (Closes: #243245).
   * 05_default_action.dpatch: block http://www.google-analytics.com/urchin.js
     because this is used for cross site user tracking according to 
     http://www.google.com/analytics/ (Closes: #340913).

-  * 22_user_action.dpatch: the popup filter is named "all-popups" not
-    "popups", fix this in user.action. (Closes: #385886).

 
  -- Roland Rosenfeld <roland@debian.org>  Sun, 10 Sep 2006 12:30:49 +0200
 
 
  -- Roland Rosenfeld <roland@debian.org>  Sun, 10 Sep 2006 12:30:49 +0200
 

diff --git a/debian/patches/00list b/debian/patches/00list
index 10f98d5..fe413e5 100644 (file)
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,7 +1,7 @@
 # 01_local_usermanual.dpatch # now upstream
 02_linkcolor.dpatch
 # 03_ipv6.dpatch # incompatible with 18_dns_retry.dpatch
 # 01_local_usermanual.dpatch # now upstream
 02_linkcolor.dpatch
 # 03_ipv6.dpatch # incompatible with 18_dns_retry.dpatch

-04_nomultiproxy.dpatch
+# 04_nomultiproxy.dpatch # now upstream

 05_defaut_action.dpatch
 06_8bit_manual.dpatch
 07_typos.dpatch
 05_defaut_action.dpatch
 06_8bit_manual.dpatch
 07_typos.dpatch


@@ -19,4 +19,4 @@
 19_manpage_fixup.dpatch
 20_makefile_fixup.dpatch
 21_version_3.0.4.dpatch
 19_manpage_fixup.dpatch
 20_makefile_fixup.dpatch
 21_version_3.0.4.dpatch

-22_user_action.dpatch
+# 22_user_action.dpatch # now upstream

diff --git a/debian/patches/05_defaut_action.dpatch b/debian/patches/05_defaut_action.dpatch
index a97dddf..6c29ef3 100644 (file)
--- a/debian/patches/05_defaut_action.dpatch
+++ b/debian/patches/05_defaut_action.dpatch
@@ -8,7 +8,7 @@
 diff -urNad privoxy~/default.action.master privoxy/default.action.master
 --- privoxy~/default.action.master
 +++ privoxy/default.action.master
 diff -urNad privoxy~/default.action.master privoxy/default.action.master
 --- privoxy~/default.action.master
 +++ privoxy/default.action.master

-@@ -955,6 +955,8 @@
+@@ -959,6 +959,8 @@

  stats.surfaid.ihost.com/(crc/)?images/(bounce/)?uc.GIF
  #MASTER# BLOCK-REFERRER: http://www.planetgamecube.com/
  .imrworldwide.com
  stats.surfaid.ihost.com/(crc/)?images/(bounce/)?uc.GIF
  #MASTER# BLOCK-REFERRER: http://www.planetgamecube.com/
  .imrworldwide.com


@@ -17,40 +17,7 @@ diff -urNad privoxy~/default.action.master privoxy/default.action.master
  
  #----------------------------------------------------------------------------
  # Specific counters (see above for generic patterns)
  
  #----------------------------------------------------------------------------
  # Specific counters (see above for generic patterns)

-@@ -1593,6 +1595,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 +1718,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
- 
- {-filter{unsolicited-popups}}
- #MASTER# DONT-VERIFY
-@@ -1733,6 +1741,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
- 
- {+fast-redirects{check-decoded-url} -block}
- #MASTER# PROBLEM-URL: http://isbn.nu/0596001088/price/2.html
-@@ -1772,3 +1786,8 @@
+@@ -1786,3 +1788,8 @@

  { +filter{js-events} }
  #MASTER# PROBLEM-URL: http://www.pharmcast.com/WarningLetters/Yr2002/December2002/J&J1202.htm
  www.pharmcast.com/
  { +filter{js-events} }
  #MASTER# PROBLEM-URL: http://www.pharmcast.com/WarningLetters/Yr2002/December2002/J&J1202.htm
  www.pharmcast.com/