Adapt to CVS version as of 2006-09-23.

[privoxy.git] / debian / patches / 03_ipv6.dpatch

diff --git a/debian/patches/03_ipv6.dpatch b/debian/patches/03_ipv6.dpatch
index 939fe01..7508be9 100755 (executable)
--- a/debian/patches/03_ipv6.dpatch
+++ b/debian/patches/03_ipv6.dpatch
@@ -305,7 +305,7 @@ diff -urNad privoxy~/cgi.c privoxy/cgi.c
   *                Based on the Internet Junkbuster originally written
   *                by and Copyright (C) 1997 Anonymous Coders and 
   *                Junkbusters Corporation.  http://www.junkbusters.com
-@@ -2221,7 +2224,6 @@
+@@ -2250,7 +2253,6 @@
   *********************************************************************/
  struct map *default_exports(const struct client_state *csp, const char *caller)
  {
@@ -313,7 +313,7 @@ diff -urNad privoxy~/cgi.c privoxy/cgi.c
     jb_err err;
     struct map * exports;
     int local_help_exists = 0;
-@@ -2257,8 +2259,7 @@
+@@ -2286,8 +2288,7 @@
     if (!err) err = map_block_killer(exports, "can-toggle");
  #endif
  
@@ -353,7 +353,7 @@ diff -urNad privoxy~/filters.c privoxy/filters.c
   *                Based on the Internet Junkbuster originally written
   *                by and Copyright (C) 1997 Anonymous Coders and
   *                Junkbusters Corporation.  http://www.junkbusters.com
-@@ -465,6 +468,9 @@
+@@ -468,6 +471,9 @@
  #include <ctype.h>
  #include <string.h>
  #include <assert.h>
@@ -363,7 +363,7 @@ diff -urNad privoxy~/filters.c privoxy/filters.c
  
  #ifndef _WIN32
  #ifndef __OS2__
-@@ -499,17 +505,119 @@
+@@ -502,17 +508,119 @@
  
  const char filters_h_rcs[] = FILTERS_H_VERSION;
  
@@ -492,7 +492,7 @@ diff -urNad privoxy~/filters.c privoxy/filters.c
  /*********************************************************************
   *
   * Function    :  block_acl
-@@ -539,7 +647,7 @@
+@@ -542,7 +650,7 @@
     /* search the list */
     while (acl != NULL)
     {
@@ -501,7 +501,7 @@ diff -urNad privoxy~/filters.c privoxy/filters.c
        {
           if (dst == NULL)
           {
-@@ -549,8 +657,8 @@
+@@ -552,8 +660,8 @@
                 return(0);
              }
           }
@@ -512,7 +512,7 @@ diff -urNad privoxy~/filters.c privoxy/filters.c
           {
              if (acl->action == ACL_PERMIT)
              {
-@@ -569,81 +677,249 @@
+@@ -572,81 +680,249 @@
  
  }
  
@@ -2132,7 +2132,7 @@ diff -urNad privoxy~/jbsockets.h privoxy/jbsockets.h
 diff -urNad privoxy~/jcc.c privoxy/jcc.c
 --- privoxy~/jcc.c
 +++ privoxy/jcc.c
-@@ -744,6 +744,7 @@
+@@ -747,6 +747,7 @@
  #include "cgi.h"
  #include "loadcfg.h"
  #include "urlmatch.h"
@@ -2140,7 +2140,7 @@ diff -urNad privoxy~/jcc.c privoxy/jcc.c
  
  const char jcc_h_rcs[] = JCC_H_VERSION;
  const char project_h_rcs[] = PROJECT_H_VERSION;
-@@ -2304,61 +2305,78 @@
+@@ -2306,61 +2307,78 @@
   * Returns     :  Port that was opened.
   *
   *********************************************************************/
@@ -2255,7 +2255,7 @@ diff -urNad privoxy~/jcc.c privoxy/jcc.c
  }
  
  
-@@ -2387,12 +2405,18 @@
+@@ -2389,12 +2407,18 @@
  static void listen_loop(void)
  {
     struct client_state *csp = NULL;
@@ -2276,7 +2276,7 @@ diff -urNad privoxy~/jcc.c privoxy/jcc.c
  
  #ifdef FEATURE_GRACEFUL_TERMINATION
     while (!g_terminate)
-@@ -2466,14 +2490,55 @@
+@@ -2468,14 +2492,55 @@
            * that this will hurt people's feelings.
            */
  
@@ -2335,7 +2335,7 @@ diff -urNad privoxy~/jcc.c privoxy/jcc.c
        {
           log_error(LOG_LEVEL_CONNECT, "accept failed: %E");
  
-@@ -2491,6 +2556,8 @@
+@@ -2493,6 +2558,8 @@
           log_error(LOG_LEVEL_CONNECT, "OK");
        }
  
@@ -3005,7 +3005,7 @@ diff -urNad privoxy~/parsers.c privoxy/parsers.c
   *                Based on the Internet Junkbuster originally written
   *                by and Copyright (C) 1997 Anonymous Coders and
   *                Junkbusters Corporation.  http://www.junkbusters.com
-@@ -1929,6 +1932,167 @@
+@@ -1932,6 +1935,167 @@
     return JB_ERR_OK;
  }
  
@@ -3200,7 +3200,7 @@ diff -urNad privoxy~/parsers.h privoxy/parsers.h
 diff -urNad privoxy~/project.h privoxy/project.h
 --- privoxy~/project.h
 +++ privoxy/project.h
-@@ -598,6 +598,20 @@
+@@ -607,6 +607,20 @@
  
  #endif /* ndef _WIN32 */
  
@@ -3221,7 +3221,7 @@ diff -urNad privoxy~/project.h privoxy/project.h
  
  /**
   * A standard error code.  This should be JB_ERR_OK or one of the JB_ERR_xxx
-@@ -667,19 +681,6 @@
+@@ -681,19 +695,6 @@
   */
  #define FOREVER 1
  
@@ -3241,7 +3241,7 @@ diff -urNad privoxy~/project.h privoxy/project.h
  /* Forward def for struct client_state */
  struct configuration_spec;
  
-@@ -758,13 +759,16 @@
+@@ -772,13 +773,16 @@
     char *ver;      /**< Protocol version */
     int status;     /**< HTTP Status */
  
@@ -3259,7 +3259,7 @@ diff -urNad privoxy~/project.h privoxy/project.h
                                  of host's IP. NULL before connect_to() */
  
     char  *dbuffer; /**< Buffer with '\0'-delimited domain name.           */
-@@ -1144,13 +1148,16 @@
+@@ -1158,13 +1162,16 @@
         As a string. */
     char *ip_addr_str;
     /** Client PC's IP address, as reported by the accept() function.
@@ -3278,7 +3278,7 @@ diff -urNad privoxy~/project.h privoxy/project.h
     /** Our hostname. I.e. the reverse DNS of the IP address that the client
         used to reach us, as a string. */
     char *my_hostname;
-@@ -1325,18 +1332,33 @@
+@@ -1339,18 +1346,33 @@
     /** Connection type.  Must be SOCKS_NONE, SOCKS_4, or SOCKS_4A. */
     int   type;
  
@@ -3312,7 +3312,7 @@ diff -urNad privoxy~/project.h privoxy/project.h
     /** Next entry in the linked list. */
     struct forward_spec *next;
  };
-@@ -1345,7 +1367,7 @@
+@@ -1359,7 +1381,7 @@
  /**
   * Initializer for a static struct forward_spec.
   */
@@ -3321,7 +3321,7 @@ diff -urNad privoxy~/project.h privoxy/project.h
  
  
  /**
-@@ -1374,7 +1396,8 @@
+@@ -1388,7 +1410,8 @@
   */
  struct access_control_addr
  {
@@ -3331,7 +3331,7 @@ diff -urNad privoxy~/project.h privoxy/project.h
     unsigned long mask;  /**< The network mask as an integer. */
     unsigned long port;  /**< The port number. */
  };
-@@ -1409,6 +1432,17 @@
+@@ -1423,6 +1446,17 @@
  /** configuration_spec::feature_flags: HTTP-header-based toggle. */
  #define RUNTIME_FEATURE_HTTP_TOGGLE       4
  
@@ -3349,7 +3349,7 @@ diff -urNad privoxy~/project.h privoxy/project.h
  /**
   * Data loaded from the configuration file.
   *
-@@ -1472,11 +1506,13 @@
+@@ -1486,11 +1520,13 @@
  
  #endif /* def FEATURE_COOKIE_JAR */