From 227758b43db62ca1955e594bb08d32956f75bf69371a8f0788271a244a65d37f Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Thu, 10 Nov 2011 11:49:29 +0000
Subject: [PATCH] Update to 2.8.4

OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/gsoap?expand=0&rev=10
---
 gsoap-04-strerror.diff | 29 +++++++++++++++++++++++++++++
 gsoap-2.8.4.tar.xz     |  3 +++
 gsoap.changes          | 14 ++++++++++++++
 gsoap.spec             |  7 ++++---
 sanitize_source.sh     |  2 +-
 5 files changed, 51 insertions(+), 4 deletions(-)
 create mode 100644 gsoap-04-strerror.diff
 create mode 100644 gsoap-2.8.4.tar.xz

diff --git a/gsoap-04-strerror.diff b/gsoap-04-strerror.diff
new file mode 100644
index 0000000..6825b53
--- /dev/null
+++ b/gsoap-04-strerror.diff
@@ -0,0 +1,29 @@
+From: Jan Engelhardt <jengelh@medozas.de>
+Date: 2011-11-10 12:19:12.730015880 +0100
+Upstream: tbd
+
+When GNU_SOURCE is defined -- which happens to be the case in the
+default G++ environment -- strerror_r behaves differently: it may
+not actually fill in the buffer if there is no need to. The error
+string pointer is returned in any case.
+
+---
+ gsoap/stdsoap2.cpp |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+Index: gsoap-2.8.4/gsoap/stdsoap2.cpp
+===================================================================
+--- gsoap-2.8.4.orig/gsoap/stdsoap2.cpp
++++ gsoap-2.8.4/gsoap/stdsoap2.cpp
+@@ -15905,7 +15905,11 @@ soap_strerror(struct soap *soap)
+   {
+ #ifndef WIN32
+ # ifdef HAVE_STRERROR_R
++#  ifdef _GNU_SOURCE
++    return strerror_r(err, soap->msgbuf, sizeof(soap->msgbuf));
++#  else
+     strerror_r(err, soap->msgbuf, sizeof(soap->msgbuf));
++#  endif
+ # else
+     return strerror(err);
+ # endif
diff --git a/gsoap-2.8.4.tar.xz b/gsoap-2.8.4.tar.xz
new file mode 100644
index 0000000..d6bc216
--- /dev/null
+++ b/gsoap-2.8.4.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b691423f59eb49e66e4b096dc0023ce04788c9058808bcdd9504ffa42d4950ab
+size 4903360
diff --git a/gsoap.changes b/gsoap.changes
index 7edb5c2..55ceec0 100644
--- a/gsoap.changes
+++ b/gsoap.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Thu Nov 10 11:40:07 UTC 2011 - jengelh@medozas.de
+
+- Update to gsoap 2.8.4
+* Added NTLM support (enabled with -DWITH_NTLM, requires libntlm).
+* Added WS-Discovery 1.1 support
+* Added //gsoap typed directive to control xsi:type attribuation
+  per namespace.
+* Added SOAP_XML_NOTYPE flag to disable xsi:type attributes.
+* Improved WS-Security encryption (AES,
+  soap_wsse_add_EncryptedKey_encrypt_only).
+* Improved HTTP proxy authentication support (digest and NTLM).
+- Added patch to fix empty error strings (gsoap-04-strerror.diff)
+
 -------------------------------------------------------------------
 Tue Oct 18 15:39:46 UTC 2011 - jengelh@medozas.de
 
diff --git a/gsoap.spec b/gsoap.spec
index 9253e96..66a86e4 100644
--- a/gsoap.spec
+++ b/gsoap.spec
@@ -1,7 +1,7 @@
 Name:		gsoap
 %define lname	libgsoap-2_8-0
 Summary:	Toolkit for C/C++ server and client web service applications
-Version:	2.8.3
+Version:	2.8.4
 Release:	0
 Group:		Development/Libraries/C and C++
 URL:		http://gsoap2.sf.net/
@@ -12,6 +12,7 @@ Source2:	sanitize_source.sh
 Patch1:		gsoap-01-sharedlibs.diff
 Patch2:		gsoap-02-typepuns.diff
 Patch3:		gsoap-03-initext.diff
+Patch4:		gsoap-04-strerror.diff
 BuildRoot:	%_tmppath/%name-%version-build
 BuildRequires:	bison, fdupes flex, gcc-c++, pkgconfig
 %if 0%{?suse_version} >= 1130
@@ -77,13 +78,13 @@ symlinks for libgsoap.
 tar -xf "%{S:0}" --use=xz;
 %setup -DTq
 %endif
-%patch -P 1 -P 2 -P 3 -p1
+%patch -P 1 -P 2 -P 3 -P 4 -p1
 
 %build
 # Rebuild configure - fix that utterly long mktime test.
 autoreconf -fi;
 
-%configure --enable-ipv6 --disable-static
+%configure --enable-ipv6 --disable-static CFLAGS="-O0 -ggdb3" CXXFLAGS="-O0 -ggdb3"
 pushd gsoap/src/;
 make soapcpp2_yacc.c;
 popd;
diff --git a/sanitize_source.sh b/sanitize_source.sh
index a5d65a3..eabafbb 100644
--- a/sanitize_source.sh
+++ b/sanitize_source.sh
@@ -13,7 +13,7 @@ if ! which fduphl >/dev/null; then
 	exit 1;
 fi;
 
-version="2.8.3";
+version="2.8.4";
 shortver="2.8"; # agh...
 
 rm -Rf "gsoap-$shortver" "gsoap-$version";