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

[Eli Schwartz]

    Date: Tuesday, March 6, 2018 @ 19:48:47
  Author: eschwartz
Revision: 303199

upgpkg: squid 3.5.27-2

Fix modifying directory ownership in post_install rather than package(), by
finishing migration to tmpfiles.d(5).

Remove install script as it no longer does anything except provide messages
related to several-years-old package upgrades.

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

----------------+
 PKGBUILD       |    7 +++----
 squid.install  |   14 --------------
 squid.tmpfiles |    5 +++--
 3 files changed, 6 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-03-06 19:44:11 UTC (rev 303198)
+++ PKGBUILD	2018-03-06 19:48:47 UTC (rev 303199)
@@ -6,7 +6,7 @@
 
 pkgname=squid
 pkgver=3.5.27
-pkgrel=1
+pkgrel=2
 pkgdesc='Full-featured Web proxy cache server'
 arch=('x86_64')
 url='http://www.squid-cache.org'
@@ -18,7 +18,6 @@
 	'etc/squid/cachemgr.conf'
 	'etc/squid/errorpage.css'
 	'etc/squid/mime.conf')
-install=$pkgname.install
 validpgpkeys=('EA31CC5E9488E5168D2DCC5EB268E706FF5CF463')
 source=("http://www.squid-cache.org/Versions/v3/3.5/$pkgname-$pkgver.tar.xz"{,.asc}
         'squid.pam'
@@ -31,7 +30,7 @@
             'SKIP'
             '11fb388f8679fd6461e0de006810ea608a3686fffda16904b0ed71f412be499c'
             'b0cf95652d56c62ae0ceba8912d11ac248bdb3eb91f062bceadd99f80c4b160e'
-            '0d7db4e078a2a6d8d8e46537054aa84523efdf95dd92a78189e81606200f48a5'
+            '495f54e51f6ec1e4dce87090d76718aea1eb37559c4439d876dd39598163062a'
             'c903eb86e6968b9d3bd0a9ad3335e8ce76a718b6217251e9dd7e66d5cf1ac94a'
             '3a97aa6bf6dcdc427e73bb2f36afdeaaf2bbf7dd2c0bbb7f1a948850198a8b7c'
             '8bc77fa1f653a17a4956feac042be9577ba30a8a43480b443fbd67640ae711ee')
@@ -102,7 +101,7 @@
 #  install -dm755 "$pkgdir/usr/lib/systemd/system/timers.target.wants"
 #  ln -s ../squid-rotate.timer \
 #    "$pkgdir/usr/lib/systemd/system/timers.target.wants/squid-rotate.timer"
-  rm -rf "$pkgdir/run" "$pkgdir/var/run"
+  rm -rf "$pkgdir/run" "$pkgdir"/var/{cache,log,run}
 }
 
 # vim: ts=2 sw=2 et ft=sh

Deleted: squid.install
===================================================================
--- squid.install	2018-03-06 19:44:11 UTC (rev 303198)
+++ squid.install	2018-03-06 19:48:47 UTC (rev 303199)
@@ -1,14 +0,0 @@
-post_install() {
-  chown 15:15 var/{cache,log}/squid
-  echo "- squid-rotate.timer is not enabled by default"
-}
-
-post_upgrade() {
-  post_install
-  if [ `vercmp "$2" "3.5.4-1"` -le 0 ]; then
-    echo "- Add 'dns_v4_first on' option into config unless your provider support ipv6!"
-  fi
-  if [ `vercmp "$2" "3.5.21-1"` -le 0 ]; then
-    echo "- squid-rotate.timer is not enabled by default"
-  fi
-}

Modified: squid.tmpfiles
===================================================================
--- squid.tmpfiles	2018-03-06 19:44:11 UTC (rev 303198)
+++ squid.tmpfiles	2018-03-06 19:48:47 UTC (rev 303199)
@@ -1,2 +1,3 @@
-d /run/squid 0755 proxy proxy -
-d /var/log/squid 0755 proxy proxy -
+d /run/squid       0755 proxy proxy -
+d /var/cache/squid 0755 proxy proxy -
+d /var/log/squid   0755 proxy proxy -