Update Debian patches to the state of CVS as of 2007-12-01.

[privoxy.git] / debian / patches / 14_config.dpatch

diff --git a/debian/patches/14_config.dpatch b/debian/patches/14_config.dpatch
index ec35869..5e7d20e 100644 (file)
--- 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
+ #