[gentoo-commits] gentoo-x86 commit in net-misc/miniupnpd/files: miniupnpd-1.3-iptables_path.diff miniupnpd-1.3-conf.d miniupnpd-1.3-Makefile_fix.diff miniupnpd-1.3-init.d miniupnpd-20090214-iptables.diff miniupnpd-20090214-init.d miniupnpd-20090214-iptables_compile.diff miniupnpd-20090214-conf.d miniupnpd-20090214-iptables_path.diff

[Bjarke Istrup Pedersen (gurligebis)]

gurligebis    09/04/24 23:43:23

  Added:                miniupnpd-1.3-iptables_path.diff
                        miniupnpd-1.3-conf.d
                        miniupnpd-1.3-Makefile_fix.diff
                        miniupnpd-1.3-init.d
  Removed:              miniupnpd-20090214-iptables.diff
                        miniupnpd-20090214-init.d
                        miniupnpd-20090214-iptables_compile.diff
                        miniupnpd-20090214-conf.d
                        miniupnpd-20090214-iptables_path.diff
  Log:
  Bumping to 1.3, which is stable from upstream and fixes compiling with
  iptables >=1.4.3
  (Portage version: 2.2_rc31/cvs/Linux i686)

Revision  Changes    Path
1.1                  net-misc/miniupnpd/files/miniupnpd-1.3-iptables_path.diff

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/miniupnpd/files/miniupnpd-1.3-iptables_path.diff?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/miniupnpd/files/miniupnpd-1.3-iptables_path.diff?rev=1.1&content-type=text/plain

Index: miniupnpd-1.3-iptables_path.diff
===================================================================
diff -aurp old/netfilter/iptables_display.sh new/netfilter/iptables_display.sh
--- old/netfilter/iptables_display.sh	2009-04-19 20:17:14.000000000 +0000
+++ new/netfilter/iptables_display.sh	2009-04-19 20:17:52.000000000 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # $Id: iptables_display.sh,v 1.3 2006/11/23 12:32:56 nanard Exp $
-IPTABLES=iptables
+IPTABLES=/sbin/iptables
 
 #display all chains relative to miniupnpd
 $IPTABLES -v -n -t nat -L PREROUTING
diff -aurp old/netfilter/iptables_flush.sh new/netfilter/iptables_flush.sh
--- old/netfilter/iptables_flush.sh	2009-04-19 20:17:14.000000000 +0000
+++ new/netfilter/iptables_flush.sh	2009-04-19 20:17:52.000000000 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # $Id: iptables_flush.sh,v 1.2 2006/11/23 12:32:57 nanard Exp $
-IPTABLES=iptables
+IPTABLES=/sbin/iptables
 
 #flush all rules owned by miniupnpd
 $IPTABLES -t nat -F MINIUPNPD
diff -aurp old/netfilter/iptables_init.sh new/netfilter/iptables_init.sh
--- old/netfilter/iptables_init.sh	2009-04-19 20:17:14.000000000 +0000
+++ new/netfilter/iptables_init.sh	2009-04-19 20:18:19.000000000 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # $Id: iptables_init.sh,v 1.4 2008/04/25 18:15:08 nanard Exp $
-IPTABLES=iptables
+IPTABLES=/sbin/iptables
 
 #change this parameters :
 EXTIF=eth0
@@ -16,5 +16,5 @@ $IPTABLES -t nat -A PREROUTING -i $EXTIF
 #adding the MINIUPNPD chain for filter
 $IPTABLES -t filter -N MINIUPNPD
 #adding the rule to MINIUPNPD
-$IPTABLES -t filter -A FORWARD -i $EXTIF -o ! $EXTIF -j MINIUPNPD
+$IPTABLES -t filter -A FORWARD -i $EXTIF ! -o $EXTIF -j MINIUPNPD
 
diff -aurp old/netfilter/iptables_removeall.sh new/netfilter/iptables_removeall.sh
--- old/netfilter/iptables_removeall.sh	2009-04-19 20:17:14.000000000 +0000
+++ new/netfilter/iptables_removeall.sh	2009-04-19 20:18:27.000000000 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # $Id: iptables_removeall.sh,v 1.4 2008/04/25 18:15:09 nanard Exp $
-IPTABLES=iptables
+IPTABLES=/sbin/iptables
 
 #change this parameters :
 EXTIF=eth0
@@ -16,6 +16,6 @@ $IPTABLES -t nat -X MINIUPNPD
 #removing the MINIUPNPD chain for filter
 $IPTABLES -t filter -F MINIUPNPD
 #adding the rule to MINIUPNPD
-$IPTABLES -t filter -D FORWARD -i $EXTIF -o ! $EXTIF -j MINIUPNPD
+$IPTABLES -t filter -D FORWARD -i $EXTIF ! -o $EXTIF -j MINIUPNPD
 $IPTABLES -t filter -X MINIUPNPD
 



1.1                  net-misc/miniupnpd/files/miniupnpd-1.3-conf.d

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/miniupnpd/files/miniupnpd-1.3-conf.d?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/miniupnpd/files/miniupnpd-1.3-conf.d?rev=1.1&content-type=text/plain

Index: miniupnpd-1.3-conf.d
===================================================================
ARGS='-f /etc/miniupnpd/miniupnpd.conf'




1.1                  net-misc/miniupnpd/files/miniupnpd-1.3-Makefile_fix.diff

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/miniupnpd/files/miniupnpd-1.3-Makefile_fix.diff?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/miniupnpd/files/miniupnpd-1.3-Makefile_fix.diff?rev=1.1&content-type=text/plain

Index: miniupnpd-1.3-Makefile_fix.diff
===================================================================
--- Makefile.old	2009-04-23 11:43:02.000000000 +0000
+++ Makefile	2009-04-23 11:43:16.000000000 +0000
@@ -59,6 +59,8 @@ LIBS = $(IPTABLESPATH)/libiptc/libiptc.a
 endif
 endif
 
+CFLAGS := $(CFLAGS) -DIPTABLES_143
+
 TESTUPNPDESCGENOBJS = testupnpdescgen.o upnpdescgen.o
 
 EXECUTABLES = miniupnpd testupnpdescgen testgetifstats \



1.1                  net-misc/miniupnpd/files/miniupnpd-1.3-init.d

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/miniupnpd/files/miniupnpd-1.3-init.d?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/miniupnpd/files/miniupnpd-1.3-init.d?rev=1.1&content-type=text/plain

Index: miniupnpd-1.3-init.d
===================================================================
#!/sbin/runscript
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-misc/miniupnpd/files/miniupnpd-1.3-init.d,v 1.1 2009/04/24 23:43:23 gurligebis Exp $

depend() {
	need net iptables
}

start() {
	ebegin "Starting miniupnpd"
	/etc/miniupnpd/iptables_init.sh
	start-stop-daemon --start --pidfile /var/run/miniupnpd.pid --startas /usr/sbin/miniupnpd -- ${ARGS}
	eend $?
}

stop() {
	ebegin "Stopping miniupnpd"
        start-stop-daemon --stop --pidfile /var/run/miniupnpd.pid
	eend $?
	/etc/miniupnpd/iptables_removeall.sh
}