From fb9fd1ffef2e90ecc5d998208eb3e201176f5c94 Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@gmail.com>
Date: Wed, 25 Jan 2017 00:26:15 -0500
Subject: [PATCH] stunnel: update to 5.39.

---
 srcpkgs/stunnel/patches/stunnel-5.39.patch    | 11 +++++++++++
 srcpkgs/stunnel/patches/stunnel-openbsd.patch |  9 ---------
 srcpkgs/stunnel/template                      |  6 +++---
 3 files changed, 14 insertions(+), 12 deletions(-)
 create mode 100644 srcpkgs/stunnel/patches/stunnel-5.39.patch

diff --git a/srcpkgs/stunnel/patches/stunnel-5.39.patch b/srcpkgs/stunnel/patches/stunnel-5.39.patch
new file mode 100644
index 00000000000..d93fccb9eb9
--- /dev/null
+++ b/srcpkgs/stunnel/patches/stunnel-5.39.patch
@@ -0,0 +1,11 @@
+--- src/ssl.c.orig	2017-01-25 00:19:22.320035678 -0500
++++ src/ssl.c	2017-01-25 00:19:26.536104001 -0500
+@@ -50,7 +50,7 @@
+ int index_cli, index_opt, index_redirect, index_addr;
+ 
+ int ssl_init(void) { /* init TLS before parsing configuration file */
+-#if OPENSSL_VERSION_NUMBER>=0x10100000L
++#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+     OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS |
+         OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL);
+ #else
diff --git a/srcpkgs/stunnel/patches/stunnel-openbsd.patch b/srcpkgs/stunnel/patches/stunnel-openbsd.patch
index 1c9bf5b690d..1ff82df299f 100644
--- a/srcpkgs/stunnel/patches/stunnel-openbsd.patch
+++ b/srcpkgs/stunnel/patches/stunnel-openbsd.patch
@@ -28,15 +28,6 @@ $OpenBSD: patch-src_sthreads_c,v 1.2 2016/11/10 10:10:50 gsoares Exp $
 $OpenBSD: patch-src_ssl_c,v 1.4 2016/11/09 23:14:31 gsoares Exp $
 --- src/ssl.c.orig	Fri Aug  5 06:39:57 2016
 +++ src/ssl.c	Thu Nov  3 23:50:50 2016
-@@ -50,7 +50,7 @@ NOEXPORT int add_rand_file(GLOBAL_OPTIONS *, const cha
- int index_cli, index_opt, index_redirect, index_addr;
- 
- int ssl_init(void) { /* init SSL before parsing configuration file */
--#if OPENSSL_VERSION_NUMBER>=0x10100000L
-+#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-     OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS |
-         OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL);
- #else
 @@ -83,7 +83,7 @@ int ssl_init(void) { /* init SSL before parsing config
  }
  
diff --git a/srcpkgs/stunnel/template b/srcpkgs/stunnel/template
index 3af37525f8f..d61ff5435d3 100644
--- a/srcpkgs/stunnel/template
+++ b/srcpkgs/stunnel/template
@@ -1,6 +1,6 @@
 # Template file for 'stunnel'
 pkgname=stunnel
-version=5.38
+version=5.39
 revision=1
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-ssl=${XBPS_CROSS_BASE}/usr"
@@ -11,7 +11,7 @@ maintainer="Toyam Cox <Vaelatern@gmail.com>"
 license="GPL-2"
 homepage="https://www.stunnel.org/"
 distfiles="https://www.stunnel.org/downloads/archive/5.x/${pkgname}-${version}.tar.gz"
-checksum=09ada29ba1683ab1fd1f31d7bed8305127a0876537e836a40cb83851da034fd5
+checksum=288c087a50465390d05508068ac76c8418a21fae7275febcc63f041ec5b04dee
 
 post_install() {
 	rm ${DESTDIR}/usr/share/man/man8/stunnel.??.8
@@ -29,5 +29,5 @@ post_install() {
 # modify the configuration samples to chroot and use this by default.
 # As of 5.38 the signature expected for the CRYPTO_set_mem_functions seems to
 # be out of line with what libressl provides.
-# LibreSSL wants 'void (*)(void *)' but argument is of type 'void (*)(void *, const c har *, int)'
+# LibreSSL wants 'void (*)(void *)' but argument is of type 'void (*)(void *, const char *, int)'
 # This is probably not a security problem.