Fix init script auto-initialization code for coss cache type (#217455).

Package-Manager: portage-2.1.4.4

4 files changed, 42 insertions, 14 deletions

diff --git a/net-proxy/squid/ChangeLog b/net-proxy/squid/ChangeLog
index c810756fc3c4..24114d6b8823 100644
--- a/net-proxy/squid/ChangeLog
+++ b/net-proxy/squid/ChangeLog
@@ -1,6 +1,10 @@
 # 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.180 2008/04/12 17:53:16 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.181 2008/04/13 13:33:12 mrness Exp $
+
+  13 Apr 2008; Alin Năstac <mrness@gentoo.org> files/squid.initd,
+  files/squid.initd-logrotate:
+  Fix init script auto-initialization code for coss cache type (#217455).
 
   12 Apr 2008; Tobias Scherbaum <dertobi123@gentoo.org> squid-2.6.18.ebuild:
   ppc stable, bug #216319
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index 8ce2e1725ac5..debc468060f6 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX squid-2.6.17-ToS_Hit_ToS_Preserve.patch 7810 RMD160 970a50b5dd2efd658bef93b36ebbccdcd27c6632 SHA1 3b304b9fa331306e5276a90dcf3e471012f6aa4c SHA256 4bb7df6a5bbaf91c9878c652e467214eabe1712851b5168cb87ac064c7694c04
 AUX squid-2.6.17-gentoo.patch 11898 RMD160 39ef756fa4f6726e670ca82ce3a393acde2c57fb SHA1 96d860933c3a7d3086fc7a36be892fa71477921c SHA256 8bb7e156181aa885838045d93d2853daf49ebac9e96929c7d827c2c157b5925d
 AUX squid-2.6.17-qos.patch 10046 RMD160 769bfe700a58cec631d5617ceab4a4a96a78ad16 SHA1 5eac2a5d62665a7cd2e9a870cf63a27c0abab81a SHA256 e98147f5388d9c5fac55bbd7d746609d29d96fb78352ae9a673227a3c326104c
@@ -12,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 2028 RMD160 46451effb565730f60cc8dee1bd7b8be022a0352 SHA1 caecee822c723485bcab9b82d68bc5251c7c2cad SHA256 6e6a8893ea3d653136af9cfbd269384011a93b030dbd06910bce0f4226ad034e
-AUX squid.initd-logrotate 1922 RMD160 5e5764c847213e1ce79ae2a6000c90c7d73096e9 SHA1 e8173d324c2a0b8e5a60e6415cf351e58fff3b26 SHA256 09521512a35b780d11cd2dd6243de64e22ca8a3e448fbaa98daa3c1c02235fa0
+AUX squid.initd 2167 RMD160 2d8b3f722aa843b9c01251726eb362d62cd6aa75 SHA1 594b85c77c0908fc696473a02430b3c797206252 SHA256 e313404c335415c4044cd258f7be6cec6d713ff86d8a333e18aaea930ea2af7e
+AUX squid.initd-logrotate 2061 RMD160 c333070a63e1e00266a088f64d980eed4dabc214 SHA1 d9873dcf5d7db5ef9e00d007116d9d1d1927588f SHA256 1ed0babc4af97b9807189f03456d3a549e5880df55efb09972282e557c72de30
 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,5 +29,12 @@ EBUILD squid-2.6.18.ebuild 5736 RMD160 6124f6c388572e127513e40a38bfd7678a8c022d
 EBUILD squid-2.6.19.ebuild 5546 RMD160 438d136377d4a069d055143d52fe389db446c7e9 SHA1 aefd1049d8d048ac38ebcd42b0d5e099a32e5863 SHA256 c6e50bbc45511d97b8b3685f99fa48fbaadeaf4ab49a0b49a8ecb5f2138dc88d
 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 41492 RMD160 2a6a93509f6a80796d08cbecf7b64a5de1d2ba8b SHA1 8aad607ed7042b3977f52101725a2bd5fd0b6ac5 SHA256 cb048d902f76addd650a1d927be061ef48fc19cbdf87b6b08671053e8d413b92
+MISC ChangeLog 41661 RMD160 bdc62eb9f1c8ec2ae7c10396262042a9c4caa70f SHA1 6de4d00f15fff802e9e02ca7cf3e530a5f62185c SHA256 53ca926c2452c32cd426717983587ef003df4df4354a77ec792648bc394db79e
 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/
+-----END PGP SIGNATURE-----
diff --git a/net-proxy/squid/files/squid.initd b/net-proxy/squid/files/squid.initd
index 6e798c5915d1..9ef9eefe1319 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.7 2007/03/10 09:39:42 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.initd,v 1.8 2008/04/13 13:33:13 mrness Exp $
 
 opts="${opts} reload rotate"
 
@@ -24,22 +24,29 @@ maxfds() {
 
 checkconfig() {
 	maxfds
-	local CACHE_SWAP=$(awk '/^[ \t]*cache_dir[ \t]+/ { printf "%s ", $3 ; }' < /etc/squid/squid.conf)
-	[ -z "$CACHE_SWAP" ] && CACHE_SWAP=/var/cache/squid
-	umask 027
+	
+	local CACHE_SWAP=$(awk '/^[ \t]*cache_dir[ \t]+/ { if ($2 == "coss" ) printf "%s/stripe ", $3 ; else printf "%s/00 "; }' < /etc/squid/squid.conf)
+	[ -z "$CACHE_SWAP" ] && CACHE_SWAP="/var/cache/squid/00"
+	
+	local x
 	for x in $CACHE_SWAP ; do
-		if [ ! -d $x/00 ] ; then
+		if [ ! -e $x ] ; then
 			ebegin "Initializing cache directories"
+			local ORIG_UMASK=$(umask)
+			umask 027
 			local INIT_CACHE_RESPONSE="$(/usr/sbin/squid -z -N -D 2>&1)"
 			if [ $? != 0 ] || echo "$INIT_CACHE_RESPONSE" | grep -q "erminated abnormally" ; then
+				umask $ORIG_UMASK
 				eend 1
 				echo "$INIT_CACHE_RESPONSE"
 				return 1
 			fi
+			umask $ORIG_UMASK
 			eend 0
 			break
 		fi
 	done
+	
 	return 0
 }
 
diff --git a/net-proxy/squid/files/squid.initd-logrotate b/net-proxy/squid/files/squid.initd-logrotate
index 7f684bcec0ac..71b6f40876b8 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.5 2007/03/10 09:39:42 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.initd-logrotate,v 1.6 2008/04/13 13:33:13 mrness Exp $
 
 opts="${opts} reload"
 
@@ -24,22 +24,29 @@ maxfds() {
 
 checkconfig() {
 	maxfds
-	local CACHE_SWAP=$(awk '/^[ \t]*cache_dir[ \t]+/ { printf "%s ", $3 ; }' < /etc/squid/squid.conf)
-	[ -z "$CACHE_SWAP" ] && CACHE_SWAP=/var/cache/squid
-	umask 027
+	
+	local CACHE_SWAP=$(awk '/^[ \t]*cache_dir[ \t]+/ { if ($2 == "coss" ) printf "%s/stripe ", $3 ; else printf "%s/00 "; }' < /etc/squid/squid.conf)
+	[ -z "$CACHE_SWAP" ] && CACHE_SWAP="/var/cache/squid/00"
+	
+	local x
 	for x in $CACHE_SWAP ; do
-		if [ ! -d $x/00 ] ; then
+		if [ ! -e $x ] ; then
 			ebegin "Initializing cache directories"
+			local ORIG_UMASK=$(umask)
+			umask 027
 			local INIT_CACHE_RESPONSE="$(/usr/sbin/squid -z -N -D 2>&1)"
 			if [ $? != 0 ] || echo "$INIT_CACHE_RESPONSE" | grep -q "erminated abnormally" ; then
+				umask $ORIG_UMASK
 				eend 1
 				echo "$INIT_CACHE_RESPONSE"
 				return 1
 			fi
+			umask $ORIG_UMASK
 			eend 0
 			break
 		fi
 	done
+	
 	return 0
 }