rpms/squid/F-12 squid.spec,1.168,1.169

[Henrik Nordström]

Author: hno

Update of /cvs/pkgs/rpms/squid/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv20918

Modified Files:
	squid.spec 
Log Message:
3.1.5 + bugfixes



Index: squid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-12/squid.spec,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -p -r1.168 -r1.169
--- squid.spec	31 May 2010 20:02:59 -0000	1.168
+++ squid.spec	15 Jul 2010 11:23:29 -0000	1.169
@@ -3,8 +3,8 @@
 ## % define __find_requires %{SOURCE99}
 
 Name:     squid
-Version:  3.1.4
-Release:  2%{?dist}
+Version:  3.1.5
+Release:  1%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
 License:  GPLv2+
@@ -21,8 +21,10 @@ Source98: perl-requires-squid.sh
 ## Source99: filter-requires-squid.sh
 
 # Upstream patches
-#Patch001: http://www.squid-cache.org/Versions/v3/3.1/changesets/squid-3.1-xxxx.patch
-Patch001: http://www.squid-cache.org/Versions/v3/HEAD/changesets/squid-3-10526.patch
+Patch001: http://www.squid-cache.org/Versions/v3/3.1/changesets/squid-3.1-10017.patch
+Patch002: http://www.squid-cache.org/Versions/v3/3.1/changesets/squid-3.1-10018.patch
+Patch003: http://www.squid-cache.org/Versions/v3/3.1/changesets/squid-3.1-10019.patch
+Patch004: http://www.squid-cache.org/Versions/v3/3.1/changesets/squid-3.1-10021.patch
 
 # Local patches
 # Applying upstream patches first makes it less likely that local patches
@@ -33,6 +35,10 @@ Patch204: squid-3.0.STABLE1-perlpath.pat
 Patch205: squid-3.1.0.15-smb-path.patch
 Patch208: squid-3.0.STABLE7-from_manpg.patch
 
+# Temporary patches
+# 3.1.5 bundles a slightly broken libtool. Fixed upstream.
+Patch301: squid-3.1.5-libtoolinclude.patch
+
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: bash >= 2.0
 Requires(pre): shadow-utils
@@ -70,8 +76,10 @@ lookup program (dnsserver), a program fo
 %prep
 %setup -q
 
-#patch001 -p0 -b .3.1-xxxx
-%patch001 -p0 -b .3-10526
+%patch001 -p0
+%patch002 -p0
+%patch003 -p0
+%patch004 -p0
 
 %patch201 -p1 -b .config
 %patch202 -p1 -b .location
@@ -79,6 +87,8 @@ lookup program (dnsserver), a program fo
 %patch205 -p1 -b .smb-path
 %patch208 -p1 -b .from_manpg
 
+%patch301 -p1 -b .libtoolinclude
+
 %build
 export CXXFLAGS="-fPIE %{optflags}" ; export CFLAGS="-fPIE -Os -g -pipe -fsigned-char %{optflags}" ; export LDFLAGS="-pie" ;
 %configure \
@@ -258,7 +268,12 @@ fi
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
-* Mon May 31 2010 Henrik Nordstrom <henrik at henriknordstrom.net> - 7: 3.1.4-2
+* Thu Jul 15 2010 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.1.5-2
+- Upstream 3.1.5 bugfix release
+- Upstream patch for Bug #614665: Squid crashes with  ident auth
+- Upstream patches for various memory leaks
+
+* Mon May 31 2010 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.1.4-2
 - Correct case-insensitiveness in HTTP list header parsing
 
 * Sun May 30 2010 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.1.4-1