From 60b84734caeb5cc110a3d0ec27351f33f5044dc0 Mon Sep 17 00:00:00 2001 From: Roland Rosenfeld Date: Tue, 4 Dec 2007 16:00:11 +0000 Subject: [PATCH] Update Debian patches to the state of CVS as of 2007-12-01. --- debian/changelog | 15 ++--- debian/patches/00list | 4 -- debian/patches/05_defaut_action.dpatch | 4 +- debian/patches/14_config.dpatch | 65 ++++++------------- debian/patches/15_mansection8.dpatch | 4 +- debian/patches/23_fix_faq_id.dpatch | 19 ------ debian/patches/24_global_action.dpatch | 16 ++--- debian/patches/27_remove_nsl.dpatch | 2 +- debian/patches/30_actionsfile_fullname.dpatch | 27 -------- debian/patches/31_usermanual-dash.dpatch | 24 ------- debian/patches/32_faq_ulinkfix.dpatch | 19 ------ 11 files changed, 37 insertions(+), 162 deletions(-) delete mode 100755 debian/patches/23_fix_faq_id.dpatch delete mode 100755 debian/patches/30_actionsfile_fullname.dpatch delete mode 100755 debian/patches/31_usermanual-dash.dpatch delete mode 100755 debian/patches/32_faq_ulinkfix.dpatch diff --git a/debian/changelog b/debian/changelog index c87ca191..4f48e86b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,18 +1,13 @@ -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 Sun, 21 Oct 2007 14:05:00 +0200 + * Remove 23_fix_faq_id.dpatch, which is now applied upstream. + + -- Roland Rosenfeld Sun, 02 Dec 2007 16:11:10 +0100 privoxy (3.0.6-4) unstable; urgency=low diff --git a/debian/patches/00list b/debian/patches/00list index 06927b2e..d8b0a2ed 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -9,10 +9,6 @@ 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 --git a/debian/patches/05_defaut_action.dpatch b/debian/patches/05_defaut_action.dpatch index 9194b972..f49dda5b 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 -@@ -598,6 +598,8 @@ +@@ -613,6 +613,8 @@ .*[epu]ad*. county*. countr*. @@ -17,7 +17,7 @@ diff -urNad privoxy~/default.action.master privoxy/default.action.master ############################################################################# # Generic block patterns by path: -@@ -1823,6 +1825,11 @@ +@@ -1854,6 +1856,11 @@ {+filter{tiny-textforms} +prevent-compression} .sourceforge.net/tracker diff --git a/debian/patches/14_config.dpatch b/debian/patches/14_config.dpatch index ec358695..5e7d20e7 100644 --- a/debian/patches/14_config.dpatch +++ b/debian/patches/14_config.dpatch @@ -9,21 +9,21 @@ diff -urNad privoxy~/config privoxy/config --- 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! # @@ -31,60 +31,33 @@ diff -urNad privoxy~/config privoxy/config -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 + # diff --git a/debian/patches/15_mansection8.dpatch b/debian/patches/15_mansection8.dpatch index 944f316e..4cbc6f3a 100644 --- a/debian/patches/15_mansection8.dpatch +++ b/debian/patches/15_mansection8.dpatch @@ -62,7 +62,7 @@ diff -urNad privoxy~/GNUmakefile.in privoxy/GNUmakefile.in # 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. @@ -73,7 +73,7 @@ diff -urNad privoxy~/GNUmakefile.in privoxy/GNUmakefile.in @# 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 diff --git a/debian/patches/23_fix_faq_id.dpatch b/debian/patches/23_fix_faq_id.dpatch deleted file mode 100755 index 20c2e33d..00000000 --- a/debian/patches/23_fix_faq_id.dpatch +++ /dev/null @@ -1,19 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 23_fix_faq_id.dpatch by Roland Rosenfeld -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Fix value of id attribute in 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 @@ - - - General Information --Who should use Privoxy? -+Who should use Privoxy? - - Anyone that is interested in security, privacy, or in - finer-grained control over their web and Internet experience. diff --git a/debian/patches/24_global_action.dpatch b/debian/patches/24_global_action.dpatch index 916073fe..4b90453a 100755 --- a/debian/patches/24_global_action.dpatch +++ b/debian/patches/24_global_action.dpatch @@ -21,18 +21,18 @@ diff -urNad privoxy~/GNUmakefile.in privoxy/GNUmakefile.in 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 --git a/debian/patches/27_remove_nsl.dpatch b/debian/patches/27_remove_nsl.dpatch index 988d988e..a14da4eb 100755 --- a/debian/patches/27_remove_nsl.dpatch +++ b/debian/patches/27_remove_nsl.dpatch @@ -8,7 +8,7 @@ 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 diff --git a/debian/patches/30_actionsfile_fullname.dpatch b/debian/patches/30_actionsfile_fullname.dpatch deleted file mode 100755 index 3a55d003..00000000 --- a/debian/patches/30_actionsfile_fullname.dpatch +++ /dev/null @@ -1,27 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 30_actionsfile_fullname.dpatch by Roland Rosenfeld -## -## 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 diff --git a/debian/patches/31_usermanual-dash.dpatch b/debian/patches/31_usermanual-dash.dpatch deleted file mode 100755 index da896518..00000000 --- a/debian/patches/31_usermanual-dash.dpatch +++ /dev/null @@ -1,24 +0,0 @@ -#! /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 deleted file mode 100755 index 6a26a024..00000000 --- a/debian/patches/32_faq_ulinkfix.dpatch +++ /dev/null @@ -1,19 +0,0 @@ -#! /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 -- 2.39.2