Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--net-proxy/squid/ChangeLog6
-rw-r--r--net-proxy/squid/Manifest34
-rw-r--r--net-proxy/squid/files/squid.initd10
-rw-r--r--net-proxy/squid/files/squid.initd-logrotate10
4 files changed, 37 insertions, 23 deletions
diff --git a/net-proxy/squid/ChangeLog b/net-proxy/squid/ChangeLog
index 744fb75174ee..8f8b373c0cfb 100644
--- a/net-proxy/squid/ChangeLog
+++ b/net-proxy/squid/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-proxy/squid
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.89 2006/09/05 06:03:06 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.90 2006/09/20 08:59:55 mrness Exp $
+
+ 20 Sep 2006; Alin Nastac <mrness@gentoo.org> files/squid.initd,
+ files/squid.initd-logrotate:
+ Fix format of message displayed on service stop (#148005).
05 Sep 2006; Joshua Kinard <kumba@gentoo.org> squid-2.5.14.ebuild:
Marked stable on mips.
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index 44ca38b55fa1..1d346fd481cc 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX squid.confd 437 RMD160 8fdfc1416b2f5aaa2964affc25e5fb140f6555c5 SHA1 59e15695bf4d7269002eac5015592419ad8155cc SHA256 d90a92f886764f56fd928ec3340da078a8ff35576a8339fa91b1ce59d0d02a34
MD5 8e7207b10699502e573d9d60ff0e07a6 files/squid.confd 437
RMD160 8fdfc1416b2f5aaa2964affc25e5fb140f6555c5 files/squid.confd 437
@@ -6,14 +9,14 @@ AUX squid.cron 133 RMD160 f1ecb5957645deea4cd1ecedbf808172ee8330a6 SHA1 96cfa686
MD5 6f30a7f5c48ec35a7044acb189c858c5 files/squid.cron 133
RMD160 f1ecb5957645deea4cd1ecedbf808172ee8330a6 files/squid.cron 133
SHA256 e3522246629d51381313db1632e083b1df06d1caee9790d4345f2b9f1ba05210 files/squid.cron 133
-AUX squid.initd 2015 RMD160 c3aeee9fa6da941ce0bb8eed5b451949f07476f7 SHA1 41f7d2c6dde660c8e5bd57d79756ab5a37bceb7b SHA256 3211f0f1a17aa5e4bf7e1c5177b1e48d5d75b185f0bcbf5cec0e70d33380b2ff
-MD5 29c067429711e7189923fcfc522000b3 files/squid.initd 2015
-RMD160 c3aeee9fa6da941ce0bb8eed5b451949f07476f7 files/squid.initd 2015
-SHA256 3211f0f1a17aa5e4bf7e1c5177b1e48d5d75b185f0bcbf5cec0e70d33380b2ff files/squid.initd 2015
-AUX squid.initd-logrotate 1909 RMD160 879def42ae96e802e271fb232c960c8b40c16be3 SHA1 281508b0c32fe0909f3ffb7dad35a82e374e8cb2 SHA256 21a177768d9c260ca9748b49474072e8c1cb5e18ec80833c36db43e6dc0003a3
-MD5 59d7ba17075734a74e527151edef9075 files/squid.initd-logrotate 1909
-RMD160 879def42ae96e802e271fb232c960c8b40c16be3 files/squid.initd-logrotate 1909
-SHA256 21a177768d9c260ca9748b49474072e8c1cb5e18ec80833c36db43e6dc0003a3 files/squid.initd-logrotate 1909
+AUX squid.initd 2037 RMD160 c39b6a35ba5fba6a0a967c5bb0ad8ac7d3952fa6 SHA1 9c88e297d0c7e86ec61a078dd33cb8ba3d95069b SHA256 c5ab9064323d751755e2879f7c485182612d95d05e239b913b6283b56674df61
+MD5 0f5091218dbf9023c09781b0fa8436f8 files/squid.initd 2037
+RMD160 c39b6a35ba5fba6a0a967c5bb0ad8ac7d3952fa6 files/squid.initd 2037
+SHA256 c5ab9064323d751755e2879f7c485182612d95d05e239b913b6283b56674df61 files/squid.initd 2037
+AUX squid.initd-logrotate 1931 RMD160 1f97920e77166a60a516fcd61924bfb2256e3c72 SHA1 6eaa258757ec4089003de69a3df1ba7ea010124e SHA256 3c8e474b78000563fe904e25520bafe67280dabb05c2ca647148a87b39e95062
+MD5 7c57574bac4ccbd73c1a1a305070e9de files/squid.initd-logrotate 1931
+RMD160 1f97920e77166a60a516fcd61924bfb2256e3c72 files/squid.initd-logrotate 1931
+SHA256 3c8e474b78000563fe904e25520bafe67280dabb05c2ca647148a87b39e95062 files/squid.initd-logrotate 1931
AUX squid.logrotate 101 RMD160 57f6c2461bd8948524dc08c2665593234380891e SHA1 fe8b3c43c0d327150069a65aa473302ae6c423ff SHA256 29e97214612a8656d2d2d60e20451f9e23a9550e58a7af2050bf83fb7af485f6
MD5 5286e7e73ca5687381fa09ff41dccbd1 files/squid.logrotate 101
RMD160 57f6c2461bd8948524dc08c2665593234380891e files/squid.logrotate 101
@@ -57,10 +60,10 @@ EBUILD squid-2.6.3.ebuild 6334 RMD160 780713533edc0b532f40ba1f7c1e633450c0d25b S
MD5 ffee808397d3f365676dac10aa7af9a1 squid-2.6.3.ebuild 6334
RMD160 780713533edc0b532f40ba1f7c1e633450c0d25b squid-2.6.3.ebuild 6334
SHA256 93ccea9bf0c42175b5717cb16528f9b7ac20cd4d868f59117ce9353e59fd48aa squid-2.6.3.ebuild 6334
-MISC ChangeLog 28176 RMD160 33e1b4c798c2c462a9899653e9dd81aee90f91d7 SHA1 3f709e4b7ed7c80ee4c23bfcc8494fce149ab36d SHA256 675ddeed8e9f933a3027fb9bf0db47d262f6e26ef5c2768ec5a859665bf39699
-MD5 0902b2d42d41c3141824590a57c5ab78 ChangeLog 28176
-RMD160 33e1b4c798c2c462a9899653e9dd81aee90f91d7 ChangeLog 28176
-SHA256 675ddeed8e9f933a3027fb9bf0db47d262f6e26ef5c2768ec5a859665bf39699 ChangeLog 28176
+MISC ChangeLog 28336 RMD160 941a138e19c8b93eaf7a72c5feed8725e191c100 SHA1 233596a1872874e557ad217e72373c167792e4e8 SHA256 6d94ec679424bd6813d86fd0e19dc2be246f5438b4ef99e88a06ea8b6f1f0356
+MD5 8db802338fd90400e27591eb74eb78d8 ChangeLog 28336
+RMD160 941a138e19c8b93eaf7a72c5feed8725e191c100 ChangeLog 28336
+SHA256 6d94ec679424bd6813d86fd0e19dc2be246f5438b4ef99e88a06ea8b6f1f0356 ChangeLog 28336
MISC metadata.xml 229 RMD160 3017fab68c82b875738f1df5bb414f46480f142f SHA1 975a764b9c2b956a744795d61a702bd3545bbfb9 SHA256 b986c2ccab6337ef434285c558ed764218d7ca79a82cb5ee3d2615cd03360e87
MD5 24a10e76803f4cc98cdc979586096c6f metadata.xml 229
RMD160 3017fab68c82b875738f1df5bb414f46480f142f metadata.xml 229
@@ -83,3 +86,10 @@ SHA256 8401caf0f6014b6f7ba8e4d83e22927b249992a9f62c174e0b6e6473f2dede55 files/di
MD5 20c37d29b4c77c6ce131a4cfd43522ef files/digest-squid-2.6.3 554
RMD160 faca783db3cf13434396304df1626fbb0d2c62a3 files/digest-squid-2.6.3 554
SHA256 13bfe27e077faccb18011cb199666e201afa371eae2d11a9b0cd4b6a38dfb01c files/digest-squid-2.6.3 554
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFEQMT3sf9c6kjmR8RArSMAKC+jZk/llDg0xhbilPO/tlDcr7c2QCeJd1n
+09187V4AFlLuxXFcLaTtWOI=
+=JQLi
+-----END PGP SIGNATURE-----
diff --git a/net-proxy/squid/files/squid.initd b/net-proxy/squid/files/squid.initd
index 736e91a4fdd7..29fda35bf202 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.5 2006/01/18 21:46:22 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.initd,v 1.6 2006/09/20 08:59:55 mrness Exp $
opts="${opts} reload rotate"
@@ -56,22 +56,22 @@ stop() {
# Now we have to wait until squid has _really_ stopped.
sleep 1
if [ -f /var/run/squid.pid ] ; then
- einfon "Waiting ."
+ einfon "Waiting for squid to shutdown ."
cnt=0
while [ -f /var/run/squid.pid ] ; do
cnt=`expr $cnt + 1`
if [ $cnt -gt 60 ] ; then
# Waited 120 seconds now. Fail.
+ echo
eend 1 "Failed."
break
fi
sleep 2
echo -n "."
done
- eend 0
- else
- eend 0
+ echo
fi
+ eend 0
}
reload() {
diff --git a/net-proxy/squid/files/squid.initd-logrotate b/net-proxy/squid/files/squid.initd-logrotate
index cdde5a8a8efe..5fda1fe35876 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.3 2006/01/18 21:46:22 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.initd-logrotate,v 1.4 2006/09/20 08:59:55 mrness Exp $
opts="${opts} reload"
@@ -56,22 +56,22 @@ stop() {
# Now we have to wait until squid has _really_ stopped.
sleep 1
if [ -f /var/run/squid.pid ] ; then
- einfon "Waiting ."
+ einfon "Waiting for squid to shutdown ."
cnt=0
while [ -f /var/run/squid.pid ] ; do
cnt=`expr $cnt + 1`
if [ $cnt -gt 60 ] ; then
# Waited 120 seconds now. Fail.
+ echo
eend 1 "Failed."
break
fi
sleep 2
echo -n "."
done
- eend 0
- else
- eend 0
+ echo
fi
+ eend 0
}
reload() {