From 3f755abe05be82c2e684ff009850aaea5169d4da052041b7799ac662b15e48d5 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Wed, 15 Mar 2017 16:12:49 +0000
Subject: [PATCH] gsoap-2.8.44

OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/gsoap?expand=0&rev=89
---
 gsoap-2.8.43.tar.xz  |  3 ---
 gsoap-2.8.44.tar.xz  |  3 +++
 gsoap-sslverify.diff | 22 ++++++++++++++++++++++
 gsoap.changes        |  8 ++++++++
 gsoap.spec           | 10 +++++-----
 sanitize_source.sh   |  2 +-
 6 files changed, 39 insertions(+), 9 deletions(-)
 delete mode 100644 gsoap-2.8.43.tar.xz
 create mode 100644 gsoap-2.8.44.tar.xz
 create mode 100644 gsoap-sslverify.diff

diff --git a/gsoap-2.8.43.tar.xz b/gsoap-2.8.43.tar.xz
deleted file mode 100644
index cd99cf9..0000000
--- a/gsoap-2.8.43.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b84b0cac2953422232090fbb14bb02b9ea87c55d3ac340a207057bc980aa5dda
-size 22258352
diff --git a/gsoap-2.8.44.tar.xz b/gsoap-2.8.44.tar.xz
new file mode 100644
index 0000000..41aeb90
--- /dev/null
+++ b/gsoap-2.8.44.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3f009d816641397d3cbaedf834f93f52d3babaf25a9791ea38cd0e512d7ff29f
+size 20995468
diff --git a/gsoap-sslverify.diff b/gsoap-sslverify.diff
new file mode 100644
index 0000000..56ed522
--- /dev/null
+++ b/gsoap-sslverify.diff
@@ -0,0 +1,22 @@
+---
+ gsoap/stdsoap2.cpp |    7 +++++++
+ 1 file changed, 7 insertions(+)
+
+Index: gsoap-2.8.43/gsoap/stdsoap2.cpp
+===================================================================
+--- gsoap-2.8.43.orig/gsoap/stdsoap2.cpp
++++ gsoap-2.8.43/gsoap/stdsoap2.cpp
+@@ -3672,6 +3672,13 @@ soap_ssl_error(struct soap *soap, int re
+     while ((r = ERR_get_error()))
+     { size_t l = strlen(soap->msgbuf);
+       ERR_error_string_n(r, soap->msgbuf + l, sizeof(soap->msgbuf) - l);
++      l = strlen(soap->msgbuf);
++      if (l + 1 < sizeof(soap->msgbuf))
++        soap->msgbuf[l++] = '\n';
++      if (ERR_GET_REASON(r) == SSL_R_CERTIFICATE_VERIFY_FAILED && l <= sizeof(soap->msgbuf)) {
++        const char *reason = X509_verify_cert_error_string(SSL_get_verify_result(soap->ssl));
++        (SOAP_SNPRINTF(soap->msgbuf + l, sizeof(soap->msgbuf) - l, strlen(reason)), "%s", reason);
++      }
+     }
+   }
+   else
diff --git a/gsoap.changes b/gsoap.changes
index 52c4139..376713f 100644
--- a/gsoap.changes
+++ b/gsoap.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Mar 15 16:11:44 UTC 2017 - jengelh@inai.de
+
+- Update to new upstream release 2.8.44
+  * Fixed WS-Discovery `soap_wsdd_listen` memory cleanup on timeouts.
+  * Fixed `soap->os` saved message string NUL termination (a
+    problem in C code, not in C++).
+
 -------------------------------------------------------------------
 Wed Feb  8 09:24:37 UTC 2017 - jengelh@inai.de
 
diff --git a/gsoap.spec b/gsoap.spec
index 3c323ba..11653fa 100644
--- a/gsoap.spec
+++ b/gsoap.spec
@@ -17,8 +17,8 @@
 
 
 Name:           gsoap
-%define lname	libgsoap-2_8_43
-Version:        2.8.43
+%define lname	libgsoap-2_8_44
+Version:        2.8.44
 Release:        0
 Summary:        Toolkit for SOAP/REST-based C/C++ server and client web service applications
 License:        SUSE-GPL-2.0+-with-openssl-exception
@@ -29,6 +29,7 @@ Source:         gsoap-%version.tar.xz
 Source2:        sanitize_source.sh
 Patch1:         gsoap-automake1_13.diff
 Patch2:         gsoap-01-sharedlibs.diff
+Patch3:         gsoap-sslverify.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -84,7 +85,7 @@ This subpackage contains the documentation for the gSOAP toolkit.
 %prep
 %setup -q
 cmp gsoap/stdsoap2.cpp gsoap/stdsoap2.c
-%patch -P 1 -P 2 -p1
+%patch -P 1 -P 2 -P 3 -p1
 ln -fs stdsoap2.cpp gsoap/stdsoap2.c
 
 %build
@@ -96,8 +97,6 @@ perl -i -lpe 's{AC_INIT\(gsoap, 2.8\)}{AC_INIT([gsoap], [%version])}' \
 # Also needed because Makefile.am and configure.ac are touched.
 autoreconf -fi
 
-export CFLAGS="-O0 -ggdb3"
-export CXXFLAGS=$CFLAGS
 %configure --enable-ipv6 --disable-static
 pushd gsoap/src/
 # build prerequisites for parallel build first
@@ -111,6 +110,7 @@ make install DESTDIR="$b"
 rm -f "$b/%_libdir"/*.la
 mkdir -p "$b/%_defaultdocdir"
 cp -a gsoap/doc "$b/%_defaultdocdir/%name"
+find "$b" -type f -name "*inconsolata*" -exec chmod a-x "{}" "+"
 %if 0%{?fdupes:1}
 %fdupes %buildroot/%_prefix
 %endif
diff --git a/sanitize_source.sh b/sanitize_source.sh
index 8e6f937..4c226f1 100644
--- a/sanitize_source.sh
+++ b/sanitize_source.sh
@@ -13,7 +13,7 @@ if ! which hardlink >/dev/null; then
 	exit 1;
 fi;
 
-version="2.8.43"
+version="2.8.44"
 shortver="2.8" # agh...
 if [ ! -e "gsoap_$version.zip" ]; then
 	wget -c "http://downloads.sf.net/gsoap2/gsoap_$version.zip"