Sat May 7 22:35:21 UTC 2011

1 files changed, 36 insertions, 32 deletions

diff --git a/extra/squid/PKGBUILD b/extra/squid/PKGBUILD
index ab4cca63d..e3611bc0f 100644
--- a/extra/squid/PKGBUILD
+++ b/extra/squid/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 79502 2010-05-04 00:58:56Z kevin $
+# $Id: PKGBUILD 122870 2011-05-07 00:40:13Z kevin $
 # Maintainer: Kevin Piche <kevin@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=squid
-pkgver=2.7.STABLE9
+pkgver=3.1.12
 pkgrel=1
 pkgdesc="A full-featured Web proxy cache server."
 arch=(i686 x86_64)
@@ -12,51 +12,55 @@ depends=('openssl' 'pam' 'cron' 'perl')
 makedepends=('libcap>=2.16')
 license=('GPL')
 backup=(etc/squid/squid.conf etc/squid/mime.conf etc/conf.d/squid)
-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 fix-for-new-cap-headers.patch)
-md5sums=('3c6642c85470b1079207d43bba25a819'
-         '082e53bb6e2c79bc44ac95c3d69145da'
-         'd213b0cc1db72b749bb8c88716fdab39'
-         '81f9a446d143f42c6a3f30304e91c39f'
-         '270977cdd9b47ef44c0c427ab9034777'
-         '5e17df989e2a74e869790c066f61225b'
-         '9b7586646c8a81730029798895a0eaca')
+install=squid.install
+source=(http://www.squid-cache.org/Versions/v3/3.1/${pkgname}-${pkgver}.tar.bz2
+        squid squid.conf.d squid.pam squid.cron squid-3.1.11-unused.patch)
+md5sums=('3b4979e4b44f46d4e13f50326c537d89' 'd213b0cc1db72b749bb8c88716fdab39'
+         '2383772ef94efddc7b920628bc7ac5b0' '270977cdd9b47ef44c0c427ab9034777'
+         '5e17df989e2a74e869790c066f61225b' '8e59089e4a8556fc18df51979f1cfbff')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np1 -i ${srcdir}/squid-makefiles.patch || return 1
+
+  # gcc 4.6 doesn't support -fhuge-objects.
+  sed '/^    HUGE_OBJECT_FLAG=/ s/"-fhuge-objects"//' -i configure
+  # fix compile errors with gcc 4.6
+  # http://bugs.squid-cache.org/show_bug.cgi?id=3178
+  patch -Np1 -i ${srcdir}/squid-3.1.11-unused.patch
+
+  # fix cache_dir, cache_dir size, and effective group.
+  sed '/^DEFAULT_SWAP_DIR/ s@/cache@/cache/squid@' -i src/Makefile.in
+  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 --enable-auth="basic,digest,ntlm" \
-      --enable-removal-policies="lru,heap" \
-      --enable-digest-auth-helpers="password" \
-      --enable-storeio="aufs,ufs,diskd,coss,null" \
+      --localstatedir=/var --with-logdir=/var/log/squid \
+      --enable-auth="basic,digest,ntlm" --enable-removal-policies="lru,heap" \
+      --enable-digest-auth-helpers="password" --enable-storeio="aufs,ufs,diskd" \
       --enable-basic-auth-helpers="getpwnam,YP,NCSA,SMB,MSNT,PAM,multi-domain-NTLM" \
       --enable-external-acl-helpers="ip_user,unix_group,wbinfo_group" \
-      --enable-ntlm-auth-helpers="SMB,fakeauth,no_check" \
+      --enable-ntlm-auth-helpers="smb_lm,fakeauth,no_check" \
       --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-async-io --enable-truncate --enable-arp-acl \
-      --enable-htcp --enable-carp --enable-epoll --with-maxfd=4096
-      --with-large-files
+      --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
 #some versions have build problems with both async and truncate enabled:
-#      --enable-async-io --enable-arp-acl \
-
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
-  rm -rf ${pkgdir}/var
-  mv ${pkgdir}/usr/bin/Run* ${pkgdir}/usr/lib/squid
-  mkdir -p ${pkgdir}/var/cache/squid
-  mkdir -p ${pkgdir}/var/log/squid
+#      --enable-async-io
+
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+
   install -D -m755 ${srcdir}/squid ${pkgdir}/etc/rc.d/squid
   install -D -m755 ${srcdir}/squid.cron ${pkgdir}/etc/cron.weekly/squid
   install -D -m644 ${srcdir}/squid.conf.d ${pkgdir}/etc/conf.d/squid
   install -D -m644 ${srcdir}/squid.pam ${pkgdir}/etc/pam.d/squid
-  install -D -m644 ${pkgdir}/etc/squid/squid.conf \
-                   ${pkgdir}/etc/squid/squid.conf.default
 }
 # vim: ts=2 sw=2 et ft=sh