From owner-svn-ports-all@FreeBSD.ORG Sat Jun 21 15:52:18 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3003EC29; Sat, 21 Jun 2014 15:52:18 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 10AD32D71; Sat, 21 Jun 2014 15:52:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5LFqH4D052546; Sat, 21 Jun 2014 15:52:17 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5LFqGb7052534; Sat, 21 Jun 2014 15:52:16 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201406211552.s5LFqGb7052534@svn.freebsd.org> From: William Grzybowski Date: Sat, 21 Jun 2014 15:52:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r358711 - in head/net/miniupnpd: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Jun 2014 15:52:18 -0000 Author: wg Date: Sat Jun 21 15:52:16 2014 New Revision: 358711 URL: http://svnweb.freebsd.org/changeset/ports/358711 QAT: https://qat.redports.org/buildarchive/r358711/ Log: net/miniupnpd: update to 1.8.20140523 - Expose more config options PR: 189061 Submitted by: razzfazz gmail com Approved by: maintainer Added: head/net/miniupnpd/files/enable_check_portinuse.patch (contents, props changed) head/net/miniupnpd/files/enable_igdv2.patch (contents, props changed) head/net/miniupnpd/files/enable_ipv6.patch (contents, props changed) head/net/miniupnpd/files/enable_leasefile.patch (contents, props changed) head/net/miniupnpd/files/enable_upnp_strict.patch (contents, props changed) head/net/miniupnpd/files/patch-Makefile (contents, props changed) Modified: head/net/miniupnpd/Makefile head/net/miniupnpd/distinfo Directory Properties: head/net/miniupnpd/files/miniupnpd.in (props changed) Modified: head/net/miniupnpd/Makefile ============================================================================== --- head/net/miniupnpd/Makefile Sat Jun 21 15:48:37 2014 (r358710) +++ head/net/miniupnpd/Makefile Sat Jun 21 15:52:16 2014 (r358711) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= miniupnpd -PORTVERSION= 1.8.20140310 +PORTVERSION= 1.8.20140523 PORTEPOCH= 1 CATEGORIES= net MASTER_SITES= http://miniupnp.tuxfamily.org/files/ \ @@ -15,17 +15,26 @@ SUB_FILES= miniupnpd.conf.sample SUB_LIST= UUID=${UUID} UUID!= uuidgen -FWNAME?= pf PLIST_FILES= etc/miniupnpd.conf.sample sbin/miniupnpd \ man/man8/miniupnpd.8.gz MAKE_JOBS_UNSAFE=yes USE_RC_SUBR= miniupnpd -OPTIONS_DEFINE= PF_ENABLE_FILTER_RULES +OPTIONS_DEFINE= PF_ENABLE_FILTER_RULES CHECK_PORTINUSE IPV6 UPNP_IGDV2 UPNP_STRICT LEASEFILE PF_ENABLE_FILTER_RULES_DESC= Enable pf generation of filter rules +CHECK_PORTINUSE_DESC= Check if ports are in use +IPV6_DESC= Enable IPv6 +UPNP_IGDV2_DESC= Build an IGDv2 instead of an IGDv1 +UPNP_STRICT_DESC= Be more strict regarding compliance with UPnP specifications +LEASEFILE_DESC= Enable lease file PF_ENABLE_FILTER_RULES_EXTRA_PATCHES= ${PATCHDIR}/pf_enable_filter_rules.patch +CHECK_PORTINUSE_EXTRA_PATCHES= ${PATCHDIR}/enable_check_portinuse.patch +IPV6_EXTRA_PATCHES= ${PATCHDIR}/enable_ipv6.patch +UPNP_IGDV2_EXTRA_PATCHES= ${PATCHDIR}/enable_igdv2.patch +UPNP_STRICT_EXTRA_PATCHES= ${PATCHDIR}/enable_upnp_strict.patch +LEASEFILE_EXTRA_PATCHES= ${PATCHDIR}/enable_leasefile.patch post-patch: @${REINPLACE_CMD} 's|CFLAGS ?= -pipe -Os|CFLAGS ?= -pipe|' \ Modified: head/net/miniupnpd/distinfo ============================================================================== --- head/net/miniupnpd/distinfo Sat Jun 21 15:48:37 2014 (r358710) +++ head/net/miniupnpd/distinfo Sat Jun 21 15:52:16 2014 (r358711) @@ -1,2 +1,2 @@ -SHA256 (miniupnpd-1.8.20140310.tar.gz) = 733530eee970bfc29f90b0a793612d2c721eb4f19f9c50f6d7677b6e0d59a726 -SIZE (miniupnpd-1.8.20140310.tar.gz) = 176585 +SHA256 (miniupnpd-1.8.20140523.tar.gz) = e72cd1e515aa9e6281e519e1814fe74e7689f5da71ce463a996a17e787ffe490 +SIZE (miniupnpd-1.8.20140523.tar.gz) = 190936 Added: head/net/miniupnpd/files/enable_check_portinuse.patch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/miniupnpd/files/enable_check_portinuse.patch Sat Jun 21 15:52:16 2014 (r358711) @@ -0,0 +1,11 @@ +--- genconfig.sh.orig 2014-04-22 00:37:51.000000000 -0700 ++++ genconfig.sh 2014-04-22 09:30:24.000000000 -0700 +@@ -401,7 +401,7 @@ + if [ -n "$PORTINUSE" ]; then + echo "#define CHECK_PORTINUSE" >> ${CONFIGFILE} + else +- echo "/*#define CHECK_PORTINUSE*/" >> ${CONFIGFILE} ++ echo "#define CHECK_PORTINUSE" >> ${CONFIGFILE} + fi + echo "" >> ${CONFIGFILE} + Added: head/net/miniupnpd/files/enable_igdv2.patch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/miniupnpd/files/enable_igdv2.patch Sat Jun 21 15:52:16 2014 (r358711) @@ -0,0 +1,11 @@ +--- genconfig.sh.orig 2014-04-11 01:16:49.000000000 -0700 ++++ genconfig.sh 2014-04-26 18:22:26.000000000 -0700 +@@ -436,7 +436,7 @@ + if [ -n "$IGD2" ]; then + echo "#define IGD_V2" >> ${CONFIGFILE} + else +- echo "/*#define IGD_V2*/" >> ${CONFIGFILE} ++ echo "#define IGD_V2" >> ${CONFIGFILE} + fi + echo "" >> ${CONFIGFILE} + Added: head/net/miniupnpd/files/enable_ipv6.patch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/miniupnpd/files/enable_ipv6.patch Sat Jun 21 15:52:16 2014 (r358711) @@ -0,0 +1,11 @@ +--- genconfig.sh.orig 2014-04-11 01:16:49.000000000 -0700 ++++ genconfig.sh 2014-04-26 18:23:04.000000000 -0700 +@@ -417,7 +417,7 @@ + if [ -n "$IPV6" ]; then + echo "#define ENABLE_IPV6" >> ${CONFIGFILE} + else +- echo "/*#define ENABLE_IPV6*/" >> ${CONFIGFILE} ++ echo "#define ENABLE_IPV6" >> ${CONFIGFILE} + fi + echo "" >> ${CONFIGFILE} + Added: head/net/miniupnpd/files/enable_leasefile.patch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/miniupnpd/files/enable_leasefile.patch Sat Jun 21 15:52:16 2014 (r358711) @@ -0,0 +1,11 @@ +--- genconfig.sh.orig 2014-04-22 00:37:51.000000000 -0700 ++++ genconfig.sh 2014-04-26 18:01:49.000000000 -0700 +@@ -393,7 +393,7 @@ + if [ -n "$LEASEFILE" ] ; then + echo "#define ENABLE_LEASEFILE" >> ${CONFIGFILE} + else +- echo "/*#define ENABLE_LEASEFILE*/" >> ${CONFIGFILE} ++ echo "#define ENABLE_LEASEFILE" >> ${CONFIGFILE} + fi + echo "" >> ${CONFIGFILE} + Added: head/net/miniupnpd/files/enable_upnp_strict.patch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/miniupnpd/files/enable_upnp_strict.patch Sat Jun 21 15:52:16 2014 (r358711) @@ -0,0 +1,11 @@ +--- genconfig.sh.orig 2014-04-11 01:16:49.000000000 -0700 ++++ genconfig.sh 2014-04-26 18:23:27.000000000 -0700 +@@ -472,7 +472,7 @@ + if [ -n "$STRICT" ] ; then + echo "#define UPNP_STRICT" >> ${CONFIGFILE} + else +- echo "/*#define UPNP_STRICT*/" >> ${CONFIGFILE} ++ echo "#define UPNP_STRICT" >> ${CONFIGFILE} + fi + echo "" >> ${CONFIGFILE} + Added: head/net/miniupnpd/files/patch-Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/miniupnpd/files/patch-Makefile Sat Jun 21 15:52:16 2014 (r358711) @@ -0,0 +1,51 @@ +--- Makefile.orig 2014-04-20 09:47:29.000000000 -0700 ++++ Makefile 2014-06-20 22:53:14.863342337 -0700 +@@ -15,7 +15,7 @@ + # $ CONFIG_OPTIONS="--ipv6 --igd2" make + # + +-CFLAGS ?= -pipe -Os ++CFLAGS ?= -pipe + #CFLAGS = -pipe -O -g -DDEBUG + #CFLAGS += -ansi + CFLAGS += -Wall +@@ -45,25 +45,36 @@ + .endif + + # better way to find if we are using ipf or pf +-.if exists(/etc/rc.subr) && exists(/etc/rc.conf) + .if $(OSNAME) == "FreeBSD" ++.if exists(/etc/rc.subr) && exists(/etc/rc.conf) + FWNAME != . /etc/rc.subr; . /etc/rc.conf; \ +- if checkyesno ipfilter_enable; then \ ++ if checkyesno firewall_enable; then \ ++ echo "ipfw"; elif checkyesno ipfilter_enable; then \ + echo "ipf"; elif checkyesno pf_enable; then \ +- echo "pf"; else echo "ipfw"; fi ++ echo "pf"; else echo "pf"; fi ++.else ++FWNAME = pf ++.endif + .endif + + .if $(OSNAME) == "NetBSD" ++.if exists(/etc/rc.subr) && exists(/etc/rc.conf) + FWNAME != . /etc/rc.subr; . /etc/rc.conf; \ + if checkyesno ipfilter; then \ + echo "ipf"; else echo "pf"; fi ++.else ++FWNAME = pf ++.endif + .endif + + .if $(OSNAME) == "DragonFly" ++.if exists(/etc/rc.subr) && exists(/etc/rc.conf) + FWNAME != . /etc/rc.subr; . /etc/rc.conf; \ + if checkyesno ipfilter; then \ + echo "ipf"; elif checkyesno pf_enable; then \ + echo "pf"; else echo "ipfw"; fi ++.else ++FWNAME = ipfw + .endif + .endif +