diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-10 11:35:18 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-10 11:35:18 +0200 |
| commit | 51d25a8023c8dafdbcafd8bcc6adb19979f15ac6 (patch) | |
| tree | 3419b254ec8c04b09a938d993fdb768eae03c005 /extra/squid | |
| parent | 11fe0679d59f68c3fbe3d0a205e5087bf694262e (diff) | |
| parent | 7b2739f21a7ed0d52497fa381c9a2383e71ab7a8 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
extra/kdemultimedia/PKGBUILD
extra/kdenetwork/PKGBUILD
extra/samba/PKGBUILD
multilib/lib32-gnutls/PKGBUILD
multilib/wine/PKGBUILD
staging/kdemultimedia/PKGBUILD
Diffstat (limited to 'extra/squid')
| -rw-r--r-- | extra/squid/PKGBUILD | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/extra/squid/PKGBUILD b/extra/squid/PKGBUILD index f6aaa75b4..3ef694a5a 100644 --- a/extra/squid/PKGBUILD +++ b/extra/squid/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 157558 2012-04-29 00:21:17Z eric $ +# $Id: PKGBUILD 161289 2012-06-08 23:27:08Z dreisner $ # Maintainer: Kevin Piche <kevin@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=squid -pkgver=3.1.19 -pkgrel=2 +pkgver=3.1.20 +pkgrel=1 pkgdesc="A full-featured Web proxy cache server." arch=('i686' 'x86_64' 'mips64el') url="http://www.squid-cache.org" @@ -15,7 +15,7 @@ backup=('etc/squid/squid.conf' 'etc/squid/mime.conf' 'etc/conf.d/squid') 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') -md5sums=('9b6ffaf96bee8f05f0085bc6361d7c94' +md5sums=('c4d733a383c0508fd0746d64a2d7278a' 'd213b0cc1db72b749bb8c88716fdab39' '2383772ef94efddc7b920628bc7ac5b0' '270977cdd9b47ef44c0c427ab9034777' @@ -61,5 +61,8 @@ package() { 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 + + # avoid conflict with filesystem>=2012.06 + rmdir "$pkgdir/var/run" } # vim: ts=2 sw=2 et ft=sh |