Tue Dec 4 02:21:34 PST 2012

1 files changed, 57 insertions, 58 deletions

diff --git a/community/squid/PKGBUILD b/community/squid/PKGBUILD
index 8e4cee10d..f2dfc58ed 100644
--- a/community/squid/PKGBUILD
+++ b/community/squid/PKGBUILD
@@ -1,29 +1,30 @@
-# $Id: PKGBUILD 80303 2012-11-19 15:56:56Z spupykin $
+# $Id: PKGBUILD 80766 2012-12-03 10:12:25Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Kevin Piche <kevin@archlinux.org>
+# Contributor: Mark Coolen <mark.coolen@gmail.com>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Maintainer: Mark Coolen <mark.coolen@gmail.com>
+# Contributor: Kevin Piche <kevin@archlinux.org>
 
-pkgname="squid"
-pkgver="3.2.3"
-pkgrel="1"
-pkgdesc="A full-featured Web proxy cache server."
-arch=('i686' 'x86_64')
-url="http://www.squid-cache.org"
+pkgname=squid
+pkgver=3.2.4
+pkgrel=1
+pkgdesc='Full-featured Web proxy cache server'
+arch=('x86_64' 'i686')
+url='http://www.squid-cache.org'
 depends=('openssl' 'pam' 'cron' 'perl' 'libltdl')
 makedepends=('libcap')
 license=('GPL')
+options=('emptydirs')
 backup=('etc/squid/squid.conf'
         'etc/squid/mime.conf'
         'etc/conf.d/squid')
-install=squid.install
+install=$pkgname.install
 source=("http://www.squid-cache.org/Versions/v3/3.2/$pkgname-$pkgver.tar.bz2"
         'squid'
         'squid.conf.d'
         'squid.pam'
         'squid.cron'
         'squid.service')
-md5sums=('b26171dfd397defd9ee113d555691b86'
+md5sums=('5fd7d120c429aaeacdf008938a36cb94'
          '02f7b5bd793f778e40834fd6457d2199'
          '2383772ef94efddc7b920628bc7ac5b0'
          '270977cdd9b47ef44c0c427ab9034777'
@@ -31,7 +32,7 @@ md5sums=('b26171dfd397defd9ee113d555691b86'
          '20e00e1aa1198786795f3da32db3c1d8')
 
 build() {
-  cd "$pkgname-$pkgver"
+  cd "$srcdir/$pkgname-$pkgver"
 
   # gcc 4.6 doesn't support -fhuge-objects.
   sed '/^    HUGE_OBJECT_FLAG=/ s/"-fhuge-objects"//' -i configure
@@ -41,58 +42,56 @@ build() {
   sed '/^#cache_dir/ s/100/256/
        /^NAME: cache_effective_group/ {n;n;s/none/proxy/}' -i src/cf.data.pre
 
-./configure \
-      --prefix=/usr \
-      --datadir=/usr/share/squid \
-      --sysconfdir=/etc/squid \
-      --libexecdir=/usr/lib/squid \
-      --localstatedir=/var \
-      --with-logdir=/var/log/squid \
-      --with-pidfile=/run/squid.pid \
-      --enable-auth \
-      --enable-auth-basic \
-      --enable-auth-ntlm \
-      --enable-auth-digest \
-      --enable-auth-negotiate \
-      --enable-removal-policies="lru,heap" \
-      --enable-storeio="aufs,ufs,diskd" \
-      --enable-delay-pools \
-      --enable-arp-acl \
-      --enable-ssl \
-      --enable-snmp \
-      --enable-linux-netfilter \
-      --enable-ident-lookups \
-      --enable-useragent-log \
-      --enable-cache-digests \
-      --enable-referer-log \
-      --enable-arp-acl \
-      --enable-htcp \
-      --enable-carp \
-      --enable-epoll \
-      --with-filedescriptors=4096 \
-      --with-large-files \
-      --enable-arp-acl \
-      --with-default-user=proxy \
-      --enable-async-io \
-      --enable-truncate
-
-
+  sed -i '1,1i#include <errno.h>' helpers/external_acl/file_userip/ext_file_userip_acl.cc
 
+  ./configure \
+    --prefix=/usr \
+    --datadir=/usr/share/squid \
+    --sysconfdir=/etc/squid \
+    --libexecdir=/usr/lib/squid \
+    --localstatedir=/var \
+    --with-logdir=/var/log/squid \
+    --with-pidfile=/run/squid.pid \
+    --enable-auth \
+    --enable-auth-basic \
+    --enable-auth-ntlm \
+    --enable-auth-digest \
+    --enable-auth-negotiate \
+    --enable-removal-policies="lru,heap" \
+    --enable-storeio="aufs,ufs,diskd" \
+    --enable-delay-pools \
+    --enable-arp-acl \
+    --enable-ssl \
+    --enable-snmp \
+    --enable-linux-netfilter \
+    --enable-ident-lookups \
+    --enable-useragent-log \
+    --enable-cache-digests \
+    --enable-referer-log \
+    --enable-arp-acl \
+    --enable-htcp \
+    --enable-carp \
+    --enable-epoll \
+    --with-filedescriptors=4096 \
+    --with-large-files \
+    --enable-arp-acl \
+    --with-default-user=proxy \
+    --enable-async-io \
+    --enable-truncate
   make
 }
 
 package() {
-  make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
-
-  install -Dm755 "$srcdir"/squid "$pkgdir"/etc/rc.d/squid
-  install -Dm755 "$srcdir"/squid.cron "$pkgdir"/etc/cron.weekly/squid
-  install -Dm644 "$srcdir"/squid.conf.d "$pkgdir"/etc/conf.d/squid
-  install -Dm644 "$srcdir"/squid.pam "$pkgdir"/etc/pam.d/squid
+  cd "$srcdir"
 
-  install -Dm644 "$srcdir/squid.service" "$pkgdir/usr/lib/systemd/system/squid.service"
-
-  # random unneeded empty dir...
-  rmdir "$pkgdir/usr/include"
+  make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
+  install -Dm755 "$srcdir/squid" "$pkgdir/etc/rc.d/squid"
+  install -Dm755 "$srcdir/squid.cron" "$pkgdir/etc/cron.weekly/squid"
+  install -Dm755 "$srcdir/squid.conf.d" "$pkgdir/etc/conf.d/squid"
+  install -Dm644 "$srcdir/squid.pam" "$pkgdir/etc/pam.d/squid"
+  install -Dm644 "$srcdir/squid.service" \
+    "$pkgdir/usr/lib/systemd/system/squid.service"
+  rm -rf $pkgdir/run $pkgdir/var/run
 }
 
 # vim: ts=2 sw=2 et ft=sh