From 196834a6caf82d7613483089e45d8b05a121faf0 Mon Sep 17 00:00:00 2001
From: maxice8 <thinkabit.ukim@gmail.com>
Date: Mon, 14 Jan 2019 18:34:07 -0200
Subject: [PATCH] gsoap: update to 2.8.75.

---
 srcpkgs/gsoap/patches/libressl.patch         | 23 ++++----------------
 srcpkgs/gsoap/patches/remove-xlocale_h.patch | 20 -----------------
 srcpkgs/gsoap/template                       |  4 ++--
 3 files changed, 6 insertions(+), 41 deletions(-)
 delete mode 100644 srcpkgs/gsoap/patches/remove-xlocale_h.patch

diff --git a/srcpkgs/gsoap/patches/libressl.patch b/srcpkgs/gsoap/patches/libressl.patch
index 97280759473..1c41302b275 100644
--- a/srcpkgs/gsoap/patches/libressl.patch
+++ b/srcpkgs/gsoap/patches/libressl.patch
@@ -1,28 +1,13 @@
-LibreSSL doesn't defined TLS1_3_VERSION so take route away from it
-
-diff --git a/gsoap/stdsoap2.c b/gsoap/stdsoap2.c
-index 91eff5b..efe647e 100644
---- gsoap/stdsoap2.c
-+++ gsoap/stdsoap2.c
-@@ -4394,7 +4394,7 @@ ssl_auth_init(struct soap *soap)
-   /* enable all TSLv1 protocols and disable SSLv3 by default if no SSL/TLS flags are set */
-   if (!(soap->ssl_flags & SOAP_SSLv3_TLSv1))
-     soap->ssl_flags = SOAP_TLSv1;
--#if (OPENSSL_VERSION_NUMBER >= 0x10101000L)
-+#if !defined(LIBRESSL_VERSION_NUMBER)
-   if ((soap->ssl_flags & SOAP_SSLv3))
-     minv = SSL3_VERSION;
-   else if ((soap->ssl_flags & SOAP_TLSv1_0))
 diff --git a/gsoap/stdsoap2.cpp b/gsoap/stdsoap2.cpp
-index 102f007..f44ff05 100644
+index cd48626..8bbf676 100644
 --- gsoap/stdsoap2.cpp
 +++ gsoap/stdsoap2.cpp
-@@ -4394,7 +4394,7 @@ ssl_auth_init(struct soap *soap)
+@@ -4396,7 +4396,7 @@ ssl_auth_init(struct soap *soap)
    /* enable all TSLv1 protocols and disable SSLv3 by default if no SSL/TLS flags are set */
    if (!(soap->ssl_flags & SOAP_SSLv3_TLSv1))
      soap->ssl_flags = SOAP_TLSv1;
--#if (OPENSSL_VERSION_NUMBER >= 0x10101000L)
-+#if !defined(LIBRESSL_VERSION_NUMBER)
+-#if OPENSSL_VERSION_NUMBER >= 0x10101000L
++#if OPENSSL_VERSION_NUMBER >= 0x10101000L && !defined(LIBRESSL_VERSION_NUMBER)
    if ((soap->ssl_flags & SOAP_SSLv3))
      minv = SSL3_VERSION;
    else if ((soap->ssl_flags & SOAP_TLSv1_0))
diff --git a/srcpkgs/gsoap/patches/remove-xlocale_h.patch b/srcpkgs/gsoap/patches/remove-xlocale_h.patch
deleted file mode 100644
index ad0cd13319b..00000000000
--- a/srcpkgs/gsoap/patches/remove-xlocale_h.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- gsoap/stdsoap2.h
-+++ gsoap/stdsoap2.h
-@@ -722,7 +722,7 @@ extern intmax_t __strtoull(const char*, char**, int);
- 
- /* force inclusion of xlocale.h */
- #if defined(WITH_INCLUDE_XLOCALE_H) && !defined(HAVE_XLOCALE_H)
--# define HAVE_XLOCALE_H
-+//# define HAVE_XLOCALE_H
- #endif
- 
- #ifdef WITH_C_LOCALE
-@@ -733,7 +733,7 @@ extern intmax_t __strtoull(const char*, char**, int);
- #  define SOAP_FREELOCALE(soap) (void)((soap)->c_locale && (_free_locale((soap)->c_locale), ((soap)->c_locale = NULL)))
- # else
- #  if defined(HAVE_XLOCALE_H)
--#   include <xlocale.h>
-+//#   include <xlocale.h>
- #  endif
- #  define SOAP_LOCALE_T locale_t
- #  define SOAP_LOCALE(soap) ((soap)->c_locale ? (soap)->c_locale : ((soap)->c_locale = newlocale(LC_ALL_MASK, "C", NULL)))
diff --git a/srcpkgs/gsoap/template b/srcpkgs/gsoap/template
index d2fb68054ef..83390b85b52 100644
--- a/srcpkgs/gsoap/template
+++ b/srcpkgs/gsoap/template
@@ -1,6 +1,6 @@
 # Template file for 'gsoap'
 pkgname=gsoap
-version=2.8.74
+version=2.8.75
 revision=1
 wrksrc="gsoap-${version%.*}"
 build_style=gnu-configure
@@ -12,7 +12,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="gSOAP-1.3b, GPL-2.0-only"
 homepage="http://www.cs.fsu.edu/~engelen/soap.html"
 distfiles="${SOURCEFORGE_SITE}/gsoap2/gsoap_${version}.zip"
-checksum=edb5b620a5017543d79dc9df301456ab105f4448aa126758c9c69b85ca563290
+checksum=825cfc31d97090ab634d8739a57179e59e5ac6f6071878cdf3c32d8cb90b3649
 disable_parallel_build=yes
 
 if [ "$CROSS_BUILD" ]; then