diff options
| author | Leonardo Arena <rnalrd@alpinelinux.org> | 2013-04-08 09:39:43 +0000 |
|---|---|---|
| committer | Leonardo Arena <rnalrd@alpinelinux.org> | 2013-04-08 09:39:43 +0000 |
| commit | 2b464df777a401a03a5e1f65dcb89afef1d4220d (patch) | |
| tree | 9f6435b7851258aebcbb014eb251ba49b8b7e4cf | |
| parent | f83a57d404fa2952d84a6f45126513d67063dea2 (diff) | |
| download | aports-2b464df777a401a03a5e1f65dcb89afef1d4220d.tar.bz2 aports-2b464df777a401a03a5e1f65dcb89afef1d4220d.tar.xz | |
main/privoxy: update patch
| -rw-r--r-- | main/privoxy/APKBUILD | 10 | ||||
| -rw-r--r-- | main/privoxy/privoxy-3.0.19-gentoo.patch (renamed from main/privoxy/privoxy-3.0.16-gentoo.patch) | 46 |
2 files changed, 31 insertions, 25 deletions
diff --git a/main/privoxy/APKBUILD b/main/privoxy/APKBUILD index f78696aeea..ced7b25c94 100644 --- a/main/privoxy/APKBUILD +++ b/main/privoxy/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=privoxy pkgver=3.0.21 -pkgrel=0 +pkgrel=1 pkgdesc="A web proxy with advanced filtering capabilities" url="http://www.privoxy.org" arch="all" @@ -15,7 +15,7 @@ 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-3.0.19-gentoo.patch " _builddir="$srcdir"/$pkgname-$pkgver-stable @@ -54,12 +54,12 @@ package() { md5sums="79558f2545cfcf9731f7de611646d837 privoxy-3.0.21-stable-src.tar.gz 170d5679e4c3504f07ef1a4c9859e9b8 privoxy.initd f2b6a652dbfbc65e5b89024a8ea3da7e privoxy.logrotate -48cce19ecdcf8f17a021ac3aa8f837bc privoxy-3.0.16-gentoo.patch" +1b9fc3bcef325f5970dee8ff7fb38497 privoxy-3.0.19-gentoo.patch" sha256sums="5ec7e601948d2bd0ebf0ebe90eed7d49e7663c395ce16d0403e91ea2d459ddb8 privoxy-3.0.21-stable-src.tar.gz 14f021afb156336f4065a9c349b2d9005025788cecdea9ea0c86b98fc7e44263 privoxy.initd a14373c8a26aab32f6f025c11a5521d7923ce900d00b31aa61da9f3979e3bb2e privoxy.logrotate -abb03fb860afe5f0b0a2fe7848f36baddaa596619d73e903e0b234ccc3e3917b privoxy-3.0.16-gentoo.patch" +71c6e6b042a820c44e7110c8a60f7987c826900fd4b22073565977ce63d4860a privoxy-3.0.19-gentoo.patch" sha512sums="b7f0d6865bce32445442f3af290e1a43538e4f76c22cb0d0ff9d5a1752f8c019dabb70f023ae370ee59015bd0f6795db97f064f7621efb62265d5e196d2e0e41 privoxy-3.0.21-stable-src.tar.gz 50a2134b6dc13aa79f7e2ebbafde4767a5a1e6b8836b49fe1304bbb1e07329a2c6c3789c291f2cea6bf89128296269a10ebec81d79f6d8e4841b696b80d21455 privoxy.initd 118caaeac3aba751584c5bdfc737bf5bfeddf1a62fda1f44bcd4654ae2e33183bc1ce6fc66d4a1bdd79766e42e669b1615a6d46d528a1bd49cabdf98385a3bb9 privoxy.logrotate -9e1b5d4a0d459ce52e87e927f768a6f2d87db64e8eec1e60606b07670186a0e308a4518a55b427dd0130346d5bc4426074eb943b83d320f7ed01dc2fa6f3d034 privoxy-3.0.16-gentoo.patch" +e0f916f33b8f17375b60686a0e4795883f29e46c55e273e0a69fae63d4b4e5a2585bb86b04aa288fdd75cdf51eedf7d72a9f8092e13a853e934e0029ae919a24 privoxy-3.0.19-gentoo.patch" diff --git a/main/privoxy/privoxy-3.0.16-gentoo.patch b/main/privoxy/privoxy-3.0.19-gentoo.patch index d445ec1b01..4571e24e1f 100644 --- a/main/privoxy/privoxy-3.0.16-gentoo.patch +++ b/main/privoxy/privoxy-3.0.19-gentoo.patch @@ -1,19 +1,25 @@ ---- privoxy/GNUmakefile.in -+++ privoxy/GNUmakefile.in -@@ -61,10 +61,10 @@ - MAN_DIR = @mandir@ +--- a/GNUmakefile.in ++++ b/GNUmakefile.in +@@ -62,8 +62,8 @@ MAN_DEST = $(MAN_DIR)/man1 + MAN_PAGE = privoxy.1 SHARE_DEST = @datadir@ -DOC_DEST = $(SHARE_DEST)/doc/privoxy -+DOC_DEST = @docdir@ -VAR_DEST = @localstatedir@ ++DOC_DEST = @docdir@ +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 @@ +@@ -852,7 +852,6 @@ + $(INSTALL) $(INSTALL_T) $(DOK_WEB)/man-page/*html $(DESTDIR)$$DOC/man-page;\ + $(INSTALL) $(INSTALL_T) $(DOK_WEB)/privoxy-index.html $(DESTDIR)$$DOC/index.html;\ + $(INSTALL) $(INSTALL_T) AUTHORS $(DESTDIR)$$DOC;\ +- $(INSTALL) $(INSTALL_T) LICENSE $(DESTDIR)$$DOC;\ + $(INSTALL) $(INSTALL_T) README $(DESTDIR)$$DOC;\ + $(INSTALL) $(INSTALL_T) ChangeLog $(DESTDIR)$$DOC;\ + $(INSTALL) $(INSTALL_T) $(DOK_WEB)/p_doc.css $(DESTDIR)$$DOC;\ +@@ -923,34 +922,8 @@ fi ;\ $(ECHO) Installing configuration files to $(DESTDIR)$(CONF_DEST);\ for i in $(CONFIGS); do \ @@ -48,9 +54,9 @@ 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 @@ +--- a/config ++++ b/config +@@ -265,7 +265,7 @@ # # No trailing "/", please. # @@ -59,7 +65,7 @@ # # # 2.2. templdir -@@ -324,7 +324,7 @@ +@@ -322,7 +322,7 @@ # # No trailing "/", please. # @@ -68,7 +74,7 @@ # # # 2.4. actionsfile -@@ -464,7 +464,7 @@ +@@ -462,7 +462,7 @@ # Any log files must be writable by whatever user Privoxy is # being run as (on Unix, default user id is "privoxy"). # @@ -77,18 +83,18 @@ # # # 2.7. trustfile ---- privoxy/default.action.master -+++ privoxy/default.action.master -@@ -564,7 +564,7 @@ - { \ - +change-x-forwarded-for{block} \ +--- a/default.action.master ++++ b/default.action.master +@@ -566,7 +566,7 @@ + +client-header-tagger{css-requests} \ + +client-header-tagger{image-requests} \ +hide-from-header{block} \ -+set-image-blocker{pattern} \ ++set-image-blocker{blank} \ } standard.Cautious -@@ -584,7 +584,7 @@ +@@ -588,7 +588,7 @@ +hide-from-header{block} \ +hide-referrer{conditional-block} \ +session-cookies-only \ @@ -97,7 +103,7 @@ } standard.Medium -@@ -623,7 +623,7 @@ +@@ -627,7 +627,7 @@ +hide-referrer{conditional-block} \ +limit-connect{,} \ +overwrite-last-modified{randomize} \ |