diff --git a/security/stunnel/Makefile b/security/stunnel/Makefile index 1243839959fd..305f8dc07aff 100644 --- a/security/stunnel/Makefile +++ b/security/stunnel/Makefile @@ -1,118 +1,116 @@ PORTNAME= stunnel -DISTVERSION= 5.65 +DISTVERSION= 5.67 PORTEPOCH= 1 CATEGORIES= security MASTER_SITES= https://www.stunnel.org/downloads/archive/5.x/ \ https://ftp.nluug.nl/pub/networking/stunnel/archive/5.x/ \ - http://ftp.nluug.nl/pub/networking/stunnel/archive/5.x/ + http://www.usenix.org.uk/mirrors/stunnel/archive/5.x/ MAINTAINER= zi@FreeBSD.org COMMENT= SSL encryption wrapper for standard network daemons WWW= https://www.stunnel.org/ -# FIXME: IMHO, there really ought to be a GPL-2+ option or some such. -LICENSE= GPLv2 GPLv3 -LICENSE_COMB= dual +LICENSE= GPLv2+ BROKEN_SSL= libressl libressl-devel BROKEN_SSL_REASON= missing upstream support USES= cpe libtool perl5 shebangfix ssl USE_PERL5= build USE_LDCONFIG= yes USE_RC_SUBR= stunnel GNU_CONFIGURE= yes CONFIGURE_ARGS= --localstatedir=/var/tmp --enable-static --disable-systemd \ --with-ssl="${OPENSSLBASE}" SHEBANG_FILES= src/stunnel3.in SUB_FILES= daemon.conf SUB_LIST= STUNNEL_PIDFILE=${STUNNEL_PIDFILE} \ STUNNEL_USER=${STUNNEL_USER} \ STUNNEL_GROUP=${STUNNEL_GROUP} 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_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 STUNNEL_PIDFILE=/var/run/stunnel/stunnel.pid STUNNEL_USER?= stunnel STUNNEL_GROUP?= stunnel USERS= ${STUNNEL_USER} GROUPS= ${STUNNEL_GROUP} .include .if ${PORT_OPTIONS:MLIBWRAP} LDFLAGS+= -lwrap .endif .if ${PORT_OPTIONS:MUCONTEXT} CONFIGURE_ARGS+=--with-threads=ucontext LDFLAGS+= -lpthread .elif ${PORT_OPTIONS:MFORK} CONFIGURE_ARGS+=--with-threads=fork .else CONFIGURE_ARGS+=--with-threads=pthread LDFLAGS+= -lpthread .endif .include .if ${PORT_OPTIONS:MFIPS} && ${SSL_DEFAULT:Mlibressl*} IGNORE= LibreSSL does not support FIPS standard .endif .if ${SSL_DEFAULT:Mlibressl*} 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 @${REINPLACE_CMD} -E -e 's|\@prefix\@/var/lib/stunnel/|/var/tmp/stunnel|; \ s|nobody|stunnel|;s|nogroup|stunnel|;s|;include |include |' \ ${WRKSRC}/tools/stunnel.conf-sample.in @${REINPLACE_CMD} -E -e 's|\$$\(prefix\)/var/run/stunnel/stunnel.pid|$$(localstatedir)/stunnel.pid|' \ ${WRKSRC}/src/Makefile.in @${FIND} ${WRKSRC} -type f -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -E -e 's,@(ACLOCAL|AUTO(MAKE|CONF|HEADER))@,/usr/bin/true,' @${REINPLACE_CMD} -E -e 's|install-confDATA install-data-local|install-confDATA|g' \ ${WRKSRC}/tools/Makefile.in .if empty(PORT_OPTIONS:MDOCS) @${REINPLACE_CMD} -E -e 's/ install-docDATA/ /' ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -E -e '/install-data-am/s,install-docDATA,,' ${WRKSRC}/doc/Makefile.in .endif .if empty(PORT_OPTIONS:MEXAMPLES) @${REINPLACE_CMD} -E -e 's/([^n])install-examplesDATA/\1/' \ ${WRKSRC}/tools/Makefile.in .else @${REINPLACE_CMD} -E -e 's|\$$\(docdir\)/examples|${EXAMPLESDIR}|g' ${WRKSRC}/tools/Makefile.in .endif post-build: @${STRIP_CMD} ${WRKSRC}/src/.libs/libstunnel.so post-install: ${MKDIR} ${STAGEDIR}${ETCDIR}/conf.d/ ${INSTALL_DATA} ${WRKDIR}/daemon.conf ${STAGEDIR}${ETCDIR}/conf.d/00-daemon.conf cert: @${ECHO} "" @${ECHO} "**************************************************************************" @${ECHO} "The new certificate will be saved into ${ETCDIR}/stunnel.pem" @${ECHO} "**************************************************************************" @${ECHO} "" @(cd ${WRKSRC}/tools/; make cert) .include diff --git a/security/stunnel/distinfo b/security/stunnel/distinfo index 404e9e9270b2..e395762d0358 100644 --- a/security/stunnel/distinfo +++ b/security/stunnel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1658088789 -SHA256 (stunnel-5.65.tar.gz) = 60c500063bd1feff2877f5726e38278c086f96c178f03f09d264a2012d6bf7fc -SIZE (stunnel-5.65.tar.gz) = 872293 +TIMESTAMP = 1670228606 +SHA256 (stunnel-5.67.tar.gz) = 3086939ee6407516c59b0ba3fbf555338f9d52f459bcab6337c0f00e91ea8456 +SIZE (stunnel-5.67.tar.gz) = 881256 diff --git a/security/stunnel/files/patch-src_client.c b/security/stunnel/files/patch-src_client.c deleted file mode 100644 index 181ffc5fa946..000000000000 --- a/security/stunnel/files/patch-src_client.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/client.c.orig 2022-07-17 20:37:11 UTC -+++ src/client.c -@@ -77,6 +77,8 @@ NOEXPORT int redirect(CLI *); - NOEXPORT void print_bound_address(CLI *); - NOEXPORT void reset(SOCKET, const char *); - -+extern char **environ; -+ - /* allocate local data structure for the new thread */ - CLI *alloc_client_session(SERVICE_OPTIONS *opt, SOCKET rfd, SOCKET wfd) { - static unsigned long long seq=0;