rpms/squid/devel .cvsignore, 1.58, 1.59 sources, 1.61, 1.62 squid.spec, 1.165, 1.166

[Henrik Nordström]

Author: hno

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

Modified Files:
	.cvsignore sources squid.spec 
Log Message:
Backport OpenSSL 1.0 fix from HEAD


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/.cvsignore,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- .cvsignore	25 Feb 2010 11:25:50 -0000	1.58
+++ .cvsignore	25 Feb 2010 13:28:01 -0000	1.59
@@ -1,2 +1,3 @@
 squid-3.1.0.17.tar.bz2
 squid-3.1.0.17.tar.bz2.asc
+squid-3-10294.patch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/sources,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- sources	25 Feb 2010 11:25:50 -0000	1.61
+++ sources	25 Feb 2010 13:28:01 -0000	1.62
@@ -1,2 +1,3 @@
 5acabbc26f52363389703a8ce510c88d  squid-3.1.0.17.tar.bz2
 f70d58df04ffc2d92d89e90f8e62352b  squid-3.1.0.17.tar.bz2.asc
+4dad838e5d3571b47713e83144525950  squid-3-10294.patch


Index: squid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/squid.spec,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -p -r1.165 -r1.166
--- squid.spec	25 Feb 2010 11:25:51 -0000	1.165
+++ squid.spec	25 Feb 2010 13:28:01 -0000	1.166
@@ -4,7 +4,7 @@
 
 Name:     squid
 Version:  3.1.0.17
-Release:  1%{?dist}
+Release:  2%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
 License:  GPLv2
@@ -21,7 +21,7 @@ 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-10294.patch
 
 # Local patches
 # Applying upstream patches first makes it less likely that local patches
@@ -70,7 +70,7 @@ lookup program (dnsserver), a program fo
 %prep
 %setup -q
 
-#patch001 -p0 -b .3.1-xxxx
+%patch001 -p0 -b .3-10294
 
 %patch201 -p1 -b .config
 %patch202 -p1 -b .location
@@ -262,7 +262,7 @@ fi
 
 
 %changelog
-* Thu Feb 25 2010 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.1.0.17-1
+* Thu Feb 25 2010 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.1.0.17-2
 - Upgrade to 3.1.0.17
 
 * Thu Feb 18 2010 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.1.0.16-7