From 2f91d893b67bddaf36e521602f2d8a1c36b2876c Mon Sep 17 00:00:00 2001 From: maxice8 Date: Sun, 8 Oct 2017 17:15:26 -0300 Subject: [PATCH] stunnel: update to 5.42. --- srcpkgs/stunnel/patches/stunnel-openbsd.patch | 24 ------------------- srcpkgs/stunnel/template | 6 ++--- 2 files changed, 3 insertions(+), 27 deletions(-) diff --git a/srcpkgs/stunnel/patches/stunnel-openbsd.patch b/srcpkgs/stunnel/patches/stunnel-openbsd.patch index e60fae630ad..9ee8a9271a1 100644 --- a/srcpkgs/stunnel/patches/stunnel-openbsd.patch +++ b/srcpkgs/stunnel/patches/stunnel-openbsd.patch @@ -38,30 +38,6 @@ $OpenBSD: patch-src_ssl_c,v 1.4 2016/11/09 23:14:31 gsoares Exp $ int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g) { $OpenBSD: patch-src_prototypes_h,v 1.2 2016/11/10 10:10:50 gsoares Exp $ ---- src/prototypes.h.orig Sat Oct 29 05:25:37 2016 -+++ src/prototypes.h Wed Nov 9 20:22:39 2016 -@@ -660,13 +660,13 @@ typedef enum { - #endif /* OPENSSL_NO_DH */ - STUNNEL_LOCKS /* number of locks */ - } LOCK_TYPE; --#if OPENSSL_VERSION_NUMBER < 0x10100004L -+#if OPENSSL_VERSION_NUMBER < 0x10100004L || defined(LIBRESSL_VERSION_NUMBER) - typedef int STUNNEL_RWLOCK; - #else - typedef CRYPTO_RWLOCK *STUNNEL_RWLOCK; - #endif - extern STUNNEL_RWLOCK stunnel_locks[STUNNEL_LOCKS]; --#if OPENSSL_VERSION_NUMBER>=0x10100004L -+#if OPENSSL_VERSION_NUMBER>=0x10100004L && !defined(LIBRESSL_VERSION_NUMBER) - #define CRYPTO_THREAD_read_unlock(type) CRYPTO_THREAD_unlock(type) - #define CRYPTO_THREAD_write_unlock(type) CRYPTO_THREAD_unlock(type) - #else - -$OpenBSD: patch-src_options_c,v 1.7 2016/11/09 23:14:31 gsoares Exp $ - -use SSLv23_client_method() required to build with libressl since that it haven't -TLS_client_method() for now. - --- src/options.c.orig Fri Aug 5 06:39:57 2016 +++ src/options.c Thu Nov 3 23:13:15 2016 @@ -2617,7 +2617,7 @@ NOEXPORT char *parse_service_option(CMD cmd, SERVICE_O diff --git a/srcpkgs/stunnel/template b/srcpkgs/stunnel/template index 77f5c4a74ee..658fa145ca8 100644 --- a/srcpkgs/stunnel/template +++ b/srcpkgs/stunnel/template @@ -1,7 +1,7 @@ # Template file for 'stunnel' pkgname=stunnel -version=5.41 -revision=2 +version=5.42 +revision=1 build_style=gnu-configure configure_args="--enable-ipv6 --with-ssl=${XBPS_CROSS_BASE}/usr" hostmakedepends="perl" @@ -11,7 +11,7 @@ maintainer="Toyam Cox " license="GPL-2" homepage="https://www.stunnel.org/" distfiles="https://www.stunnel.org/downloads/archive/5.x/${pkgname}-${version}.tar.gz" -checksum=f05c6321ee1f6ddebacc234ccf20825971941e831b5beea6d0ce0b8e1668148f +checksum=1b6a7aea5ca223990bc8bd621fb0846baa4278e1b3e00ff6eee279cb8e540fab post_install() { rm ${DESTDIR}/usr/share/man/man8/stunnel.??.8