Add changes from 3.0.6-2, 3.0.6-3 and several unreleased changes

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

diff --git a/debian/patches/14_config.dpatch b/debian/patches/14_config.dpatch
index b1b9695..76240b8 100644 (file)
--- a/debian/patches/14_config.dpatch
+++ b/debian/patches/14_config.dpatch
@@ -6,67 +6,67 @@
 
 @DPATCH@
 diff -urNad privoxy~/config privoxy/config
---- privoxy~/config    2006-02-11 20:29:59.000000000 +0100
-+++ privoxy/config     2006-02-11 20:30:28.000000000 +0100
+--- privoxy~/config
++++ privoxy/config
 @@ -1,4 +1,4 @@
--#        Sample Configuration File for Privoxy v3.0.x
+-#        Sample Configuration File for Privoxy v3.0.6
 +#        Sample Configuration File for Privoxy
- #  
- #  Copyright (C) 2001-2004 Privoxy Developers http://privoxy.org
- #  
-@@ -104,7 +104,7 @@
- #      flat, except for confdir/templates, where the HTML templates
- #      for CGI output reside (e.g. Privoxy's 404 error page).
- #  
--confdir .
-+confdir /etc/privoxy
- 
- #  
- #  1.2. logdir
-@@ -131,7 +131,7 @@
- #  
- #      No trailing "/", please
- #  
--logdir .
-+logdir /var/log/privoxy
- 
- #  
- #  1.3. actionsfile
-@@ -406,7 +406,7 @@
+ #
+ #  $Id: config,v 1.57 2007/01/02 01:39:52 david__schmidt Exp $
+ #
+@@ -123,7 +123,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
  
- #  
- #  2.2. trust-info-url
-@@ -442,8 +442,8 @@
+ #
+ #  1.2. trust-info-url
+@@ -159,8 +159,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/why_we_block.html
 -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
  
- #  
- #  2.3. admin-address
-@@ -730,7 +730,7 @@
+ #
+ #  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).
+ #
+-confdir .
++confdir /etc/privoxy
+ 
+ #
+ #  2.2. logdir
+@@ -293,7 +293,7 @@
+ #
+ #      No trailing "/", please
+ #
+-logdir .
++logdir /var/log/privoxy
+ 
+ #
+ #  2.3. actionsfile
+@@ -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-edit-actions
-@@ -763,7 +763,7 @@
+ #
+ #  4.4. enable-remote-http-toggle
+@@ -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.5. ACLs: permit-access and deny-access
+ #
+ #  4.6. ACLs: permit-access and deny-access