From owner-svn-ports-head@FreeBSD.ORG Thu Mar 6 16:59:29 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BEB5CDA8; Thu, 6 Mar 2014 16:59:29 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 9F314D07; Thu, 6 Mar 2014 16:59:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s26GxTtx097400; Thu, 6 Mar 2014 16:59:29 GMT (envelope-from zi@svn.freebsd.org) Received: (from zi@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s26GxSlu097395; Thu, 6 Mar 2014 16:59:28 GMT (envelope-from zi@svn.freebsd.org) Message-Id: <201403061659.s26GxSlu097395@svn.freebsd.org> From: Ryan Steinmetz Date: Thu, 6 Mar 2014 16:59:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r347278 - head/security/stunnel X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Mar 2014 16:59:29 -0000 Author: zi Date: Thu Mar 6 16:59:28 2014 New Revision: 347278 URL: http://svnweb.freebsd.org/changeset/ports/347278 QAT: https://qat.redports.org/buildarchive/r347278/ Log: - Update to 5.00 - Convert to STAGE - Use new OPTIONS magic Added: head/security/stunnel/pkg-message (contents, props changed) Modified: head/security/stunnel/Makefile head/security/stunnel/distinfo head/security/stunnel/pkg-plist (contents, props changed) Modified: head/security/stunnel/Makefile ============================================================================== --- head/security/stunnel/Makefile Thu Mar 6 16:45:33 2014 (r347277) +++ head/security/stunnel/Makefile Thu Mar 6 16:59:28 2014 (r347278) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= stunnel -PORTVERSION= 4.56 +PORTVERSION= 5.00 CATEGORIES= security MASTER_SITES= https://www.stunnel.org/downloads/%SUBDIR%/ \ http://mirrors.zerg.biz/stunnel/%SUBDIR%/ \ @@ -17,7 +17,6 @@ MASTER_SITES= https://www.stunnel.org/do http://stunnel.cybermirror.org/%SUBDIR%/ \ http://mirrors.zerg.biz/stunnel/%SUBDIR%/ \ http://mirrors.rit.edu/zi/ -MASTER_SITE_SUBDIR= . obsolete/4.x MAINTAINER= zi@FreeBSD.org COMMENT= SSL encryption wrapper for standard network daemons @@ -31,20 +30,26 @@ USE_RC_SUBR= stunnel USE_LDCONFIG= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --localstatedir=/var/tmp \ - --enable-static --disable-fips +CONFIGURE_ARGS= --localstatedir=/var/tmp --enable-static -OPTIONS_DEFINE= IPV6 LIBWRAP SSL_PORT -OPTIONS_SINGLE= THREAD -OPTIONS_SINGLE_THREAD= FORK PTHREAD UCONTEXT -OPTIONS_DEFAULT= PTHREAD - -SSL_PORT_DESC= Use OpenSSL from the ports collection -FORK_DESC= Use the fork(3) threading model -PTHREAD_DESC= Use the pthread(3) threading model -UCONTEXT_DESC= Use the ucontext(3) threading model +OPTIONS_DEFINE= IPV6 LIBWRAP SSL_PORT FIPS +OPTIONS_SINGLE= THREAD +OPTIONS_SINGLE_THREAD= FORK PTHREAD UCONTEXT +OPTIONS_DEFAULT= PTHREAD + +IPV6_CONFIGURE_ENABLE= ipv6 +LIBWRAP_CONFIGURE_ENABLE= libwrap +SSL_PORT_CONFIGURE_ON= --with-ssl="${OPENSSLBASE}" +SSL_PORT_CONFIGURE_OFF= --with-ssl=/usr +SSL_PORT_USE= OPENSSL=yes +FIPS_CONFIGURE_ENABLE= fips + +SSL_PORT_DESC= Use OpenSSL from the ports collection +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 -NO_STAGE= yes .include STUNNEL_USER?= stunnel @@ -53,29 +58,14 @@ STUNNEL_GROUP?= stunnel USERS= ${STUNNEL_USER} GROUPS= ${STUNNEL_GROUP} -MAN8= stunnel.8 stunnel.fr.8 stunnel.pl.8 - .if ${PORT_OPTIONS:MSSL_PORT} -USE_OPENSSL= YES WITH_OPENSSL_PORT= yes -CONFIGURE_ARGS+= --with-ssl="${OPENSSLBASE}" -.else -CONFIGURE_ARGS+= --with-ssl=/usr .endif .include -.if ${PORT_OPTIONS:MIPV6} -CONFIGURE_ARGS+= --enable-ipv6 -.else -CONFIGURE_ARGS+= --disable-ipv6 -.endif - .if ${PORT_OPTIONS:MLIBWRAP} -CONFIGURE_ARGS+= --enable-libwrap LDFLAGS+= -lwrap -.else -CONFIGURE_ARGS+= --disable-libwrap .endif .if ${PORT_OPTIONS:MUCONTEXT} @@ -112,15 +102,6 @@ post-patch: @${REINPLACE_CMD} -E -e 's|\$$\(docdir\)/examples|${EXAMPLESDIR}|g' ${WRKSRC}/tools/Makefile.in .endif -post-install: - @${ECHO} "" - @${ECHO} "**************************************************************************" - @${ECHO} "To create and install a new certificate, type \"make cert\"" - @${ECHO} "" - @${ECHO} "And don't forget to check out the FAQ at http://www.stunnel.org/" - @${ECHO} "**************************************************************************" - @${ECHO} "" - cert: @${ECHO} "" @${ECHO} "**************************************************************************" Modified: head/security/stunnel/distinfo ============================================================================== --- head/security/stunnel/distinfo Thu Mar 6 16:45:33 2014 (r347277) +++ head/security/stunnel/distinfo Thu Mar 6 16:59:28 2014 (r347278) @@ -1,2 +1,2 @@ -SHA256 (stunnel-4.56.tar.gz) = 9cae2cfbe26d87443398ce50d7d5db54e5ea363889d5d2ec8d2778a01c871293 -SIZE (stunnel-4.56.tar.gz) = 540032 +SHA256 (stunnel-5.00.tar.gz) = 88986d52a7ef1aff0cc26fc0a9830361c991baba7ee591d5cf1cc8baef75bc13 +SIZE (stunnel-5.00.tar.gz) = 586738 Added: head/security/stunnel/pkg-message ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/stunnel/pkg-message Thu Mar 6 16:59:28 2014 (r347278) @@ -0,0 +1,5 @@ +************************************************************************** +To create and install a new certificate, type "make cert" + +And don't forget to check out the FAQ at http://www.stunnel.org/ +************************************************************************** Modified: head/security/stunnel/pkg-plist ============================================================================== --- head/security/stunnel/pkg-plist Thu Mar 6 16:45:33 2014 (r347277) +++ head/security/stunnel/pkg-plist Thu Mar 6 16:59:28 2014 (r347278) @@ -1,9 +1,13 @@ +@comment $FreeBSD$ bin/stunnel bin/stunnel3 %%ETCDIR%%/stunnel.conf-sample lib/stunnel/libstunnel.a lib/stunnel/libstunnel.la lib/stunnel/libstunnel.so +man/man8/stunnel.8.gz +man/man8/stunnel.fr.8.gz +man/man8/stunnel.pl.8.gz %%PORTDOCS%%%%DOCSDIR%%/stunnel.html %%PORTDOCS%%%%DOCSDIR%%/stunnel.fr.html %%PORTDOCS%%%%DOCSDIR%%/stunnel.pl.html