rpms/squid/devel .cvsignore, 1.50, 1.51 sources, 1.53, 1.54 squid.spec, 1.147, 1.148

[Henrik Nordström]

Author: hno

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

Modified Files:
	.cvsignore sources squid.spec 
Log Message:
3.1.0.14


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- .cvsignore	26 Sep 2009 19:31:47 -0000	1.50
+++ .cvsignore	27 Sep 2009 20:49:38 -0000	1.51
@@ -1,11 +1,2 @@
-squid-3.1.0.13.tar.bz2
-squid-3.1.0.13.tar.bz2.asc
-b9694.patch
-b9696.patch
-b9704.patch
-b9707.patch
-b9719.patch
-b9720.patch
-squid-3.1-9737.patch
-squid-3.1-9743.patch
-squid-3-10002.patch
+squid-3.1.0.14.tar.bz2
+squid-3.1.0.14.tar.bz2.asc


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/sources,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- sources	26 Sep 2009 19:31:47 -0000	1.53
+++ sources	27 Sep 2009 20:49:39 -0000	1.54
@@ -1,11 +1,2 @@
-a7e3f6c35853a8ad200ba448004417da  squid-3.1.0.13.tar.bz2
-56e2fc1fc8bc3c24d77daf4d5bb8c768  squid-3.1.0.13.tar.bz2.asc
-c764a5ffa0171ffadf61011dc8dd4cad  b9694.patch
-e7a8c54548fa45519d8c9d7a885a821a  b9696.patch
-bf71774b13a1506d9a1dffd2cd6daf34  b9704.patch
-a31a23ec33542a9ed2c486ee44c60550  b9707.patch
-1665438b177324cf666562a36d9234f4  b9719.patch
-307067bdf851610c1c663067948fb5dc  b9720.patch
-b6603141eeef4d119aa52dfc7e694538  squid-3.1-9737.patch
-0376008be9d4de6da28907484ac4eaee  squid-3.1-9743.patch
-a83ca39085d085ed5a79fe4553b87a66  squid-3-10002.patch
+0e76bc406495b010ac898937e19528c3  squid-3.1.0.14.tar.bz2
+87a0a414d9c4709610a249c75eadbc28  squid-3.1.0.14.tar.bz2.asc


Index: squid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/squid.spec,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -p -r1.147 -r1.148
--- squid.spec	26 Sep 2009 20:21:48 -0000	1.147
+++ squid.spec	27 Sep 2009 20:49:39 -0000	1.148
@@ -3,8 +3,8 @@
 ## % define __find_requires %{SOURCE99}
 
 Name:     squid
-Version:  3.1.0.13
-Release:  7%{?dist}
+Version:  3.1.0.14
+Release:  1%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
 License:  GPLv2+
@@ -21,16 +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/bXXXX.patch
-Patch001: http://www.squid-cache.org/Versions/v3/3.1/changesets/b9694.patch
-Patch002: http://www.squid-cache.org/Versions/v3/3.1/changesets/b9696.patch
-Patch003: http://www.squid-cache.org/Versions/v3/3.1/changesets/b9704.patch
-Patch004: http://www.squid-cache.org/Versions/v3/3.1/changesets/b9707.patch
-Patch005: http://www.squid-cache.org/Versions/v3/3.1/changesets/b9719.patch
-Patch006: http://www.squid-cache.org/Versions/v3/3.1/changesets/b9720.patch
-Patch007: http://www.squid-cache.org/Versions/v3/3.1/changesets/squid-3.1-9737.patch
-Patch008: http://www.squid-cache.org/Versions/v3/3.1/changesets/squid-3.1-9743.patch
-Patch009: http://www.squid-cache.org/Versions/v3/HEAD/changesets/squid-3-10002.patch
+#Patch001: http://www.squid-cache.org/Versions/v3/3.1/changesets/squid-3.1-XXXXX.patch
 
 # Local patches
 # Applying upstream patches first makes it less likely that local patches
@@ -76,15 +67,6 @@ lookup program (dnsserver), a program fo
 %prep
 %setup -q
 
-%patch001 -p0 -b .b9694
-%patch002 -p0 -b .b9696
-%patch003 -p0 -b .b9704
-%patch004 -p0 -b .b9707
-%patch005 -p0 -b .b9719
-%patch006 -p0 -b .b9720
-%patch007 -p0 -b .3.1-9737
-%patch008 -p0 -b .3.1-9743
-%patch009 -p0 -b .3-10002
 %patch201 -p1 -b .config
 %patch202 -p1 -b .location
 %patch204 -p1 -b .perlpath
@@ -270,6 +252,9 @@ fi
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
+* Sun Sep 27 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.1.0.14-1
+- Update to 3.1.0.14
+
 * Sat Sep 26 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.1.0.13-7
 - Include upstream patches fixing important operational issues
 - Enable ESI support now that it does not conflict with normal operation