rpms/squid/F-12 .cvsignore, 1.61, 1.62 sources, 1.64, 1.65 squid.init, 1.16, 1.17 squid.spec, 1.165, 1.166

[Henrik Nordström]

Author: hno

Update of /cvs/pkgs/rpms/squid/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv21507

Modified Files:
	.cvsignore sources squid.init squid.spec 
Log Message:
jskala: little shifting lines in init script header due to rpmlint complaint


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-12/.cvsignore,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- .cvsignore	30 Mar 2010 09:26:25 -0000	1.61
+++ .cvsignore	14 May 2010 06:10:16 -0000	1.62
@@ -1,2 +1,6 @@
-squid-3.1.1.tar.bz2
-squid-3.1.1.tar.bz2.asc
+squid-3.1.3.tar.bz2
+squid-3.1.3.tar.bz2.asc
+squid-3.1-9967.patch
+squid-3.1-9968.patch
+squid-3.1-9969.patch
+squid-3.1-9970.patch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-12/sources,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- sources	30 Mar 2010 09:26:25 -0000	1.64
+++ sources	14 May 2010 06:10:16 -0000	1.65
@@ -1,2 +1,6 @@
-4316f396d9134049c775c16dc5cf297c  squid-3.1.1.tar.bz2
-e66585f71487323c52927d94ba126013  squid-3.1.1.tar.bz2.asc
+5b9ec56d38106826caf3888ab62bf865  squid-3.1.3.tar.bz2
+73ef4731b94ede53f82d7f149f96b329  squid-3.1.3.tar.bz2.asc
+0179f45a3ad39e44870cd573c3712280  squid-3.1-9967.patch
+1803005fc493a457bc544a0c9c4e06d7  squid-3.1-9968.patch
+b61bddb9fecd92b3d85ea553da0eb1c4  squid-3.1-9969.patch
+96b2df1dd9e5d127e9c74ff826e95cf3  squid-3.1-9970.patch


Index: squid.init
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-12/squid.init,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- squid.init	23 Nov 2009 11:19:01 -0000	1.16
+++ squid.init	14 May 2010 06:10:16 -0000	1.17
@@ -1,9 +1,10 @@
 #!/bin/bash
-### BEGIN INIT INFO
-# Provides: squid
 # chkconfig: - 90 25
 # pidfile: /var/run/squid.pid
 # config: /etc/squid/squid.conf
+#
+### BEGIN INIT INFO
+# Provides: squid
 # Short-Description: starting and stopping Squid Internet Object Cache
 # Description: Squid - Internet Object Cache. Internet object caching is \
 #       a way to store requested Internet objects (i.e., data available \


Index: squid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-12/squid.spec,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -p -r1.165 -r1.166
--- squid.spec	19 Apr 2010 17:55:50 -0000	1.165
+++ squid.spec	14 May 2010 06:10:16 -0000	1.166
@@ -3,8 +3,8 @@
 ## % define __find_requires %{SOURCE99}
 
 Name:     squid
-Version:  3.1.1
-Release:  3%{?dist}
+Version:  3.1.3
+Release:  2%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
 License:  GPLv2+
@@ -21,7 +21,10 @@ 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/3.1/changesets/squid-3.1-9967.patch
+Patch002: http://www.squid-cache.org/Versions/v3/3.1/changesets/squid-3.1-9968.patch
+Patch003: http://www.squid-cache.org/Versions/v3/3.1/changesets/squid-3.1-9969.patch
+Patch004: http://www.squid-cache.org/Versions/v3/3.1/changesets/squid-3.1-9970.patch
 
 # Local patches
 # Applying upstream patches first makes it less likely that local patches
@@ -31,7 +34,6 @@ 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.1-ipv6_disabled.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: bash >= 2.0
@@ -70,14 +72,16 @@ lookup program (dnsserver), a program fo
 %prep
 %setup -q
 
-#patch001 -p0 -b .3.1-XXXX
+%patch001 -p0 -b .3.1-9967
+%patch002 -p0 -b .3.1-9968
+%patch003 -p0 -b .3.1-9969
+%patch004 -p0 -b .3.1-9970
 
 %patch201 -p1 -b .config
 %patch202 -p1 -b .location
 %patch204 -p1 -b .perlpath
 %patch205 -p1 -b .smb-path
 %patch208 -p1 -b .from_manpg
-%patch209 -p1 -b .ipv6_disabled
 
 %build
 export CXXFLAGS="-fPIE %{optflags}" ; export CFLAGS="-fPIE -Os -g -pipe -fsigned-char %{optflags}" ; export LDFLAGS="-pie" ;
@@ -258,6 +262,14 @@ fi
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
+* Fri May 14 2010 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.1.3-2
+- Fully fix #548903 - "comm_open: socket failure: (97) Address family not supported by protocol" if IPv6 disabled
+- Various IPv6 related issues fixed, making tcp_outgoing_address behave
+  as expected and no commResetFD warnings when using tproxy setups.
+
+* Sat May 02 2010 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.1.3-1
+- Update to 3.1.3 Upstream bugfix release, fixing WCCPv1
+
 * Mon Apr 19 2010 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.1.1-3
 - Bug #583489: Adjust logrotate script to changes in logrotate package.