From: Roland Rosenfeld Date: Sun, 14 Oct 2007 16:00:46 +0000 (+0000) Subject: Update all patches to CVS version as of 2007-10-14. X-Git-Tag: v_3_0_7~129 X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=commitdiff_plain;h=b0184cb983140a641d30ebfb4942759f48c010a9 Update all patches to CVS version as of 2007-10-14. --- diff --git a/debian/changelog b/debian/changelog index 4a4c1ff8..95e4ab7d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,16 +1,18 @@ -privoxy (3.0.7~CSV20070607-0.1) UNRELEASED; urgency=low +privoxy (3.0.7~CSV20071014-0.1) UNRELEASED; urgency=low - * CVS as of 2007-06-07. + * CVS as of 2007-10-14. * Enable new zlib feature (Closes: #368448): - build-depend on zlib1g-dev - disable prevent-compression in 25_standard_medium.dpatch * Remove 28_pcre_returncode.dpatch, which is now applied upstream. - * 29_usermanual: fix some broken markup in user-manual.sgml * 30_actionsfile_fullname.dpatch: The "actionsfile" syntax in the configuration file is consistent with the rest of the configuration options and requires the whole file name. + * 31_usermanual-dash: remove "--" from log comments, because jade + doesn't like these. + * 32_faq_ulinkfix: Fix ulink parameter. - -- Roland Rosenfeld Thu, 7 Jun 2007 12:30:02 +0200 + -- Roland Rosenfeld Sun, 14 Oct 2007 17:45:59 +0200 privoxy (3.0.6-3) unstable; urgency=low diff --git a/debian/patches/00list b/debian/patches/00list index f70b06bb..06927b2e 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -13,5 +13,6 @@ 24_global_action.dpatch 25_standard_medium.dpatch 27_remove_nsl.dpatch -29_usermanual.dpatch 30_actionsfile_fullname.dpatch +31_usermanual-dash.dpatch +32_faq_ulinkfix.dpatch diff --git a/debian/patches/05_defaut_action.dpatch b/debian/patches/05_defaut_action.dpatch index f1d9c973..a77e3007 100644 --- 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 -@@ -1839,6 +1839,11 @@ +@@ -1823,6 +1823,11 @@ {+filter{tiny-textforms} +prevent-compression} .sourceforge.net/tracker diff --git a/debian/patches/24_global_action.dpatch b/debian/patches/24_global_action.dpatch index bbf87add..916073fe 100755 --- a/debian/patches/24_global_action.dpatch +++ b/debian/patches/24_global_action.dpatch @@ -32,74 +32,16 @@ diff -urNad privoxy~/config privoxy/config diff -urNad privoxy~/default.action.master privoxy/default.action.master --- privoxy~/default.action.master +++ privoxy/default.action.master -@@ -537,74 +537,6 @@ +@@ -537,16 +537,6 @@ allow-ads = -block -filter{banners-by-size} -filter{banners-by-link} ############################################################################# -# Defaults -############################################################################# -{ \ ---add-header \ ---block \ ---client-header-filter{hide-tor-exit-notation} \ ---content-type-overwrite \ ---crunch-client-header \ ---crunch-if-none-match \ ---crunch-outgoing-cookies \ ---crunch-incoming-cookies \ ---crunch-server-header \ ---deanimate-gifs \ ---downgrade-http-version \ ---fast-redirects \ ---filter{js-annoyances} \ ---filter{js-events} \ ---filter{html-annoyances} \ ---filter{content-cookies} \ ---filter{refresh-tags} \ ---filter{unsolicited-popups} \ ---filter{all-popups} \ ---filter{img-reorder} \ ---filter{banners-by-size} \ ---filter{banners-by-link} \ ---filter{webbugs} \ ---filter{tiny-textforms} \ ---filter{jumping-windows} \ ---filter{frameset-borders} \ ---filter{demoronizer} \ ---filter{shockwave-flash} \ ---filter{quicktime-kioskmode} \ ---filter{fun} \ ---filter{crude-parental} \ ---filter{ie-exploits} \ ---filter{site-specifics} \ ---filter{google} \ ---filter{yahoo} \ ---filter{msn} \ ---filter{blogspot} \ ---filter{no-ping} \ ---force-text-mode \ ---handle-as-empty-document \ ---handle-as-image \ ---hide-accept-language \ ---hide-content-disposition \ ---hide-if-modified-since \ -+hide-forwarded-for-headers \ -+hide-from-header{block} \ ---hide-referrer \ ---hide-user-agent \ ---inspect-jpegs \ ---kill-popups \ ---limit-connect \ ---prevent-compression \ ---overwrite-last-modified \ ---redirect \ ---send-vanilla-wafer \ ---send-wafer \ ---server-header-filter{xml-to-html} \ ---server-header-filter{html-to-xml} \ ---session-cookies-only \ -+set-image-blocker{pattern} \ ---treat-forbidden-connects-like-blocks \ -} -/ # Match all URLs - @@ -110,71 +52,13 @@ diff -urNad privoxy~/default.action.master privoxy/default.action.master diff -urNad privoxy~/global.action privoxy/global.action --- privoxy~/global.action +++ privoxy/global.action -@@ -0,0 +1,67 @@ +@@ -0,0 +1,9 @@ +############################################################################# +# Defaults +############################################################################# +{ \ -+-add-header \ -+-block \ -+-client-header-filter{hide-tor-exit-notation} \ -+-content-type-overwrite \ -+-crunch-client-header \ -+-crunch-if-none-match \ -+-crunch-outgoing-cookies \ -+-crunch-incoming-cookies \ -+-crunch-server-header \ -+-deanimate-gifs \ -+-downgrade-http-version \ -+-fast-redirects \ -+-filter{js-annoyances} \ -+-filter{js-events} \ -+-filter{html-annoyances} \ -+-filter{content-cookies} \ -+-filter{refresh-tags} \ -+-filter{unsolicited-popups} \ -+-filter{all-popups} \ -+-filter{img-reorder} \ -+-filter{banners-by-size} \ -+-filter{banners-by-link} \ -+-filter{webbugs} \ -+-filter{tiny-textforms} \ -+-filter{jumping-windows} \ -+-filter{frameset-borders} \ -+-filter{demoronizer} \ -+-filter{shockwave-flash} \ -+-filter{quicktime-kioskmode} \ -+-filter{fun} \ -+-filter{crude-parental} \ -+-filter{ie-exploits} \ -+-filter{site-specifics} \ -+-filter{google} \ -+-filter{yahoo} \ -+-filter{msn} \ -+-filter{blogspot} \ -+-filter{no-ping} \ -+-force-text-mode \ -+-handle-as-empty-document \ -+-handle-as-image \ -+-hide-accept-language \ -+-hide-content-disposition \ -+-hide-if-modified-since \ ++hide-forwarded-for-headers \ ++hide-from-header{block} \ -+-hide-referrer \ -+-hide-user-agent \ -+-inspect-jpegs \ -+-kill-popups \ -+-limit-connect \ -+-prevent-compression \ -+-overwrite-last-modified \ -+-redirect \ -+-send-vanilla-wafer \ -+-send-wafer \ -+-server-header-filter{xml-to-html} \ -+-server-header-filter{html-to-xml} \ -+-session-cookies-only \ ++set-image-blocker{pattern} \ -+-treat-forbidden-connects-like-blocks \ +} +/ # Match all URLs diff --git a/debian/patches/25_standard_medium.dpatch b/debian/patches/25_standard_medium.dpatch index 84466a5b..70e51b41 100755 --- a/debian/patches/25_standard_medium.dpatch +++ b/debian/patches/25_standard_medium.dpatch @@ -10,63 +10,21 @@ diff -urNad privoxy~/global.action privoxy/global.action --- privoxy~/global.action +++ privoxy/global.action -@@ -11,29 +11,29 @@ - -crunch-outgoing-cookies \ - -crunch-incoming-cookies \ - -crunch-server-header \ ---deanimate-gifs \ +@@ -2,8 +2,17 @@ + # Defaults + ############################################################################# + { \ ++deanimate-gifs{last} \ - -downgrade-http-version \ - -fast-redirects \ - -filter{js-annoyances} \ - -filter{js-events} \ - -filter{html-annoyances} \ - -filter{content-cookies} \ ---filter{refresh-tags} \ ++filter{refresh-tags} \ - -filter{unsolicited-popups} \ - -filter{all-popups} \ ---filter{img-reorder} \ ---filter{banners-by-size} \ ++filter{img-reorder} \ ++filter{banners-by-size} \ - -filter{banners-by-link} \ ---filter{webbugs} \ ++filter{webbugs} \ - -filter{tiny-textforms} \ ---filter{jumping-windows} \ ++filter{jumping-windows} \ - -filter{frameset-borders} \ - -filter{demoronizer} \ - -filter{shockwave-flash} \ - -filter{quicktime-kioskmode} \ - -filter{fun} \ - -filter{crude-parental} \ ---filter{ie-exploits} \ ++filter{ie-exploits} \ - -filter{site-specifics} \ - -filter{google} \ - -filter{yahoo} \ -@@ -48,19 +48,19 @@ - -hide-if-modified-since \ +hide-forwarded-for-headers \ +hide-from-header{block} \ ---hide-referrer \ ++hide-referrer{conditional-block} \ - -hide-user-agent \ - -inspect-jpegs \ - -kill-popups \ - -limit-connect \ ---prevent-compression \ - -overwrite-last-modified \ -+-prevent-compression \ - -redirect \ - -send-vanilla-wafer \ - -send-wafer \ - -server-header-filter{xml-to-html} \ - -server-header-filter{html-to-xml} \ ---session-cookies-only \ ++session-cookies-only \ +set-image-blocker{pattern} \ - -treat-forbidden-connects-like-blocks \ } + / # Match all URLs diff --git a/debian/patches/29_usermanual.dpatch b/debian/patches/29_usermanual.dpatch deleted file mode 100755 index e5ff6654..00000000 --- a/debian/patches/29_usermanual.dpatch +++ /dev/null @@ -1,55 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 29_usermanual.dpatch by Roland Rosenfeld -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: fix some broken markup in user-manual.sgml - -@DPATCH@ -diff -urNad privoxy~/doc/source/user-manual.sgml privoxy/doc/source/user-manual.sgml ---- privoxy~/doc/source/user-manual.sgml -+++ privoxy/doc/source/user-manual.sgml -@@ -452,7 +452,7 @@ - - - Header filtering can be done with dedicated header filters now. As a result -- the actions filter-client-headers and filter-server-headers -+ the actions filter-client-headers and filter-server-headers - that were introduced with Privoxy 3.0.5 to apply - the content filters to the headers as, well have been removed again. - -@@ -2442,8 +2442,6 @@ - - - -- -- - - - -@@ -4079,7 +4077,7 @@ - - - forward-socks4a 127.0.0.1:9050 . to use the socks4a proxy listening at 127.0.0.1 port 9050. -- Replace forward-socks4a with forward-socks4 to use a socks4 connection (with local DNS -+ Replace forward-socks4a with forward-socks4 to use a socks4 connection (with local DNS - resolution) instead. - - -@@ -4087,7 +4085,7 @@ - - forward-socks4a 127.0.0.1:9050 proxy.example.org:8000 to use the socks4a proxy - listening at 127.0.0.1 port 9050 to reach the HTTP proxy listening at proxy.example.org port 8000. -- Replace forward-socks4a with forward-socks4 to use a socks4 connection (with local DNS -+ Replace forward-socks4a with forward-socks4 to use a socks4 connection (with local DNS - resolution) instead. - - -@@ -4116,7 +4114,7 @@ - to exit. - - -- Use the show-url-info CGI page -+ Use the show-url-info CGI page - to verify that your forward settings do what you thought the do. - - diff --git a/debian/patches/31_usermanual-dash.dpatch b/debian/patches/31_usermanual-dash.dpatch new file mode 100755 index 00000000..da896518 --- /dev/null +++ b/debian/patches/31_usermanual-dash.dpatch @@ -0,0 +1,24 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 31_usermanual-dash.dpatch by Roland Rosenfeld +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: remove "--" from log comments, because jade doesn't like these. + +@DPATCH@ +diff -urNad privoxy~/doc/source/user-manual.sgml privoxy/doc/source/user-manual.sgml +--- privoxy~/doc/source/user-manual.sgml ++++ privoxy/doc/source/user-manual.sgml +@@ -8913,11 +8913,11 @@ + Update embedded show-url-info output. + + Revision 2.37 2007/08/27 16:09:55 fabiankeil +- Fix --pre-chroot-nslookup description which I failed to ++ Fix -pre-chroot-nslookup description which I failed to + copy and paste properly. Reported by Stephen Gildea. + + Revision 2.36 2007/08/26 16:47:14 fabiankeil +- Add Stephen Gildea's --pre-chroot-nslookup patch [#1276666], ++ Add Stephen Gildea's -pre-chroot-nslookup patch [#1276666], + extensive comments moved to user manual. + + Revision 2.35 2007/08/26 14:59:49 fabiankeil diff --git a/debian/patches/32_faq_ulinkfix.dpatch b/debian/patches/32_faq_ulinkfix.dpatch new file mode 100755 index 00000000..6a26a024 --- /dev/null +++ b/debian/patches/32_faq_ulinkfix.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 32_faq_ulinkfix.dpatch by Roland Rosenfeld +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix ulink parameter. + +@DPATCH@ +diff -urNad privoxy~/doc/source/faq.sgml privoxy/doc/source/faq.sgml +--- privoxy~/doc/source/faq.sgml ++++ privoxy/doc/source/faq.sgml +@@ -1162,7 +1162,7 @@ + The whole idea of Privoxy is to modify client requests + and server responses in all sorts of ways and therefore + it's not a transparent proxy as described in +- RFC 2616. ++ RFC 2616. + + + However, some people say transparent proxy when they