SPECS: squid.spec - added 28 patches for version 2.5.STABLE10 from...

Mon Sep 5 11:04:11 CEST 2005

Author: hawk                         Date: Mon Sep  5 09:04:11 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added 28 patches for version 2.5.STABLE10 from squids site
- removed TODO, security issue is fixed by sslConnectTimeout.patch
- include greek error messages in package
- include config and manpage for cachemgr.cgi in package
- release 5

---- Files affected:
SPECS:
   squid.spec (1.217 -> 1.218) 

---- Diffs:

================================================================
Index: SPECS/squid.spec
diff -u SPECS/squid.spec:1.217 SPECS/squid.spec:1.218

--- SPECS/squid.spec:1.217	Mon Sep  5 10:17:33 2005
+++ SPECS/squid.spec	Mon Sep  5 11:04:00 2005
@@ -1,6 +1,4 @@
 # $Revision$, $Date$
-# TODO:
-# - http://securitytracker.com/alerts/2005/Sep/1014846.html
 #
 # Conditional build:
 %bcond_with	combined_log	# enables apache-like combined log format
@@ -14,7 +12,7 @@
 Summary(zh_CN):	SQUID ¸ßËŮťşłĺ´úŔíˇţÎńĆ÷
 Name:		squid
 Version:	2.5.STABLE10
-Release:	3
+Release:	4
 Epoch:		7
 License:	GPL v2
 Group:		Networking/Daemons
@@ -32,6 +30,34 @@
 Source6:	%{name}.logrotate
 Source7:	%{name}.pamd
 # Bug fixes from Squid home page, please include URL
+Patch1:		http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE10-content_length.patch
+Patch2:		http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE10-spanish.patch
+Patch3:		http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE10-internal_date.patch
+Patch4:		http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE10-chroot-2.patch
+Patch5:		http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE10-transparent-2.patch
+Patch6:		http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE10-redirect_flags.patch
+Patch7:		http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE10-cache_dir_change.patch
+Patch8:		http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE10-snmp_getnext.patch
+Patch9:		http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE10-ftp_title-2.patch
+Patch10:	http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE10-ftp_basehref.patch
+Patch11:	http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE10-wbinfo_groups.patch
+Patch12:	http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE10-64bit_cleanup.patch
+Patch13:	http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE10-wb_ntlm_auth_silent.patch
+Patch14:	http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE10-buildenv.patch
+Patch15:	http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE10-mail_program.patch
+Patch16:	http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE10-arp_ipfilter-2.patch
+Patch17:	http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE10-sslConnectTimeout.patch
+Patch18:	http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE10-statHistAssert.patch
+Patch19:	http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE10-chroot_dir.patch
+Patch20:	http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE10-errmsg.patch
+Patch21:	http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE10-FORTIFY_SOURCE.patch
+Patch22:	http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE10-ftp_250.patch
+Patch23:	http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE10-Greek.patch
+Patch24:	http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE10-STORE_PENDING.patch
+Patch25:	http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE10-ldap_auth-U.patch
+Patch26:	http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE10-cacheClientTable.patch
+Patch27:	http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE10-Solaris_IPFilter.patch
+Patch28:	http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE10-mail_from.patch
 # Other patches:
 Patch100:	http://www.sed.pl/~mrk/qos/%{name}_hit_miss_mark.patch
 Patch101:	%{name}-fhs.patch
@@ -424,6 +450,34 @@
 %prep
 %setup -q -a1 -a4
 # Bug fixes from Squid home page:
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
+%patch17 -p1
+%patch18 -p1
+%patch19 -p1
+%patch20 -p1
+%patch21 -p1
+%patch22 -p1
+%patch23 -p1
+%patch24 -p1
+%patch25 -p1
+%patch26 -p1
+%patch27 -p1
+%patch28 -p1
 # Other patches:
 %patch100 -p1
 %patch101 -p1
@@ -611,6 +665,7 @@
 %lang(fi) %{_datadir}/squid/errors/Finnish
 %lang(fr) %{_datadir}/squid/errors/French
 %lang(de) %{_datadir}/squid/errors/German
+%lang(el) %{_datadir}/squid/errors/Greek
 %lang(he) %{_datadir}/squid/errors/Hebrew
 %lang(hu) %{_datadir}/squid/errors/Hungarian
 %lang(it) %{_datadir}/squid/errors/Italian
@@ -647,7 +702,9 @@
 
 %files cachemgr
 %defattr(644,root,root,755)
+%attr(640,root,squid) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/cachemgr.conf
 %attr(755,root,root) %{_cgidir}/*
+%{_mandir}/man8/cachemgr.cgi.8*
 
 %files ldap_auth
 %defattr(644,root,root,755)
@@ -737,6 +794,13 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.218  2005/09/05 09:04:00  hawk
+- added 28 patches for version 2.5.STABLE10 from squids site
+- removed TODO, security issue is fixed by sslConnectTimeout.patch
+- include greek error messages in package
+- include config and manpage for cachemgr.cgi in package
+- release 5
+
 Revision 1.217  2005/09/05 08:17:33  blues
 - TODO added
 
================================================================

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


