diff options
| author | J0WI <J0WI@users.noreply.github.com> | 2021-03-29 03:24:05 +0200 |
|---|---|---|
| committer | Leo <thinkabit.ukim@gmail.com> | 2021-03-30 23:04:10 +0000 |
| commit | d4b1b0d6782d0a820958fa8a9c05cebd3d6ebec0 (patch) | |
| tree | 6392ef8030df4a014a9875afa7c00f3b4f153623 | |
| parent | 4879cf44a8dae6173828a5dbfbc577704274704c (diff) | |
main/privoxy: security upgrade to 3.0.32
| -rw-r--r-- | main/privoxy/APKBUILD | 20 | ||||
| -rw-r--r-- | main/privoxy/privoxy-alpine.patch | 16 |
2 files changed, 22 insertions, 14 deletions
diff --git a/main/privoxy/APKBUILD b/main/privoxy/APKBUILD index bba3c2f88f0..49214371796 100644 --- a/main/privoxy/APKBUILD +++ b/main/privoxy/APKBUILD @@ -1,9 +1,9 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=privoxy -pkgver=3.0.31 +pkgver=3.0.32 pkgrel=0 pkgdesc="web proxy with advanced filtering capabilities" -url="https://www.privoxy.org" +url="https://www.privoxy.org/" arch="all" license="GPL-2.0-or-later" pkgusers="privoxy" @@ -19,6 +19,14 @@ source="https://downloads.sourceforge.net/ijbswa/privoxy-$pkgver-stable-src.tar. options="!check" # No test suite builddir="$srcdir/$pkgname-$pkgver-stable" +# secfixes: +# 3.0.32-r0: +# - CVE-2021-20272 +# - CVE-2021-20273 +# - CVE-2021-20274 +# - CVE-2021-20275 +# - CVE-2021-20276 + prepare() { update_config_sub default_prepare @@ -50,14 +58,14 @@ package() { install -D -m644 "$srcdir"/privoxy.logrotate \ "$pkgdir"/etc/logrotate.d/privoxy - find "$pkgdir"/etc/privoxy/ -type d | xargs chmod 770 - find "$pkgdir"/etc/privoxy/ -type f | xargs chmod 660 + find "$pkgdir"/etc/privoxy/ -type d -exec chmod 770 {} \; + find "$pkgdir"/etc/privoxy/ -type f -exec chmod 660 {} \; chown -R privoxy:privoxy "$pkgdir"/var/log/privoxy \ "$pkgdir"/etc/privoxy } -sha512sums="0bea9973ac22e594a959452390c8612605dbf1fd55151632d35ecc7fe0ef9ca87cc1694a8bcb0511467445ec414b721b9d33651d917b2a8083768d8905ec68ed privoxy-3.0.31-stable-src.tar.gz +sha512sums="da41c0045bf593219df64718645eff984b5df43737811cc0fa12fce7e8ae1ab59eefbe20f23d6ce8f62216cfd81f1a9c319688d15693c25eed36010f3e1d5ffd privoxy-3.0.32-stable-src.tar.gz 346bda3a2108547569af3397c77e092c54fa0c20bc6d3bb1d4c202b4e2b8d9c13018eab0a326cd9632310ec8052600ee7db4b6011610faec386c399cdd01af9c privoxy.initd 118caaeac3aba751584c5bdfc737bf5bfeddf1a62fda1f44bcd4654ae2e33183bc1ce6fc66d4a1bdd79766e42e669b1615a6d46d528a1bd49cabdf98385a3bb9 privoxy.logrotate -0220785fff0b34b75e3c8cecbeb302e0137e96039e0663ae44d7450e334a3c1d742c2760de55d52817fb9ed2efb19f505e1fb7406d055b387b7b084f5f52011f privoxy-alpine.patch" +1059feed20a31d7d2b5d1f44b7b1af40373d87dbd9e7e83c8998ac1b4e27dfbfdfeb6a9ea7934e15d0c14fed1fd03fb63d2ec8d2a6b53e5884a21dc8df4828fc privoxy-alpine.patch" diff --git a/main/privoxy/privoxy-alpine.patch b/main/privoxy/privoxy-alpine.patch index c04030613c7..7f46879d024 100644 --- a/main/privoxy/privoxy-alpine.patch +++ b/main/privoxy/privoxy-alpine.patch @@ -2,9 +2,9 @@ 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 +@@ -62,8 +62,8 @@ + MAN_DEST = $(MAN_DIR)/man8 + MAN_PAGE = privoxy.8 SHARE_DEST = @datadir@ -DOC_DEST = $(SHARE_DEST)/doc/privoxy -VAR_DEST = @localstatedir@ @@ -13,17 +13,17 @@ index 2593901..c3a681a 100644 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 +@@ -964,34 +964,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 \ +- $(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST) || exit 1;\ +- elif [ -s "$(DESTDIR)$(CONF_DEST)/$$i" ]; then \ - $(ECHO) Installing $$i as $$i.new ;\ -- $(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST)/$$i.new || exit 1;\ + $(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST)/$$i.new || exit 1;\ - NEW=1;\ - else \ - $(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST) || exit 1;\ @@ -47,7 +47,7 @@ index 2593901..c3a681a 100644 - $(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 | \ + $(SED) 's+%PROGRAM%+$(PROGRAM)+' slackware/rc.privoxy.in | \ diff --git a/config b/config index 8b20f92..25596d6 100644 --- a/config |