[arch-commits] Commit in squid/repos (4 files)

Giovanni Scafora giovanni at archlinux.org
Mon Nov 2 16:20:30 UTC 2009


    Date: Monday, November 2, 2009 @ 11:20:30
  Author: giovanni
Revision: 57848

Merged revisions 55979,57846-57847 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/squid/trunk

........
  r55979 | kevin | 2009-10-16 17:58:06 -0700 (ven, 16 ott 2009) | 2 lines
  
  upgpkg: squid 2.7.STABLE7-1
      Update to latest
........
  r57846 | kevin | 2009-11-02 07:59:10 -0800 (lun, 02 nov 2009) | 2 lines
  
  Added missing patch.
........
  r57847 | giovanni | 2009-11-02 08:19:39 -0800 (lun, 02 nov 2009) | 1 line
........

Added:
  squid/repos/extra-i686/fix-for-new-cap-headers.patch
    (from rev 57847, squid/trunk/fix-for-new-cap-headers.patch)
Modified:
  squid/repos/extra-i686/	(properties)
  squid/repos/extra-i686/PKGBUILD
  squid/repos/extra-i686/squid.install

-------------------------------+
 PKGBUILD                      |   14 ++++++++------
 fix-for-new-cap-headers.patch |   14 ++++++++++++++
 squid.install                 |   16 +++++++---------
 3 files changed, 29 insertions(+), 15 deletions(-)


Property changes on: squid/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /squid/trunk:1-51905
   + /squid/trunk:1-57847

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-11-02 16:19:39 UTC (rev 57847)
+++ extra-i686/PKGBUILD	2009-11-02 16:20:30 UTC (rev 57848)
@@ -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'
+         '9b7586646c8a81730029798895a0eaca')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np1 -i ../squid-makefiles.patch
+  patch -Np1 -i ${srcdir}/squid-makefiles.patch || return 1
+  patch -Np0 -i ${srcdir}/fix-for-new-cap-headers.patch || return 1
 
   ./configure --prefix=/usr --datadir=/usr/share/squid \
       --sysconfdir=/etc/squid --libexecdir=/usr/lib/squid \

Copied: squid/repos/extra-i686/fix-for-new-cap-headers.patch (from rev 57847, squid/trunk/fix-for-new-cap-headers.patch)
===================================================================
--- extra-i686/fix-for-new-cap-headers.patch	                        (rev 0)
+++ extra-i686/fix-for-new-cap-headers.patch	2009-11-02 16:20:30 UTC (rev 57848)
@@ -0,0 +1,14 @@
+--- src/tools.c.orig	2009-11-02 10:54:49.000000000 -0500
++++ src/tools.c	2009-11-02 10:55:05.000000000 -0500
+@@ -44,9 +44,9 @@
+ #if HAVE_SYS_CAPABILITY_H
+ #undef _POSIX_SOURCE
+ /* Ugly glue to get around linux header madness colliding with glibc */
+-#define _LINUX_TYPES_H
++/*#define _LINUX_TYPES_H*/
+ #define _LINUX_FS_H
+-typedef uint32_t __u32;
++/*typedef uint32_t __u32;*/
+ #include <sys/capability.h>
+ #endif
+ #endif

Modified: extra-i686/squid.install
===================================================================
--- extra-i686/squid.install	2009-11-02 16:19:39 UTC (rev 57847)
+++ extra-i686/squid.install	2009-11-02 16:20:30 UTC (rev 57848)
@@ -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