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

Dan McGee dan at archlinux.org
Sun Sep 13 13:52:59 UTC 2009


    Date: Sunday, September 13, 2009 @ 09:52:59
  Author: dan
Revision: 51903

upgpkg: squid 2.7.STABLE6-3
    fix 14085, fix cron file when squid is not running

Modified:
  squid/trunk/PKGBUILD
  squid/trunk/squid.cron

------------+
 PKGBUILD   |   15 +++++++++------
 squid.cron |    5 +++--
 2 files changed, 12 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-09-13 13:47:42 UTC (rev 51902)
+++ PKGBUILD	2009-09-13 13:52:59 UTC (rev 51903)
@@ -4,11 +4,11 @@
 
 pkgname=squid
 pkgver=2.7.STABLE6
-pkgrel=2
+pkgrel=3
 pkgdesc="A full-featured Web proxy cache server."
 arch=(i686 x86_64)
 url="http://www.squid-cache.org"
-depends=('openssl' 'pam' 'dcron' 'perl')
+depends=('openssl' 'pam' 'cron' 'perl')
 makedepends=('libcap>=2.16')
 license=('GPL')
 backup=(etc/squid/squid.conf etc/squid/mime.conf etc/conf.d/squid)
@@ -16,9 +16,12 @@
 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' '082e53bb6e2c79bc44ac95c3d69145da'
-         'd213b0cc1db72b749bb8c88716fdab39' '81f9a446d143f42c6a3f30304e91c39f'
-         '270977cdd9b47ef44c0c427ab9034777' 'f47bb20c7be3089d78e6d2b491f7923b')
+md5sums=('6de3a6a7a56a7ecae092f2d31a04f039'
+         '082e53bb6e2c79bc44ac95c3d69145da'
+         'd213b0cc1db72b749bb8c88716fdab39'
+         '81f9a446d143f42c6a3f30304e91c39f'
+         '270977cdd9b47ef44c0c427ab9034777'
+         '5e17df989e2a74e869790c066f61225b')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
@@ -37,7 +40,7 @@
       --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-poll --with-maxfd=4096
+      --enable-htcp --enable-carp --enable-epoll --with-maxfd=4096
 #some versions have build problems with both async and truncate enabled:
 #      --enable-async-io --enable-arp-acl \
 

Modified: squid.cron
===================================================================
--- squid.cron	2009-09-13 13:47:42 UTC (rev 51902)
+++ squid.cron	2009-09-13 13:52:59 UTC (rev 51903)
@@ -1,3 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
-/usr/sbin/squid -k rotate
+PID=`pidof -o %PPID /usr/sbin/squid`
+[ -n "$PID" ] && /usr/sbin/squid -k rotate




More information about the arch-commits mailing list