diff options
Diffstat (limited to 'community/gsoap/musl-fixes.patch')
| -rw-r--r-- | community/gsoap/musl-fixes.patch | 52 |
1 files changed, 32 insertions, 20 deletions
diff --git a/community/gsoap/musl-fixes.patch b/community/gsoap/musl-fixes.patch index 7a8045cfe4..ae706d13be 100644 --- a/community/gsoap/musl-fixes.patch +++ b/community/gsoap/musl-fixes.patch @@ -1,28 +1,39 @@ ---- a/gsoap/stdsoap2.c -+++ b/gsoap/stdsoap2.c -@@ -22111,7 +22111,7 @@ +--- a/gsoap/stdsoap2.c 2019-02-20 22:32:37.000000000 +0200 ++++ b/gsoap/stdsoap2.c 2019-02-21 13:47:00.423192212 +0200 +@@ -5099,7 +5099,7 @@ tcp_gethost(struct soap *soap, const cha + return soap->error = SOAP_EOM; + return SOAP_OK; + } +-#if defined(__GLIBC__) || (defined(HAVE_GETHOSTBYNAME_R) && (defined(FREEBSD) || defined(__FreeBSD__))) || defined(__ANDROID__) ++#if defined(LINUX) || (defined(HAVE_GETHOSTBYNAME_R) && (defined(FREEBSD) || defined(__FreeBSD__))) || defined(__ANDROID__) + if (gethostbyname_r(addr, &hostent, soap->buf, sizeof(soap->buf), &host, &soap->errnum) < 0) + host = NULL; + #elif defined(_AIX43) || ((defined(TRU64) || defined(HP_UX)) && defined(HAVE_GETHOSTBYNAME_R)) +Only in gsoap-2.8/gsoap: stdsoap2.c.orig +--- a/gsoap/stdsoap2.cpp 2019-02-20 22:32:37.000000000 +0200 ++++ b/gsoap/stdsoap2.cpp 2019-02-21 13:47:00.428192236 +0200 +@@ -5099,7 +5099,7 @@ tcp_gethost(struct soap *soap, const cha + return soap->error = SOAP_EOM; + return SOAP_OK; + } +-#if defined(__GLIBC__) || (defined(HAVE_GETHOSTBYNAME_R) && (defined(FREEBSD) || defined(__FreeBSD__))) || defined(__ANDROID__) ++#if defined(LINUX) || (defined(HAVE_GETHOSTBYNAME_R) && (defined(FREEBSD) || defined(__FreeBSD__))) || defined(__ANDROID__) + if (gethostbyname_r(addr, &hostent, soap->buf, sizeof(soap->buf), &host, &soap->errnum) < 0) + host = NULL; + #elif defined(_AIX43) || ((defined(TRU64) || defined(HP_UX)) && defined(HAVE_GETHOSTBYNAME_R)) +@@ -22307,7 +22307,7 @@ soap_strerror(struct soap *soap) { #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 +-# if ((!defined(_POSIX_C_SOURCE) || !defined(_XOPEN_SOURCE) || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !_GNU_SOURCE) || defined(__ANDROID__) ++# if ((!defined(_POSIX_C_SOURCE) || !defined(_XOPEN_SOURCE) || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !_GNU_SOURCE) || defined(__ANDROID__) || !defined(__GLIBC__) strerror_r(err, soap->msgbuf, sizeof(soap->msgbuf)); /* XSI-compliant */ ---- a/gsoap/stdsoap2.cpp -+++ b/gsoap/stdsoap2.cpp -@@ -22111,7 +22111,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 */ ---- a/gsoap/stdsoap2.h -+++ b/gsoap/stdsoap2.h -@@ -991,7 +991,7 @@ + return strerror_r(err, soap->msgbuf, sizeof(soap->msgbuf)); /* GNU-specific */ +Only in gsoap-2.8/gsoap: stdsoap2.cpp.orig +--- a/gsoap/stdsoap2.h 2019-02-20 22:32:37.000000000 +0200 ++++ b/gsoap/stdsoap2.h 2019-02-21 13:47:00.428192236 +0200 +@@ -998,7 +998,7 @@ extern "C" { # endif #elif defined(SOCKLEN_T) # define SOAP_SOCKLEN_T SOCKLEN_T @@ -31,3 +42,4 @@ # define SOAP_SOCKLEN_T socklen_t #elif defined(IRIX) || defined(WIN32) || defined(__APPLE__) || defined(SUN_OS) || defined(OPENSERVER) || defined(TRU64) || defined(VXWORKS) # define SOAP_SOCKLEN_T int +Only in gsoap-2.8/gsoap: stdsoap2.h.orig |