rpms/privoxy/devel privoxy-3.0.6-dynamic-pcre.patch, NONE, 1.1 privoxy-3.0.6-kill.patch, NONE, 1.1 privoxy.spec, 1.18, 1.19

[fedora-cvs-commits at redhat.com]

Author: karsten

Update of /cvs/dist/rpms/privoxy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7292

Modified Files:
	privoxy.spec 
Added Files:
	privoxy-3.0.6-dynamic-pcre.patch privoxy-3.0.6-kill.patch 
Log Message:
- add upstream patch for dynamic pcre (#226316)
- use kill -s HUP instead of 'kill -HUP' (#193159)


privoxy-3.0.6-dynamic-pcre.patch:
 filters.c |   51 +++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 45 insertions(+), 6 deletions(-)

--- NEW FILE privoxy-3.0.6-dynamic-pcre.patch ---
diff -urN privoxy-3.0.6-stable/filters.c privoxy-3.0.6-stable_new/filters.c
--- privoxy-3.0.6-stable/filters.c	2006-09-23 15:26:38.000000000 +0200
+++ privoxy-3.0.6-stable_new/filters.c	2007-03-05 11:55:37.000000000 +0100
@@ -1489,7 +1489,9 @@
       {
          if (strcmp(b->name, filtername->str) == 0)
          {
-            int current_hits = 0;
+            int current_hits = 0; /* Number of hits caused by this filter */
+            int job_number   = 0; /* Which job we're currently executing  */
+            int job_hits     = 0; /* How many hits the current job caused */
 
             if ( NULL == b->joblist )
             {
@@ -1501,13 +1503,50 @@
             /* Apply all jobs from the joblist */
             for (job = b->joblist; NULL != job; job = job->next)
             {
-               current_hits += pcrs_execute(job, old, size, &new, &size);
-               if (old != csp->iob->cur) free(old);
-               old=new;
+               job_number++;
+               job_hits = pcrs_execute(job, old, size, &new, &size);
+
+               if (job_hits >= 0)
+               {
+                  /*
+                   * That went well. Continue filtering
+                   * and use the result of this job as
+                   * input for the next one.
+                   */
+                  current_hits += job_hits;
+                  if (old != csp->iob->cur)
+                  {
+                     free(old);
+                  }
+                  old = new;
+               }
+               else
+               {
+                  /*
+                   * The job caused an unexpected error. Inform the user
+                   * and skip the rest of jobs in this filter. We could
+                   * continue with the next job, but usually the jobs
+                   * depend on each other or are similar enough to
+                   * fail with the same reason.
+                   *
+                   * XXX: In theory pcrs_strerror() would
+                   * return a proper error message here.
+                   *
+                   * At the moment, however, our pcrs expects the
+                   * error codes of pcre 3.4 and newer pcre version
+                   * return different error codes. As a result
+                   * pcrs_strerror()'s error message might be bogus,
+                   * therefore we print the numerical value as well.
+                   */
+                  log_error(LOG_LEVEL_ERROR, "Skipped filter \'%s\' after job number %u: %s (%d)",
+                     b->name, job_number, pcrs_strerror (job_hits), job_hits);
+                  break;
+               }
             }
 
-            log_error(LOG_LEVEL_RE_FILTER, "re_filtering %s%s (size %d) with filter %s produced %d hits (new size %d).",
-                      csp->http->hostport, csp->http->path, prev_size, b->name, current_hits, size);
+            log_error(LOG_LEVEL_RE_FILTER,
+               "re_filtering %s%s (size %d) with filter %s produced %d hits (new size %d).",
+               csp->http->hostport, csp->http->path, prev_size, b->name, current_hits, size);
 
             hits += current_hits;
          }

privoxy-3.0.6-kill.patch:
 privoxy.init |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE privoxy-3.0.6-kill.patch ---
--- privoxy-3.0.6-stable_new/privoxy.init.kill	2007-03-05 12:01:00.000000000 +0100
+++ privoxy-3.0.6-stable_new/privoxy.init	2007-03-05 12:01:15.000000000 +0100
@@ -95,7 +95,7 @@
 	;;
   reload)
 	if [ -f $PRIVOXY_PID ] ; then
-        kill -HUP `cat $PRIVOXY_PID`
+        kill -s HUP `cat $PRIVOXY_PID`
         RETVAL=$?
      fi
 	;;


Index: privoxy.spec
===================================================================
RCS file: /cvs/dist/rpms/privoxy/devel/privoxy.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- privoxy.spec	26 Feb 2007 10:16:10 -0000	1.18
+++ privoxy.spec	5 Mar 2007 11:05:36 -0000	1.19
@@ -4,12 +4,14 @@
 
 Name: privoxy
 Version: 3.0.6
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: Privoxy - privacy enhancing proxy
 License: GPL
 Source0: http://dl.sf.net/ijbswa/%{name}/%{name}-%{version}-stable-src.tar.gz
 Patch:  privoxy-3.0.3-service.patch
 Patch1: privoxy-3.0.6-stripchangelog.patch
+Patch2: privoxy-3.0.6-dynamic-pcre.patch
+Patch3: privoxy-3.0.6-kill.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Group: System Environment/Daemons
 URL: http://www.privoxy.org/
@@ -33,6 +35,8 @@
 %setup -q -n %{name}-%{version}-stable
 %patch -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 rm -rf autom4te.cache
@@ -114,6 +118,10 @@
 %doc doc/webserver
 
 %changelog
+* Mon Mar 05 2007 Karsten Hopp <karsten at redhat.com> 3.0.6-6
+- add upstream patch for dynamic pcre (#226316)
+- use kill -s HUP instead of 'kill -HUP' (#193159)
+
 * Mon Feb 26 2007 Karsten Hopp <karsten at redhat.com> 3.0.6-5
 - add disttag
 - don't convert manpage to UTF-8