rpms/squid/F-9 squid.spec,1.103,1.104

Henrik Nordström hno at fedoraproject.org
Thu Jan 29 22:45:06 UTC 2009


Author: hno

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

Modified Files:
	squid.spec 
Log Message:
Correct F-9 spec file. Should not copy from F-10..



Index: squid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-9/squid.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- squid.spec	29 Jan 2009 22:38:36 -0000	1.103
+++ squid.spec	29 Jan 2009 22:44:35 -0000	1.104
@@ -32,8 +32,6 @@
 Patch203: squid-3.0.STABLE1-build.patch
 Patch204: squid-3.0.STABLE1-perlpath.patch
 Patch205: squid-3.0.STABLE1-smb-path.patch
-#Patch207: squid-3.0.STABLE5-configure_netfilter.patch
-Patch208: squid-3.0.STABLE7-from_manpg.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: bash >= 2.0
@@ -64,8 +62,6 @@
 %patch203 -p1 -b .build
 %patch204 -p1 -b .perlpath
 %patch205 -p1 -b .smb-path
-#%patch207 -p1 -b .configure_netfilter
-%patch208 -p1 -b .from_manpg
 
 %build
 export CXXFLAGS="-fPIE %{optflags}" ; export CFLAGS="-fPIE -Os -g -pipe -fsigned-char %{optflags}" ; export LDFLAGS="-pie" ;
@@ -78,9 +74,8 @@
    --sysconfdir=/etc/squid \
    --disable-dependency-tracking \
    --enable-arp-acl \
-   --enable-auth="basic,digest,ntlm,negotiate" \
+   --enable-auth="basic,digest,ntlm" \
    --enable-basic-auth-helpers="LDAP,MSNT,NCSA,PAM,SMB,YP,getpwnam,multi-domain-NTLM,SASL" \
-   --enable-negotiate-auth-helpers="squid_kerb_auth" \
    --enable-cache-digests \
    --enable-cachemgr-hostname=localhost \
    --enable-delay-pools \
@@ -349,46 +344,24 @@
 
 * Fri Oct 24 2008 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.0.STABLE10-1
 - upgrade to latest upstream
-
-* Sun Oct 19 2008 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.0.STABLE9-2
-- disable coss support, not officially supported in 3.0
-
-* Sun Oct 19 2008 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.0.STABLE9-1
-- update to latest upstream
-
-* Thu Oct 09 2008 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.0.STABLE7-4
 - change logrotate to move instead of copytruncate
+- disable coss support, not officially supported in 3.0
 
-* Wed Oct 08 2008 Jiri Skala <jskala at redhat.com> - 7:3.0.STABLE7-3
-- fix #465052 -  FTBFS squid-3.0.STABLE7-1.fc10
-
-* Thu Aug 14 2008 Jiri Skala <jskala at redhat.com> - 7:3.0.STABLE7-2
-- used ncsa_auth.8 from man-pages. there will be this file removed due to conflict
-- fix #458593 noisy initscript
-- fix #463129 init script tests wrong conf file
-- fix #450352 - build.patch patches only generated files
-
-* Wed Jul 02 2008 Jiri Skala <jskala at redhat.com> - 7:3.0.STABLE7-1
-- update to latest upstream
-- fix #453214
-
-* Mon May 26 2008 Martin Nagy <mnagy at redhat.com> - 7:3.0.STABLE6-2
-- fix bad allocation
+* Fri Oct 03 2008 Jiri Skala <jskala at redhat.com> - 7:3.0.STABLE7-2
+- Resolves: #463129 - optional config file
+- Resolves: #458593 - noisy init script
+- Resolves: #450352 - build.patch patches only generated files
 
-* Wed May 21 2008 Martin Nagy <mnagy at redhat.com> - 7:3.0.STABLE6-1
+* Mon Jun 30 2008 Jiri Skala <jskala at redhat.com> - 7:3.0.STABLE7-1
 - upgrade to latest upstream
-- fix bad allocation
+- fix CVE-2004-0918  Squid SNMP DoS [Fedora 9] (#453214)
 
-* Fri May 09 2008 Martin Nagy <mnagy at redhat.com> - 7:3.0.STABLE5-2
-- fix configure detection of netfilter kernel headers (#435499),
-  patch by aoliva at redhat.com
-- add support for negotiate authentication (#445337)
-
-* Fri May 02 2008 Martin Nagy <mnagy at redhat.com> - 7:3.0.STABLE5-1
+* Mon May 26 2008 Martin Nagy <mnagy at redhat.com> - 7:3.0.STABLE6-1
 - upgrade to latest upstream
+- fix bad allocation (#447045)
 
-* Tue Apr 08 2008 Martin Nagy <mnagy at redhat.com> - 7:3.0.STABLE4-1
-- upgrade to latest upstream
+* Fri May 09 2008 Alexandre Oliva <aoliva at redhat.com> - 7:3.0.STABLE2-3
+- fix configure detection of netfilter kernel headers (#435499)
 
 * Thu Apr 03 2008 Martin Nagy <mnagy at redhat.com> - 7:3.0.STABLE2-2
 - add %%{optflags} to make




More information about the fedora-extras-commits mailing list