SPECS (RA-branch): squid.spec - updated to 2.5.STABLE12

[hawk]

Author: hawk                         Date: Fri Oct 28 06:43:28 2005 GMT
Module: SPECS                         Tag: RA-branch
---- Log message:
- updated to 2.5.STABLE12

---- Files affected:
SPECS:
   squid.spec (1.135.2.35 -> 1.135.2.36) 

---- Diffs:

================================================================
Index: SPECS/squid.spec
diff -u SPECS/squid.spec:1.135.2.35 SPECS/squid.spec:1.135.2.36
--- SPECS/squid.spec:1.135.2.35	Thu Oct 20 23:36:11 2005
+++ SPECS/squid.spec	Fri Oct 28 08:43:23 2005
@@ -11,13 +11,13 @@
 Summary(uk):	Squid - ËĹŰ ĎÂ'¤ËÔŚ× Internet
 Summary(zh_CN):	SQUID ¸ßËŮťşłĺ´úŔíˇţÎńĆ÷
 Name:		squid
-Version:	2.5.STABLE11
-Release:	1.2
+Version:	2.5.STABLE12
+Release:	1
 Epoch:		7
 License:	GPL v2
 Group:		Networking/Daemons
 Source0:	http://www.squid-cache.org/Versions/v2/2.5/%{name}-%{version}.tar.bz2
-# Source0-md5:	5e7f13ad95b64b60ddd6cdc2ab800d67
+# Source0-md5:	7354255015b3772a1e024dfac173e48c
 # http://www.squid-cache.org/Doc/FAQ/FAQ.tar.gz
 Source1:	%{name}-FAQ.tar.gz
 # Source1-md5:	cb9a955f8cda9cc166e086fccd412a43
@@ -30,12 +30,7 @@
 Source6:	%{name}.logrotate
 Source7:	%{name}.pamd
 # Bug fixes from Squid home page, please include URL
-Patch0:		http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE11-delaypools_truncated.patch
-Patch1:		http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE11-tcp_outgoing_xxx.patch
-Patch2:		http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE11-ldap_auth.patch
-Patch3:		http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE11.accel_single_host_pconn.patch
-Patch4:		http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE11-CACHE_HTTP_PORT.patch
-Patch5:		http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE11-CNAME.patch
+Patch0:		http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE12-setenv.patch
 # Other patches:
 Patch110:	http://www.sed.pl/~mrk/qos/%{name}_hit_miss_mark.patch
 Patch120:	%{name}-fhs.patch
@@ -420,11 +415,6 @@
 %setup -q -a1 -a4
 # Bug fixes from Squid home page:
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
 # Other patches:
 %patch110 -p1
 %patch120 -p1
@@ -730,6 +720,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.135.2.36  2005/10/28 06:43:23  hawk
+- updated to 2.5.STABLE12
+
 Revision 1.135.2.35  2005/10/20 21:36:11  hawk
 - fixed squid.init problem
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/squid.spec?r1=1.135.2.35&r2=1.135.2.36&f=u