rpms/squid/F-11 .cvsignore, 1.40, 1.41 sources, 1.43, 1.44 squid.init, 1.12, 1.13 squid.spec, 1.119, 1.120

[Henrik Nordström]

Author: hno

Update of /cvs/pkgs/rpms/squid/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8082

Modified Files:
	.cvsignore sources squid.init squid.spec 
Log Message:
3.0.STABLE15


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-11/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- .cvsignore	20 Apr 2009 17:16:57 -0000	1.40
+++ .cvsignore	9 May 2009 22:06:08 -0000	1.41
@@ -1,2 +1 @@
-squid-3.0.STABLE14.tar.bz2
-b9001.patch
+squid-3.0.STABLE15.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-11/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- sources	20 Apr 2009 17:16:57 -0000	1.43
+++ sources	9 May 2009 22:06:08 -0000	1.44
@@ -1,2 +1 @@
-7aaff2319d2263404d788a82a10c8633  squid-3.0.STABLE14.tar.bz2
-6c97159c5ed473c3770864fd54dcccc7  b9001.patch
+5830a3c8e8d64f3483b38093da2a96fa  squid-3.0.STABLE15.tar.bz2


Index: squid.init
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-11/squid.init,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- squid.init	8 Oct 2008 06:45:52 -0000	1.12
+++ squid.init	9 May 2009 22:06:08 -0000	1.13
@@ -50,7 +50,7 @@ probe() {
 	# Check that networking is up.
 	[ ${NETWORKING} = "no" ] && exit 1
 
-	[ -z "$SQUID" ] && exit 4
+	[ `id -u` -ne 0 ] && exit 4
 
 	# check if the squid conf file is present
 	[ -f $SQUID_CONF ] || exit 6


Index: squid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-11/squid.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -p -r1.119 -r1.120
--- squid.spec	20 Apr 2009 17:16:57 -0000	1.119
+++ squid.spec	9 May 2009 22:06:08 -0000	1.120
@@ -3,8 +3,8 @@
 ## % define __find_requires %{SOURCE99}
 
 Name:     squid
-Version:  3.0.STABLE14
-Release:  2%{?dist}
+Version:  3.0.STABLE15
+Release:  1%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
 License:  GPLv2+
@@ -20,7 +20,7 @@ Source98: perl-requires-squid.sh
 ## Source99: filter-requires-squid.sh
 
 # Upstream patches
-Patch001: http://www.squid-cache.org/Versions/v3/3.0/changesets/b9001.patch
+#Patch001: http://www.squid-cache.org/Versions/v3/3.0/changesets/bXXXX.patch
 
 # External patches
 
@@ -338,6 +338,12 @@ fi
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
+* Sat May 09 2009 Henrik Nordstrom <henrik at henriknordstrom.net> 3.0.STABLE15-1
+- Upgrade to 3.0.STABLE15
+
+* Tue Apr 28 2009 Jiri Skala <jskala at redhat.com> - 3.0.STABLE14-3
+- fixed ambiguous condition in the init script (exit 4)
+
 * Mon Apr 20 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 3.0.STABLE14-2
 - Squid bug #2635: assertion failed: HttpHeader.cc:1196: "Headers[id].type == ftInt64"