Sat Apr 12 03:57:05 UTC 2014

4 files changed, 64 insertions, 13 deletions

diff --git a/community/tinyproxy/PKGBUILD b/community/tinyproxy/PKGBUILD
index c2adfa0b2..8b22f7de3 100644
--- a/community/tinyproxy/PKGBUILD
+++ b/community/tinyproxy/PKGBUILD
@@ -1,23 +1,32 @@
-# $Id: PKGBUILD 92033 2013-05-30 23:55:47Z seblu $
+# $Id: PKGBUILD 109220 2014-04-11 20:03:09Z thestinger $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
+# Contributor: Daniel Micay <danielmicay@gmail.com>
 # Contributor: Andrea Zucchelli <zukka77@gmail.com>
 
 pkgname=tinyproxy
 pkgver=1.8.3
-pkgrel=7
+pkgrel=8
 pkgdesc='A light-weight HTTP proxy daemon for POSIX operating systems.'
 arch=('i686' 'x86_64')
 url='https://banu.com/tinyproxy/'
 license=('GPL')
+depends=(glibc)
 makedepends=('asciidoc')
 install="${pkgname}.install"
 backup=('etc/tinyproxy/tinyproxy.conf')
 source=("https://banu.com/pub/${pkgname}/1.8/${pkgname}-${pkgver}.tar.bz2"
         'tinyproxy.tmpfiles.conf'
-        'tinyproxy.service')
+        'tinyproxy.service'
+        config.patch)
 md5sums=('292ac51da8ad6ae883d4ebf56908400d'
-         '3c2764578f26581346fe312da0519a3e'
-         '41938243faca487a14beeee5114f244e')
+         'b747d0f253ba7bb3f604e69a35a278bf'
+         '41938243faca487a14beeee5114f244e'
+         '9739e020c40abefd6e921e9cff854f35')
+
+prepare() {
+  cd $pkgname-$pkgver
+  patch -p0 -i ../config.patch
+}
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -33,11 +42,6 @@ package() {
   make DESTDIR="${pkgdir}" install
   install -Dm0644 "${srcdir}/tinyproxy.tmpfiles.conf" "${pkgdir}/usr/lib/tmpfiles.d/tinyproxy.conf"
 
-  install -dm0755 -o nobody -g nobody "${pkgdir}/var/log/${pkgname}"
-
-  # Provide sane defaults
-  sed -i '/^#Listen/a\Listen 127.0.0.1' "${pkgdir}/etc/tinyproxy/tinyproxy.conf"
-
   install -Dm0644 "${srcdir}/tinyproxy.service" \
     "${pkgdir}/usr/lib/systemd/system/tinyproxy.service"
 }
diff --git a/community/tinyproxy/config.patch b/community/tinyproxy/config.patch
new file mode 100644
index 000000000..66f0e33b9
--- /dev/null
+++ b/community/tinyproxy/config.patch
@@ -0,0 +1,31 @@
+--- etc/tinyproxy.conf.in	2010-03-03 04:37:24.000000000 -0500
++++ etc/tinyproxy.conf.in.arch	2014-04-11 15:43:53.340725405 -0400
+@@ -12,8 +12,8 @@
+ # as the root user. Either the user or group name or the UID or GID
+ # number may be used.
+ #
+-User nobody
+-Group nobody
++User tinyproxy
++Group tinyproxy
+ 
+ #
+ # Port: Specify the port which tinyproxy will listen on.  Please note
+@@ -27,7 +27,7 @@
+ # only one. If this is commented out, tinyproxy will bind to all
+ # interfaces present.
+ #
+-#Listen 192.168.0.1
++Listen 127.0.0.1
+ 
+ #
+ # Bind: This allows you to specify which interface will be used for
+@@ -99,7 +99,7 @@
+ # option must not be enabled if the Logfile directive is being used.
+ # These two directives are mutually exclusive.
+ #
+-#Syslog On
++Syslog On
+ 
+ #
+ # LogLevel: 
diff --git a/community/tinyproxy/tinyproxy.install b/community/tinyproxy/tinyproxy.install
index 85f3dfc41..f3bbe7c71 100644
--- a/community/tinyproxy/tinyproxy.install
+++ b/community/tinyproxy/tinyproxy.install
@@ -1,9 +1,25 @@
 post_install() {
-  if [ ! -d /var/run/tinyproxy ]; then
-    install -dm0770 -o nobody -g nobody /var/run/tinyproxy
+  getent group tinyproxy &>/dev/null || groupadd -g 186 tinyproxy >/dev/null
+  getent passwd tinyproxy &>/dev/null || useradd -u 186 -g tinyproxy -d / \
+                                                 -c 'HTTP proxy daemon' \
+                                                 -s /bin/nologin \
+                                                 tinyproxy >/dev/null
+  if [ ! -d /run/tinyproxy ]; then
+    install -dm0770 -o tinyproxy -g tinyproxy /run/tinyproxy
   fi
 }
 
 post_upgrade() {
   post_install "$@"
+
+  if [[ $(vercmp $2 1.8.3-7) -le 0 ]]; then
+    post_install
+    chown -R tinyproxy:tinyproxy /run/tinyproxy
+  fi
+}
+
+post_remove() {
+  getent passwd tinyproxy &>/dev/null && userdel tinyproxy >/dev/null
+  getent group tinyproxy &>/dev/null && groupdel tinyproxy >/dev/null
+  true
 }
diff --git a/community/tinyproxy/tinyproxy.tmpfiles.conf b/community/tinyproxy/tinyproxy.tmpfiles.conf
index 791a99ad1..5a89fcb6b 100644
--- a/community/tinyproxy/tinyproxy.tmpfiles.conf
+++ b/community/tinyproxy/tinyproxy.tmpfiles.conf
@@ -1 +1 @@
-d /var/run/tinyproxy 0770 nobody nobody -
+d /run/tinyproxy 0770 tinyproxy tinyproxy -