[gentoo-commits] gentoo-x86 commit in net-misc/miniupnpd/files: miniupnpd-20090129-iptables_path.diff miniupnpd-20090129-conf.d miniupnpd-20090129-init.d miniupnpd-20090129-iptables.diff miniupnpd-20081009-iptables_path.diff miniupnpd-20081009-init.d miniupnpd-20081009-conf.d miniupnpd-20081009-iptables.diff

[Bjarke Istrup Pedersen (gurligebis)]

gurligebis    09/01/30 00:05:17

  Added:                miniupnpd-20090129-iptables_path.diff
                        miniupnpd-20090129-conf.d miniupnpd-20090129-init.d
                        miniupnpd-20090129-iptables.diff
  Removed:              miniupnpd-20081009-iptables_path.diff
                        miniupnpd-20081009-init.d miniupnpd-20081009-conf.d
                        miniupnpd-20081009-iptables.diff
  Log:
  Bumping to 20090129
  (Portage version: 2.2_rc23/cvs/Linux i686)

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

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

Index: miniupnpd-20090129-iptables_path.diff
===================================================================
diff -aurp old/netfilter/iptables_display.sh new/netfilter/iptables_display.sh
--- old/netfilter/iptables_display.sh	2008-10-27 20:53:09.000000000 +0000
+++ new/netfilter/iptables_display.sh	2008-10-27 20:53:38.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	2008-10-27 20:53:09.000000000 +0000
+++ new/netfilter/iptables_flush.sh	2008-10-27 20:53:46.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	2008-10-27 20:53:09.000000000 +0000
+++ new/netfilter/iptables_init.sh	2008-10-27 20:54:39.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
diff -aurp old/netfilter/iptables_removeall.sh new/netfilter/iptables_removeall.sh
--- old/netfilter/iptables_removeall.sh	2008-10-27 20:53:09.000000000 +0000
+++ new/netfilter/iptables_removeall.sh	2008-10-27 20:54:48.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



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

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

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




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

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

Index: miniupnpd-20090129-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-20090129-init.d,v 1.1 2009/01/30 00:05:17 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
}



1.1                  net-misc/miniupnpd/files/miniupnpd-20090129-iptables.diff

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

Index: miniupnpd-20090129-iptables.diff
===================================================================
diff -dupr miniupnpd-old/netfilter/iptcrdr.c miniupnpd-20080427/netfilter/iptcrdr.c
--- miniupnpd-old/netfilter/iptcrdr.c	2008-09-07 18:24:13.108005833 +0200
+++ miniupnpd-20080427/netfilter/iptcrdr.c	2008-09-07 18:41:11.956007153 +0200
@@ -20,11 +20,13 @@
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)
 #include <linux/netfilter_ipv4/ip_nat.h>
 #else
-#include <linux/netfilter/nf_nat.h>
-/*
+#include <stdbool.h> /* bool */
+	/* below is in <kerneldir>/include/linux/kernel.h, but not in /usr/include/linux/kernel.h,
+	 * which gcc uses */
+#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
+#include <net/netfilter/nf_nat.h>
 #define ip_nat_multi_range	nf_nat_multi_range
 #define ip_nat_range		nf_nat_range
-*/
 #endif
 
 #include "iptcrdr.h"