diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-02-25 03:21:56 +0000 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-02-25 03:21:56 +0000 |
| commit | 58e4d57ed9a8604dff646ccdfee54f9019ca5d13 (patch) | |
| tree | 4e9698b9216274fafac9483056a01a552e8e617b /community/squid | |
| parent | 15cd70d8180c2a45287e4bd8ce01a2a9248e8d62 (diff) | |
Tue Feb 25 03:19:16 UTC 2014
Diffstat (limited to 'community/squid')
| -rw-r--r-- | community/squid/PKGBUILD | 11 | ||||
| -rw-r--r-- | community/squid/squid.install | 19 | ||||
| -rw-r--r-- | community/squid/squid.tmpfiles | 1 |
3 files changed, 12 insertions, 19 deletions
diff --git a/community/squid/PKGBUILD b/community/squid/PKGBUILD index 710934ed7..00dad4da2 100644 --- a/community/squid/PKGBUILD +++ b/community/squid/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 105249 2014-02-03 11:29:24Z spupykin $ +# $Id: PKGBUILD 106151 2014-02-24 09:06:12Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Mark Coolen <mark.coolen@gmail.com> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> @@ -6,7 +6,7 @@ pkgname=squid pkgver=3.4.3 -pkgrel=1 +pkgrel=2 pkgdesc='Full-featured Web proxy cache server' arch=('x86_64' 'i686') url='http://www.squid-cache.org' @@ -20,11 +20,13 @@ install=$pkgname.install source=("http://www.squid-cache.org/Versions/v3/3.4/$pkgname-$pkgver.tar.bz2" 'squid.pam' 'squid.cron' - 'squid.service') + 'squid.service' + 'squid.tmpfiles') md5sums=('4c4c53d2260afd6e7e2dd7c445c92920' '270977cdd9b47ef44c0c427ab9034777' 'a71425c4951f2e5b640d19e6a5048531' - 'ceeb57c69ebb165676219222f109a24e') + 'ceeb57c69ebb165676219222f109a24e' + 'd243da117c1aee03c0cc6052f023a380') build() { cd "$srcdir/$pkgname-$pkgver" @@ -76,6 +78,7 @@ package() { make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install install -Dm755 "$srcdir/squid.cron" "$pkgdir/etc/cron.weekly/squid" install -Dm644 "$srcdir/squid.pam" "$pkgdir/etc/pam.d/squid" + install -Dm644 "$srcdir/squid.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/squid.conf" install -Dm644 "$srcdir/squid.service" \ "$pkgdir/usr/lib/systemd/system/squid.service" rm -rf "$pkgdir/run" "$pkgdir/var/run" diff --git a/community/squid/squid.install b/community/squid/squid.install index a7c76d87a..5c8b77600 100644 --- a/community/squid/squid.install +++ b/community/squid/squid.install @@ -1,16 +1,8 @@ post_install() { - if [ -z "$(grep ^proxy: /etc/group)" ]; then - groupadd -g 15 proxy &>/dev/null - fi - - id proxy &>/dev/null || \ - useradd -u 15 -g proxy -d /var/empty proxy - + [ -z "$(grep ^proxy: /etc/group)" ] && groupadd -g 15 proxy &>/dev/null + id proxy &>/dev/null || useradd -u 15 -g proxy -d /var/empty proxy chown proxy.proxy var/{cache,log}/squid - -# cat << EOF -#Release notes: http://www.squid-cache.org/Versions/v3/3.1/RELEASENOTES.html -#EOF + systemd-tmpfiles --create squid.conf } post_upgrade() { @@ -19,8 +11,5 @@ post_upgrade() { pre_remove() { userdel proxy &> /dev/null - if [ ! -z "$(grep ^proxy: /etc/group)" ]; then - groupdel proxy &>/dev/null - fi + [ ! -z "$(grep ^proxy: /etc/group)" ] && groupdel proxy &>/dev/null } - diff --git a/community/squid/squid.tmpfiles b/community/squid/squid.tmpfiles new file mode 100644 index 000000000..a45d96ccf --- /dev/null +++ b/community/squid/squid.tmpfiles @@ -0,0 +1 @@ +d /run/squid 0755 proxy proxy - |