rpms/squid/devel .cvsignore, 1.63, 1.64 sources, 1.66, 1.67 squid.spec, 1.173, 1.174 squid-3.1.1-ipv6_disabled.patch, 1.1, NONE

[Henrik Nordström]

Author: hno

Update of /cvs/pkgs/rpms/squid/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv19391

Modified Files:
	.cvsignore sources squid.spec 
Removed Files:
	squid-3.1.1-ipv6_disabled.patch 
Log Message:
Various IPv6 related fixes


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/.cvsignore,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- .cvsignore	2 May 2010 21:43:59 -0000	1.63
+++ .cvsignore	14 May 2010 05:56:08 -0000	1.64
@@ -1,2 +1,6 @@
 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/devel/sources,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- sources	2 May 2010 21:43:59 -0000	1.66
+++ sources	14 May 2010 05:56:09 -0000	1.67
@@ -1,2 +1,6 @@
 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.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/squid.spec,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -p -r1.173 -r1.174
--- squid.spec	2 May 2010 21:43:59 -0000	1.173
+++ squid.spec	14 May 2010 05:56:10 -0000	1.174
@@ -4,7 +4,7 @@
 
 Name:     squid
 Version:  3.1.3
-Release:  1%{?dist}
+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
@@ -69,14 +71,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
 %configure \
@@ -261,6 +265,11 @@ fi
 
 
 %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
 


--- squid-3.1.1-ipv6_disabled.patch DELETED ---