Fix init script (#217455).

Package-Manager: portage-2.1.4.4

6 files changed, 23 insertions, 15 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/Manifest b/net-proxy/squid/Manifest
index debc468060f6..d68f4589198d 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -15,8 +15,8 @@ AUX squid-3.0.1-gentoo.patch 8934 RMD160 67177aa2318791b8b19b05a5dfb8a3612414417
 AUX squid-3.0.4-gentoo.patch 8934 RMD160 3961e96f8bd04bf2fe422ee975f1afb98452183e SHA1 2d9cb25af596dff69de70a83639527566175e4fa SHA256 d50e02fbaa23159c752fb7accc42302850679904be4de301a7911ba19472fdba
 AUX squid.confd 437 RMD160 8fdfc1416b2f5aaa2964affc25e5fb140f6555c5 SHA1 59e15695bf4d7269002eac5015592419ad8155cc SHA256 d90a92f886764f56fd928ec3340da078a8ff35576a8339fa91b1ce59d0d02a34
 AUX squid.cron 143 RMD160 0706a7ad04691b9a93a2897c319008440483ba11 SHA1 6138db0eccb7320e707b8d60c2970ef684e29336 SHA256 4c9e2afe5b0bba583ce896233ea1f9262beeb1b6cf51b4adb48d5f5c03933b2f
-AUX squid.initd 2167 RMD160 2d8b3f722aa843b9c01251726eb362d62cd6aa75 SHA1 594b85c77c0908fc696473a02430b3c797206252 SHA256 e313404c335415c4044cd258f7be6cec6d713ff86d8a333e18aaea930ea2af7e
-AUX squid.initd-logrotate 2061 RMD160 c333070a63e1e00266a088f64d980eed4dabc214 SHA1 d9873dcf5d7db5ef9e00d007116d9d1d1927588f SHA256 1ed0babc4af97b9807189f03456d3a549e5880df55efb09972282e557c72de30
+AUX squid.initd 2171 RMD160 f0e96395e869526a7daf5072d3ed1b2ea8e1a2b9 SHA1 aaacc2b0a879a7225db17bc725c8c028d6d393e3 SHA256 a64c0aaae506be98bcc024b9d3b3a883b1b9be91b8a73960d3a7cff445b8217f
+AUX squid.initd-logrotate 2065 RMD160 34ad950dca48d37559f81e84b82f0e9dd9c96cb1 SHA1 1d086d251e9c57634809cc39bcb901a3c4d4e4dc SHA256 2c2693b3e2fa14416523343d2d7e7b2697243c4316b586b031c0f283510dd4ba
 AUX squid.logrotate 101 RMD160 57f6c2461bd8948524dc08c2665593234380891e SHA1 fe8b3c43c0d327150069a65aa473302ae6c423ff SHA256 29e97214612a8656d2d2d60e20451f9e23a9550e58a7af2050bf83fb7af485f6
 AUX squid.pam 315 RMD160 afb3f1cc36ba5ef0015c40040b6d5c18485ec828 SHA1 40933fabaaa2a9cb38d57c3acb77857082c82ae5 SHA256 68ef4282f9fb8506df710d0ae16e84e991e9b138c7f1d0af922682219c7a971f
 DIST squid-2.6.STABLE17.tar.gz 1724676 RMD160 8fadcf6a78c0f8ce20426ed9a78837e19a0a9af6 SHA1 e5022a9318e6547d4c2409c59f457f92de620401 SHA256 01231f7eb0a28faff41f3f279b949f32602ae4fce41d26f6190e9812fe2a360c
@@ -26,15 +26,15 @@ DIST squid-3.0.STABLE1.tar.gz 2406601 RMD160 241524529c75f875fb6c760d023076d2c9f
 DIST squid-3.0.STABLE4.tar.gz 2417659 RMD160 2f8d2bc2dbde880938a8dbf9741e442e8c4f03e0 SHA1 afe3c57046ea7f62fbecd53e06c05c9e5b43a79c SHA256 046682c44d96fb6970a4fd41af8d7adb79a7e7fbe300b23553c891ce5e9b1011
 EBUILD squid-2.6.17.ebuild 5733 RMD160 0e82971b5cd81a8062374b242c9ae66747395ebb SHA1 cc0b1c1dc3229a8c9e21449d5b200fae0945f8c6 SHA256 368f9eafd65feaa2232893441767a506e3eefd178ecb51c0339920895914a4c3
 EBUILD squid-2.6.18.ebuild 5736 RMD160 6124f6c388572e127513e40a38bfd7678a8c022d SHA1 36b6690af1488b08f44365a3039699cdc93d27e3 SHA256 5973cf5ef472c2f99451ea33fd9c227179ce03d52f76e8de2dfa785c9db08a80
-EBUILD squid-2.6.19.ebuild 5546 RMD160 438d136377d4a069d055143d52fe389db446c7e9 SHA1 aefd1049d8d048ac38ebcd42b0d5e099a32e5863 SHA256 c6e50bbc45511d97b8b3685f99fa48fbaadeaf4ab49a0b49a8ecb5f2138dc88d
+EBUILD squid-2.6.19-r1.ebuild 5549 RMD160 5446906be9923ec0393fb9ff37871b7ad092953b SHA1 2e0d8e636ae16d4108c24d94125b0306a39c9e46 SHA256 76a14b7a4e2672827c1094d5ad2555ca8638fbb0d44a4a1c05add65cb4ac61cf
 EBUILD squid-3.0.1.ebuild 5592 RMD160 f6d70636cc6850c920950e0e950a7289bb768742 SHA1 b216f62a1dd663ce035cdb5339b775d7e15f84cb SHA256 1bcee6f665a5be35e93e87f57abfd7f640cbab0a3af6e9fd127e3cec6fc60daf
-EBUILD squid-3.0.4.ebuild 5552 RMD160 89034c5e673932aa4cffdb23e13aa805146bfe4d SHA1 29bf69c50d79fc0409461031f088f3e58a41b4d7 SHA256 8639546785d76e9bc4704921e2ea557395be795cc5498b7a1e8c84fbb326f4ab
-MISC ChangeLog 41661 RMD160 bdc62eb9f1c8ec2ae7c10396262042a9c4caa70f SHA1 6de4d00f15fff802e9e02ca7cf3e530a5f62185c SHA256 53ca926c2452c32cd426717983587ef003df4df4354a77ec792648bc394db79e
+EBUILD squid-3.0.4-r1.ebuild 5555 RMD160 14dbced2298c05b78a76a7f7a890823249225c7c SHA1 37d2a8fcd4d56009603b364f1b2a20c677352ed9 SHA256 cfef7eca7949f4fc82d657f7ddf7221e7866311df4f82b07863d8653784197af
+MISC ChangeLog 41945 RMD160 cde20b1224d18a1f66d85b8a67b23fabbc6cd636 SHA1 f97f5c8568df5716aa87f0cffea8f75626c2d439 SHA256 0f189bb365b98e78a2a5e8a25a60187268cbf0faa0d3c6681f736112cfd8374b
 MISC metadata.xml 229 RMD160 3017fab68c82b875738f1df5bb414f46480f142f SHA1 975a764b9c2b956a744795d61a702bd3545bbfb9 SHA256 b986c2ccab6337ef434285c558ed764218d7ca79a82cb5ee3d2615cd03360e87
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD4DBQFIAgui+fWpoTWIA9ERAgyeAJ9y6GY4Yl7bBpT4+cURh2cFqNth+gCYoyi/
-e7xUF3mt7CI1Qt2GYDOsXA==
-=1z8/
+iD8DBQFIAu99+fWpoTWIA9ERAmwSAJ9WuThnAP5fL+vfp/Olh3o5nRoCUwCgiw/y
+zOyQtrBWGFcYVeLZNIira5o=
+=b0oz
 -----END PGP SIGNATURE-----
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"