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

Giovanni Scafora giovanni at archlinux.org
Mon Nov 2 16:22:38 UTC 2009


    Date: Monday, November 2, 2009 @ 11:22:37
  Author: giovanni
Revision: 57849

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

........
  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-x86_64/fix-for-new-cap-headers.patch
    (from rev 57847, squid/trunk/fix-for-new-cap-headers.patch)
Modified:
  squid/repos/extra-x86_64/	(properties)
  squid/repos/extra-x86_64/PKGBUILD

-------------------------------+
 PKGBUILD                      |    6 +++---
 fix-for-new-cap-headers.patch |   14 ++++++++++++++
 2 files changed, 17 insertions(+), 3 deletions(-)


Property changes on: squid/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /squid/trunk:1-55979
   + /squid/trunk:1-57848

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-11-02 16:20:30 UTC (rev 57848)
+++ extra-x86_64/PKGBUILD	2009-11-02 16:22:37 UTC (rev 57849)
@@ -22,12 +22,12 @@
          '81f9a446d143f42c6a3f30304e91c39f'
          '270977cdd9b47ef44c0c427ab9034777'
          '5e17df989e2a74e869790c066f61225b'
-         '315eea1079de827dd7eb94be2470132f')
+         '9b7586646c8a81730029798895a0eaca')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np1 -i ${srcdir}/squid-makefiles.patch
-  patch -Np0 -i ${srcdir}/fix-for-new-cap-headers.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-x86_64/fix-for-new-cap-headers.patch (from rev 57847, squid/trunk/fix-for-new-cap-headers.patch)
===================================================================
--- extra-x86_64/fix-for-new-cap-headers.patch	                        (rev 0)
+++ extra-x86_64/fix-for-new-cap-headers.patch	2009-11-02 16:22:37 UTC (rev 57849)
@@ -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




More information about the arch-commits mailing list