From bcff1ccdbaae18be3577638568851b7e9aedaa30 Mon Sep 17 00:00:00 2001 From: Roland Rosenfeld Date: Sun, 10 Sep 2006 11:05:00 +0000 Subject: [PATCH] * 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). --- debian/changelog | 18 +++++++++++++---- debian/patches/00list | 1 + debian/patches/05_defaut_action.dpatch | 24 +++++++++++++++++++--- debian/patches/22_user_action.dpatch | 28 ++++++++++++++++++++++++++ 4 files changed, 64 insertions(+), 7 deletions(-) create mode 100755 debian/patches/22_user_action.dpatch diff --git a/debian/changelog b/debian/changelog index 8e0fdb03..816d32fe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,14 +1,24 @@ -privoxy (3.0.4.cvs20060909-1) UNRELEASED; urgency=low +privoxy (3.0.4.cvs20060910-1) UNRELEASED; urgency=low - * New upstream CVS snapshot as of 2006-09-09. + * 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). * 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. * 20_makefile_fixup.dpatch: Fix a syntax error in the GNUmakefile.in. - - -- Roland Rosenfeld Sat, 9 Sep 2006 15:26:34 +0200 + * 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 Sun, 10 Sep 2006 12:30:49 +0200 privoxy (3.0.3-2-2) unstable; urgency=low diff --git a/debian/patches/00list b/debian/patches/00list index c2254958..10f98d5d 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -19,3 +19,4 @@ 19_manpage_fixup.dpatch 20_makefile_fixup.dpatch 21_version_3.0.4.dpatch +22_user_action.dpatch diff --git a/debian/patches/05_defaut_action.dpatch b/debian/patches/05_defaut_action.dpatch index 716d81c6..a97dddfb 100644 --- a/debian/patches/05_defaut_action.dpatch +++ b/debian/patches/05_defaut_action.dpatch @@ -8,7 +8,16 @@ diff -urNad privoxy~/default.action.master privoxy/default.action.master --- privoxy~/default.action.master +++ privoxy/default.action.master -@@ -1593,6 +1593,8 @@ +@@ -955,6 +955,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 + + #---------------------------------------------------------------------------- + # 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 @@ -17,7 +26,7 @@ diff -urNad privoxy~/default.action.master privoxy/default.action.master #---------------------------------------------------------------------------- # These animated gifs are either useful or nice: -@@ -1714,6 +1716,10 @@ +@@ -1714,6 +1718,10 @@ #MASTER# PROBLEM-URL: http://www.nasa.gov #MASTER# REMARKS: No progress past main page without js-annoyances .nasa.gov @@ -28,7 +37,7 @@ diff -urNad privoxy~/default.action.master privoxy/default.action.master {-filter{unsolicited-popups}} #MASTER# DONT-VERIFY -@@ -1733,6 +1739,12 @@ +@@ -1733,6 +1741,12 @@ cf.nbc4.com/ #MASTER# PROBLEM-URL: http://www.hh.schule.de/ak/nt/ www.hh.schule.de/ak/nt/ @@ -41,3 +50,12 @@ diff -urNad privoxy~/default.action.master privoxy/default.action.master {+fast-redirects{check-decoded-url} -block} #MASTER# PROBLEM-URL: http://isbn.nu/0596001088/price/2.html +@@ -1772,3 +1786,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 diff --git a/debian/patches/22_user_action.dpatch b/debian/patches/22_user_action.dpatch new file mode 100755 index 00000000..e22f45bd --- /dev/null +++ b/debian/patches/22_user_action.dpatch @@ -0,0 +1,28 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 22_user_action.dpatch by Roland Rosenfeld +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix popup filter name in user.action (see #385886). + +@DPATCH@ +diff -urNad privoxy~/user.action privoxy/user.action +--- privoxy~/user.action ++++ privoxy/user.action +@@ -39,7 +39,7 @@ + +crunch-all-cookies = +crunch-incoming-cookies +crunch-outgoing-cookies + -crunch-all-cookies = -crunch-incoming-cookies -crunch-outgoing-cookies + allow-all-cookies = -crunch-all-cookies -session-cookies-only -filter{content-cookies} +- allow-popups = -filter{popups} -kill-popups ++ allow-popups = -filter{all-popups} -kill-popups + +block-as-image = +block +handle-as-image + -block-as-image = -block + +@@ -51,7 +51,7 @@ + + # Your favourite blend of filters: + # +-myfilters = +filter{html-annoyances} +filter{js-annoyances} +filter{popups}\ ++myfilters = +filter{html-annoyances} +filter{js-annoyances} +filter{all-popups}\ + +filter{webbugs} +filter{banners-by-size} +filter{fun} + + # Allow ads for selected useful free sites: -- 2.39.2