diff options
| author |   Alin Năstac <mrness@gentoo.org> | 2009-10-22 21:32:10 +0000 |
|---|---|---|
| committer | Alin Năstac <mrness@gentoo.org> | 2009-10-22 21:32:10 +0000 |
| commit | ead10ebea69b1f293c11f21e31d304b5d58832d2 (patch) | |
| tree | 99c53865ac78fb1b400e4d3431c7b842991cb593 /net-proxy/privoxy/files | |
| parent | Version bump (#289691). (diff) | |
| download | historical-ead10ebea69b1f293c11f21e31d304b5d58832d2.tar.gz historical-ead10ebea69b1f293c11f21e31d304b5d58832d2.tar.bz2 historical-ead10ebea69b1f293c11f21e31d304b5d58832d2.zip | |
Version bump.
Package-Manager: portage-2.1.6.13/cvs/Linux x86_64
Diffstat (limited to 'net-proxy/privoxy/files')
| -rw-r--r-- | net-proxy/privoxy/files/privoxy-3.0.11-timeout.patch | 20 | ||||
| -rw-r--r-- | net-proxy/privoxy/files/privoxy-3.0.15_beta-gentoo.patch (renamed from net-proxy/privoxy/files/privoxy-3.0.11-gentoo.patch) | 64 |
2 files changed, 32 insertions, 52 deletions
diff --git a/net-proxy/privoxy/files/privoxy-3.0.11-timeout.patch b/net-proxy/privoxy/files/privoxy-3.0.11-timeout.patch deleted file mode 100644 index 0433e1d923ec..000000000000 --- a/net-proxy/privoxy/files/privoxy-3.0.11-timeout.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- jcc.c 2009/03/08 14:19:23 1.231 -+++ jcc.c 2009/03/08 19:29:16 1.232 -@@ -2600,8 +2605,6 @@ - struct timeval timeout; - - memset(buf, 0, sizeof(buf)); -- memset(&timeout, 0, sizeof(timeout)); -- timeout.tv_sec = csp->config->socket_timeout; - - http = csp->http; - -@@ -2843,6 +2846,8 @@ - } - #endif /* FEATURE_CONNECTION_KEEP_ALIVE */ - -+ timeout.tv_sec = csp->config->socket_timeout; -+ timeout.tv_usec = 0; - n = select((int)maxfd+1, &rfds, NULL, NULL, &timeout); - - if (n == 0) diff --git a/net-proxy/privoxy/files/privoxy-3.0.11-gentoo.patch b/net-proxy/privoxy/files/privoxy-3.0.15_beta-gentoo.patch index 3276c1f2ac7e..7792e1616453 100644 --- a/net-proxy/privoxy/files/privoxy-3.0.11-gentoo.patch +++ b/net-proxy/privoxy/files/privoxy-3.0.15_beta-gentoo.patch @@ -1,32 +1,6 @@ -diff -Nru privoxy-3.0.11-stable.orig/GNUmakefile.in privoxy-3.0.11-stable/GNUmakefile.in ---- privoxy-3.0.11-stable.orig/GNUmakefile.in 2009-02-08 18:35:48.000000000 +0000 -+++ privoxy-3.0.11-stable/GNUmakefile.in 2009-03-13 19:56:45.000000000 +0000 -@@ -1140,22 +1140,8 @@ - fi ;\ - $(ECHO) Installing configuration files to $(DESTDIR)$(CONF_DEST);\ - for i in $(CONFIGS); do \ -- if [ "$$i" = "default.action" ] || [ "$$i" = "default.filter" ] ; then \ -- $(RM) $(DESTDIR)$(CONF_DEST)/$$i ;\ -- $(ECHO) Installing fresh $$i;\ - $(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST) || exit 1;\ -- elif [ -s "$(CONF_DEST)/$$i" ]; then \ -- $(ECHO) Installing $$i as $$i.new ;\ -- $(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST)/$$i.new || exit 1;\ -- NEW=1;\ -- else \ -- $(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST) || exit 1;\ -- fi ;\ - done ;\ -- if [ -n "$$NEW" ]; then \ -- $(CHMOD) $(RWD_MODE) $(DESTDIR)$(CONF_DEST)/*.new || exit 1 ;\ -- $(ECHO) "Warning: Older config files are preserved. Check new versions for changes!" ;\ -- fi ;\ - [ ! -f $(DESTDIR)$(LOG_DEST)/logfile ] && $(ECHO) Creating logfiles in $(DESTDIR)$(LOG_DEST) || \ - $(ECHO) Checking logfiles in $(DESTDIR)$(LOG_DEST) ;\ - $(TOUCH) $(DESTDIR)$(LOG_DEST)/logfile || exit 1 ;\ -diff -Nru privoxy-3.0.11-stable.orig/config privoxy-3.0.11-stable/config ---- privoxy-3.0.11-stable.orig/config 2009-02-19 17:26:26.000000000 +0000 -+++ privoxy-3.0.11-stable/config 2009-03-13 19:21:49.000000000 +0000 +diff -Nru privoxy-3.0.15-beta.orig/config privoxy-3.0.15-beta/config +--- privoxy-3.0.15-beta.orig/config 2009-10-10 07:56:41.000000000 +0200 ++++ privoxy-3.0.15-beta/config 2009-10-22 23:26:11.000000000 +0200 @@ -267,7 +267,7 @@ # # No trailing "/", please. @@ -54,9 +28,9 @@ diff -Nru privoxy-3.0.11-stable.orig/config privoxy-3.0.11-stable/config # # # 2.7. trustfile -diff -Nru privoxy-3.0.11-stable.orig/default.action.master privoxy-3.0.11-stable/default.action.master ---- privoxy-3.0.11-stable.orig/default.action.master 2009-02-12 19:08:32.000000000 +0000 -+++ privoxy-3.0.11-stable/default.action.master 2009-03-13 19:22:01.000000000 +0000 +diff -Nru privoxy-3.0.15-beta.orig/default.action.master privoxy-3.0.15-beta/default.action.master +--- privoxy-3.0.15-beta.orig/default.action.master 2009-10-02 20:07:22.000000000 +0200 ++++ privoxy-3.0.15-beta/default.action.master 2009-10-22 23:26:11.000000000 +0200 @@ -564,7 +564,7 @@ { \ +change-x-forwarded-for{block} \ @@ -84,3 +58,29 @@ diff -Nru privoxy-3.0.11-stable.orig/default.action.master privoxy-3.0.11-stable } standard.Advanced +diff -Nru privoxy-3.0.15-beta.orig/GNUmakefile.in privoxy-3.0.15-beta/GNUmakefile.in +--- privoxy-3.0.15-beta.orig/GNUmakefile.in 2009-09-26 19:21:01.000000000 +0200 ++++ privoxy-3.0.15-beta/GNUmakefile.in 2009-10-22 23:26:11.000000000 +0200 +@@ -901,22 +901,8 @@ + fi ;\ + $(ECHO) Installing configuration files to $(DESTDIR)$(CONF_DEST);\ + for i in $(CONFIGS); do \ +- if [ "$$i" = "default.action" ] || [ "$$i" = "default.filter" ] ; then \ +- $(RM) $(DESTDIR)$(CONF_DEST)/$$i ;\ +- $(ECHO) Installing fresh $$i;\ + $(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST) || exit 1;\ +- elif [ -s "$(CONF_DEST)/$$i" ]; then \ +- $(ECHO) Installing $$i as $$i.new ;\ +- $(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST)/$$i.new || exit 1;\ +- NEW=1;\ +- else \ +- $(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST) || exit 1;\ +- fi ;\ + done ;\ +- if [ -n "$$NEW" ]; then \ +- $(CHMOD) $(RWD_MODE) $(DESTDIR)$(CONF_DEST)/*.new || exit 1 ;\ +- $(ECHO) "Warning: Older config files are preserved. Check new versions for changes!" ;\ +- fi ;\ + [ ! -f $(DESTDIR)$(LOG_DEST)/logfile ] && $(ECHO) Creating logfiles in $(DESTDIR)$(LOG_DEST) || \ + $(ECHO) Checking logfiles in $(DESTDIR)$(LOG_DEST) ;\ + $(TOUCH) $(DESTDIR)$(LOG_DEST)/logfile || exit 1 ;\ |