From owner-freebsd-ports-bugs@FreeBSD.ORG Sat May 24 05:30:01 2014 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.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 480BCB77 for ; Sat, 24 May 2014 05:30:01 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (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 2A0A32AD2 for ; Sat, 24 May 2014 05:30:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.8/8.14.8) with ESMTP id s4O5U1Dx055064 for ; Sat, 24 May 2014 05:30:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s4O5U0E0055062; Sat, 24 May 2014 05:30:00 GMT (envelope-from gnats) Date: Sat, 24 May 2014 05:30:00 GMT Message-Id: <201405240530.s4O5U0E0055062@freefall.freebsd.org> To: freebsd-ports-bugs@FreeBSD.org Cc: From: Daniel Becker Subject: Re: ports/189061: [PATCH] net/miniupnpd: update to 20140523 and expose more config options Reply-To: Daniel Becker X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 May 2014 05:30:01 -0000 The following reply was made to PR ports/189061; it has been noted by GNATS. From: Daniel Becker To: bug-followup@FreeBSD.org Cc: Tor Halvard Furulund Subject: Re: ports/189061: [PATCH] net/miniupnpd: update to 20140523 and expose more config options Date: Fri, 23 May 2014 22:23:10 -0700 --Apple-Mail=_4A7BDF36-3DAA-40E9-A990-C2059BDF429C Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii In the meantime, upstream has been updated to 1.8-20140523. Updated = patch attached. --Apple-Mail=_4A7BDF36-3DAA-40E9-A990-C2059BDF429C Content-Disposition: attachment; filename=miniupnpd.patch Content-Type: application/octet-stream; name="miniupnpd.patch" Content-Transfer-Encoding: 7bit diff -ruN miniupnpd.orig/Makefile miniupnpd/Makefile --- miniupnpd.orig/Makefile 2014-04-04 06:55:54.000000000 -0700 +++ miniupnpd/Makefile 2014-05-23 22:16:52.402526650 -0700 @@ -2,7 +2,7 @@ # $FreeBSD: head/net/miniupnpd/Makefile 350123 2014-04-04 13:55:54Z bapt $ PORTNAME= miniupnpd -PORTVERSION= 1.8.20140310 +PORTVERSION= 1.8.20140523 PORTEPOCH= 1 CATEGORIES= net MASTER_SITES= http://miniupnp.tuxfamily.org/files/ \ @@ -22,10 +22,20 @@ 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|' \ diff -ruN miniupnpd.orig/distinfo miniupnpd/distinfo --- miniupnpd.orig/distinfo 2014-03-15 06:38:35.000000000 -0700 +++ miniupnpd/distinfo 2014-05-23 22:18:21.833539979 -0700 @@ -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 diff -ruN miniupnpd.orig/files/enable_check_portinuse.patch miniupnpd/files/enable_check_portinuse.patch --- miniupnpd.orig/files/enable_check_portinuse.patch 1969-12-31 16:00:00.000000000 -0800 +++ miniupnpd/files/enable_check_portinuse.patch 2014-05-23 22:16:52.403525136 -0700 @@ -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} + diff -ruN miniupnpd.orig/files/enable_igdv2.patch miniupnpd/files/enable_igdv2.patch --- miniupnpd.orig/files/enable_igdv2.patch 1969-12-31 16:00:00.000000000 -0800 +++ miniupnpd/files/enable_igdv2.patch 2014-05-23 22:16:52.403525136 -0700 @@ -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} + diff -ruN miniupnpd.orig/files/enable_ipv6.patch miniupnpd/files/enable_ipv6.patch --- miniupnpd.orig/files/enable_ipv6.patch 1969-12-31 16:00:00.000000000 -0800 +++ miniupnpd/files/enable_ipv6.patch 2014-05-23 22:16:52.404526102 -0700 @@ -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} + diff -ruN miniupnpd.orig/files/enable_leasefile.patch miniupnpd/files/enable_leasefile.patch --- miniupnpd.orig/files/enable_leasefile.patch 1969-12-31 16:00:00.000000000 -0800 +++ miniupnpd/files/enable_leasefile.patch 2014-05-23 22:16:52.404526102 -0700 @@ -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} + diff -ruN miniupnpd.orig/files/enable_upnp_strict.patch miniupnpd/files/enable_upnp_strict.patch --- miniupnpd.orig/files/enable_upnp_strict.patch 1969-12-31 16:00:00.000000000 -0800 +++ miniupnpd/files/enable_upnp_strict.patch 2014-05-23 22:16:52.404526102 -0700 @@ -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} + --Apple-Mail=_4A7BDF36-3DAA-40E9-A990-C2059BDF429C--