diff --git a/.cvsignore b/.cvsignore index df66f5b..8662c6b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -privoxy-3.0.13-beta-src.tar.gz +privoxy-3.0.16-stable-src.tar.gz diff --git a/privoxy-3.0.3-service.patch b/privoxy-3.0.3-service.patch deleted file mode 100644 index d099377..0000000 --- a/privoxy-3.0.3-service.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- privoxy-3.0.3-stable/privoxy.init.foo 2004-09-09 18:04:22.247380535 -0400 -+++ privoxy-3.0.3-stable/privoxy.init 2004-09-09 18:04:28.657543191 -0400 -@@ -3,7 +3,7 @@ - # This is file /etc/rc.d/init.d/privoxy and was put here - # by the privoxy rpm - # --# chkconfig: 2345 84 09 -+# chkconfig: - 84 09 - # - # description: Web proxy with advanced filtering capabilities \ - # such as filtering web page content, managing \ diff --git a/privoxy-3.0.6-dynamic-pcre.patch b/privoxy-3.0.6-dynamic-pcre.patch deleted file mode 100644 index aaa1240..0000000 --- a/privoxy-3.0.6-dynamic-pcre.patch +++ /dev/null @@ -1,70 +0,0 @@ -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; - } diff --git a/privoxy-3.0.6-kill.patch b/privoxy-3.0.6-kill.patch deleted file mode 100644 index 812e3e9..0000000 --- a/privoxy-3.0.6-kill.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 - ;; diff --git a/privoxy-3.0.6-stripchangelog.patch b/privoxy-3.0.6-stripchangelog.patch deleted file mode 100644 index ee54f45..0000000 --- a/privoxy-3.0.6-stripchangelog.patch +++ /dev/null @@ -1,160 +0,0 @@ ---- privoxy-3.0.6-stable/privoxy.init.rh2 2007-02-22 15:06:30.000000000 +0100 -+++ privoxy-3.0.6-stable/privoxy.init 2007-02-22 15:07:34.000000000 +0100 -@@ -9,11 +9,6 @@ - # such as filtering web page content, managing \ - # cookies and removing ads - # -- --# ******************************************************************** --# --# File : $Source: /cvsroot/ijbswa/current/privoxy.init,v $ --# - # Purpose : This shell script takes care of starting and stopping - # privoxy. - # -@@ -42,145 +37,7 @@ - # or write to the Free Software Foundation, Inc., 59 - # Temple Place - Suite 330, Boston, MA 02111-1307, USA. - # --# Revisions : --# $Log: privoxy.init,v $ --# Revision 1.11 2006/07/18 14:48:47 david__schmidt --# Reorganizing the repository: swapping out what was HEAD (the old 3.1 branch) --# with what was really the latest development (the v_3_0_branch branch) --# --# Revision 1.8.2.3 2002/12/10 20:52:16 kick_ --# better service description. This text will be shown when the user configures the services --# --# Revision 1.8.2.2 2002/08/05 08:42:13 kick_ --# same permissions, same runlevels as all the other initscripts --# --# Revision 1.8.2.1 2002/07/12 09:14:26 kick_ --# don't use ghost files for rcX.d/*, chkconfig is available to do this job. Enable translation of error messge --# --# Revision 1.8 2002/04/09 02:51:31 hal9 --# Changed $JB to $PRIVOXY. --# --# Revision 1.7 2002/04/08 14:54:51 morcego --# Moved the chkconfig comments to the begining of the file, couse Linuxconf --# was getting confused with it where it was. --# --# Revision 1.6 2002/03/26 22:29:55 swa --# we have a new homepage! --# --# Revision 1.5 2002/03/25 06:14:18 morcego --# Removing the OPRG definition (no longer needed) --# --# Revision 1.4 2002/03/25 04:16:48 hal9 --# Fix proper config file location. --# --# Revision 1.3 2002/03/24 19:12:15 hal9 --# Fixed some naming conflicts. --# --# Revision 1.2 2002/03/24 11:40:14 swa --# name change --# --# Revision 1.1 2002/03/24 11:23:44 swa --# name change --# --# Revision 1.1 2002/03/22 20:53:03 morcego --# - Ongoing process to change name to JunkbusterNG --# - configure/configure.in: no change needed --# - GNUmakefile.in: --# - TAR_ARCH = /tmp/JunkbusterNG-$(RPM_VERSION).tar.gz --# - PROGRAM = jbng@EXEEXT@ --# - rh-spec now references as junkbusterng-rh.spec --# - redhat-upload: references changed to junkbusterng-* (package names) --# - tarball-dist: references changed to JunkbusterNG-distribution-* --# - tarball-src: now JunkbusterNG-* --# - install: initscript now junkbusterng.init and junkbusterng (when --# installed) --# - junkbuster-rh.spec: renamed to junkbusterng-rh.spec --# - junkbusterng.spec: --# - References to the expression ijb where changed where possible --# - New package name: junkbusterng (all in lower case, acording to --# the LSB recomendation) --# - Version changed to: 2.9.13 --# - Release: 1 --# - Added: junkbuster to obsoletes and conflicts (Not sure this is --# right. If it obsoletes, why conflict ? Have to check it later) --# - Summary changed: Stefan, please check and aprove it --# - Changes description to use the new name --# - Sed string was NOT changed. Have to wait to the manpage to --# change first --# - Keeping the user junkbuster for now. It will require some aditional --# changes on the script (scheduled for the next specfile release) --# - Added post entry to move the old logfile to the new log directory --# - Removing "chkconfig --add" entry (not good to have it automaticaly --# added to the startup list). --# - Added preun section to stop the service with the old name, as well --# as remove it from the startup list --# - Removed the chkconfig --del entry from the conditional block on --# the preun scriptlet (now handled on the %files section) --# - junkbuster.init: renamed to junkbusterng.init --# - junkbusterng.init: --# - Changed JB_BIN to jbng --# - Created JB_OBIN with the old value of JB_BIN (junkbuster), to --# be used where necessary (config dir) --# --# Aditional notes: --# - The config directory is /etc/junkbuster yet. Have to change it on the --# specfile, after it is changes on the code --# - The only files that got renamed on the cvs tree were the rh specfile and --# the init file. Some file references got changes on the makefile and on the --# rh-spec (as listed above) --# --# Revision 1.15 2002/03/09 15:05:58 swa --# wrong user.group --# --# Revision 1.14 2002/03/06 06:13:40 hal9 --# Adapted for Andreas' changes for --user and --pidfile. --# --# Revision 1.13 2002/03/05 05:10:10 oes --# Changed pidfile path to conform with FHS --# --# Revision 1.12 2002/03/04 20:44:36 oes --# Changed to new cmdline syntax --# --# Revision 1.11 2001/12/30 14:07:32 steudten --# - Add signal handling (unix) --# - Add SIGHUP handler (unix) --# - Add creation of pidfile (unix) --# - Add action 'top' in rc file (RH) --# - Add entry 'SIGNALS' to manpage --# - Add exit message to logfile (unix) --# --# Revision 1.10 2001/11/05 21:30:23 steudten --# Make JB startup without & due to be a 'real' daemon right now. --# Make the script easy to change. --# --# Revision 1.9 2001/09/15 01:53:12 steudten --# --# Remove test for subsys flag in start. Some minor changes. --# --# Revision 1.8 2001/06/28 13:50:36 sarantis --# swap ?$ with $?; remove bogus ";;" --# --# Revision 1.7 2001/06/28 13:40:26 sarantis --# remove single quotes from $JB; it was not expanded. --# --# Revision 1.6 2001/06/28 13:38:42 sarantis --# formatting changes; individual return values are returned from the init script. --# --# Revision 1.5 2001/06/11 11:37:40 sarantis --# Minor editing changes. --# --# Revision 1.4 2001/06/09 09:14:11 swa --# shamelessly adapted RPM stuff from the newest rpm that --# RedHat provided for the JB. --# --# Revision 1.3 2001/05/25 10:12:44 oes --# Fixed default case in switch statement (# -> *) --# --# Revision 1.2 2001/05/24 07:52:24 swa --# added header. removed ^M. --# - # --# ********************************************************************/ - - - # Source function library. diff --git a/privoxy.spec b/privoxy.spec index f445ad9..876b8d1 100644 --- a/privoxy.spec +++ b/privoxy.spec @@ -1,17 +1,15 @@ %define privoxyconf %{_sysconfdir}/%{name} %define privoxy_uid 73 %define privoxy_gid 73 -#define beta_or_stable stable -%define beta_or_stable beta +%define beta_or_stable stable +#define beta_or_stable beta Name: privoxy -Version: 3.0.13 -Release: beta.1%{?dist}.1 +Version: 3.0.16 +Release: 1%{?dist} Summary: Privacy enhancing proxy License: GPLv2+ Source0: http://downloads.sourceforge.net/ijbswa/%{name}-%{version}-%{beta_or_stable}-src.tar.gz -Patch: privoxy-3.0.3-service.patch -Patch1: 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,8 +31,6 @@ Privoxy is based on the Internet Junkbuster. %prep %setup -q -n %{name}-%{version}-%{beta_or_stable} -%patch -p1 -%patch1 -p1 %build rm -rf autom4te.cache @@ -51,15 +47,17 @@ mkdir -p %{buildroot}%{_sbindir} \ %{buildroot}%{_mandir}/man1 \ %{buildroot}%{_localstatedir}/log/%{name} \ %{buildroot}%{privoxyconf}/templates \ - %{buildroot}%{_sysconfdir}/logrotate.d \ %{buildroot}%{_sysconfdir}/rc.d/init.d +# Upstream dropped this one: +# %{buildroot}%{_sysconfdir}/logrotate.d install -p -m 744 %{name} %{buildroot}%{_sbindir}/%{name} install -p -m 644 {config,*.action,default.filter,trust} %{buildroot}%{privoxyconf}/ install -p -m 644 templates/* %{buildroot}%{privoxyconf}/templates install -p -m 644 %{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1 -install -p -m 644 %{name}.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/%{name} -install -p -m 755 %{name}.init %{buildroot}%{_sysconfdir}/rc.d/init.d/%{name} +# Upstream dropped this one: +#install -p -m 644 %{name}.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/%{name} +install -p -m 755 %{name}-generic.init %{buildroot}%{_sysconfdir}/rc.d/init.d/%{name} install -p -m 711 -d %{buildroot}%{_localstatedir}/log/%{name} # Customize the configuration file @@ -106,7 +104,7 @@ fi # Owned by root %defattr(-,root,root,-) -%config(noreplace) %{_sysconfdir}/logrotate.d/%{name} +#config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %attr(0755,root,root) %{_initrddir}/%{name} %{_mandir}/man1/%{name}.* %doc README AUTHORS ChangeLog LICENSE @@ -114,6 +112,9 @@ fi #doc/source/developer-manual doc/source/faq doc/source/user-manual %changelog +* Tue Mar 23 2010 Karsten Hopp 3.0.16-1 +- update to 3.0.16 + * Sun Jul 26 2009 Fedora Release Engineering - 3.0.13-beta.1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/sources b/sources index aee7ec7..ca99ace 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9b2dc94a0cce32ba46ce88cdb422d3b6 privoxy-3.0.13-beta-src.tar.gz +64d3ffcdf8307e04a375773bb4eb255e privoxy-3.0.16-stable-src.tar.gz