Attachment #143983 for bug #189061




# $FreeBSD: head/net/miniupnpd/Makefile 350123 2014-04-04 13:55:54Z bapt $

PORTNAME=	miniupnpd
PORTVERSION=	1.8.20140523
PORTEPOCH=	1
CATEGORIES=	net
MASTER_SITES=	http://miniupnp.tuxfamily.org/files/ \

SUB_LIST=	UUID=${UUID}

UUID!=		uuidgen
FWNAME?=	pf
PLIST_FILES=	etc/miniupnpd.conf.sample sbin/miniupnpd \
		man/man8/miniupnpd.8.gz
MAKE_JOBS_UNSAFE=yes

USE_RC_SUBR=	miniupnpd

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

Lines 1-2 Link Here

(-)miniupnpd/distinfo (-2 / +2 lines)
1	SHA256 (miniupnpd-1.8.20140310.tar.gz) = 733530eee970bfc29f90b0a793612d2c721eb4f19f9c50f6d7677b6e0d59a726	1	SHA256 (miniupnpd-1.8.20140523.tar.gz) = e72cd1e515aa9e6281e519e1814fe74e7689f5da71ce463a996a17e787ffe490
2	SIZE (miniupnpd-1.8.20140310.tar.gz) = 176585	2	SIZE (miniupnpd-1.8.20140523.tar.gz) = 190936

Line 0 Link Here

(-)miniupnpd/files/enable_check_portinuse.patch (+11 lines)
	1	--- genconfig.sh.orig 2014-04-22 00:37:51.000000000 -0700
	2	+++ genconfig.sh 2014-04-22 09:30:24.000000000 -0700
	3	@@ -401,7 +401,7 @@
	4	if [ -n "$PORTINUSE" ]; then
	5	echo "#define CHECK_PORTINUSE" >> ${CONFIGFILE}
	6	else
	7	- echo "/#define CHECK_PORTINUSE/" >> ${CONFIGFILE}
	8	+ echo "#define CHECK_PORTINUSE" >> ${CONFIGFILE}
	9	fi
	10	echo "" >> ${CONFIGFILE}
	11

Line 0 Link Here

(-)miniupnpd/files/enable_igdv2.patch (+11 lines)
	1	--- genconfig.sh.orig 2014-04-11 01:16:49.000000000 -0700
	2	+++ genconfig.sh 2014-04-26 18:22:26.000000000 -0700
	3	@@ -436,7 +436,7 @@
	4	if [ -n "$IGD2" ]; then
	5	echo "#define IGD_V2" >> ${CONFIGFILE}
	6	else
	7	- echo "/#define IGD_V2/" >> ${CONFIGFILE}
	8	+ echo "#define IGD_V2" >> ${CONFIGFILE}
	9	fi
	10	echo "" >> ${CONFIGFILE}
	11

Line 0 Link Here

(-)miniupnpd/files/enable_ipv6.patch (+11 lines)
	1	--- genconfig.sh.orig 2014-04-11 01:16:49.000000000 -0700
	2	+++ genconfig.sh 2014-04-26 18:23:04.000000000 -0700
	3	@@ -417,7 +417,7 @@
	4	if [ -n "$IPV6" ]; then
	5	echo "#define ENABLE_IPV6" >> ${CONFIGFILE}
	6	else
	7	- echo "/#define ENABLE_IPV6/" >> ${CONFIGFILE}
	8	+ echo "#define ENABLE_IPV6" >> ${CONFIGFILE}
	9	fi
	10	echo "" >> ${CONFIGFILE}
	11

Line 0 Link Here

(-)miniupnpd/files/enable_leasefile.patch (+11 lines)
	1	--- genconfig.sh.orig 2014-04-22 00:37:51.000000000 -0700
	2	+++ genconfig.sh 2014-04-26 18:01:49.000000000 -0700
	3	@@ -393,7 +393,7 @@
	4	if [ -n "$LEASEFILE" ] ; then
	5	echo "#define ENABLE_LEASEFILE" >> ${CONFIGFILE}
	6	else
	7	- echo "/#define ENABLE_LEASEFILE/" >> ${CONFIGFILE}
	8	+ echo "#define ENABLE_LEASEFILE" >> ${CONFIGFILE}
	9	fi
	10	echo "" >> ${CONFIGFILE}
	11

Line 0 Link Here

(-)miniupnpd/files/enable_upnp_strict.patch (+11 lines)
	1	--- genconfig.sh.orig 2014-04-11 01:16:49.000000000 -0700
	2	+++ genconfig.sh 2014-04-26 18:23:27.000000000 -0700
	3	@@ -472,7 +472,7 @@
	4	if [ -n "$STRICT" ] ; then
	5	echo "#define UPNP_STRICT" >> ${CONFIGFILE}
	6	else
	7	- echo "/#define UPNP_STRICT/" >> ${CONFIGFILE}
	8	+ echo "#define UPNP_STRICT" >> ${CONFIGFILE}
	9	fi
	10	echo "" >> ${CONFIGFILE}
	11




--- Makefile.orig	2014-04-20 09:47:29.000000000 -0700
+++ Makefile	2014-06-20 22:53:14.863342337 -0700
@@ -15,7 +15,7 @@
 # $ CONFIG_OPTIONS="--ipv6 --igd2" make
 #
 
-CFLAGS ?= -pipe -Os
+CFLAGS ?= -pipe
 #CFLAGS = -pipe -O -g -DDEBUG
 #CFLAGS += -ansi
 CFLAGS += -Wall
@@ -45,25 +45,36 @@
 .endif
 
 # better way to find if we are using ipf or pf
-.if exists(/etc/rc.subr) && exists(/etc/rc.conf)
 .if $(OSNAME) == "FreeBSD"
+.if exists(/etc/rc.subr) && exists(/etc/rc.conf)
 FWNAME != . /etc/rc.subr; . /etc/rc.conf; \
-          if checkyesno ipfilter_enable; then \
+          if checkyesno firewall_enable; then \
+          echo "ipfw"; elif checkyesno ipfilter_enable; then \
           echo "ipf"; elif checkyesno pf_enable; then \
-          echo "pf"; else echo "ipfw"; fi
+          echo "pf"; else echo "pf"; fi
+.else
+FWNAME = pf
+.endif
 .endif
 
 .if $(OSNAME) == "NetBSD"
+.if exists(/etc/rc.subr) && exists(/etc/rc.conf)
 FWNAME != . /etc/rc.subr; . /etc/rc.conf; \
           if checkyesno ipfilter; then \
           echo "ipf"; else echo "pf"; fi
+.else
+FWNAME = pf
+.endif
 .endif
 
 .if $(OSNAME) == "DragonFly"
+.if exists(/etc/rc.subr) && exists(/etc/rc.conf)
 FWNAME != . /etc/rc.subr; . /etc/rc.conf; \
           if checkyesno ipfilter; then \
           echo "ipf"; elif checkyesno pf_enable; then \
           echo "pf"; else echo "ipfw"; fi
+.else
+FWNAME = ipfw
 .endif
 .endif
 

Return to bug 189061

Lines 2-8 Link Here

(-)miniupnpd/Makefile (-3 / +12 lines)
2	# $FreeBSD: head/net/miniupnpd/Makefile 350123 2014-04-04 13:55:54Z bapt $	2	# $FreeBSD: head/net/miniupnpd/Makefile 350123 2014-04-04 13:55:54Z bapt $
3		3
4	PORTNAME= miniupnpd	4	PORTNAME= miniupnpd
5	PORTVERSION= 1.8.20140310	5	PORTVERSION= 1.8.20140523
6	PORTEPOCH= 1	6	PORTEPOCH= 1
7	CATEGORIES= net	7	CATEGORIES= net
8	MASTER_SITES= http://miniupnp.tuxfamily.org/files/ \	8	MASTER_SITES= http://miniupnp.tuxfamily.org/files/ \
Lines 15-31 Link Here
15	SUB_LIST= UUID=${UUID}	15	SUB_LIST= UUID=${UUID}
16		16
17	UUID!= uuidgen	17	UUID!= uuidgen
18	FWNAME?= pf
19	PLIST_FILES= etc/miniupnpd.conf.sample sbin/miniupnpd \	18	PLIST_FILES= etc/miniupnpd.conf.sample sbin/miniupnpd \
20	man/man8/miniupnpd.8.gz	19	man/man8/miniupnpd.8.gz
21	MAKE_JOBS_UNSAFE=yes	20	MAKE_JOBS_UNSAFE=yes
22		21
23	USE_RC_SUBR= miniupnpd	22	USE_RC_SUBR= miniupnpd
24		23
25	OPTIONS_DEFINE= PF_ENABLE_FILTER_RULES	24	OPTIONS_DEFINE= PF_ENABLE_FILTER_RULES CHECK_PORTINUSE IPV6 UPNP_IGDV2 UPNP_STRICT LEASEFILE
26	PF_ENABLE_FILTER_RULES_DESC= Enable pf generation of filter rules	25	PF_ENABLE_FILTER_RULES_DESC= Enable pf generation of filter rules
		26	CHECK_PORTINUSE_DESC= Check if ports are in use
		27	IPV6_DESC= Enable IPv6
		28	UPNP_IGDV2_DESC= Build an IGDv2 instead of an IGDv1
		29	UPNP_STRICT_DESC= Be more strict regarding compliance with UPnP specifications
		30	LEASEFILE_DESC= Enable lease file
27		31
28	PF_ENABLE_FILTER_RULES_EXTRA_PATCHES= ${PATCHDIR}/pf_enable_filter_rules.patch	32	PF_ENABLE_FILTER_RULES_EXTRA_PATCHES= ${PATCHDIR}/pf_enable_filter_rules.patch
		33	CHECK_PORTINUSE_EXTRA_PATCHES= ${PATCHDIR}/enable_check_portinuse.patch
		34	IPV6_EXTRA_PATCHES= ${PATCHDIR}/enable_ipv6.patch
		35	UPNP_IGDV2_EXTRA_PATCHES= ${PATCHDIR}/enable_igdv2.patch
		36	UPNP_STRICT_EXTRA_PATCHES= ${PATCHDIR}/enable_upnp_strict.patch
		37	LEASEFILE_EXTRA_PATCHES= ${PATCHDIR}/enable_leasefile.patch
29		38
30	post-patch:	39	post-patch:
31	@${REINPLACE_CMD} 's\|CFLAGS ?= -pipe -Os\|CFLAGS ?= -pipe\|' \	40	@${REINPLACE_CMD} 's\|CFLAGS ?= -pipe -Os\|CFLAGS ?= -pipe\|' \

Line 0 Link Here

(-)miniupnpd/files/patch-Makefile (+51 lines)
	1	--- Makefile.orig 2014-04-20 09:47:29.000000000 -0700
	2	+++ Makefile 2014-06-20 22:53:14.863342337 -0700
	3	@@ -15,7 +15,7 @@
	4	# $ CONFIG_OPTIONS="--ipv6 --igd2" make
	5	#
	6
	7	-CFLAGS ?= -pipe -Os
	8	+CFLAGS ?= -pipe
	9	#CFLAGS = -pipe -O -g -DDEBUG
	10	#CFLAGS += -ansi
	11	CFLAGS += -Wall
	12	@@ -45,25 +45,36 @@
	13	.endif
	14
	15	# better way to find if we are using ipf or pf
	16	-.if exists(/etc/rc.subr) && exists(/etc/rc.conf)
	17	.if $(OSNAME) == "FreeBSD"
	18	+.if exists(/etc/rc.subr) && exists(/etc/rc.conf)
	19	FWNAME != . /etc/rc.subr; . /etc/rc.conf; \
	20	- if checkyesno ipfilter_enable; then \
	21	+ if checkyesno firewall_enable; then \
	22	+ echo "ipfw"; elif checkyesno ipfilter_enable; then \
	23	echo "ipf"; elif checkyesno pf_enable; then \
	24	- echo "pf"; else echo "ipfw"; fi
	25	+ echo "pf"; else echo "pf"; fi
	26	+.else
	27	+FWNAME = pf
	28	+.endif
	29	.endif
	30
	31	.if $(OSNAME) == "NetBSD"
	32	+.if exists(/etc/rc.subr) && exists(/etc/rc.conf)
	33	FWNAME != . /etc/rc.subr; . /etc/rc.conf; \
	34	if checkyesno ipfilter; then \
	35	echo "ipf"; else echo "pf"; fi
	36	+.else
	37	+FWNAME = pf
	38	+.endif
	39	.endif
	40
	41	.if $(OSNAME) == "DragonFly"
	42	+.if exists(/etc/rc.subr) && exists(/etc/rc.conf)
	43	FWNAME != . /etc/rc.subr; . /etc/rc.conf; \
	44	if checkyesno ipfilter; then \
	45	echo "ipf"; elif checkyesno pf_enable; then \
	46	echo "pf"; else echo "ipfw"; fi
	47	+.else
	48	+FWNAME = ipfw
	49	.endif
	50	.endif
	51