Date: Sat, 28 Jan 2017 17:23:51 +0000 (UTC) From: Ryan Steinmetz <zi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r432635 - in head/security/stunnel: . files Message-ID: <201701281723.v0SHNpm9089431@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: zi Date: Sat Jan 28 17:23:50 2017 New Revision: 432635 URL: https://svnweb.freebsd.org/changeset/ports/432635 Log: - Update to 5.40 - Set default pid location via stunnel's conf.d directory structure Added: head/security/stunnel/files/pid.conf (contents, props changed) Modified: head/security/stunnel/Makefile head/security/stunnel/distinfo head/security/stunnel/pkg-plist Modified: head/security/stunnel/Makefile ============================================================================== --- head/security/stunnel/Makefile Sat Jan 28 17:05:59 2017 (r432634) +++ head/security/stunnel/Makefile Sat Jan 28 17:23:50 2017 (r432635) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= stunnel -PORTVERSION= 5.39 +PORTVERSION= 5.40 PORTEPOCH= 1 CATEGORIES= security MASTER_SITES= https://www.stunnel.org/downloads/%SUBDIR%/ \ @@ -87,7 +87,7 @@ 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 @@ -108,6 +108,10 @@ post-patch: 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} "**************************************************************************" Modified: head/security/stunnel/distinfo ============================================================================== --- head/security/stunnel/distinfo Sat Jan 28 17:05:59 2017 (r432634) +++ head/security/stunnel/distinfo Sat Jan 28 17:23:50 2017 (r432635) @@ -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 Added: head/security/stunnel/files/pid.conf ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/stunnel/files/pid.conf Sat Jan 28 17:23:50 2017 (r432635) @@ -0,0 +1 @@ +pid = /var/run/stunnel.pid Modified: head/security/stunnel/pkg-plist ============================================================================== --- head/security/stunnel/pkg-plist Sat Jan 28 17:05:59 2017 (r432634) +++ head/security/stunnel/pkg-plist Sat Jan 28 17:23:50 2017 (r432635) @@ -1,6 +1,7 @@ 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 @@ -34,4 +35,5 @@ man/man8/stunnel.pl.8.gz %%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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701281723.v0SHNpm9089431>