-privoxy (3.0.7~CSV20071021-0.1) UNRELEASED; urgency=low
+privoxy (3.0.7~CSV20071202-0.1) UNRELEASED; urgency=low
- * CVS as of 2007-10-21.
+ * CVS as of 2007-12-01.
* 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.
- * 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> Sun, 21 Oct 2007 14:05:00 +0200
+ * Remove 23_fix_faq_id.dpatch, which is now applied upstream.
+
+ -- Roland Rosenfeld <roland@debian.org> Sun, 02 Dec 2007 16:11:10 +0100
privoxy (3.0.6-4) unstable; urgency=low
17_502_no_such_domain.dpatch
19_manpage_fixup.dpatch
20_makefile_fixup.dpatch
-23_fix_faq_id.dpatch
24_global_action.dpatch
25_standard_medium.dpatch
27_remove_nsl.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
-@@ -598,6 +598,8 @@
+@@ -613,6 +613,8 @@
.*[epu]ad*.
county*.
countr*.
#############################################################################
# Generic block patterns by path:
-@@ -1823,6 +1825,11 @@
+@@ -1854,6 +1856,11 @@
{+filter{tiny-textforms} +prevent-compression}
.sourceforge.net/tracker
--- privoxy~/config
+++ privoxy/config
@@ -1,4 +1,4 @@
--# Sample Configuration File for Privoxy v3.0.6
+-# Sample Configuration File for Privoxy v3.0.7
+# Sample Configuration File for Privoxy
#
- # $Id: config,v 1.57 2007/01/02 01:39:52 david__schmidt Exp $
+ # $Id: config,v 1.59 2007/11/15 02:46:31 hal9 Exp $
#
-@@ -123,7 +123,7 @@
+@@ -128,7 +128,7 @@
# If set, this option should be the first option in the config
# file, because it is used while the config file is being read.
#
-#user-manual http://www.privoxy.org/user-manual/
+user-manual /usr/share/doc/privoxy/user-manual
-
+ #
#
# 1.2. trust-info-url
-@@ -159,8 +159,8 @@
+@@ -163,8 +163,8 @@
# don't end up locked out from the information on why they were
# locked out in the first place!
#
-trust-info-url http://www.example.com/what_we_allow.html
+#trust-info-url http://www.example.com/why_we_block.html
+#trust-info-url http://www.example.com/what_we_allow.html
-
+ #
#
# 1.3. admin-address
-@@ -266,7 +266,7 @@
- # flat, except for confdir/templates, where the HTML templates
- # for CGI output reside (e.g. Privoxy's 404 error page).
+@@ -260,7 +260,7 @@
+ #
+ # No trailing "/", please.
#
-confdir .
+confdir /etc/privoxy
-
#
- # 2.2. logdir
-@@ -293,7 +293,7 @@
#
- # No trailing "/", please
+ # 2.2. templdir
+@@ -315,7 +315,7 @@
+ #
+ # No trailing "/", please.
#
-logdir .
+logdir /var/log/privoxy
-
#
- # 2.3. actionsfile
-@@ -575,7 +575,7 @@
- # If you want to use CLF (Common Log Format), you should set
- # "debug 512" ONLY and not enable anything else.
+ #
+ # 2.4. actionsfile
+@@ -609,7 +609,7 @@
+ # it's reached, messages are logged truncated and marked with
+ # "... [too long, truncated]".
#
-debug 1 # show each GET/POST/CONNECT request
+#debug 1 # show each GET/POST/CONNECT request
debug 4096 # Startup banner and warnings
debug 8192 # Errors - *we highly recommended enabling this*
-
-@@ -735,7 +735,7 @@
- # Note that you must have compiled Privoxy with support for this
- # feature, otherwise this option has no effect.
- #
--enable-remote-toggle 1
-+enable-remote-toggle 0
-
- #
- # 4.4. enable-remote-http-toggle
-@@ -770,7 +770,7 @@
- # untrustworthy clients and want to enforce filtering, you will
- # have to disable this option, otherwise you can ignore it.
- #
--enable-remote-http-toggle 1
-+enable-remote-http-toggle 0
-
- #
- # 4.5. enable-edit-actions
-@@ -803,7 +803,7 @@
- # Note that you must have compiled Privoxy with support for this
- # feature, otherwise this option has no effect.
- #
--enable-edit-actions 1
-+enable-edit-actions 0
-
- #
- # 4.6. ACLs: permit-access and deny-access
+ #
# readme page and INSTALL file
-@@ -1127,8 +1127,8 @@
+@@ -1132,8 +1132,8 @@
$(INSTALL) $(INSTALL_T) $(DOK_WEB)/p_doc.css $$DOC/user-manual;\
fi
@# Not all platforms support gzipped man pages.
@# Change the config file default directories according to the configured ones
@$(ECHO) Rewriting config for this installation
-@@ -1288,7 +1288,7 @@
+@@ -1293,7 +1293,7 @@
@# man page and docs
@$(ECHO) Removing $(PROGRAM) docs
+++ /dev/null
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 23_fix_faq_id.dpatch by Roland Rosenfeld <roland@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix value of id attribute in <sect2> tag (no underscore allowed).
-
-@DPATCH@
-diff -urNad privoxy~/doc/source/faq.sgml privoxy/doc/source/faq.sgml
---- privoxy~/doc/source/faq.sgml
-+++ privoxy/doc/source/faq.sgml
-@@ -149,7 +149,7 @@
- <!-- ~~~~~ New section ~~~~~ -->
-
- <sect1 id="general"><title>General Information</title>
--<sect2 renderas="sect3" id="who_uses"><title>Who should use Privoxy?</title>
-+<sect2 renderas="sect3" id="whouses"><title>Who should use Privoxy?</title>
- <para>
- Anyone that is interested in security, privacy, or in
- finer-grained control over their web and Internet experience.
diff -urNad privoxy~/config privoxy/config
--- privoxy~/config
+++ privoxy/config
-@@ -335,6 +335,7 @@
- # without at least one actions file.
+@@ -361,6 +361,7 @@
+ # to allow previously forbidden characters.
+ #
+ actionsfile standard.action # Internal purpose, recommended
++actionsfile global.action # Global default setting for all sites
+ actionsfile default.action # Main actions file
+ actionsfile user.action # User customizations
#
- actionsfile standard # Internal purpose, recommended
-+actionsfile global # Global default setting for all sites
- actionsfile default # Main actions file
- actionsfile user # User customizations
-
diff -urNad privoxy~/default.action.master privoxy/default.action.master
--- privoxy~/default.action.master
+++ privoxy/default.action.master
-@@ -537,16 +537,6 @@
+@@ -552,16 +552,6 @@
allow-ads = -block -filter{banners-by-size} -filter{banners-by-link}
#############################################################################
diff -urNad privoxy~/configure.in privoxy/configure.in
--- privoxy~/configure.in
+++ privoxy/configure.in
-@@ -923,7 +923,7 @@
+@@ -926,7 +926,7 @@
dnl =================================================================
dnl Next line needed to find the gethost*_r functions on Solaris
+++ /dev/null
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 30_actionsfile_fullname.dpatch by Roland Rosenfeld <roland@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: The "actionsfile" syntax in the configuration file is consistent
-## DP: with the rest of the configuration options and requires the
-## DP: whole file name.
-
-@DPATCH@
-diff -urNad privoxy~/config privoxy/config
---- privoxy~/config
-+++ privoxy/config
-@@ -334,10 +334,10 @@
- # privacy considerations, etc. There is no point in using Privoxy
- # without at least one actions file.
- #
--actionsfile standard # Internal purpose, recommended
--actionsfile global # Global default setting for all sites
--actionsfile default # Main actions file
--actionsfile user # User customizations
-+actionsfile standard.action # Internal purpose, recommended
-+actionsfile global.action # Global default setting for all sites
-+actionsfile default.action # Main actions file
-+actionsfile user.action # User customizations
-
- #
- # 2.4. filterfile
+++ /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