Page MenuHomeFreeBSD

D2694.id.diff
No OneTemporary

D2694.id.diff

Index: head/security/stunnel/Makefile
===================================================================
--- head/security/stunnel/Makefile
+++ head/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 @@
--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 @@
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
Index: head/security/stunnel/distinfo
===================================================================
--- head/security/stunnel/distinfo
+++ head/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

File Metadata

Mime Type
text/plain
Expires
Mon, Feb 2, 6:51 AM (7 h, 20 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28410526
Default Alt Text
D2694.id.diff (1 KB)

Event Timeline