SPECS: squid.spec - first attempt to update to squid 2.6 - it's ma...

blues blues at pld-linux.org
Wed Nov 8 16:25:42 CET 2006


Author: blues                        Date: Wed Nov  8 15:25:42 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- first attempt to update to squid 2.6 - it's marked as stable. More work
  needed

---- Files affected:
SPECS:
   squid.spec (1.251 -> 1.252) 

---- Diffs:

================================================================
Index: SPECS/squid.spec
diff -u SPECS/squid.spec:1.251 SPECS/squid.spec:1.252
--- SPECS/squid.spec:1.251	Tue Oct 31 16:13:17 2006
+++ SPECS/squid.spec	Wed Nov  8 16:25:37 2006
@@ -14,13 +14,13 @@
 Summary(uk):	Squid - ËĹŰ ĎÂ'¤ËÔŚ× Internet
 Summary(zh_CN):	SQUID ¸ßËŮťşłĺ´úŔíˇţÎńĆ÷
 Name:		squid
-Version:	2.5.STABLE14
-Release:	4
+Version:	2.6.STABLE5
+Release:	0.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:	f413e0b887a5f9b2a75350243ed5564c
+Source0:	http://www.squid-cache.org/Versions/v2/2.6/%{name}-%{version}.tar.bz2
+# Source0-md5:	b9f2e3b2c9e2c44e0fb729bf8f26d945
 # http://www.squid-cache.org/Doc/FAQ/FAQ.tar.gz
 Source1:	%{name}-FAQ.tar.gz
 # Source1-md5:	cb9a955f8cda9cc166e086fccd412a43
@@ -33,8 +33,7 @@
 Source6:	%{name}.logrotate
 Source7:	%{name}.pamd
 # Bug fixes from Squid home page, please include URL
-Patch10:	http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE14-httpReplyDestroy.patch
-Patch11:	http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE14-hierarchy_tag.patch
+# lets have fun - there is no patches... yet :)
 # Other patches:
 Patch100:	http://www.sed.pl/~mrk/qos/%{name}_hit_miss_mark.patch
 Patch101:	%{name}-fhs.patch
@@ -443,25 +442,24 @@
 %prep
 %setup -q -a1 -a4
 # Bug fixes from Squid home page:
-%patch10 -p1
-%patch11 -p1
+
 # Other patches:
-%patch100 -p1
+#%patch100 -p1	--needs fix
 %patch101 -p1
 %patch102 -p1
-%patch103 -p1
-%patch104 -p1
-%patch105 -p1
+#%patch103 -p1	--needs fix
+#%patch104 -p1	--needs fix
+#%patch105 -p1	--needs fix
 %patch106 -p1
 %patch107 -p1
-%patch108 -p1
+#%patch108 -p1	--needs fix
 %patch109 -p1
 %patch110 -p1
 %patch111 -p1
 %{?with_combined_log:%patch112 -p1}
 %patch113 -p1
-%patch114 -p1
-%patch115 -p1
+#%patch114 -p1	--needs fix
+#%patch115 -p1	--needs fix
 
 %{__sed} -i -e '1s#!.*bin/perl#!%{__perl}#' {contrib,scripts,helpers/*/*}/*.pl
 
@@ -762,6 +760,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.252  2006/11/08 15:25:37  blues
+- first attempt to update to squid 2.6 - it's marked as stable. More work
+  needed
+
 Revision 1.251  2006/10/31 15:13:17  qboosh
 - todo: switch to /usr/lib/cgi-bin
 
================================================================

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



More information about the pld-cvs-commit mailing list