From 6f03407f091e9899853dc9d3487391e85559eb97 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Mon, 21 Nov 2011 07:26:58 +0000 Subject: main/privoxy: upgrade to 3.0.18 --- main/privoxy/APKBUILD | 16 +++-- main/privoxy/privoxy-3.0.16-gentoo.patch | 108 ----------------------------- main/privoxy/privoxy-alpine.patch | 112 +++++++++++++++++++++++++++++++ 3 files changed, 122 insertions(+), 114 deletions(-) delete mode 100644 main/privoxy/privoxy-3.0.16-gentoo.patch create mode 100644 main/privoxy/privoxy-alpine.patch (limited to 'main/privoxy') diff --git a/main/privoxy/APKBUILD b/main/privoxy/APKBUILD index c6a92ebe20..61cff17d11 100644 --- a/main/privoxy/APKBUILD +++ b/main/privoxy/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa pkgname=privoxy -pkgver=3.0.17 -pkgrel=1 +pkgver=3.0.18 +pkgrel=0 pkgdesc="A web proxy with advanced filtering capabilities" url="http://www.privoxy.org" arch="all" @@ -15,13 +15,17 @@ subpackages="$pkgname-doc" source="http://downloads.sourceforge.net/ijbswa/$pkgname-$pkgver-stable-src.tar.gz $pkgname.initd $pkgname.logrotate - privoxy-3.0.16-gentoo.patch + privoxy-alpine.patch " _builddir="$srcdir"/$pkgname-$pkgver-stable prepare() { cd "$_builddir" - patch -p1 -i "$srcdir"/privoxy-3.0.16-gentoo.patch || return 1 + for i in $source; do + case $i in + *.patch) patch -p1 -i "$srcdir"/$i || return 1;; + esac + done aclocal && autoheader && autoconf } @@ -51,7 +55,7 @@ package() { "$pkgdir"/etc/privoxy } -md5sums="9d363d738a3f3d73e774d6dfeafdb15f privoxy-3.0.17-stable-src.tar.gz +md5sums="baf0b13bb591ec6e1ba15b720ddea65c privoxy-3.0.18-stable-src.tar.gz 170d5679e4c3504f07ef1a4c9859e9b8 privoxy.initd f2b6a652dbfbc65e5b89024a8ea3da7e privoxy.logrotate -48cce19ecdcf8f17a021ac3aa8f837bc privoxy-3.0.16-gentoo.patch" +cb233d3e5b13027557a405f467ee307c privoxy-alpine.patch" diff --git a/main/privoxy/privoxy-3.0.16-gentoo.patch b/main/privoxy/privoxy-3.0.16-gentoo.patch deleted file mode 100644 index d445ec1b01..0000000000 --- a/main/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 - diff --git a/main/privoxy/privoxy-alpine.patch b/main/privoxy/privoxy-alpine.patch new file mode 100644 index 0000000000..c04030613c --- /dev/null +++ b/main/privoxy/privoxy-alpine.patch @@ -0,0 +1,112 @@ +diff --git a/GNUmakefile.in b/GNUmakefile.in +index 2593901..c3a681a 100644 +--- a/GNUmakefile.in ++++ b/GNUmakefile.in +@@ -62,8 +62,8 @@ MAN_DIR = @mandir@ + MAN_DEST = $(MAN_DIR)/man1 + MAN_PAGE = privoxy.1 + SHARE_DEST = @datadir@ +-DOC_DEST = $(SHARE_DEST)/doc/privoxy +-VAR_DEST = @localstatedir@ ++DOC_DEST = @docdir@ ++VAR_DEST = /var + LOGS_DEST = $(VAR_DEST)/log/privoxy + PIDS_DEST = $(VAR_DEST)/run + +@@ -922,34 +922,8 @@ install: CONF_DEST LOG_DEST PID_DEST check_doc GROUP_T + 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 | \ +diff --git a/config b/config +index 8b20f92..25596d6 100644 +--- a/config ++++ b/config +@@ -265,7 +265,7 @@ + # + # No trailing "/", please. + # +-confdir . ++confdir /etc/privoxy + # + # + # 2.2. templdir +@@ -322,7 +322,7 @@ confdir . + # + # No trailing "/", please. + # +-logdir . ++logdir /var/log/privoxy + # + # + # 2.4. actionsfile +@@ -462,7 +462,7 @@ filterfile user.filter # User customizations + # 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 +diff --git a/default.action.master b/default.action.master +index a26a0ec..5c67e8e 100644 +--- a/default.action.master ++++ b/default.action.master +@@ -566,7 +566,7 @@ allow-ads = -block -filter{banners-by-size} -filter{banners-by-link} + +client-header-tagger{css-requests} \ + +client-header-tagger{image-requests} \ + +hide-from-header{block} \ +-+set-image-blocker{pattern} \ +++set-image-blocker{blank} \ + } + standard.Cautious + +@@ -588,7 +588,7 @@ standard.Cautious + +hide-from-header{block} \ + +hide-referrer{conditional-block} \ + +session-cookies-only \ +-+set-image-blocker{pattern} \ +++set-image-blocker{blank} \ + } + standard.Medium + +@@ -627,7 +627,7 @@ standard.Medium + +hide-referrer{conditional-block} \ + +limit-connect{,} \ + +overwrite-last-modified{randomize} \ +-+set-image-blocker{pattern} \ +++set-image-blocker{blank} \ + } + standard.Advanced + -- cgit v1.2.3