Fix init script (#217455).

(Portage version: 2.1.4.4)

5 files changed, 15 insertions, 7 deletions

diff --git a/net-proxy/squid/ChangeLog b/net-proxy/squid/ChangeLog
index 24114d6b8823..041b2661ab4f 100644
--- a/net-proxy/squid/ChangeLog
+++ b/net-proxy/squid/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-proxy/squid
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.181 2008/04/13 13:33:12 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.182 2008/04/14 05:45:05 mrness Exp $
+
+*squid-3.0.4-r1 (14 Apr 2008)
+*squid-2.6.19-r1 (14 Apr 2008)
+
+  14 Apr 2008; Alin Năstac <mrness@gentoo.org> files/squid.initd,
+  files/squid.initd-logrotate, -squid-2.6.19.ebuild,
+  +squid-2.6.19-r1.ebuild, -squid-3.0.4.ebuild, +squid-3.0.4-r1.ebuild:
+  Fix init script (#217455).
 
   13 Apr 2008; Alin Năstac <mrness@gentoo.org> files/squid.initd,
   files/squid.initd-logrotate:
diff --git a/net-proxy/squid/files/squid.initd b/net-proxy/squid/files/squid.initd
index 9ef9eefe1319..0cdaad8540fa 100644
--- a/net-proxy/squid/files/squid.initd
+++ b/net-proxy/squid/files/squid.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.initd,v 1.8 2008/04/13 13:33:13 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.initd,v 1.9 2008/04/14 05:45:06 mrness Exp $
 
 opts="${opts} reload rotate"
 
@@ -25,7 +25,7 @@ maxfds() {
 checkconfig() {
 	maxfds
 	
-	local CACHE_SWAP=$(awk '/^[ \t]*cache_dir[ \t]+/ { if ($2 == "coss" ) printf "%s/stripe ", $3 ; else printf "%s/00 "; }' < /etc/squid/squid.conf)
+	local CACHE_SWAP=$(awk '/^[ \t]*cache_dir[ \t]+/ { if ($2 == "coss" ) printf "%s/stripe ", $3 ; else printf "%s/00 ", $3; }' < /etc/squid/squid.conf)
 	[ -z "$CACHE_SWAP" ] && CACHE_SWAP="/var/cache/squid/00"
 	
 	local x
diff --git a/net-proxy/squid/files/squid.initd-logrotate b/net-proxy/squid/files/squid.initd-logrotate
index 71b6f40876b8..e1062981546f 100644
--- a/net-proxy/squid/files/squid.initd-logrotate
+++ b/net-proxy/squid/files/squid.initd-logrotate
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.initd-logrotate,v 1.6 2008/04/13 13:33:13 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.initd-logrotate,v 1.7 2008/04/14 05:45:06 mrness Exp $
 
 opts="${opts} reload"
 
@@ -25,7 +25,7 @@ maxfds() {
 checkconfig() {
 	maxfds
 	
-	local CACHE_SWAP=$(awk '/^[ \t]*cache_dir[ \t]+/ { if ($2 == "coss" ) printf "%s/stripe ", $3 ; else printf "%s/00 "; }' < /etc/squid/squid.conf)
+	local CACHE_SWAP=$(awk '/^[ \t]*cache_dir[ \t]+/ { if ($2 == "coss" ) printf "%s/stripe ", $3 ; else printf "%s/00 ", $3; }' < /etc/squid/squid.conf)
 	[ -z "$CACHE_SWAP" ] && CACHE_SWAP="/var/cache/squid/00"
 	
 	local x
diff --git a/net-proxy/squid/squid-2.6.19.ebuild b/net-proxy/squid/squid-2.6.19-r1.ebuild
index 722c925d3c0e..37e7137090a0 100644
--- a/net-proxy/squid/squid-2.6.19.ebuild
+++ b/net-proxy/squid/squid-2.6.19-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-2.6.19.ebuild,v 1.1 2008/04/12 06:12:24 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-2.6.19-r1.ebuild,v 1.1 2008/04/14 05:45:05 mrness Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
diff --git a/net-proxy/squid/squid-3.0.4.ebuild b/net-proxy/squid/squid-3.0.4-r1.ebuild
index 7f7ec7e61098..40884302af10 100644
--- a/net-proxy/squid/squid-3.0.4.ebuild
+++ b/net-proxy/squid/squid-3.0.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.0.4.ebuild,v 1.1 2008/04/12 06:12:24 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.0.4-r1.ebuild,v 1.1 2008/04/14 05:45:05 mrness Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"