Author: hawk Date: Tue Jan 17 14:54:34 2006 GMT
Module: SPECS Tag: RA-branch
---- Log message:
- more patches from squids site, apply libnsl_fixes patch, merged nolibs
and align patches from HEAD, renumbered patches
- release 1.1 for Ra
---- Files affected:
SPECS:
squid.spec (1.135.2.36 -> 1.135.2.37)
---- Diffs:
================================================================
Index: SPECS/squid.spec
diff -u SPECS/squid.spec:1.135.2.36 SPECS/squid.spec:1.135.2.37
--- SPECS/squid.spec:1.135.2.36 Fri Oct 28 08:43:23 2005
+++ SPECS/squid.spec Tue Jan 17 15:54:29 2006
@@ -12,7 +12,7 @@
Summary(zh_CN): SQUID ¸ßËŮťşłĺ´úŔíˇţÎńĆ÷
Name: squid
Version: 2.5.STABLE12
-Release: 1
+Release: 1.1
Epoch: 7
License: GPL v2
Group: Networking/Daemons
@@ -31,17 +31,23 @@
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.STABLE12-setenv.patch
+Patch1:
http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE12-SMB_BadFetch.patch
+Patch2:
http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE12-wbinfo_group.patch
+Patch3:
http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE12-asyncio_counters.patch
+Patch4:
http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE12-prctl_args.patch
# Other patches:
-Patch110: http://www.sed.pl/~mrk/qos/%{name}_hit_miss_mark.patch
-Patch120: %{name}-fhs.patch
-Patch130: %{name}-location.patch
-Patch140: %{name}-domainmatch.patch
-Patch150: %{name}-libnsl_fixes.patch
-Patch170: %{name}-ac_fix.patch
-Patch180: %{name}-crash-on-ENOSPC.patch
-Patch210:
http://piorun.ds.pg.gda.pl/~blues/patches/%{name}-more_FD-new.patch
-Patch220: %{name}-empty-referer.patch
-Patch230: %{name}-2.5.STABLE4-apache-like-combined-log.patch
+Patch100: http://www.sed.pl/~mrk/qos/%{name}_hit_miss_mark.patch
+Patch101: %{name}-fhs.patch
+Patch102: %{name}-location.patch
+Patch103: %{name}-domainmatch.patch
+Patch104: %{name}-libnsl_fixes.patch
+Patch105: %{name}-ac_fix.patch
+Patch106: %{name}-crash-on-ENOSPC.patch
+Patch107: %{name}-nolibs.patch
+Patch108:
http://piorun.ds.pg.gda.pl/~blues/patches/%{name}-more_FD-new.patch
+Patch109: %{name}-empty-referer.patch
+Patch110: %{name}-align.patch
+Patch111: %{name}-2.5.STABLE4-apache-like-combined-log.patch
URL: http://www.squid-cache.org/
BuildRequires: autoconf
BuildRequires: automake
@@ -415,16 +421,23 @@
%setup -q -a1 -a4
# Bug fixes from Squid home page:
%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
# Other patches:
+%patch100 -p1
+%patch101 -p1
+%patch102 -p1
+%patch103 -p1
+%patch104 -p1
+%patch105 -p1
+%patch106 -p1
+%patch107 -p1
+%patch108 -p1
+%patch109 -p1
%patch110 -p1
-%patch120 -p1
-%patch130 -p1
-%patch140 -p1
-%patch170 -p1
-%patch180 -p1
-%patch210 -p1
-%patch220 -p1
-%{?with_combined_log:%patch230 -p1}
+%{?with_combined_log:%patch111 -p1}
%build
%{__aclocal}
@@ -720,6 +733,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.135.2.37 2006/01/17 14:54:29 hawk
+- more patches from squids site, apply libnsl_fixes patch, merged nolibs
+ and align patches from HEAD, renumbered patches
+- release 1.1 for Ra
+
Revision 1.135.2.36 2005/10/28 06:43:23 hawk
- updated to 2.5.STABLE12
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/squid.spec?r1=1.135.2.36&r2=1.135.2.37&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
