sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- update to 1.7

Browse source 
PR:           ports/168462
Submitted by: Tor Halvard Furulund <squat _at_ squat.no> (maintainer)
Approved by:  decke (mentor)
This commit is contained in:
Armin Pirkovitsch 2012-06-02 11:03:26 +00:00
parent b93bea7faa
commit d881f1247d
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=298009
5 changed files with 27 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/miniupnpd/Makefile
View file

@ -6,7 +6,7 @@
# #
PORTNAME= miniupnpd PORTNAME= miniupnpd
PORTVERSION= 1.6 PORTVERSION= 1.7
PORTEPOCH= 1 PORTEPOCH= 1
CATEGORIES= net CATEGORIES= net
MASTER_SITES= http://miniupnp.tuxfamily.org/files/ \ MASTER_SITES= http://miniupnp.tuxfamily.org/files/ \

4
net/miniupnpd/distinfo
View file

@ -1,2 +1,2 @@
SHA256 (miniupnpd-1.6.tar.gz) = a26744025038a207d96a2dce96aa76db095886eb68dee87321b9da55cb1c8585 SHA256 (miniupnpd-1.7.tar.gz) = 27cfacea0a2aefc109b44497b756bf3e4ab9f92beb55fc492b09df5c46c6bb74
SIZE (miniupnpd-1.6.tar.gz) = 124917 SIZE (miniupnpd-1.7.tar.gz) = 138047

22
net/miniupnpd/files/patch-Makefile
View file

@ -1,15 +1,15 @@
--- Makefile.orig 2011-05-27 00:49:17.000000000 +0200 --- Makefile.orig 2012-05-30 10:27:24.587226775 +0200
+++ Makefile 2012-05-11 19:42:37.000000000 +0200 +++ Makefile 2012-05-30 10:28:12.497226510 +0200
@@ -11,7 +11,7 @@ @@ -15,7 +15,7 @@
# Linux users, please use Makefile.linux : # $ CONFIG_OPTIONS="--ipv6 --igd2" make
# make -f Makefile.linux #
-CFLAGS = -pipe -Wall -Os -CFLAGS ?= -pipe -Os
+CFLAGS += -pipe -Wall +CFLAGS ?= -pipe
#CFLAGS = -pipe -Wall -O -g -DDEBUG #CFLAGS = -pipe -O -g -DDEBUG
CC ?= gcc CFLAGS += -ansi
RM = rm -f CFLAGS += -Wall
@@ -32,10 +32,12 @@ @@ -43,10 +43,12 @@
# better way to find if we are using ipf or pf # better way to find if we are using ipf or pf
.if $(OSNAME) == "FreeBSD" .if $(OSNAME) == "FreeBSD"

31
net/miniupnpd/files/patch-genconfig.sh
View file

@ -1,40 +1,35 @@
--- genconfig.sh.orig 2009-09-04 18:21:24.000000000 +0200 --- genconfig.sh.orig 2012-05-24 20:05:47.000000000 +0200
+++ genconfig.sh 2009-11-25 12:31:04.344410750 +0100 +++ genconfig.sh 2012-05-30 20:12:57.685877655 +0200
@@ -66,18 +66,25 @@ @@ -112,18 +112,20 @@
fi
# new way to see which one to use PF or IPF. # new way to see which one to use PF or IPF.
# see http://miniupnp.tuxfamily.org/forum/viewtopic.php?p=957 # 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 - . /etc/rc.subr
- # source config file so we can probe vars - # source config file so we can probe vars
- . /etc/rc.conf - . /etc/rc.conf
- if checkyesno ipfilter_enable; then - if checkyesno ipfilter_enable; then
- echo "Using ipf" - echo "Using ipf"
- FW=ipf - FW=ipf
- echo "#define USE_IPF 1" >> ${CONFIGFILE}
- elif checkyesno pf_enable; then - elif checkyesno pf_enable; then
- echo "Using pf" - echo "Using pf"
- FW=pf - FW=pf
- echo "#define USE_PF 1" >> ${CONFIGFILE} - elif checkyesno firewall_enable; then
+ # source file wource config file so we can probe vars - echo "Using ifpw"
- FW=ipfw
+ if [ -f /etc/rc.subr ] && [ -f /etc/rc.conf ]; then + if [ -f /etc/rc.subr ] && [ -f /etc/rc.conf ]; then
+ # source file with handy subroutines like checkyesno
+ . /etc/rc.subr + . /etc/rc.subr
+ # source config file so we can probe vars + # source config file so we can probe vars
+ . /etc/rc.conf + . /etc/rc.conf
+ if checkyesno ipfilter_enable; then + if checkyesno ipfilter_enable; then
+ echo "Using ipf" + echo "Using ipf"
+ FW=ipf + FW=ipf
+ echo "#define USE_IPF 1" >> ${CONFIGFILE}
+ elif checkyesno pf_enable; then + elif checkyesno pf_enable; then
+ echo "Using pf" + echo "Using pf"
+ FW=pf + FW=pf
+ echo "#define USE_PF 1" >> ${CONFIGFILE} + elif checkyesno firewall_enable; then
+ else + echo "Using ifpw"
+ echo "Could not detect usage of ipf or pf. Compiling for pf by default" + FW=ipfw
+ FW=pf
+ echo "#define USE_PF 1" >> ${CONFIGFILE}
+ fi + fi
# TODO : Add support for IPFW else
# echo "#define USE_IPFW 1" >> ${CONFIGFILE} echo "Could not detect usage of ipf, pf, ipfw. Compiling for pf by default"
# FW=ipfw FW=pf

11
net/miniupnpd/files/pf_enable_filter_rules.patch
View file

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