diff options
Diffstat (limited to 'testing/privoxy/privoxy-3.0.16-gentoo.patch')
| -rw-r--r-- | testing/privoxy/privoxy-3.0.16-gentoo.patch | 108 |
1 files changed, 0 insertions, 108 deletions
diff --git a/testing/privoxy/privoxy-3.0.16-gentoo.patch b/testing/privoxy/privoxy-3.0.16-gentoo.patch deleted file mode 100644 index d445ec1b01..0000000000 --- a/testing/privoxy/privoxy-3.0.16-gentoo.patch +++ /dev/null @@ -1,108 +0,0 @@ ---- privoxy/GNUmakefile.in -+++ privoxy/GNUmakefile.in -@@ -61,10 +61,10 @@ - MAN_DIR = @mandir@ - MAN_DEST = $(MAN_DIR)/man1 - SHARE_DEST = @datadir@ --DOC_DEST = $(SHARE_DEST)/doc/privoxy -+DOC_DEST = @docdir@ --VAR_DEST = @localstatedir@ -+VAR_DEST = /var - LOGS_DEST = $(VAR_DEST)/log/privoxy - PIDS_DEST = $(VAR_DEST)/run - - # if $prefix = /usr/local then the default CONFDEST change from - # CONF_DEST = $(CONF_BASE) to CONF_DEST = $(CONF_BASE)/privoxy -@@ -901,34 +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 ;\ -- if [ x$$USER != x ]; then \ -- $(CHOWN) $$USER $(DESTDIR)$(LOG_DEST)/logfile || \ -- $(ECHO) "** WARNING ** current install user different from configured user. Logging may fail!!" ;\ -- fi ;\ -- if [ x$$GROUP_T != x ]; then \ -- $(CHGRP) $$GROUP_T $(DESTDIR)$(LOG_DEST)/logfile || \ -- $(ECHO) "** WARNING ** current install user different from configured user. Logging may fail!!" ;\ -- fi ;\ -- $(CHMOD) $(RWD_MODE) $(DESTDIR)$(LOG_DEST)/logfile || exit 1 ;\ - if [ "$(prefix)" = "/usr/local" ] || [ "$(prefix)" = "/usr" ]; then \ - if [ -f /etc/slackware-version ] && [ -d /etc/rc.d/ ] && [ -w /etc/rc.d/ ] ; then \ - $(SED) 's+%PROGRAM%+$(PROGRAM)+' slackware/rc.privoxy.orig | \ ---- privoxy/config -+++ privoxy/config -@@ -267,7 +267,7 @@ - # - # No trailing "/", please. - # --confdir . -+confdir /etc/privoxy - # - # - # 2.2. templdir -@@ -324,7 +324,7 @@ - # - # No trailing "/", please. - # --logdir . -+logdir /var/log/privoxy - # - # - # 2.4. actionsfile -@@ -464,7 +464,7 @@ - # Any log files must be writable by whatever user Privoxy is - # being run as (on Unix, default user id is "privoxy"). - # --logfile logfile -+logfile privoxy.log - # - # - # 2.7. trustfile ---- privoxy/default.action.master -+++ privoxy/default.action.master -@@ -564,7 +564,7 @@ - { \ - +change-x-forwarded-for{block} \ - +hide-from-header{block} \ --+set-image-blocker{pattern} \ -++set-image-blocker{blank} \ - } - standard.Cautious - -@@ -584,7 +584,7 @@ - +hide-from-header{block} \ - +hide-referrer{conditional-block} \ - +session-cookies-only \ --+set-image-blocker{pattern} \ -++set-image-blocker{blank} \ - } - standard.Medium - -@@ -623,7 +623,7 @@ - +hide-referrer{conditional-block} \ - +limit-connect{,} \ - +overwrite-last-modified{randomize} \ --+set-image-blocker{pattern} \ -++set-image-blocker{blank} \ - } - standard.Advanced - |