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

Kevin Piché kevin at archlinux.org
Sat Oct 17 00:58:07 UTC 2009


    Date: Friday, October 16, 2009 @ 20:58:06
  Author: kevin
Revision: 55979

upgpkg: squid 2.7.STABLE7-1
    Update to latest

Modified:
  squid/trunk/PKGBUILD
  squid/trunk/squid.install

---------------+
 PKGBUILD      |   14 ++++++++------
 squid.install |   16 +++++++---------
 2 files changed, 15 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-10-17 00:38:15 UTC (rev 55978)
+++ PKGBUILD	2009-10-17 00:58:06 UTC (rev 55979)
@@ -3,8 +3,8 @@
 # Contributor: Tom Newsom <Jeepster at gmx.co.uk>
 
 pkgname=squid
-pkgver=2.7.STABLE6
-pkgrel=3
+pkgver=2.7.STABLE7
+pkgrel=1
 pkgdesc="A full-featured Web proxy cache server."
 arch=(i686 x86_64)
 url="http://www.squid-cache.org"
@@ -15,17 +15,19 @@
 install=$pkgname.install
 source=(http://www.squid-cache.org/Versions/v2/2.7/${pkgname}-${pkgver}.tar.bz2
         squid-makefiles.patch squid squid.conf.d squid.pam
-        squid.cron)
-md5sums=('6de3a6a7a56a7ecae092f2d31a04f039'
+        squid.cron fix-for-new-cap-headers.patch)
+md5sums=('c18b0371fca813d5e7c7e0baf87baa22'
          '082e53bb6e2c79bc44ac95c3d69145da'
          'd213b0cc1db72b749bb8c88716fdab39'
          '81f9a446d143f42c6a3f30304e91c39f'
          '270977cdd9b47ef44c0c427ab9034777'
-         '5e17df989e2a74e869790c066f61225b')
+         '5e17df989e2a74e869790c066f61225b'
+         '315eea1079de827dd7eb94be2470132f')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np1 -i ../squid-makefiles.patch
+  patch -Np1 -i ${srcdir}/squid-makefiles.patch
+  patch -Np0 -i ${srcdir}/fix-for-new-cap-headers.patch
 
   ./configure --prefix=/usr --datadir=/usr/share/squid \
       --sysconfdir=/etc/squid --libexecdir=/usr/lib/squid \

Modified: squid.install
===================================================================
--- squid.install	2009-10-17 00:38:15 UTC (rev 55978)
+++ squid.install	2009-10-17 00:58:06 UTC (rev 55979)
@@ -1,10 +1,10 @@
 post_install() {
-  if [ ! `grep proxy /etc/group` ]; then
-    groupadd -g 15 proxy &>/dev/null;
+  if [ ! `grep ^proxy: /etc/group` ]; then
+    usr/sbin/groupadd -g 15 proxy &>/dev/null;
   fi
 
   id proxy &>/dev/null || \
-    useradd -u 15 -g proxy -d /var/empty proxy
+    usr/sbin/useradd -u 15 -g proxy -d /var/empty proxy
 
   chown proxy.proxy var/{cache,log}/squid
 
@@ -20,11 +20,9 @@
 }
 
 pre_remove() {
-  userdel proxy &> /dev/null
-  groupdel proxy &> /dev/null
+  usr/sbin/userdel proxy &> /dev/null
+  if [ `grep ^proxy: /etc/group` ]; then
+    usr/sbin/groupdel proxy &>/dev/null
+  fi
 }
 
-op=$1
-shift
-
-$op $*




More information about the arch-commits mailing list