[arch-commits] Commit in privoxy/trunk (PKGBUILD privoxy.install)

[Lukas Fleischer]

    Date: Sunday, September 27, 2015 @ 14:52:17
  Author: lfleischer
Revision: 141693

upgpkg: privoxy 3.0.23-2

Fix user/group management.

Modified:
  privoxy/trunk/PKGBUILD
  privoxy/trunk/privoxy.install

-----------------+
 PKGBUILD        |    7 +++----
 privoxy.install |    7 -------
 2 files changed, 3 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-09-27 12:47:08 UTC (rev 141692)
+++ PKGBUILD	2015-09-27 12:52:17 UTC (rev 141693)
@@ -1,11 +1,10 @@
-# $Id$
-# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
+# Maintainer: Lukas Fleischer <lfleischer at archlinux.org>
 # Contributor: Juergen Hoetzel <juergen at hoetzel.info>
 # Contributor: basilburn (basilburn), Paul Bredbury (brebs) 
 
 pkgname=privoxy
 pkgver=3.0.23
-pkgrel=1
+pkgrel=2
 pkgdesc='A web proxy with advanced filtering capabilities.'
 arch=('i686' 'x86_64')
 url='http://www.privoxy.org'
@@ -51,7 +50,7 @@
 
   # Don't overwrite existing log files and fix log directory permissions.
   rm "${pkgdir}/var/log/privoxy/"*
-  chgrp -R 42 "${pkgdir}/var/log/privoxy/"
+  chown -R 42:42 "${pkgdir}"/etc/privoxy "${pkgdir}"/var/log/privoxy
 
   # Avoid conflict with filesystem>=2012.06.
   rmdir "$pkgdir/var/run"

Modified: privoxy.install
===================================================================
--- privoxy.install	2015-09-27 12:47:08 UTC (rev 141692)
+++ privoxy.install	2015-09-27 12:52:17 UTC (rev 141693)
@@ -1,7 +1,6 @@
 post_install() {
   groupadd -g 42 privoxy &>/dev/null
   useradd -u 42 -g privoxy -d /var/spool/privoxy -s /bin/false privoxy &>/dev/null
-  chown -R privoxy:privoxy /etc/privoxy /var/log/privoxy
 
   if [ ! -d /var/spool/privoxy ]; then
     install -dm0770 -o privoxy -g privoxy /var/spool/privoxy
@@ -11,9 +10,3 @@
 post_upgrade() {
   post_install $1
 }
-
-pre_remove() {
-  userdel privoxy &>/dev/null
-  groupdel privoxy &>/dev/null
-  rm -rf var/spool/privoxy
-}