main/tinyproxy: upgrade to 1.8.3

3 files changed, 18 insertions, 20 deletions

diff --git a/main/tinyproxy/APKBUILD b/main/tinyproxy/APKBUILD
index 4e9cf93cc1..1ce0c08ade 100644
--- a/main/tinyproxy/APKBUILD
+++ b/main/tinyproxy/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Michael Mason <ms13sp@gmail.com>
 # Maintainer: Michael Mason <ms13sp@gmail.com>
 pkgname=tinyproxy
-pkgver=1.6.5
-pkgrel=7
+pkgver=1.8.3
+pkgrel=0
 pkgdesc="Lightweight HTTP proxy"
 pkgusers="tinyproxy"
 pkggroups="tinyproxy"
@@ -10,37 +10,39 @@ url="https://www.banu.com/tinyproxy/"
 arch="all"
 license="GPL"
 depends=
-makedepends=wget
-install="tinyproxy.pre-install tinyproxy.post-install"
+makedepends="wget asciidoc"
+install="tinyproxy.pre-install"
 subpackages="$pkgname-doc"
-source="https://www.banu.com/pub/$pkgname/1.6/$pkgname-$pkgver.tar.gz
+source="https://www.banu.com/pub/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2
         tinyproxy.initd
         "
 
 _builddir="$srcdir/$pkgname-$pkgver"
-build() {
+prepare() {
         cd "$_builddir"
 
         # set default user to tinyproxy:tinyproxy and correct pidfile
         sed -i -e 's:^User.*:User tinyproxy:' \
                 -e 's:^Group.*:Group tinyproxy:' \
                 -e 's:^PidFile.*:PidFile "/var/run/tinyproxy/tinyproxy.pid":' \
-                doc/tinyproxy.conf
+                etc/tinyproxy.conf.in
+}
 
+build() {
+        cd "$_builddir"
         ./configure --prefix=/usr \
-                --sysconfdir=/etc \
-                --mandir=/usr/share/man \
-                --infodir=/usr/share/info
-
+                --sysconfdir=/etc/tinyproxy \
+                --disable-dependency-tracking \
+                || return
         make || return 1
 }
 
 package() {
         cd "$_builddir"
-        make DESTDIR="$pkgdir" install
+        make DESTDIR="$pkgdir" install || return 1
         install -d -D -o tinyproxy -g tinyproxy "$pkgdir"/var/run/tinyproxy
         install -Dm755 "$srcdir"/tinyproxy.initd "$pkgdir"/etc/init.d/tinyproxy
 }
 
-md5sums="2b2862ba33d2939e4572688d442ba415  tinyproxy-1.6.5.tar.gz
+md5sums="292ac51da8ad6ae883d4ebf56908400d  tinyproxy-1.8.3.tar.bz2
 ce2b2e3c79fa0e8491fe625bbb15710a  tinyproxy.initd"
diff --git a/main/tinyproxy/tinyproxy.post-install b/main/tinyproxy/tinyproxy.post-install
deleted file mode 100755
index ef518c6162..0000000000
--- a/main/tinyproxy/tinyproxy.post-install
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-chown tinyproxy:tinyproxy /var/run/tinyproxy
-
-# return with success even if user already exist
-exit 0
diff --git a/main/tinyproxy/tinyproxy.pre-install b/main/tinyproxy/tinyproxy.pre-install
index ffa4e65b8b..22cd241a60 100755
--- a/main/tinyproxy/tinyproxy.pre-install
+++ b/main/tinyproxy/tinyproxy.pre-install
@@ -1,6 +1,8 @@
 #!/bin/sh
 
-adduser -h /var/run/tinyproxy -s /bin/false -D tinyproxy 2>/dev/null
+addgroup -S tinyproxy 2>/dev/null
+adduser -S -s /bin/false -D -H -h /var/run/tinyproxy -G tinyproxy \
+        -g "tinyproxy user" tinyproxy 2>/dev/null
 
 # return with success even if user already exist
 exit 0