Index: head/security/stunnel/Makefile =================================================================== --- head/security/stunnel/Makefile (revision 432634) +++ head/security/stunnel/Makefile (revision 432635) @@ -1,119 +1,123 @@ # Created by: Martti Kuparinen # $FreeBSD$ PORTNAME= stunnel -PORTVERSION= 5.39 +PORTVERSION= 5.40 PORTEPOCH= 1 CATEGORIES= security MASTER_SITES= https://www.stunnel.org/downloads/%SUBDIR%/ \ https://www.stunnel.org/downloads/beta/ \ http://mirrors.zerg.biz/stunnel/%SUBDIR%/ \ http://mirrors.go-part.com/stunnel/%SUBDIR%/ \ http://ftp.nluug.nl/pub/networking/stunnel/%SUBDIR%/ \ ftp://ftp.nluug.nl/pub/networking/stunnel/%SUBDIR%/ \ http://ftp.nluug.nl/pub/networking/stunnel/%SUBDIR%/ \ ftp://ftp.surfnet.nl/pub/networking/stunnel/%SUBDIR%/ \ http://ftp.surfnet.nl/pub/networking/stunnel/%SUBDIR%/ \ ftp://stunnel.mirt.net/stunnel/%SUBDIR%/ \ http://www.namesdir.com/mirrors/stunnel/%SUBDIR%/ \ http://stunnel.cybermirror.org/%SUBDIR%/ \ http://mirrors.zerg.biz/stunnel/%SUBDIR%/ \ http://mirrors.rit.edu/zi/ MAINTAINER= zi@FreeBSD.org COMMENT= SSL encryption wrapper for standard network daemons # FIXME: IMHO, there really ought to be a GPL-2+ option or some such. LICENSE= GPLv2 GPLv3 LICENSE_COMB= dual 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 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_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|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} ${FILESDIR}/pid.conf ${STAGEDIR}${ETCDIR}/conf.d/ cert: @${ECHO} "" @${ECHO} "**************************************************************************" @${ECHO} "The new certificate will be saved into ${ETCDIR}/stunnel.pem" @${ECHO} "**************************************************************************" @${ECHO} "" @(cd ${WRKSRC}/tools/; make install-data-local) .include Index: head/security/stunnel/distinfo =================================================================== --- head/security/stunnel/distinfo (revision 432634) +++ head/security/stunnel/distinfo (revision 432635) @@ -1,3 +1,3 @@ -TIMESTAMP = 1483375978 -SHA256 (stunnel-5.39.tar.gz) = 288c087a50465390d05508068ac76c8418a21fae7275febcc63f041ec5b04dee -SIZE (stunnel-5.39.tar.gz) = 647101 +TIMESTAMP = 1485624002 +SHA256 (stunnel-5.40.tar.gz) = 23acdb390326ffd507d90f8984ecc90e0d9993f6bd6eac1d0a642456565c45ff +SIZE (stunnel-5.40.tar.gz) = 648828 Index: head/security/stunnel/files/pid.conf =================================================================== --- head/security/stunnel/files/pid.conf (nonexistent) +++ head/security/stunnel/files/pid.conf (revision 432635) @@ -0,0 +1 @@ +pid = /var/run/stunnel.pid Property changes on: head/security/stunnel/files/pid.conf ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/stunnel/pkg-plist =================================================================== --- head/security/stunnel/pkg-plist (revision 432634) +++ head/security/stunnel/pkg-plist (revision 432635) @@ -1,37 +1,39 @@ bin/stunnel bin/stunnel3 %%ETCDIR%%/stunnel.conf-sample +%%ETCDIR%%/conf.d/pid.conf lib/stunnel/libstunnel.a lib/stunnel/libstunnel.so man/man8/stunnel.8.gz man/man8/stunnel.pl.8.gz %%PORTDOCS%%%%DOCSDIR%%/stunnel.html %%PORTDOCS%%%%DOCSDIR%%/stunnel.pl.html %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ca.html %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ca.pl %%PORTEXAMPLES%%%%EXAMPLESDIR%%/importCA.html %%PORTEXAMPLES%%%%EXAMPLESDIR%%/importCA.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/script.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/stunnel.init %%PORTEXAMPLES%%%%EXAMPLESDIR%%/stunnel.service %%PORTEXAMPLES%%%%EXAMPLESDIR%%/stunnel.spec @comment %%PORTEXAMPLES%%%%EXAMPLESDIR%%/stunnel.logrotate @comment %%PORTEXAMPLES%%%%EXAMPLESDIR%%/stunnel.rh.init %%PORTEXAMPLES%%@dir %%EXAMPLESDIR%% %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/BUGS %%PORTDOCS%%%%DOCSDIR%%/ChangeLog %%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT.GPL %%PORTDOCS%%%%DOCSDIR%%/CREDITS %%PORTDOCS%%%%DOCSDIR%%/INSTALL %%PORTDOCS%%%%DOCSDIR%%/INSTALL.FIPS %%PORTDOCS%%%%DOCSDIR%%/INSTALL.W32 %%PORTDOCS%%%%DOCSDIR%%/INSTALL.WCE %%PORTDOCS%%%%DOCSDIR%%/PORTS %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/TODO %%PORTDOCS%%@dir %%DOCSDIR%% @dir lib/stunnel @dir etc/stunnel +@dir etc/stunnel/conf.d @unexec if [ -d %D/etc/stunnel ]; then echo "If you are permanently removing this port, you should run ``rm -rf %D/etc/stunnel`` to remove any configuration files left."; fi