From gaod@gaod.tfcis.org  Sun Feb 15 23:49:58 2009
Return-Path: <gaod@gaod.tfcis.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9449910656C0
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 15 Feb 2009 23:49:58 +0000 (UTC)
	(envelope-from gaod@gaod.tfcis.org)
Received: from gaod.tfcis.org (gaod.tfcis.org [210.70.137.25])
	by mx1.freebsd.org (Postfix) with SMTP id 11FE88FC0C
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 15 Feb 2009 23:49:57 +0000 (UTC)
	(envelope-from gaod@gaod.tfcis.org)
Received: from gaod.tfcis.org (localhost [127.0.0.1])
	by gaod.tfcis.org (Postfix) with ESMTP id 135958FC4C
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 16 Feb 2009 07:50:07 +0800 (CST)
Received: (from root@localhost)
	by gaod.tfcis.org (8.14.3/8.14.3/Submit) id n1FNo7hA021718;
	Mon, 16 Feb 2009 07:50:07 +0800 (CST)
	(envelope-from gaod)
Message-Id: <200902152350.n1FNo7hA021718@gaod.tfcis.org>
Date: Mon, 16 Feb 2009 07:50:07 +0800 (CST)
From: Hung-Yi Chen <gaod@hychen.org>
Reply-To: Hung-Yi Chen <gaod@hychen.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] net/miniupnpd: update to 1.2
X-Send-Pr-Version: 3.113
X-GNATS-Notify: squat@squat.no

>Number:         131728
>Category:       ports
>Synopsis:       [PATCH] net/miniupnpd: update to 1.2
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    lwhsu
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Feb 16 00:00:08 UTC 2009
>Closed-Date:    Sun Apr 19 15:19:37 UTC 2009
>Last-Modified:  Sun Apr 19 15:19:37 UTC 2009
>Originator:     Hung-Yi Chen
>Release:        FreeBSD 7.1-RELEASE-p2 i386
>Organization:
>Environment:
System: FreeBSD gaod.tfcis.org 7.1-RELEASE-p2 FreeBSD 7.1-RELEASE-p2 #1: Sat Jan 31 15:02:27 CST 2009 gaod@gaod.tfcis.org:/usr/src/sys/i386/compile/gaod i386

>Description:
	Update to 1.2.
>How-To-Repeat:
>Fix:

--- miniupnpd begins here ---
===> Generating patch
===> Viewing diff with more
diff -ruN --exclude=CVS /usr/ports/net/miniupnpd.orig/Makefile /usr/ports/net/miniupnpd/Makefile
--- /usr/ports/net/miniupnpd.orig/Makefile	2008-05-05 21:39:09.000000000 +0800
+++ /usr/ports/net/miniupnpd/Makefile	2009-02-16 07:46:16.000000000 +0800
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	miniupnpd
-PORTVERSION=	1.1
-PORTEPOCH=	1
+PORTVERSION=	1.2
 CATEGORIES=	net
 MASTER_SITES=	http://miniupnp.tuxfamily.org/files/ \
 		http://miniupnp.free.fr/files/
diff -ruN --exclude=CVS /usr/ports/net/miniupnpd.orig/distinfo /usr/ports/net/miniupnpd/distinfo
--- /usr/ports/net/miniupnpd.orig/distinfo	2008-05-05 21:39:09.000000000 +0800
+++ /usr/ports/net/miniupnpd/distinfo	2009-02-16 07:33:32.000000000 +0800
@@ -1,3 +1,3 @@
-MD5 (miniupnpd-1.1.tar.gz) = a0f6651476721db9b554668c8c83b151
-SHA256 (miniupnpd-1.1.tar.gz) = 71dae8514ebaaf5656bbc8bc049b10a9fd1f323838e023313f009884d4a023dd
-SIZE (miniupnpd-1.1.tar.gz) = 78594
+MD5 (miniupnpd-1.2.tar.gz) = 48f1fa81e5c2cb1c561c29cdcf261602
+SHA256 (miniupnpd-1.2.tar.gz) = a6dd2b63c5a65a57c24f11a1cb5a02cf40a35e0e49e941e76c8b3c8854c4eb53
+SIZE (miniupnpd-1.2.tar.gz) = 81025
diff -ruN --exclude=CVS /usr/ports/net/miniupnpd.orig/files/miniupnpd.conf.sample.in /usr/ports/net/miniupnpd/files/miniupnpd.conf.sample.in
--- /usr/ports/net/miniupnpd.orig/files/miniupnpd.conf.sample.in	2007-04-03 04:55:58.000000000 +0800
+++ /usr/ports/net/miniupnpd/files/miniupnpd.conf.sample.in	2009-02-16 07:40:26.000000000 +0800
@@ -8,24 +8,55 @@
 # the 1st IP is also used for UPnP Soap traffic.
 #listening_ip= 192.168.0.61 
 listening_ip=10.0.2.1
+
+# port for HTTP (descriptions and SOAP) traffic. set 0 for autoselect.
 port=5555
 
+# path to the unix socket used to communicate with MiniSSDPd
+# If running, MiniSSDPd will manage M-SEARCH answering.
+# default is /var/run/minissdpd.sock
+#minissdpdsocket=/var/run/minissdpd.sock
+
+# enable NAT-PMP support (default is no)
+enable_natpmp=yes
+
+# lease file location
+#lease_file=/var/log/upnp.leases
+
 # bitrates reported by daemon in bits per second
 bitrate_up=131072
 bitrate_down=524288
 
+# "secure" mode : when enabled, UPnP client are allowed to add mappings only
+# to their IP.
+#secure_mode=yes
+secure_mode=no
+
 # default presentation url is http address on port 80
 #presentation_url=
 
 # report system uptime instead of daemon uptime
 system_uptime=yes
 
+# unused rules cleaning.
+# never remove any rule before this threshold for the number
+# of redirections is exceeded. default to 20
+#clean_ruleset_threshold=10
+# clean process work interval in seconds. default to 0 (disabled).
+# a 600 seconds (10 minutes) interval makes sense
+clean_ruleset_interval=600
+
 # notify interval in seconds default is 30 seconds.
 #notify_interval=240
 
 # log packets in pf
 #packet_log=no
 
+# ALTQ queue in pf
+# filter rules must be used for this to be used.
+# compile with PF_ENABLE_FILTER_RULES (see config.h file)
+#queue=queue_name1
+
 # uuid : generated by the install a new one can be created with
 # uuidgen
 uuid=%%UUID%%
===> Done
--- miniupnpd ends here ---


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Mon Feb 16 00:00:22 UTC 2009 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=131728 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: squat@squat.no
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/131728: [PATCH] net/miniupnpd: update to 1.2
Date: Mon, 16 Feb 2009 00:00:18 UT

 Maintainer of net/miniupnpd,
 
 Please note that PR ports/131728 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/131728
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org
Responsible-Changed-From-To: freebsd-ports-bugs->lwhsu 
Responsible-Changed-By: lwhsu 
Responsible-Changed-When: Mon Feb 16 00:24:52 UTC 2009 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=131728 

From: Tor Halvard Furulund <squat@squat.no>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/131728: [PATCH] net/miniupnpd: update to 1.2
Date: Wed, 18 Feb 2009 01:20:51 +0100

 I approve this patch, but I would rather see that the default is:
 secure_mode=yes
 So people have to want the unsafe option.
 Maybe enable_natpmp also should be left with the default from the developers of this software. (enable_natpmp=no)
 My personal opinion is that FreeBSD ports should not change this kind of default behavior of software without reasons. I therefore suggest that both is commented out, so people can change them by them self if they want to.
 
 I also believe that one has to patch work/miniupnpd-1.2/Makefile and remove/change line 25 to line 30:
 .if $(OSNAME) == "FreeBSD"
 FWNAME != . /etc/rc.subr; . /etc/rc.conf; \
           if checkyesno ipfilter_enable; then \
           echo "ipf"; else echo "pf"; fi
 .endif
 ..to make this port build in tinderbox?
 
 I do not know the best practise to use instead of this. But I may have a look at it this weekend and submit a patch for it if I find a better option for detecting the use of ipf over pf.
 
 I would patch Hung-Yi Chens suggestion with:
 
 --- files/miniupnpd.conf.sample.in.org	2009-02-18 01:07:14.117996455 +0100
 +++ files/miniupnpd.conf.sample.in	2009-02-18 01:09:29.410571070 +0100
 @@ -11,13 +11,14 @@
  
  # port for HTTP (descriptions and SOAP) traffic. set 0 for autoselect.
  port=5555
 +
  # path to the unix socket used to communicate with MiniSSDPd
  # If running, MiniSSDPd will manage M-SEARCH answering.
  # default is /var/run/minissdpd.sock
  #minissdpdsocket=/var/run/minissdpd.sock
  
  # enable NAT-PMP support (default is no)
 -enable_natpmp=yes
 +#enable_natpmp=yes
  
  # lease file location
  #lease_file=/var/log/upnp.leases
 @@ -25,10 +26,10 @@
  # bitrates reported by daemon in bits per second
  bitrate_up=131072
  bitrate_down=524288
 +
  # "secure" mode : when enabled, UPnP client are allowed to add mappings only
  # to their IP.
  #secure_mode=yes
 -secure_mode=no
  
  # default presentation url is http address on port 80
  #presentation_url=
State-Changed-From-To: feedback->open 
State-Changed-By: pav 
State-Changed-When: Sun Mar 22 20:40:52 UTC 2009 
State-Changed-Why:  
Maintainer approved 

http://www.freebsd.org/cgi/query-pr.cgi?pr=131728 
State-Changed-From-To: open->feedback 
State-Changed-By: lwhsu 
State-Changed-When: Mon Mar 23 11:27:06 UTC 2009 
State-Changed-Why:  
Maintainer works on a patch to make it build in tinderbox. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=131728 

From: Tor Halvard Furulund <squat@squat.no>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/131728: [PATCH] net/miniupnpd: update to 1.2
Date: Sun, 19 Apr 2009 15:42:33 +0200

 This pr can be closed. I'm trying to solve both the tinderbox-problem and update to the newest version in:
 http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/133854
 Thanks to Hung-Yi Chens for the diffs to miniupnpd.conf.sample.in !
 
 --
 Tor Halvard Furulund
State-Changed-From-To: feedback->closed 
State-Changed-By: lwhsu 
State-Changed-When: Sun Apr 19 15:19:35 UTC 2009 
State-Changed-Why:  
Close per maintainer's request. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=131728 
>Unformatted:
