6 files changed, 17 insertions, 76 deletions
diff --git a/community/squid/PKGBUILD b/community/squid/PKGBUILD
index 9e63cf082..396e514a3 100644
--- a/community/squid/PKGBUILD
+++ b/community/squid/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 88474 2013-04-18 12:16:13Z spupykin $
+# $Id: PKGBUILD 91502 2013-05-23 10:15:09Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Mark Coolen <mark.coolen@gmail.com>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Contributor: Kevin Piche <kevin@archlinux.org>
 
 pkgname=squid
-pkgver=3.3.3
-pkgrel=1
+pkgver=3.3.5
+pkgrel=2
 pkgdesc='Full-featured Web proxy cache server'
 arch=('x86_64' 'i686' 'mips64el')
 url='http://www.squid-cache.org'
@@ -15,21 +15,16 @@ makedepends=('libcap')
 license=('GPL')
 options=('emptydirs')
 backup=('etc/squid/squid.conf'
-        'etc/squid/mime.conf'
-        'etc/conf.d/squid')
+        'etc/squid/mime.conf')
 install=$pkgname.install
 source=("http://www.squid-cache.org/Versions/v3/3.3/$pkgname-$pkgver.tar.bz2"
-        'squid'
-        'squid.conf.d'
         'squid.pam'
         'squid.cron'
         'squid.service')
-md5sums=('20f63ab34eae93b36969c9c7519f6462'
-         'e90895ce22c0b618c89a46a9a181fe6c'
-         '2383772ef94efddc7b920628bc7ac5b0'
+md5sums=('c7991aa8528034af0e21a69edf26e41b'
          '270977cdd9b47ef44c0c427ab9034777'
-         'b499c2b725aefd7bd60bec2f1a9de392'
-         '20e00e1aa1198786795f3da32db3c1d8')
+         'a71425c4951f2e5b640d19e6a5048531'
+         'ceeb57c69ebb165676219222f109a24e')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -46,6 +41,7 @@ build() {
 
   ./configure \
     --prefix=/usr \
+    --sbindir=/usr/bin \
     --datadir=/usr/share/squid \
     --sysconfdir=/etc/squid \
     --libexecdir=/usr/lib/squid \
@@ -85,9 +81,7 @@ package() {
   cd "$srcdir"
 
   make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
-  install -Dm755 "$srcdir/squid" "$pkgdir/etc/rc.d/squid"
   install -Dm755 "$srcdir/squid.cron" "$pkgdir/etc/cron.weekly/squid"
-  install -Dm755 "$srcdir/squid.conf.d" "$pkgdir/etc/conf.d/squid"
   install -Dm644 "$srcdir/squid.pam" "$pkgdir/etc/pam.d/squid"
   install -Dm644 "$srcdir/squid.service" \
     "$pkgdir/usr/lib/systemd/system/squid.service"
diff --git a/community/squid/squid b/community/squid/squid
deleted file mode 100644
index ea80aaa2e..000000000
--- a/community/squid/squid
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-# source application-specific settings
-[[ -f /etc/conf.d/squid ]] && . /etc/conf.d/squid
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-pidfile=/run/squid.pid
-{ read -r PID </run/squid.pid; } 2>/dev/null
-if [[ $PID && ! /proc/$PID/exe -ef /usr/sbin/squid ]]; then
-  rm /run/squid.pid
-  unset PID
-fi
-
-case $1 in
-  start)
-    stat_busy "Starting squid"
-    if [[ $PID ]] || ! squid $SQUID_ARGS; then
-      stat_fail
-    else
-      add_daemon squid
-      stat_done
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping squid"
-    if [[ -z $PID ]] || ! squid -k shutdown &>/dev/null; then
-      stat_fail
-    else
-      # squid takes forever to shutdown all its listening FDs
-      while [[ /proc/$PID/exe -ef /usr/sbin/squid ]]; do
-        stat_append "."
-        sleep 3
-      done
-      rm_daemon squid
-      stat_done
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community/squid/squid.conf.d b/community/squid/squid.conf.d
deleted file mode 100644
index ea248b76c..000000000
--- a/community/squid/squid.conf.d
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Parameters to be passed to squid
-#
-SQUID_ARGS="-sYC"
diff --git a/community/squid/squid.cron b/community/squid/squid.cron
index c78e51105..7425df894 100644
--- a/community/squid/squid.cron
+++ b/community/squid/squid.cron
@@ -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
diff --git a/community/squid/squid.install b/community/squid/squid.install
index e7aa5ff68..a7c76d87a 100644
--- a/community/squid/squid.install
+++ b/community/squid/squid.install
@@ -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 @@ post_upgrade() {
 }
 
 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
 }
 
diff --git a/community/squid/squid.service b/community/squid/squid.service
index 9d41cc243..1db8860e5 100644
--- a/community/squid/squid.service
+++ b/community/squid/squid.service
@@ -5,9 +5,9 @@ After=network.target
 [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