Subject: [alpine-aports] [PATCH] main/privoxy: upgrade to 3.0.28

From: Paul Bredbury <[email-masked]>
Date: Sat, 20 Apr 2019 10:12:10 +0100

Add openrc subpackage, modernize.
---
 main/privoxy/APKBUILD | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/main/privoxy/APKBUILD b/main/privoxy/APKBUILD
index 49ba3f205e..77b6c5b9f5 100644
--- a/main/privoxy/APKBUILD
+++ b/main/privoxy/APKBUILD
@@ -1,28 +1,29 @@
 # Maintainer: Natanael Copa <[email-masked]>
 pkgname=privoxy
-pkgver=3.0.26
+pkgver=3.0.28
 pkgrel=0
 pkgdesc="A web proxy with advanced filtering capabilities"
-url="http://www.privoxy.org"
+url="https://www.privoxy.org"
 arch="all"
 license="GPL"
 pkgusers="privoxy"
 pkggroups="privoxy"
 makedepends="autoconf automake pcre-dev zlib-dev coreutils"
 install="privoxy.pre-install"
-subpackages="$pkgname-doc"
+subpackages="$pkgname-doc $pkgname-openrc"
 source="https://downloads.sourceforge.net/ijbswa/$pkgname-$pkgver-stable-src.tar.gz
 	$pkgname.initd
 	$pkgname.logrotate
 	privoxy-alpine.patch
 	"
+options="!check" # No test suite
 builddir="$srcdir/$pkgname-$pkgver-stable"
 
 prepare() {
 	cd "$builddir"
 
-	update_config_sub || return 1
-	default_prepare || return 1
+	update_config_sub
+	default_prepare
 
 	aclocal && autoheader && autoconf
 }
@@ -40,9 +41,8 @@ build() {
 		--with-user=privoxy \
 		--with-group=privoxy \
 		--sysconfdir=/etc/privoxy \
-		--docdir=/usr/share/doc/$pkgname \
-		|| return 1
-	make || return 1
+		--docdir=/usr/share/doc/$pkgname
+	make
 }
 
 package() {
@@ -50,7 +50,7 @@ package() {
 
 	make DESTDIR="$pkgdir" install
 
-	rm $pkgdir/var/log/privoxy/* || true
+	rm -f "$pkgdir"/var/log/privoxy/*
 
 	install -D -m755 "$srcdir"/privoxy.initd "$pkgdir"/etc/init.d/privoxy
 	install -D -m644 "$srcdir"/privoxy.logrotate \
@@ -63,7 +63,7 @@ package() {
 		"$pkgdir"/etc/privoxy
 }
 
-sha512sums="e448305287d0451c761b76b8d8974ea1ec837b621bbb498a7ff16a54cb4d8f1f734efe2eef03235c01163bb40e225785065aad6ee265a31d90970ab98af11044  privoxy-3.0.26-stable-src.tar.gz
+sha512sums="5d58024ae73d623a2b8fb2ac49e18f047dfe252c9441388f025cf888c0e4b11546b8796cfa559759ee137002b1b31b30ad28b356ae226836454f32591eb835fc  privoxy-3.0.28-stable-src.tar.gz
 346bda3a2108547569af3397c77e092c54fa0c20bc6d3bb1d4c202b4e2b8d9c13018eab0a326cd9632310ec8052600ee7db4b6011610faec386c399cdd01af9c  privoxy.initd
 118caaeac3aba751584c5bdfc737bf5bfeddf1a62fda1f44bcd4654ae2e33183bc1ce6fc66d4a1bdd79766e42e669b1615a6d46d528a1bd49cabdf98385a3bb9  privoxy.logrotate
 0220785fff0b34b75e3c8cecbeb302e0137e96039e0663ae44d7450e334a3c1d742c2760de55d52817fb9ed2efb19f505e1fb7406d055b387b7b084f5f52011f  privoxy-alpine.patch"
-- 
2.21.0

---
Unsubscribe:  [email-masked]
Help:         [email-masked]
---