rpms/squid/F-12 squid-3.1.0.16-assert.patch, NONE, 1.1 squid.spec, 1.155, 1.156

[Jiri Skala]

Author: jskala

Update of /cvs/extras/rpms/squid/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23831

Modified Files:
	squid.spec 
Added Files:
	squid-3.1.0.16-assert.patch 
Log Message:
* Sat Feb 06 2010 Jiri Skala <jskala at redhat.com> 7:3.1.0.16-4
- fixes assertion during start up


squid-3.1.0.16-assert.patch:
 peer_select.cc |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE squid-3.1.0.16-assert.patch ---
diff -up squid-3.1.0.16/src/peer_select.cc.assert squid-3.1.0.16/src/peer_select.cc
--- squid-3.1.0.16/src/peer_select.cc.assert	2010-02-01 05:02:27.000000000 +0100
+++ squid-3.1.0.16/src/peer_select.cc	2010-02-05 15:27:09.000000000 +0100
@@ -67,6 +67,7 @@ const char *hier_strings[] = {
     "ANY_PARENT",
     "USERHASH",
     "SOURCEHASH",
+    "PINNED",
     "INVALID CODE"
 };
 


Index: squid.spec
===================================================================
RCS file: /cvs/extras/rpms/squid/F-12/squid.spec,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -p -r1.155 -r1.156
--- squid.spec	1 Feb 2010 21:24:02 -0000	1.155
+++ squid.spec	6 Feb 2010 13:31:32 -0000	1.156
@@ -4,7 +4,7 @@
 
 Name:     squid
 Version:  3.1.0.16
-Release:  3%{?dist}
+Release:  4%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
 License:  GPLv2+
@@ -32,6 +32,7 @@ Patch202: squid-3.1.0.9-location.patch
 Patch204: squid-3.0.STABLE1-perlpath.patch
 Patch205: squid-3.1.0.15-smb-path.patch
 Patch208: squid-3.0.STABLE7-from_manpg.patch
+Patch209: squid-3.1.0.16-assert.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: bash >= 2.0
@@ -78,6 +79,7 @@ lookup program (dnsserver), a program fo
 %patch204 -p1 -b .perlpath
 %patch205 -p1 -b .smb-path
 %patch208 -p1 -b .from_manpg
+%patch209 -p1 -b .assert
 
 %build
 export CXXFLAGS="-fPIE %{optflags}" ; export CFLAGS="-fPIE -Os -g -pipe -fsigned-char %{optflags}" ; export LDFLAGS="-pie" ;
@@ -258,6 +260,9 @@ fi
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
+* Sat Feb 06 2010 Jiri Skala <jskala at redhat.com> 7:3.1.0.16-4
+- fixes assertion during start up
+
 * Mon Feb 01 2010 Henrik Nordstrom <henrik at henriknordstrom.net> 7:3.1.0.16-3
 - Upgrade to 3.1.0.16 for DNS related DoS fix (Squid-2010:1)