wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-07-29 08:52:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

stunnel: update to 5.39.

Browse source
This commit is contained in:
Toyam Cox 2017-01-25 00:26:15 -05:00
parent 55a384ab2f
commit fb9fd1ffef
3 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
srcpkgs/stunnel/patches/stunnel-5.39.patch Normal file
View file

@ -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

9
srcpkgs/stunnel/patches/stunnel-openbsd.patch
View file

@ -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 $ $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.orig Fri Aug 5 06:39:57 2016
+++ src/ssl.c Thu Nov 3 23:50:50 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 @@ -83,7 +83,7 @@ int ssl_init(void) { /* init SSL before parsing config
} }

6
srcpkgs/stunnel/template
View file

@ -1,6 +1,6 @@
# Template file for 'stunnel' # Template file for 'stunnel'
pkgname=stunnel pkgname=stunnel
version=5.38 version=5.39
revision=1 revision=1
build_style=gnu-configure build_style=gnu-configure
configure_args="--enable-ipv6 --with-ssl=${XBPS_CROSS_BASE}/usr" configure_args="--enable-ipv6 --with-ssl=${XBPS_CROSS_BASE}/usr"
@ -11,7 +11,7 @@ maintainer="Toyam Cox <Vaelatern@gmail.com>"
license="GPL-2" license="GPL-2"
homepage="https://www.stunnel.org/" homepage="https://www.stunnel.org/"
distfiles="https://www.stunnel.org/downloads/archive/5.x/${pkgname}-${version}.tar.gz" distfiles="https://www.stunnel.org/downloads/archive/5.x/${pkgname}-${version}.tar.gz"
checksum=09ada29ba1683ab1fd1f31d7bed8305127a0876537e836a40cb83851da034fd5 checksum=288c087a50465390d05508068ac76c8418a21fae7275febcc63f041ec5b04dee
post_install() { post_install() {
rm ${DESTDIR}/usr/share/man/man8/stunnel.??.8 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. # 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 # As of 5.38 the signature expected for the CRYPTO_set_mem_functions seems to
# be out of line with what libressl provides. # 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. # This is probably not a security problem.