-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 <roland@debian.org> Thu, 7 Jun 2007 12:30:02 +0200
+ -- Roland Rosenfeld <roland@debian.org> Sun, 14 Oct 2007 17:45:59 +0200
privoxy (3.0.6-3) unstable; urgency=low
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 -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 -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
-
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 -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
+++ /dev/null
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 29_usermanual.dpatch by Roland Rosenfeld <roland@debian.org>
-##
-## 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 @@
- <listitem>
- <para>
- Header filtering can be done with dedicated header filters now. As a result
-- the actions <q>filter-client-headers</q> and <q>filter-server-headers</q>
-+ the actions <quote>filter-client-headers</quote> and <quote>filter-server-headers</quote>
- that were introduced with <application>Privoxy 3.0.5</application> to apply
- the content filters to the headers as, well have been removed again.
- </para>
-@@ -2442,8 +2442,6 @@
-
- </sect3>
-
--</sect2>
--
- <!-- ~ End section ~ -->
-
-
-@@ -4079,7 +4077,7 @@
- <listitem>
- <para>
- <quote>forward-socks4a 127.0.0.1:9050 .</quote> to use the socks4a proxy listening at 127.0.0.1 port 9050.
-- Replace <q>forward-socks4a</q> with <q>forward-socks4</q> to use a socks4 connection (with local DNS
-+ Replace <quote>forward-socks4a</quote> with <quote>forward-socks4</quote> to use a socks4 connection (with local DNS
- resolution) instead.
- </para>
- </listitem>
-@@ -4087,7 +4085,7 @@
- <para>
- <quote>forward-socks4a 127.0.0.1:9050 proxy.example.org:8000</quote> 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 <q>forward-socks4a</q> with <q>forward-socks4</q> to use a socks4 connection (with local DNS
-+ Replace <quote>forward-socks4a</quote> with <quote>forward-socks4</quote> to use a socks4 connection (with local DNS
- resolution) instead.
- </para>
- </listitem>
-@@ -4116,7 +4114,7 @@
- to exit.
- </para>
- <para>
-- Use the <link linkend="http://config.privoxy.org/show-url-info">show-url-info CGI page</link>
-+ Use the <ulink url="http://config.privoxy.org/show-url-info">show-url-info CGI page</ulink>
- to verify that your forward settings do what you thought the do.
- </para>
- </warning>
--- /dev/null
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 31_usermanual-dash.dpatch by Roland Rosenfeld <roland@debian.org>
+##
+## 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
--- /dev/null
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 32_faq_ulinkfix.dpatch by Roland Rosenfeld <roland@debian.org>
+##
+## 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
+- <ulink link="http://tools.ietf.org/html/rfc2616">RFC 2616</ulink>.
++ <ulink url="http://tools.ietf.org/html/rfc2616">RFC 2616</ulink>.
+ </para>
+ <para>
+ However, some people say <quote>transparent proxy</quote> when they
projects / privoxy.git / commitdiff