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

[Sergej Pupykin]

    Date: Monday, February 24, 2014 @ 10:05:50
  Author: spupykin
Revision: 106150

upgpkg: squid 3.4.3-2

upd

Added:
  squid/trunk/squid.tmpfiles
Modified:
  squid/trunk/PKGBUILD
  squid/trunk/squid.install

----------------+
 PKGBUILD       |    9 ++++++---
 squid.install  |   19 ++++---------------
 squid.tmpfiles |    1 +
 3 files changed, 11 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-02-24 08:56:42 UTC (rev 106149)
+++ PKGBUILD	2014-02-24 09:05:50 UTC (rev 106150)
@@ -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 @@
 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 @@
   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"

Modified: squid.install
===================================================================
--- squid.install	2014-02-24 08:56:42 UTC (rev 106149)
+++ squid.install	2014-02-24 09:05:50 UTC (rev 106150)
@@ -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 @@
 
 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
 }
-

Added: squid.tmpfiles
===================================================================
--- squid.tmpfiles	                        (rev 0)
+++ squid.tmpfiles	2014-02-24 09:05:50 UTC (rev 106150)
@@ -0,0 +1 @@
+d /run/squid 0755 proxy proxy -