stunnel: update to latest, disable libressl choice for now

3 files changed, 27 insertions, 22 deletions

diff --git a/package/stunnel/Makefile b/package/stunnel/Makefile
index e43c99d7e..4a7a1b353 100644
--- a/package/stunnel/Makefile
+++ b/package/stunnel/Makefile
@@ -4,15 +4,15 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		stunnel
-PKG_VERSION:=		5.24
+PKG_VERSION:=		5.31
 PKG_RELEASE:=		1
-PKG_HASH:=		ab2e5a1034d422951ddad21b572eb7fa8efb4c4ce04bc86536c6845f3d02b07e
+PKG_HASH:=		a746b71ab3dc6c23eacb0daf7342467870e43ac933430905eb1b1d050bbae0b7
 PKG_DESCR:=		encryption wrapper
 PKG_SECTION:=		net/security
 PKG_URL:=		https://www.stunnel.org
 PKG_SITES:=		https://www.stunnel.org/downloads/
 
-PKG_CHOICES_STUNNEL:=	WITH_LIBRESSL WITH_OPENSSL
+PKG_CHOICES_STUNNEL:=	WITH_OPENSSL
 PKGCD_WITH_LIBRESSL:=	use libressl for crypto
 PKGCB_WITH_LIBRESSL:=	libressl
 PKGCS_WITH_LIBRESSL:=	libressl ca-certificates
diff --git a/package/stunnel/patches/patch-configure_ac b/package/stunnel/patches/patch-configure_ac
index b9ccb30ab..fc9533b21 100644
--- a/package/stunnel/patches/patch-configure_ac
+++ b/package/stunnel/patches/patch-configure_ac
@@ -1,16 +1,21 @@
---- stunnel-5.24.orig/configure.ac	2015-09-02 23:21:07.000000000 +0200
-+++ stunnel-5.24/configure.ac	2015-10-21 10:48:27.000000000 +0200
-@@ -72,13 +72,6 @@ AX_APPEND_COMPILE_FLAGS([-Wformat=2])
- AX_APPEND_COMPILE_FLAGS([-Wconversion])
- AX_APPEND_COMPILE_FLAGS([-Wno-long-long])
- AX_APPEND_COMPILE_FLAGS([-Wno-deprecated-declarations])
--AX_APPEND_COMPILE_FLAGS([-fstack-protector])
--AX_APPEND_COMPILE_FLAGS([-fPIE])
--AX_APPEND_COMPILE_FLAGS([-D_FORTIFY_SOURCE=2])
--AX_APPEND_LINK_FLAGS([-fPIE -pie])
--AX_APPEND_LINK_FLAGS([-Wl,-z,relro])
--AX_APPEND_LINK_FLAGS([-Wl,-z,now])
--AX_APPEND_LINK_FLAGS([-Wl,-z,noexecstack])
+--- stunnel-5.31.orig/configure.ac	2016-02-03 18:23:10.000000000 +0100
++++ stunnel-5.31/configure.ac	2016-03-13 13:33:26.000000000 +0100
+@@ -86,18 +86,6 @@ if test "$GCC" = yes; then
+     AX_APPEND_COMPILE_FLAGS([-Wconversion])
+     AX_APPEND_COMPILE_FLAGS([-Wno-long-long])
+     AX_APPEND_COMPILE_FLAGS([-Wno-deprecated-declarations])
+-    AX_APPEND_COMPILE_FLAGS([-fPIE])
+-    case "${host}" in
+-        avr-*.* | powerpc-*-aix* | rl78-*.* | visium-*.*)
+-            ;;
+-        *)
+-            AX_APPEND_COMPILE_FLAGS([-fstack-protector])
+-            ;;
+-    esac
+-    AX_APPEND_LINK_FLAGS([-fPIE -pie])
+-    AX_APPEND_LINK_FLAGS([-Wl,-z,relro])
+-    AX_APPEND_LINK_FLAGS([-Wl,-z,now])
+-    AX_APPEND_LINK_FLAGS([-Wl,-z,noexecstack])
+ fi
+ AX_APPEND_COMPILE_FLAGS([-D_FORTIFY_SOURCE=2])
  
- AC_MSG_NOTICE([**************************************** libtool])
- LT_INIT([disable-static])
diff --git a/package/stunnel/patches/patch-src_verify_c b/package/stunnel/patches/patch-src_verify_c
index f326adf0b..f64f03950 100644
--- a/package/stunnel/patches/patch-src_verify_c
+++ b/package/stunnel/patches/patch-src_verify_c
@@ -1,5 +1,5 @@
---- stunnel-5.24.orig/src/verify.c	2015-09-23 12:00:08.000000000 +0200
-+++ stunnel-5.24/src/verify.c	2015-10-21 11:17:41.000000000 +0200
+--- stunnel-5.31.orig/src/verify.c	2016-02-19 20:18:43.000000000 +0100
++++ stunnel-5.31/src/verify.c	2016-03-13 13:30:11.000000000 +0100
 @@ -51,9 +51,6 @@ NOEXPORT int add_dir_lookup(X509_STORE *
  NOEXPORT int verify_callback(int, X509_STORE_CTX *);
  NOEXPORT int verify_checks(CLI *, int, X509_STORE_CTX *);
@@ -10,7 +10,7 @@
  NOEXPORT int cert_check_local(X509_STORE_CTX *);
  NOEXPORT int compare_pubkeys(X509 *, X509 *);
  #ifndef OPENSSL_NO_OCSP
-@@ -280,10 +277,6 @@ NOEXPORT int cert_check(CLI *c, X509_STO
+@@ -274,10 +271,6 @@ NOEXPORT int cert_check(CLI *c, X509_STO
      }
  
      if(depth==0) { /* additional peer certificate checks */
@@ -21,7 +21,7 @@
          if(c->opt->verify_level>=3 && !cert_check_local(callback_ctx))
              return 0; /* reject */
      }
-@@ -291,51 +284,6 @@ NOEXPORT int cert_check(CLI *c, X509_STO
+@@ -285,51 +278,6 @@ NOEXPORT int cert_check(CLI *c, X509_STO
      return 1; /* accept */
  }