[gsoap/f16] Fix an issue with IPv4 only sockets when IPv6 support is enabled

[Mattias Ellert]

commit 1fd6c6ed9b353fc5dea2ee5a0ba2160ff81b18fe
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Fri Oct 21 15:33:55 2011 +0200

    Fix an issue with IPv4 only sockets when IPv6 support is enabled

 gsoap-ipv6.patch |   54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 gsoap.spec       |    9 +++++++--
 2 files changed, 61 insertions(+), 2 deletions(-)
---
diff --git a/gsoap-ipv6.patch b/gsoap-ipv6.patch
new file mode 100644
index 0000000..cc16fbc
--- /dev/null
+++ b/gsoap-ipv6.patch
@@ -0,0 +1,54 @@
+diff -ur gsoap-2.8.orig/gsoap/samples/calc_vs2005/calc_vs2005/stdsoap2.h gsoap-2.8/gsoap/samples/calc_vs2005/calc_vs2005/stdsoap2.h
+--- gsoap-2.8.orig/gsoap/samples/calc_vs2005/calc_vs2005/stdsoap2.h	2011-06-25 00:48:41.000000000 +0200
++++ gsoap-2.8/gsoap/samples/calc_vs2005/calc_vs2005/stdsoap2.h	2011-10-21 15:01:09.083087575 +0200
+@@ -678,14 +678,6 @@
+ # define SOAP_WINSOCKINT size_t
+ #endif
+ 
+-#ifdef WITH_IPV6
+-# ifdef IPV6_V6ONLY
+-#  if !defined(WITH_NO_IPV6_V6ONLY) && !defined(WITH_IPV6_V6ONLY)
+-#   define WITH_NO_IPV6_V6ONLY /* turn on IPv6-IPv4 switching */
+-#  endif
+-# endif
+-#endif
+-
+ #if defined(WITH_IPV6_V6ONLY) || defined(WITH_NO_IPV6_V6ONLY)
+ # ifndef WITH_IPV6
+ #  define WITH_IPV6
+diff -ur gsoap-2.8.orig/gsoap/stdsoap2.h gsoap-2.8/gsoap/stdsoap2.h
+--- gsoap-2.8.orig/gsoap/stdsoap2.h	2011-06-25 00:48:46.000000000 +0200
++++ gsoap-2.8/gsoap/stdsoap2.h	2011-10-21 15:01:09.083087575 +0200
+@@ -678,14 +678,6 @@
+ # define SOAP_WINSOCKINT size_t
+ #endif
+ 
+-#ifdef WITH_IPV6
+-# ifdef IPV6_V6ONLY
+-#  if !defined(WITH_NO_IPV6_V6ONLY) && !defined(WITH_IPV6_V6ONLY)
+-#   define WITH_NO_IPV6_V6ONLY /* turn on IPv6-IPv4 switching */
+-#  endif
+-# endif
+-#endif
+-
+ #if defined(WITH_IPV6_V6ONLY) || defined(WITH_NO_IPV6_V6ONLY)
+ # ifndef WITH_IPV6
+ #  define WITH_IPV6
+diff -ur gsoap-2.8.orig/gsoap/VisualStudio2005/wsdl2h/wsdl2h/stdsoap2.h gsoap-2.8/gsoap/VisualStudio2005/wsdl2h/wsdl2h/stdsoap2.h
+--- gsoap-2.8.orig/gsoap/VisualStudio2005/wsdl2h/wsdl2h/stdsoap2.h	2011-06-25 00:48:46.000000000 +0200
++++ gsoap-2.8/gsoap/VisualStudio2005/wsdl2h/wsdl2h/stdsoap2.h	2011-10-21 15:01:09.083087575 +0200
+@@ -678,14 +678,6 @@
+ # define SOAP_WINSOCKINT size_t
+ #endif
+ 
+-#ifdef WITH_IPV6
+-# ifdef IPV6_V6ONLY
+-#  if !defined(WITH_NO_IPV6_V6ONLY) && !defined(WITH_IPV6_V6ONLY)
+-#   define WITH_NO_IPV6_V6ONLY /* turn on IPv6-IPv4 switching */
+-#  endif
+-# endif
+-#endif
+-
+ #if defined(WITH_IPV6_V6ONLY) || defined(WITH_NO_IPV6_V6ONLY)
+ # ifndef WITH_IPV6
+ #  define WITH_IPV6
diff --git a/gsoap.spec b/gsoap.spec
index 25b0c4d..f3f1d12 100644
--- a/gsoap.spec
+++ b/gsoap.spec
@@ -1,7 +1,7 @@
 Summary: Generator Tools for Coding SOAP/XML Web Services in C and C++
 Name: gsoap
 Version: 2.8.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 # gsoap is licensed both under the gSOAP public license and under GPL version
 # 2 or later with an OpenSSL linking exception.
 #
@@ -15,13 +15,14 @@ Release: 1%{?dist}
 # 3.2. Availability of Source Code.
 # Any Modification created by You will be provided to the Initial Developer in
 # Source Code form and are subject to the terms of the License.
-License: GPLv2+
+License: GPLv2+ with exceptions
 Group: Development/Tools
 URL: http://gsoap2.sourceforge.net
 Source0: http://downloads.sourceforge.net/gsoap2/gsoap_2.8.3.zip
 Source1: soapcpp2.1
 Source2: wsdl2h.1
 Patch0: %{name}-libtool.patch
+Patch1: %{name}-ipv6.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires: flex
@@ -65,6 +66,7 @@ gSOAP documentation in html
 
 # enable use of libtool in configure.in and a few Makefile.am files
 %patch0 -p1
+%patch1 -p1
 
 # XML files non-executable
 find . -name "*.xml" -exec chmod a-x {} \;
@@ -277,6 +279,9 @@ make check
 %postun -p /sbin/ldconfig
 
 %changelog
+* Fri Oct 21 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.8.3-2
+- Fix an issue with IPv4 only sockets when IPv6 support is enabled
+
 * Tue Aug 23 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.8.3-1
 - Update to gsoap 2.8.3
 - Drop the examples sub-package - the examples are written to be built