rpms/squid/F-11 .cvsignore, 1.51, 1.52 sources, 1.54, 1.55 squid.spec, 1.134, 1.135

[Henrik Nordström]

Author: hno

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

Modified Files:
	.cvsignore sources squid.spec 
Log Message:
Upstream merge error


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-11/.cvsignore,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- .cvsignore	1 Feb 2010 12:34:37 -0000	1.51
+++ .cvsignore	1 Feb 2010 14:09:43 -0000	1.52
@@ -1,2 +1,3 @@
 squid-3.0.STABLE22.tar.bz2
 squid-3.0.STABLE22.tar.bz2.asc
+squid-3.0-9161.patch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-11/sources,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- sources	1 Feb 2010 12:34:37 -0000	1.54
+++ sources	1 Feb 2010 14:09:43 -0000	1.55
@@ -1,2 +1,3 @@
 59f4c744d586dc1b95ee3cde133d053b  squid-3.0.STABLE22.tar.bz2
 e019a0831435da8842e4f6f4c71ef59c  squid-3.0.STABLE22.tar.bz2.asc
+b92ee11ee3c258ac11f8433c5c8c92fb  squid-3.0-9161.patch


Index: squid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-11/squid.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -p -r1.134 -r1.135
--- squid.spec	1 Feb 2010 12:29:44 -0000	1.134
+++ squid.spec	1 Feb 2010 14:09:44 -0000	1.135
@@ -22,7 +22,7 @@ Source98: perl-requires-squid.sh
 ## Source99: filter-requires-squid.sh
 
 # Upstream patches
-#Patch001: http://www.squid-cache.org/Versions/v3/3.0/changesets/bXXXX.patch
+Patch001: http://www.squid-cache.org/Versions/v3/3.0/changesets/squid-3.0-9161.patch
 
 # Backported patches
 #Patch101: squid-3.0.STABLE19-3-9986.patch
@@ -62,6 +62,8 @@ lookup program (dnsserver), a program fo
 %prep
 %setup -q
 
+%patch001 -p0 -b 3.0-9161
+
 %patch201 -p1 -b .config
 %patch202 -p1 -b .location
 %patch203 -p1 -b .build
@@ -343,7 +345,7 @@ fi
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
-* Mon Feb 01 2010 Henrik Nordstrom <henrik at henriknordstrom.net> 3.0.STABLE22-1
+* Mon Feb 01 2010 Henrik Nordstrom <henrik at henriknordstrom.net> 7:3.0.STABLE22-2
 - Upgrade to 3.0.STABLE22 for DNS related DoS fix (Squid-2010:1)
 
 * Sat Jan 09 2010 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.0.STABLE21-2