rpms/squid/devel squid-3.1.0.16-assert.patch, NONE, 1.1 squid.spec, 1.157, 1.158

[Jiri Skala]

Author: jskala

Update of /cvs/extras/rpms/squid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23516

Modified Files:
	squid.spec 
Added Files:
	squid-3.1.0.16-assert.patch 
Log Message:
* Wed Feb 03 2010 Jiri Skala <jskala at redhat.com> 7:3.1.0.16-4
- spec file modified to be fedora packaging guidline compliant
- little shifting lines in init script header due to rpmlint complaint
- 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/devel/squid.spec,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -p -r1.157 -r1.158
--- squid.spec	3 Feb 2010 13:13:41 -0000	1.157
+++ squid.spec	6 Feb 2010 13:29:25 -0000	1.158
@@ -31,6 +31,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
@@ -76,6 +77,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
 %configure \
@@ -263,6 +265,7 @@ fi
 * Wed Feb 03 2010 Jiri Skala <jskala at redhat.com> 7:3.1.0.16-4
 - spec file modified to be fedora packaging guidline compliant
 - little shifting lines in init script header due to rpmlint complaint
+- 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)