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

[Sergej Pupykin]

    Date: Thursday, May 23, 2013 @ 12:14:38
  Author: spupykin
Revision: 91501

upgpkg: squid 3.3.5-2

upd

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

---------------+
 PKGBUILD      |    7 ++++---
 squid.cron    |    4 ++--
 squid.install |    8 ++++----
 squid.service |    6 +++---
 4 files changed, 13 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-23 10:14:34 UTC (rev 91500)
+++ PKGBUILD	2013-05-23 10:14:38 UTC (rev 91501)
@@ -6,7 +6,7 @@
 
 pkgname=squid
 pkgver=3.3.5
-pkgrel=1
+pkgrel=2
 pkgdesc='Full-featured Web proxy cache server'
 arch=('x86_64' 'i686')
 url='http://www.squid-cache.org'
@@ -23,8 +23,8 @@
         'squid.service')
 md5sums=('c7991aa8528034af0e21a69edf26e41b'
          '270977cdd9b47ef44c0c427ab9034777'
-         'b499c2b725aefd7bd60bec2f1a9de392'
-         '20e00e1aa1198786795f3da32db3c1d8')
+         'a71425c4951f2e5b640d19e6a5048531'
+         'ceeb57c69ebb165676219222f109a24e')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -41,6 +41,7 @@
 
   ./configure \
     --prefix=/usr \
+    --sbindir=/usr/bin \
     --datadir=/usr/share/squid \
     --sysconfdir=/etc/squid \
     --libexecdir=/usr/lib/squid \

Modified: squid.cron
===================================================================
--- squid.cron	2013-05-23 10:14:34 UTC (rev 91500)
+++ squid.cron	2013-05-23 10:14:38 UTC (rev 91501)
@@ -4,6 +4,6 @@
 { read pid </run/squid.pid; } 2>/dev/null || exit 0
 
 # make sure found PID really is a squid process
-if [ /proc/$pid/exec -ef /usr/sbin/squid ]; then
-  /usr/sbin/squid -k rotate
+if [ /proc/$pid/exec -ef /usr/bin/squid ]; then
+  /usr/bin/squid -k rotate
 fi

Modified: squid.install
===================================================================
--- squid.install	2013-05-23 10:14:34 UTC (rev 91500)
+++ squid.install	2013-05-23 10:14:38 UTC (rev 91501)
@@ -1,10 +1,10 @@
 post_install() {
   if [ -z "$(grep ^proxy: /etc/group)" ]; then
-    usr/sbin/groupadd -g 15 proxy &>/dev/null
+    groupadd -g 15 proxy &>/dev/null
   fi
 
   id proxy &>/dev/null || \
-    usr/sbin/useradd -u 15 -g proxy -d /var/empty proxy
+    useradd -u 15 -g proxy -d /var/empty proxy
 
   chown proxy.proxy var/{cache,log}/squid
 
@@ -18,9 +18,9 @@
 }
 
 pre_remove() {
-  usr/sbin/userdel proxy &> /dev/null
+  userdel proxy &> /dev/null
   if [ ! -z "$(grep ^proxy: /etc/group)" ]; then
-    usr/sbin/groupdel proxy &>/dev/null
+    groupdel proxy &>/dev/null
   fi
 }
 

Modified: squid.service
===================================================================
--- squid.service	2013-05-23 10:14:34 UTC (rev 91500)
+++ squid.service	2013-05-23 10:14:38 UTC (rev 91501)
@@ -5,9 +5,9 @@
 [Service]
 Type=forking
 PIDFile=/run/squid.pid
-ExecStart=/usr/sbin/squid -sYC
-ExecStop=/usr/sbin/squid -k shutdown
-ExecReload=/usr/sbin/squid -k reconfigure
+ExecStart=/usr/bin/squid -sYC
+ExecStop=/usr/bin/squid -k shutdown
+ExecReload=/usr/bin/squid -k reconfigure
 
 [Install]
 WantedBy=multi-user.target