From 6ba4239cd76952f9563dd8059e5b9d34f69a8678 Mon Sep 17 00:00:00 2001 From: Christian Neukirchen Date: Fri, 9 Oct 2015 14:28:48 +0200 Subject: [PATCH] stunnel: update to 5.24. --- srcpkgs/stunnel/patches/stunnel-libressl.patch | 18 ------------------ srcpkgs/stunnel/template | 5 +++-- 2 files changed, 3 insertions(+), 20 deletions(-) diff --git a/srcpkgs/stunnel/patches/stunnel-libressl.patch b/srcpkgs/stunnel/patches/stunnel-libressl.patch index 6ed92b067c0..359b417d7fa 100644 --- a/srcpkgs/stunnel/patches/stunnel-libressl.patch +++ b/srcpkgs/stunnel/patches/stunnel-libressl.patch @@ -1,21 +1,3 @@ ---- src/ssl.c 2014-07-12 06:13:07.356889656 +0000 -+++ src/ssl.c 2014-07-12 06:15:39.032889896 +0000 -@@ -195,6 +195,7 @@ - } - s_log(LOG_DEBUG, "RAND_screen failed to sufficiently seed PRNG"); - #else -+#ifdef HAVE_RAND_EGD - if(global->egd_sock) { - if((bytes=RAND_egd(global->egd_sock))==-1) { - s_log(LOG_WARNING, "EGD Socket %s failed", global->egd_sock); -@@ -207,6 +208,7 @@ - so no need to check if seeded sufficiently */ - } - } -+#endif - /* try the good-old default /dev/urandom, if available */ - totbytes+=add_rand_file(global, "/dev/urandom"); - if(RAND_status()) --- src/verify.c.orig 2015-04-24 12:13:40.887968414 +0200 +++ src/verify.c 2015-04-24 12:16:03.379359153 +0200 @@ -48,7 +48,7 @@ diff --git a/srcpkgs/stunnel/template b/srcpkgs/stunnel/template index 14a08799b04..6cbfe503892 100644 --- a/srcpkgs/stunnel/template +++ b/srcpkgs/stunnel/template @@ -1,10 +1,11 @@ # Template file for 'stunnel' pkgname=stunnel -version=5.23 +version=5.24 revision=1 build_style=gnu-configure build_pie=yes configure_args="--enable-ipv6 --with-ssl=${XBPS_CROSS_BASE}/usr" +CFLAGS="-DOPENSSL_NO_EGD" hostmakedepends="perl" makedepends="libressl-devel" short_desc="SSL encryption wrapper" @@ -12,7 +13,7 @@ maintainer="Christian Neukirchen " license="GPL-2" homepage="https://www.stunnel.org/" distfiles="https://www.stunnel.org/downloads/${pkgname}-${version}.tar.gz" -checksum=0fc4a702afd2e857bae8ad1f39c51546eb282c3d0ff4f4d55d62aece7328ddea +checksum=ab2e5a1034d422951ddad21b572eb7fa8efb4c4ce04bc86536c6845f3d02b07e post_install() { rm ${DESTDIR}/usr/share/man/man8/stunnel.??.8