rpms/squid/F-12 .cvsignore, 1.54, 1.55 sources, 1.57, 1.58 squid.spec, 1.153, 1.154

[Henrik Nordström]

Author: hno

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

Modified Files:
	.cvsignore sources squid.spec 
Log Message:
upstream pam_auth build fixes


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-12/.cvsignore,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- .cvsignore	1 Feb 2010 12:39:05 -0000	1.54
+++ .cvsignore	1 Feb 2010 14:39:54 -0000	1.55
@@ -1,2 +1,4 @@
 squid-3.1.0.16.tar.bz2
 squid-3.1.0.16.tar.bz2.asc
+squid-3.1-9876.patch
+squid-3.1-9877.patch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-12/sources,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- sources	1 Feb 2010 12:39:06 -0000	1.57
+++ sources	1 Feb 2010 14:39:54 -0000	1.58
@@ -1,2 +1,4 @@
 e193368e286b6f22b6463b8062a70e04  squid-3.1.0.16.tar.bz2
 afa3f729532f9d313a09568a026d6632  squid-3.1.0.16.tar.bz2.asc
+eb9595a3074065976a0924875b10d2df  squid-3.1-9876.patch
+d1280743295fbe979f375a8db9a9ba00  squid-3.1-9877.patch


Index: squid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-12/squid.spec,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -p -r1.153 -r1.154
--- squid.spec	1 Feb 2010 12:39:06 -0000	1.153
+++ squid.spec	1 Feb 2010 14:39:54 -0000	1.154
@@ -4,7 +4,7 @@
 
 Name:     squid
 Version:  3.1.0.16
-Release:  1%{?dist}
+Release:  2%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
 License:  GPLv2+
@@ -21,7 +21,8 @@ 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-XXXXX.patch
+Patch001: http://www.squid-cache.org/Versions/v3/3.1/changesets/squid-3.1-9876.patch
+Patch002: http://www.squid-cache.org/Versions/v3/3.1/changesets/squid-3.1-9877.patch
 
 # Local patches
 # Applying upstream patches first makes it less likely that local patches
@@ -69,7 +70,8 @@ lookup program (dnsserver), a program fo
 %prep
 %setup -q
 
-#patch001 -p0 -b .XXXX
+%patch001 -p0 -b .3.1-9876
+%patch002 -p0 -b .3.1-9877
 
 %patch201 -p1 -b .config
 %patch202 -p1 -b .location
@@ -256,7 +258,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.1.0.16 for DNS related DoS fix (Squid-2010:1)
 
 * Sat Jan 09 2010 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.1.0.15-3