gsoap: use openssl instead of gnutls

Gsoap uses deprecated gnutls calls that have been removed
in gnutls 3.4. To keep SSL support in gsoap, let's switch
to openssl.

2 files changed, 13 insertions, 20 deletions

diff --git a/src/gsoap-1-fixes.patch b/src/gsoap-1-fixes.patch
index 6398128..376c9a6 100644
--- a/src/gsoap-1-fixes.patch
+++ b/src/gsoap-1-fixes.patch
@@ -1,41 +1,32 @@
 This file is part of MXE.
 See index.html for further information.
 
-Contains ad hoc patches for cross building.
-
-From 186d8a982336f627bafc9b8a3f1487ab124e220b Mon Sep 17 00:00:00 2001
+From 933115892cfe9e4c9942a9667b3362dbf5c64b52 Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Sun, 23 Oct 2011 21:36:53 +0200
 Subject: [PATCH 1/2] support static linking to ntlm
 
 
 diff --git a/configure b/configure
-index df6419e..7085c88 100755
+index 5454a6a..8508b30 100755
 --- a/configure
 +++ b/configure
-@@ -5023,7 +5023,7 @@ case "${host}" in
+@@ -5023,8 +5023,8 @@ case "${host}" in
  			;;
  	*-*-cygwin*)	platform=CYGWIN ;;
  	*-*-mingw*)	platform=MINGW
 -			SAMPLE_EXTRA_LIBS="-lws2_32 -lkernel32 -luser32 -lgdi32 -lm"
+-			WSDL2H_EXTRA_LIBS="-lws2_32 -lkernel32 -luser32 -lgdi32 -lm"
 +			SAMPLE_EXTRA_LIBS="-lntlm -lws2_32 -lkernel32 -luser32 -lgdi32 -lm"
- 			WSDL2H_EXTRA_LIBS="-lws2_32 -lkernel32 -luser32 -lgdi32 -lm"
++			WSDL2H_EXTRA_LIBS="-lntlm -lws2_32 -lkernel32 -luser32 -lgdi32 -lm"
  			;;
          *-*-freebsd*)   platform=FREEBSD ;;
-@@ -6186,7 +6186,7 @@ $as_echo_n "checking for enable gnutls in library... " >&6; }
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
-     WSDL2H_EXTRA_FLAGS="-DWITH_GNUTLS -DWITH_GZIP"
--    WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} -lgnutls -lgcrypt -lgpg-error -lz"
-+    WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} -lntlm -lgnutls -lgcrypt -lgpg-error -lz"
-     SAMPLE_INCLUDES=
-     SAMPLE_SSL_LIBS="-lgnutls -lgcrypt -lgpg-error -lz"
-     WSDL2H_SOAP_CPP_LIB="libgsoapssl++.a"
+         *-*-openbsd*)   platform=OPENBSD ;;
 -- 
-1.8.4.5
+2.1.4
 
 
-From 38b02f235f09e907867bf9bc660bbada315d1094 Mon Sep 17 00:00:00 2001
+From b7210831195d6ed4b2f43f8c7b0a8d877b86d65f Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Mon, 24 Oct 2011 11:17:13 +0200
 Subject: [PATCH 2/2] ntlm support in .pc files
@@ -102,5 +93,5 @@ index 365274b..82af331 100644
 -Cflags: @SOAPCPP2_IPV6@ -DWITH_OPENSSL -DWITH_DOM -DWITH_COOKIES -DWITH_GZIP -I${includedir}
 +Cflags: @SOAPCPP2_IPV6@ -DWITH_OPENSSL -DWITH_DOM -DWITH_NTLM -DWITH_COOKIES -DWITH_GZIP -I${includedir}
 -- 
-1.8.4.5
+2.1.4
 
diff --git a/src/gsoap.mk b/src/gsoap.mk
index bd7015f..1ff90a2 100644
--- a/src/gsoap.mk
+++ b/src/gsoap.mk
@@ -8,7 +8,7 @@ $(PKG)_CHECKSUM := e66bbdeaa6b5bdcb11de5141e1f17343a023c5c4
 $(PKG)_SUBDIR   := gsoap-$(call SHORT_PKG_VERSION,$(PKG))
 $(PKG)_FILE     := gsoap_$($(PKG)_VERSION).zip
 $(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/gsoap2/gSOAP/$($(PKG)_FILE)
-$(PKG)_DEPS     := gcc gnutls libgcrypt libntlm
+$(PKG)_DEPS     := gcc libgcrypt libntlm openssl
 
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'http://sourceforge.net/projects/gsoap2/files/gSOAP/' | \
@@ -37,6 +37,9 @@ define $(PKG)_BUILD
     $(SED) -i "s/-lgnutls/`'$(TARGET)-pkg-config' --libs-only-l gnutls`/g;" '$(1)/configure'
     $(SED) -i "s^-lgpg-error^`'$(TARGET)-gpg-error-config' --libs`^g;" '$(1)/configure'
 
+    # fix hard-coded openssl dependencies
+    $(SED) -i "s^-lssl -lcrypto^`'$(TARGET)-pkg-config' --libs-only-l openssl`^g;" '$(1)/configure'
+
     # the cross build will need soapcpp2, not soapcpp2.exe
     $(SED) -i "s,^\(SOAP = \$$(top_builddir)/gsoap/src/soapcpp2\)\$$(EXEEXT)$$,\1,;" '$(1)/gsoap/wsdl/Makefile.in'
 
@@ -47,7 +50,6 @@ define $(PKG)_BUILD
         --prefix='$(PREFIX)/$(TARGET)' \
         --host='$(TARGET)' \
         --build="`config.guess`" \
-        --enable-gnutls \
         CPPFLAGS='-DWITH_NTLM -DSOAP_SSLv3=0x40'
 
     # Building for mingw requires native soapcpp2