Attachment 124941 Details for Bug 168462 – file.diff

[patch] file.diff

file.diff (text/plain), 4.85 KB, created by Tor Halvard Furulund on 2012-05-30 12:40:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tor Halvard Furulund

Created: 2012-05-30 12:40:01 UTC

Size: 4.85 KB

patch

obsolete

>diff -ruN /usr/ports/net/miniupnpd/Makefile miniupnpd/Makefile
>--- /usr/ports/net/miniupnpd/Makefile	2012-05-11 20:19:38.000000000 +0200
>+++ miniupnpd/Makefile	2012-05-30 10:18:16.111442283 +0200
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	miniupnpd
>-PORTVERSION=	1.6
>+PORTVERSION=	1.7
> 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	2012-05-11 20:19:38.000000000 +0200
>+++ miniupnpd/distinfo	2012-05-30 10:18:34.659227826 +0200
>@@ -1,2 +1,2 @@
>-SHA256 (miniupnpd-1.6.tar.gz) = a26744025038a207d96a2dce96aa76db095886eb68dee87321b9da55cb1c8585
>-SIZE (miniupnpd-1.6.tar.gz) = 124917
>+SHA256 (miniupnpd-1.7.tar.gz) = 27cfacea0a2aefc109b44497b756bf3e4ab9f92beb55fc492b09df5c46c6bb74
>+SIZE (miniupnpd-1.7.tar.gz) = 138047
>diff -ruN /usr/ports/net/miniupnpd/files/patch-Makefile miniupnpd/files/patch-Makefile
>--- /usr/ports/net/miniupnpd/files/patch-Makefile	2012-05-11 20:19:38.000000000 +0200
>+++ miniupnpd/files/patch-Makefile	2012-05-30 10:29:57.098228313 +0200
>@@ -1,15 +1,15 @@
>---- Makefile.orig	2011-05-27 00:49:17.000000000 +0200
>-+++ Makefile	2012-05-11 19:42:37.000000000 +0200
>-@@ -11,7 +11,7 @@
>- # Linux users, please use Makefile.linux :
>- #  make -f Makefile.linux
>+--- Makefile.orig	2012-05-30 10:27:24.587226775 +0200
>++++ Makefile	2012-05-30 10:28:12.497226510 +0200
>+@@ -15,7 +15,7 @@
>+ # $ CONFIG_OPTIONS="--ipv6 --igd2" make
>+ #
>  
>--CFLAGS = -pipe -Wall -Os
>-+CFLAGS += -pipe -Wall
>- #CFLAGS = -pipe -Wall -O -g -DDEBUG
>- CC ?= gcc
>- RM = rm -f
>-@@ -32,10 +32,12 @@
>+-CFLAGS ?= -pipe -Os
>++CFLAGS ?= -pipe
>+ #CFLAGS = -pipe -O -g -DDEBUG
>+ CFLAGS += -ansi
>+ CFLAGS += -Wall
>+@@ -43,10 +43,12 @@
>  
>  # better way to find if we are using ipf or pf
>  .if $(OSNAME) == "FreeBSD"
>diff -ruN /usr/ports/net/miniupnpd/files/patch-genconfig.sh miniupnpd/files/patch-genconfig.sh
>--- /usr/ports/net/miniupnpd/files/patch-genconfig.sh	2009-11-27 02:33:34.000000000 +0100
>+++ miniupnpd/files/patch-genconfig.sh	2012-05-30 10:38:19.754228447 +0200
>@@ -1,40 +1,41 @@
>---- genconfig.sh.orig	2009-09-04 18:21:24.000000000 +0200
>-+++ genconfig.sh	2009-11-25 12:31:04.344410750 +0100
>-@@ -66,18 +66,25 @@
>- 		fi
>+--- genconfig.sh.orig	2012-05-30 10:37:23.936226718 +0200
>++++ genconfig.sh	2012-05-30 10:36:53.849226834 +0200
>+@@ -112,21 +112,23 @@
>  		# 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
>+ 		# 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}
>-+		# source file wource config file so we can probe vars
>+-		elif checkyesno firewall_enable; then
>+-			echo "Using ifpw"
>+-			FW=ipfw
>+-		else
>+-			echo "Could not detect usage of ipf, pf, ipfw. Compiling for pf by default"
>+-			FW=pf
> +		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}
>++			elif checkyesno firewall_enable; then
>++				echo "Using ifpw"
>++				FW=ipfw
> +			else
>-+				echo "Could not detect usage of ipf or pf. Compiling for pf by default"
>++				echo "Could not detect usage of ipf, pf, ipfw. Compiling for pf by default"
> +				FW=pf
>-+				echo "#define USE_PF 1" >> ${CONFIGFILE}
> +			fi
>- 		# TODO : Add support for IPFW
>- 		# echo "#define USE_IPFW 1" >> ${CONFIGFILE}
>- 		#Â FW=ipfw
>+ 		fi
>+ 		echo "#define USE_IFACEWATCHER 1" >> ${CONFIGFILE}
>+ 		OS_URL=http://www.freebsd.org/
>diff -ruN /usr/ports/net/miniupnpd/files/pf_enable_filter_rules.patch miniupnpd/files/pf_enable_filter_rules.patch
>--- /usr/ports/net/miniupnpd/files/pf_enable_filter_rules.patch	2010-10-12 16:29:11.000000000 +0200
>+++ miniupnpd/files/pf_enable_filter_rules.patch	1970-01-01 01:00:00.000000000 +0100
>@@ -1,11 +0,0 @@
>---- work/miniupnpd-1.4.20100921/genconfig.sh	2010-09-21 10:36:12.000000000 -0500
>-+++ genconfig.sh	2010-10-11 10:23:44.000000000 -0500
>-@@ -209,7 +209,7 @@
>- 
>- echo "/* Uncomment the following line to enable generation of" >> ${CONFIGFILE}
>- echo " * filter rules with pf */" >> ${CONFIGFILE}
>--echo "/*#define PF_ENABLE_FILTER_RULES*/">> ${CONFIGFILE}
>-+echo "#define PF_ENABLE_FILTER_RULES">> ${CONFIGFILE}
>- echo "" >> ${CONFIGFILE}
>- 
>- echo "/* Uncomment the following line to enable caching of results of" >> ${CONFIGFILE}

Actions: View | Diff

Attachments on bug 168462: 124941