[privoxy-commits] current/debian/patches 05_defaut_action.dpatch, 1.11, 1.12 14_config.dpatch, 1.7, 1.8

[<no...@so...>]

Update of /cvsroot/ijbswa/current/debian/patches
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv25700/patches

Modified Files:
	05_defaut_action.dpatch 14_config.dpatch 
Log Message:
Merge changes from Debian revision 3.0.6-4.


Index: 05_defaut_action.dpatch
===================================================================
RCS file: /cvsroot/ijbswa/current/debian/patches/05_defaut_action.dpatch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- 05_defaut_action.dpatch	14 Oct 2007 16:00:46 -0000	1.11
+++ 05_defaut_action.dpatch	21 Oct 2007 12:10:44 -0000	1.12
@@ -8,7 +8,16 @@
 diff -urNad privoxy~/default.action.master privoxy/default.action.master
 --- privoxy~/default.action.master
 +++ privoxy/default.action.master
-@@ -1823,6 +1823,11 @@
+@@ -598,6 +598,8 @@
+ .*[epu]ad*.
+ county*.
+ countr*.
++#MASTER# Do not block Andorra ccTLD:
++.ad
+ 
+ #############################################################################
+ # Generic block patterns by path:
+@@ -1823,6 +1825,11 @@
  {+filter{tiny-textforms} +prevent-compression}
  .sourceforge.net/tracker
  

Index: 14_config.dpatch
===================================================================
RCS file: /cvsroot/ijbswa/current/debian/patches/14_config.dpatch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- 14_config.dpatch	7 Jun 2007 10:41:02 -0000	1.7
+++ 14_config.dpatch	21 Oct 2007 12:10:44 -0000	1.8
@@ -52,6 +52,15 @@
  
  #
  #  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.
+ #
+-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.
@@ -61,6 +70,15 @@
  
  #
  #  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.