current/debian/patches 00list, 1.11, 1.12 05_defaut_action.dpatch, 1.12, 1.13 14_config.dpatch, 1.8, 1.9 15_mansection8.dpatch, 1.6, 1.7 24_global_action.dpatch, 1.4, 1.5 27_remove_nsl.dpatch, 1.3, 1.4 23_fix_faq_id.dpatch, 1.1, NONE 30_actionsfile_fullname.dpatch, 1.1, NONE 31_usermanual-dash.dpatch, 1.1, NONE 32_faq_ulinkfix.dpatch, 1.1, NONE

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

Modified Files:
        00list 05_defaut_action.dpatch 14_config.dpatch 
        15_mansection8.dpatch 24_global_action.dpatch 
        27_remove_nsl.dpatch 
Removed Files:
        23_fix_faq_id.dpatch 30_actionsfile_fullname.dpatch 
        31_usermanual-dash.dpatch 32_faq_ulinkfix.dpatch 
Log Message:
Update Debian patches to the state of CVS as of 2007-12-01.


Index: 00list
===================================================================
RCS file: /cvsroot/ijbswa/current/debian/patches/00list,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- 00list      14 Oct 2007 16:00:46 -0000      1.11
+++ 00list      4 Dec 2007 16:00:10 -0000       1.12
@@ -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

Index: 05_defaut_action.dpatch
===================================================================
RCS file: /cvsroot/ijbswa/current/debian/patches/05_defaut_action.dpatch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- 05_defaut_action.dpatch     21 Oct 2007 12:10:44 -0000      1.12
+++ 05_defaut_action.dpatch     4 Dec 2007 16:00:10 -0000       1.13
@@ -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 @@
  
  #############################################################################
  # Generic block patterns by path:
-@@ -1823,6 +1825,11 @@
+@@ -1854,6 +1856,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.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- 14_config.dpatch    21 Oct 2007 12:10:44 -0000      1.8
+++ 14_config.dpatch    4 Dec 2007 16:00:10 -0000       1.9
@@ -9,21 +9,21 @@
 --- 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$
  #
-@@ -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 @@
 -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

Index: 15_mansection8.dpatch
===================================================================
RCS file: /cvsroot/ijbswa/current/debian/patches/15_mansection8.dpatch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- 15_mansection8.dpatch       7 Jun 2007 10:41:02 -0000       1.6
+++ 15_mansection8.dpatch       4 Dec 2007 16:00:10 -0000       1.7
@@ -62,7 +62,7 @@
  
  
  # 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 @@
  
        @# 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

Index: 24_global_action.dpatch
===================================================================
RCS file: /cvsroot/ijbswa/current/debian/patches/24_global_action.dpatch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- 24_global_action.dpatch     14 Oct 2007 16:00:46 -0000      1.4
+++ 24_global_action.dpatch     4 Dec 2007 16:00:10 -0000       1.5
@@ -21,18 +21,18 @@
 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}
  
  #############################################################################

Index: 27_remove_nsl.dpatch
===================================================================
RCS file: /cvsroot/ijbswa/current/debian/patches/27_remove_nsl.dpatch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- 27_remove_nsl.dpatch        7 Jun 2007 10:41:02 -0000       1.3
+++ 27_remove_nsl.dpatch        4 Dec 2007 16:00:10 -0000       1.4
@@ -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

--- 23_fix_faq_id.dpatch DELETED ---

--- 30_actionsfile_fullname.dpatch DELETED ---

--- 31_usermanual-dash.dpatch DELETED ---

--- 32_faq_ulinkfix.dpatch DELETED ---


-------------------------------------------------------------------------
SF.Net email is sponsored by: The Future of Linux Business White Paper
from Novell.  From the desktop to the data center, Linux is going
mainstream.  Let it simplify your IT future.
http://altfarm.mediaplex.com/ad/ck/8857-50307-18918-4