aboutsummaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorbrnrd <brnrd@FreeBSD.org>2015-10-09 03:38:53 +0800
committerbrnrd <brnrd@FreeBSD.org>2015-10-09 03:38:53 +0800
commit8fea5971ab008370ef5c1048a568cb4d5416de78 (patch)
treead6b31aac98cb9f0a88eb9d5d74c83f98ca6c2f3 /security
parent42b99968f433937a536f004e452fb7238261a92b (diff)
downloadfreebsd-ports-gnome-8fea5971ab008370ef5c1048a568cb4d5416de78.tar.gz
freebsd-ports-gnome-8fea5971ab008370ef5c1048a568cb4d5416de78.tar.zst
freebsd-ports-gnome-8fea5971ab008370ef5c1048a568cb4d5416de78.zip
security/stunnel: Update to 5.24
- Supports building without EGD - Order options alphabetical Reviewed by: koobs (mentor), zi (maintainer) Approved by: zi (maintainer) PR: 198997 Differential Revision: https://reviews.freebsd.org/D2694
Diffstat (limited to 'security')
-rw-r--r--security/stunnel/Makefile16
-rw-r--r--security/stunnel/distinfo4
2 files changed, 14 insertions, 6 deletions
diff --git a/security/stunnel/Makefile b/security/stunnel/Makefile
index 5869afbb9116..175b306085d7 100644
--- a/security/stunnel/Makefile
+++ b/security/stunnel/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= stunnel
-PORTVERSION= 5.23
+PORTVERSION= 5.24
CATEGORIES= security
MASTER_SITES= https://www.stunnel.org/downloads/%SUBDIR%/ \
http://mirrors.zerg.biz/stunnel/%SUBDIR%/ \
@@ -36,19 +36,19 @@ CONFIGURE_ARGS= --localstatedir=/var/tmp --enable-static --disable-systemd \
--with-ssl="${OPENSSLBASE}"
SHEBANG_FILES= src/stunnel3.in
-OPTIONS_DEFINE= IPV6 LIBWRAP FIPS DOCS EXAMPLES
+OPTIONS_DEFINE= DOCS EXAMPLES FIPS IPV6 LIBWRAP
OPTIONS_SINGLE= THREAD
OPTIONS_SINGLE_THREAD= FORK PTHREAD UCONTEXT
OPTIONS_DEFAULT= PTHREAD
+FIPS_CONFIGURE_ENABLE= fips
IPV6_CONFIGURE_ENABLE= ipv6
LIBWRAP_CONFIGURE_ENABLE= libwrap
-FIPS_CONFIGURE_ENABLE= fips
+FIPS_DESC= Enable OpenSSL FIPS mode
FORK_DESC= Use the fork(3) threading model
PTHREAD_DESC= Use the pthread(3) threading model
UCONTEXT_DESC= Use the ucontext(3) threading model
-FIPS_DESC= Enable OpenSSL FIPS mode
STUNNEL_USER?= stunnel
STUNNEL_GROUP?= stunnel
@@ -72,6 +72,14 @@ CONFIGURE_ARGS+=--with-threads=pthread
LDFLAGS+= -lpthread
.endif
+.if ${PORT_OPTIONS:MFIPS} && "${OPENSSL_PORT}" == "security/libressl"
+IGNORE= LibreSSL does not support FIPS standard
+.endif
+
+.if "${OPENSSL_PORT}" == "security/libressl"
+NO_PACKAGE= The stunnel license restricts distribution when linked to non-OpenSSL non-base SSL-libraries
+.endif
+
post-patch:
# place files under /var/tmp so that this can be run by an unprivileged
# user stunnel and group stunnel
diff --git a/security/stunnel/distinfo b/security/stunnel/distinfo
index e8b4d88581ed..7232995c1a8f 100644
--- a/security/stunnel/distinfo
+++ b/security/stunnel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (stunnel-5.23.tar.gz) = 0fc4a702afd2e857bae8ad1f39c51546eb282c3d0ff4f4d55d62aece7328ddea
-SIZE (stunnel-5.23.tar.gz) = 630943
+SHA256 (stunnel-5.24.tar.gz) = ab2e5a1034d422951ddad21b572eb7fa8efb4c4ce04bc86536c6845f3d02b07e
+SIZE (stunnel-5.24.tar.gz) = 631730