5 files changed, 86 insertions, 4 deletions

diff --git a/net/miniupnpd/Makefile b/net/miniupnpd/Makefile
index 6b4f5d7308f9..f0a9bdcb181b 100644
--- a/net/miniupnpd/Makefile
+++ b/net/miniupnpd/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	miniupnpd
-PORTVERSION=	1.1
+PORTVERSION=	1.3
 PORTEPOCH=	1
 CATEGORIES=	net
 MASTER_SITES=	http://miniupnp.tuxfamily.org/files/ \
diff --git a/net/miniupnpd/distinfo b/net/miniupnpd/distinfo
index 964113bfc90b..2280f049c346 100644
--- a/net/miniupnpd/distinfo
+++ b/net/miniupnpd/distinfo
@@ -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.3.tar.gz) = b5e70e80dcf45b424b8fe3c966bdc613
+SHA256 (miniupnpd-1.3.tar.gz) = b4585c77ac5a7fb00a687772db95996dd2e8854db9d628c9bb85e5ecfd67f2ff
+SIZE (miniupnpd-1.3.tar.gz) = 83464
diff --git a/net/miniupnpd/files/miniupnpd.conf.sample.in b/net/miniupnpd/files/miniupnpd.conf.sample.in
index e54a73ef2d2c..987894e1039a 100644
--- a/net/miniupnpd/files/miniupnpd.conf.sample.in
+++ b/net/miniupnpd/files/miniupnpd.conf.sample.in
@@ -8,23 +8,52 @@ ext_ifname=ed0
 # 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=no
+
+# 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. (default is yes)
+#secure_mode=yes
+
 # 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
diff --git a/net/miniupnpd/files/patch-Makefile b/net/miniupnpd/files/patch-Makefile
new file mode 100644
index 000000000000..340adb1e2da1
--- /dev/null
+++ b/net/miniupnpd/files/patch-Makefile
@@ -0,0 +1,15 @@
+--- Makefile.orig	2009-01-29 19:21:05.000000000 +0100
++++ Makefile	2009-04-19 14:27:04.264746884 +0200
+@@ -25,10 +25,12 @@
+ 
+ # better way to find if we are using ipf or pf
+ .if $(OSNAME) == "FreeBSD"
++.if defined(/etc/rc.subr) && defined(/etc/rc.conf)
+ FWNAME != . /etc/rc.subr; . /etc/rc.conf; \
+           if checkyesno ipfilter_enable; then \
+           echo "ipf"; else echo "pf"; fi
+ .endif
++.endif
+ 
+ # Solaris specific CFLAGS
+ .if $(OSNAME) == "SunOS"
diff --git a/net/miniupnpd/files/patch-genconfig.sh b/net/miniupnpd/files/patch-genconfig.sh
new file mode 100644
index 000000000000..695f6eee306b
--- /dev/null
+++ b/net/miniupnpd/files/patch-genconfig.sh
@@ -0,0 +1,38 @@
+--- genconfig.sh.orig	2008-10-01 14:49:26.000000000 +0200
++++ genconfig.sh	2009-04-19 14:15:37.574904740 +0200
+@@ -70,17 +70,24 @@
+ 		# new way to see which one to use PF or IPF.
+ 		# see http://miniupnp.tuxfamily.org/forum/viewtopic.php?p=957
+ 		# source file with handy subroutines like checkyesno
+-		. /etc/rc.subr
+-		# source config file so we can probe vars
+-		. /etc/rc.conf
+-		if checkyesno ipfilter_enable; then
+-			echo "Using ipf"
+-			FW=ipf
+-			echo "#define USE_IPF 1" >> ${CONFIGFILE}
+-		elif checkyesno pf_enable; then
+-			echo "Using pf"
+-			FW=pf
+-			echo "#define USE_PF 1" >> ${CONFIGFILE}
++		if [ -f /etc/rc.subr ] && [ -f /etc/rc.conf ]; then
++			# source file with handy subroutines like checkyesno
++			. /etc/rc.subr
++			# source config file so we can probe vars
++			. /etc/rc.conf
++			if checkyesno ipfilter_enable; then
++				echo "Using ipf"
++				FW=ipf
++				echo "#define USE_IPF 1" >> ${CONFIGFILE}
++			elif checkyesno pf_enable; then
++				echo "Using pf"
++				FW=pf
++				echo "#define USE_PF 1" >> ${CONFIGFILE}
++			else
++				echo "Could not detect usage of ipf or pf. Compiling for pf by default"
++				FW=pf
++				echo "#define USE_PF 1" >> ${CONFIGFILE}
++			fi
+ 		else
+ 			echo "Could not detect usage of ipf or pf. Compiling for pf by default"
+ 			FW=pf