diff options
| author | root <root@rshg054.dnsready.net> | 2013-05-24 00:06:06 -0700 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2013-05-24 00:06:06 -0700 |
| commit | 0520c5091743d9910278e53fa32470b096825fb3 (patch) | |
| tree | ce32603cb0eb8456aef2a5eb66fddc98f246857c /community/squid | |
| parent | e0c1bfae73539aac5627d73dd70a299d274a0c10 (diff) | |
Fri May 24 00:06:06 PDT 2013
Diffstat (limited to 'community/squid')
| -rw-r--r-- | community/squid/PKGBUILD | 9 | ||||
| -rw-r--r-- | community/squid/squid.cron | 4 | ||||
| -rw-r--r-- | community/squid/squid.install | 8 | ||||
| -rw-r--r-- | community/squid/squid.service | 6 |
4 files changed, 14 insertions, 13 deletions
diff --git a/community/squid/PKGBUILD b/community/squid/PKGBUILD index 43b5a4a5e..f0a68eb21 100644 --- a/community/squid/PKGBUILD +++ b/community/squid/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 91385 2013-05-21 13:59:14Z 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> @@ -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 @@ source=("http://www.squid-cache.org/Versions/v3/3.3/$pkgname-$pkgver.tar.bz2" 'squid.service') md5sums=('c7991aa8528034af0e21a69edf26e41b' '270977cdd9b47ef44c0c427ab9034777' - 'b499c2b725aefd7bd60bec2f1a9de392' - '20e00e1aa1198786795f3da32db3c1d8') + 'a71425c4951f2e5b640d19e6a5048531' + 'ceeb57c69ebb165676219222f109a24e') build() { cd "$srcdir/$pkgname-$pkgver" @@ -41,6 +41,7 @@ build() { ./configure \ --prefix=/usr \ + --sbindir=/usr/bin \ --datadir=/usr/share/squid \ --sysconfdir=/etc/squid \ --libexecdir=/usr/lib/squid \ 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 |