Attachment #95466 for bug #133854

View | Details | Raw Unified | Return to bug 133854
Collapse All | Expand All

Lines 6-12 Link Here

(-)miniupnpd/Makefile (-1 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= miniupnpd	8	PORTNAME= miniupnpd
9	PORTVERSION= 1.1	9	PORTVERSION= 1.3
10	PORTEPOCH= 1	10	PORTEPOCH= 1
11	CATEGORIES= net	11	CATEGORIES= net
12	MASTER_SITES= http://miniupnp.tuxfamily.org/files/ \	12	MASTER_SITES= http://miniupnp.tuxfamily.org/files/ \

Lines 1-3 Link Here

(-)miniupnpd/distinfo (-3 / +3 lines)
1	MD5 (miniupnpd-1.1.tar.gz) = a0f6651476721db9b554668c8c83b151	1	MD5 (miniupnpd-1.3.tar.gz) = b5e70e80dcf45b424b8fe3c966bdc613
2	SHA256 (miniupnpd-1.1.tar.gz) = 71dae8514ebaaf5656bbc8bc049b10a9fd1f323838e023313f009884d4a023dd	2	SHA256 (miniupnpd-1.3.tar.gz) = b4585c77ac5a7fb00a687772db95996dd2e8854db9d628c9bb85e5ecfd67f2ff
3	SIZE (miniupnpd-1.1.tar.gz) = 78594	3	SIZE (miniupnpd-1.3.tar.gz) = 83464

Lines 8-30 Link Here

(-)miniupnpd/files/miniupnpd.conf.sample.in (+29 lines)
8	# the 1st IP is also used for UPnP Soap traffic.	8	# the 1st IP is also used for UPnP Soap traffic.
9	#listening_ip= 192.168.0.61	9	#listening_ip= 192.168.0.61
10	listening_ip=10.0.2.1	10	listening_ip=10.0.2.1
		11
		12	# port for HTTP (descriptions and SOAP) traffic. set 0 for autoselect.
11	port=5555	13	port=5555
12		14
		15	# path to the unix socket used to communicate with MiniSSDPd
		16	# If running, MiniSSDPd will manage M-SEARCH answering.
		17	# default is /var/run/minissdpd.sock
		18	#minissdpdsocket=/var/run/minissdpd.sock
		19
		20	# enable NAT-PMP support (default is no)
		21	#enable_natpmp=no
		22
		23	# lease file location
		24	#lease_file=/var/log/upnp.leases
		25
13	# bitrates reported by daemon in bits per second	26	# bitrates reported by daemon in bits per second
14	bitrate_up=131072	27	bitrate_up=131072
15	bitrate_down=524288	28	bitrate_down=524288
16		29
		30	# "secure" mode : when enabled, UPnP client are allowed to add mappings only
		31	# to their IP. (default is yes)
		32	#secure_mode=yes
		33
17	# default presentation url is http address on port 80	34	# default presentation url is http address on port 80
18	#presentation_url=	35	#presentation_url=
19		36
20	# report system uptime instead of daemon uptime	37	# report system uptime instead of daemon uptime
21	system_uptime=yes	38	system_uptime=yes
22		39
		40	# unused rules cleaning.
		41	# never remove any rule before this threshold for the number
		42	# of redirections is exceeded. default to 20
		43	#clean_ruleset_threshold=10
		44	# clean process work interval in seconds. default to 0 (disabled).
		45	# a 600 seconds (10 minutes) interval makes sense
		46	clean_ruleset_interval=600
		47
23	# notify interval in seconds default is 30 seconds.	48	# notify interval in seconds default is 30 seconds.
24	#notify_interval=240	49	#notify_interval=240
25		50
26	# log packets in pf	51	# log packets in pf
27	#packet_log=no	52	#packet_log=no
		53	# ALTQ queue in pf
		54	# filter rules must be used for this to be used.
		55	# compile with PF_ENABLE_FILTER_RULES (see config.h file)
		56	#queue=queue_name1
28		57
29	# uuid : generated by the install a new one can be created with	58	# uuid : generated by the install a new one can be created with
30	# uuidgen	59	# uuidgen




--- 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"




--- 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

Return to bug 133854

Line 0 Link Here

(-)miniupnpd/files/patch-Makefile (+15 lines)
	1	--- Makefile.orig 2009-01-29 19:21:05.000000000 +0100
	2	+++ Makefile 2009-04-19 14:27:04.264746884 +0200
	3	@@ -25,10 +25,12 @@
	4
	5	# better way to find if we are using ipf or pf
	6	.if $(OSNAME) == "FreeBSD"
	7	+.if defined(/etc/rc.subr) && defined(/etc/rc.conf)
	8	FWNAME != . /etc/rc.subr; . /etc/rc.conf; \
	9	if checkyesno ipfilter_enable; then \
	10	echo "ipf"; else echo "pf"; fi
	11	.endif
	12	+.endif
	13
	14	# Solaris specific CFLAGS
	15	.if $(OSNAME) == "SunOS"

Line 0 Link Here

(-)miniupnpd/files/patch-genconfig.sh (+38 lines)
	1	--- genconfig.sh.orig 2008-10-01 14:49:26.000000000 +0200
	2	+++ genconfig.sh 2009-04-19 14:15:37.574904740 +0200
	3	@@ -70,17 +70,24 @@
	4	# new way to see which one to use PF or IPF.
	5	# see http://miniupnp.tuxfamily.org/forum/viewtopic.php?p=957
	6	# source file with handy subroutines like checkyesno
	7	- . /etc/rc.subr
	8	- # source config file so we can probe vars
	9	- . /etc/rc.conf
	10	- if checkyesno ipfilter_enable; then
	11	- echo "Using ipf"
	12	- FW=ipf
	13	- echo "#define USE_IPF 1" >> ${CONFIGFILE}
	14	- elif checkyesno pf_enable; then
	15	- echo "Using pf"
	16	- FW=pf
	17	- echo "#define USE_PF 1" >> ${CONFIGFILE}
	18	+ if [ -f /etc/rc.subr ] && [ -f /etc/rc.conf ]; then
	19	+ # source file with handy subroutines like checkyesno
	20	+ . /etc/rc.subr
	21	+ # source config file so we can probe vars
	22	+ . /etc/rc.conf
	23	+ if checkyesno ipfilter_enable; then
	24	+ echo "Using ipf"
	25	+ FW=ipf
	26	+ echo "#define USE_IPF 1" >> ${CONFIGFILE}
	27	+ elif checkyesno pf_enable; then
	28	+ echo "Using pf"
	29	+ FW=pf
	30	+ echo "#define USE_PF 1" >> ${CONFIGFILE}
	31	+ else
	32	+ echo "Could not detect usage of ipf or pf. Compiling for pf by default"
	33	+ FW=pf
	34	+ echo "#define USE_PF 1" >> ${CONFIGFILE}
	35	+ fi
	36	else
	37	echo "Could not detect usage of ipf or pf. Compiling for pf by default"
	38	FW=pf