Attachment 95466 Details for Bug 133854 – file.diff

[patch] file.diff

file.diff (text/plain), 5.02 KB, created by Tor Halvard Furulund on 2009-04-19 14:20:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tor Halvard Furulund

Created: 2009-04-19 14:20:01 UTC

Size: 5.02 KB

patch

obsolete

>diff -ruN /usr/ports/net/miniupnpd/Makefile miniupnpd/Makefile
>--- /usr/ports/net/miniupnpd/Makefile	2008-04-28 15:55:01.000000000 +0200
>+++ miniupnpd/Makefile	2009-04-19 13:37:41.647055809 +0200
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	miniupnpd
>-PORTVERSION=	1.1
>+PORTVERSION=	1.3
> PORTEPOCH=	1
> CATEGORIES=	net
> MASTER_SITES=	http://miniupnp.tuxfamily.org/files/ \
>diff -ruN /usr/ports/net/miniupnpd/distinfo miniupnpd/distinfo
>--- /usr/ports/net/miniupnpd/distinfo	2008-04-28 15:55:01.000000000 +0200
>+++ miniupnpd/distinfo	2009-04-19 13:38:12.004960515 +0200
>@@ -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 -ruN /usr/ports/net/miniupnpd/files/miniupnpd.conf.sample.in miniupnpd/files/miniupnpd.conf.sample.in
>--- /usr/ports/net/miniupnpd/files/miniupnpd.conf.sample.in	2007-04-02 22:55:58.000000000 +0200
>+++ miniupnpd/files/miniupnpd.conf.sample.in	2009-02-18 01:09:29.410571070 +0100
>@@ -8,23 +8,52 @@
> # 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 -ruN /usr/ports/net/miniupnpd/files/patch-Makefile miniupnpd/files/patch-Makefile
>--- /usr/ports/net/miniupnpd/files/patch-Makefile	1970-01-01 01:00:00.000000000 +0100
>+++ miniupnpd/files/patch-Makefile	2009-04-19 14:49:31.385514189 +0200
>@@ -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 -ruN /usr/ports/net/miniupnpd/files/patch-genconfig.sh miniupnpd/files/patch-genconfig.sh
>--- /usr/ports/net/miniupnpd/files/patch-genconfig.sh	1970-01-01 01:00:00.000000000 +0100
>+++ miniupnpd/files/patch-genconfig.sh	2009-04-19 14:49:13.845569307 +0200
>@@ -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

Actions: View | Diff

Attachments on bug 133854: 95466