testing/gsoap: upgrade to 2.8.34

4 files changed, 27 insertions, 68 deletions

diff --git a/testing/gsoap/APKBUILD b/testing/gsoap/APKBUILD
index 3730e768a9..4081390c17 100644
--- a/testing/gsoap/APKBUILD
+++ b/testing/gsoap/APKBUILD
@@ -1,38 +1,23 @@
 # Contributor: <xmingske@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-
 pkgname=gsoap
-pkgver=2.8.23
+pkgver=2.8.34
 pkgrel=0
 arch="all"
 pkgdesc='A cross-platform C and C++ SDK for SOAP/XML Web services'
-license='GPL-2 gSOAP'
-url='http://gsoap2.sourceforge.net'
-
-depends=''
-makedepends='autoconf automake bison flex zlib-dev openssl-dev'
+license="GPL-2 gSOAP"
+url="http://gsoap2.sourceforge.net"
+depends=
+makedepends="autoconf automake bison flex zlib-dev openssl-dev libtool"
 subpackages="$pkgname-dev"
 source="http://downloads.sourceforge.net/project/gsoap2/gSOAP/${pkgname}_${pkgver}.zip
-	stdsoap2.c.diff
-	stdsoap2.cpp.diff
-	stdsoap2.h.diff
-"
-
-gsopa_major='2.8'
+	musl-fixes.patch
+	"
 
-_builddir="$srcdir"/$pkgname-$gsopa_major
-
-prepare() {
-	cd "${_builddir}"
-	for f in $source; do
-		case $f in
-		*.diff)	patch -p1 < "$srcdir"/$f
-		esac
-	done
-}
+builddir="$srcdir"/$pkgname-${pkgver%.*}
 
 build() {
-	cd "${_builddir}"
+	cd "${builddir}"
 	touch configure.ac aclocal.m4 configure Makefile.am Makefile.in
 	./configure --prefix=/usr \
 		--mandir=/usr/share/man \
@@ -44,19 +29,13 @@ build() {
 }
 
 package() {
-	cd "$_builddir"
+	cd "$builddir"
 	make DESTDIR="$pkgdir" install || return 1
 }
 
-md5sums="9aa06f75cd3e3defee3e81cb9a2d1743  gsoap_2.8.23.zip
-24c9892ba231da9cff0fdfd834cebb71  stdsoap2.c.diff
-8f62eb5fbd92c850c86ca4e6900efe1d  stdsoap2.cpp.diff
-b8a9439699427356b1e90d4cfc1af146  stdsoap2.h.diff"
-sha256sums="e1c30743f1c2cf40b2760568127e14af1b2a00c3026b2e5f0750e8c33d94c061  gsoap_2.8.23.zip
-ab0dea89ffb1b98d5e6c7d0a4975b9c9c022099729217b898a15934f360d88d0  stdsoap2.c.diff
-e0414a1127f9529dfb4b686b3721fd5aaedf46a8bd795b09cca24a1b66bd8872  stdsoap2.cpp.diff
-9f73f51791be1f149c1ef0db676832f1c0cad6837d14931666b3b18083f4b7e4  stdsoap2.h.diff"
-sha512sums="cc90aadfe09aa6406172c9ffa07696851ff594ca7c5b40819494badd8ce978d908d66de63a5831e7aec1bca18ee8b51ed02187057688a3b36eb0a21fe6e0f5a4  gsoap_2.8.23.zip
-116c0e1fd9d3c17ba4625934c7cd158084a9f9198a4ffae0036589d923b010e58143a8aea7804adf91683114f0bc99494f3ecc4139006b901e975ccb429e3543  stdsoap2.c.diff
-4d9b6f09407e3af95a8a2e282e5a379b5e313df21285beab69459a990aa035ee6e8fcba05b06e120f5f0e5b0e1f8499f8cdb4c41615f7cd5692fb875a88e46c8  stdsoap2.cpp.diff
-de271db85f4bfef8a01392c8aca864b16da4efe4acb1919827f7145202db32fbc8c872b225d865bbe98e144cc579c46cb419e041475b3127fc7d442680938a0a  stdsoap2.h.diff"
+md5sums="abc4cd7a3b3c042cf2eeb7c0d791bad5  gsoap_2.8.34.zip
+ce945058c898a360951c11d574699872  musl-fixes.patch"
+sha256sums="94b51ff91b241d2cd6206056bbd3d3cde2560e99296cffc5a8f6f49672469377  gsoap_2.8.34.zip
+db122e51e629121ce295f76e1f0d90595c5450c42d46342def50c56696150363  musl-fixes.patch"
+sha512sums="112ac6699416fa63bef231480333b763e24337cc0f3a17d3e0f8cb8bc18ddf3518048b2a02576ba9f865849b704d6a0e46e754f9a31449b5e14ce9a36f13c70e  gsoap_2.8.34.zip
+4c96126bdd9263fd686e7e9283e80d751f209a03d5920b9c3763851a1a8a48d48e1740eaa9269f05a1b3128a9476323a2359904dfd4c2ac43f5cee5ff64e4b98  musl-fixes.patch"
diff --git a/testing/gsoap/stdsoap2.h.diff b/testing/gsoap/musl-fixes.patch
index f21310a523..a6836ae9cf 100644
--- a/testing/gsoap/stdsoap2.h.diff
+++ b/testing/gsoap/musl-fixes.patch
@@ -1,3 +1,14 @@
+--- ./gsoap/stdsoap2.cpp.orig
++++ ./gsoap/stdsoap2.cpp
+@@ -18691,7 +18691,7 @@
+   {
+ #ifndef WIN32
+ # ifdef HAVE_STRERROR_R
+-#  if defined(_GNU_SOURCE) && !defined(__ANDROID__)
++#  if defined(_GNU_SOURCE) && !defined(__ANDROID__) && defined(__GLIBC__)
+     return strerror_r(err, soap->msgbuf, sizeof(soap->msgbuf)); /* GNU-specific */
+ #  else
+     strerror_r(err, soap->msgbuf, sizeof(soap->msgbuf)); /* XSI-compliant */
 --- gsoap-2.8.orig/gsoap/stdsoap2.h
 +++ gsoap-2.8/gsoap/stdsoap2.h
 @@ -859,7 +859,7 @@
diff --git a/testing/gsoap/stdsoap2.c.diff b/testing/gsoap/stdsoap2.c.diff
deleted file mode 100644
index 0d7b7bfec4..0000000000
--- a/testing/gsoap/stdsoap2.c.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- gsoap-2.8.orig/gsoap/stdsoap2.c
-+++ gsoap-2.8/gsoap/stdsoap2.c
-@@ -3963,7 +3963,7 @@
-   { memcpy(inaddr, &iadd, sizeof(iadd));
-     return SOAP_OK;
-   }
--#if defined(__GLIBC__) || (defined(HAVE_GETHOSTBYNAME_R) && (defined(FREEBSD) || defined(__FreeBSD__))) || defined(__ANDROID__)
-+#if defined(__GLIBC__) || (defined(HAVE_GETHOSTBYNAME_R) && (defined(FREEBSD) || defined(__FreeBSD__))) || defined(__ANDROID__) || defined(LINUX)
-   if (gethostbyname_r(addr, &hostent, soap->buf, SOAP_BUFLEN, &host, &soap->errnum) < 0)
-     host = NULL;
- #elif defined(_AIX43) || ((defined(TRU64) || defined(HP_UX)) && defined(HAVE_GETHOSTBYNAME_R))
diff --git a/testing/gsoap/stdsoap2.cpp.diff b/testing/gsoap/stdsoap2.cpp.diff
deleted file mode 100644
index 66590b3a05..0000000000
--- a/testing/gsoap/stdsoap2.cpp.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- gsoap-2.8.orig/gsoap/stdsoap2.cpp
-+++ gsoap-2.8/gsoap/stdsoap2.cpp
-@@ -3963,7 +3963,7 @@
-   { memcpy(inaddr, &iadd, sizeof(iadd));
-     return SOAP_OK;
-   }
--#if defined(__GLIBC__) || (defined(HAVE_GETHOSTBYNAME_R) && (defined(FREEBSD) || defined(__FreeBSD__))) || defined(__ANDROID__)
-+#if defined(__GLIBC__) || (defined(HAVE_GETHOSTBYNAME_R) && (defined(FREEBSD) || defined(__FreeBSD__))) || defined(__ANDROID__) || defined(LINUX)
-   if (gethostbyname_r(addr, &hostent, soap->buf, SOAP_BUFLEN, &host, &soap->errnum) < 0)
-     host = NULL;
- #elif defined(_AIX43) || ((defined(TRU64) || defined(HP_UX)) && defined(HAVE_GETHOSTBYNAME_R))
-@@ -17240,7 +17240,7 @@
-   {
- #ifndef WIN32
- # ifdef HAVE_STRERROR_R
--#  ifdef _GNU_SOURCE
-+#  if defined (_GNU_SOURCE) && defined(__GLIBC__)
-     return strerror_r(err, soap->msgbuf, sizeof(soap->msgbuf)); /* GNU-specific */
- #  else
-     strerror_r(err, soap->msgbuf, sizeof(soap->msgbuf)); /* XSI-compliant */