From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Apr 27 23:10:00 2014 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.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 D0CA7139 for ; Sun, 27 Apr 2014 23:10:00 +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 AC85EB4E for ; Sun, 27 Apr 2014 23:10:00 +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 s3RNA0cS004699 for ; Sun, 27 Apr 2014 23:10:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s3RNA0R7004698; Sun, 27 Apr 2014 23:10:00 GMT (envelope-from gnats) Resent-Date: Sun, 27 Apr 2014 23:10:00 GMT Resent-Message-Id: <201404272310.s3RNA0R7004698@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Daniel Becker 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 63DFFF2 for ; Sun, 27 Apr 2014 23:00:43 +0000 (UTC) Received: from cgiserv.freebsd.org (cgiserv.freebsd.org [IPv6:2001:1900:2254:206a::50:4]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 42F87AB4 for ; Sun, 27 Apr 2014 23:00:43 +0000 (UTC) Received: from cgiserv.freebsd.org ([127.0.1.6]) by cgiserv.freebsd.org (8.14.8/8.14.8) with ESMTP id s3RN0hLF001525 for ; Sun, 27 Apr 2014 23:00:43 GMT (envelope-from nobody@cgiserv.freebsd.org) Received: (from nobody@localhost) by cgiserv.freebsd.org (8.14.8/8.14.8/Submit) id s3RN0gvx001524; Sun, 27 Apr 2014 23:00:42 GMT (envelope-from nobody) Message-Id: <201404272300.s3RN0gvx001524@cgiserv.freebsd.org> Date: Sun, 27 Apr 2014 23:00:42 GMT From: Daniel Becker To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/189061: [PATCH] net/miniupnpd: update to 20140422 and expose more config options X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Apr 2014 23:10:00 -0000 >Number: 189061 >Category: ports >Synopsis: [PATCH] net/miniupnpd: update to 20140422 and expose more config options >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sun Apr 27 23:10:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Daniel Becker >Release: >Organization: >Environment: >Description: Attached patch updates miniupnpd to current revision 20140422 and exposes more of its compile-time options in "make config". >How-To-Repeat: >Fix: Patch attached with submission follows: diff -ruN miniupnpd.orig/Makefile miniupnpd/Makefile --- miniupnpd.orig/Makefile 2014-04-04 06:55:54.000000000 -0700 +++ miniupnpd/Makefile 2014-04-26 18:12:17.000000000 -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.20140422 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-04-22 09:22:09.000000000 -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.20140422.tar.gz) = 2980c7dbcdf00d6942ad21c814d88a3c70996b550a8e229eb52362bd472c3961 +SIZE (miniupnpd-1.8.20140422.tar.gz) = 187225 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-04-22 09:30:43.000000000 -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-04-26 18:22:45.000000000 -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-04-26 18:23:09.000000000 -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-04-26 18:02:58.000000000 -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-04-26 18:23:32.000000000 -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} + >Release-Note: >Audit-Trail: >Unformatted: