1 |
gurligebis 09/04/16 17:33:30 |
2 |
|
3 |
Added: miniupnpd-20090214-iptables_compile.diff |
4 |
miniupnpd-20090214-iptables_path.diff |
5 |
miniupnpd-20090214-conf.d miniupnpd-20090214-init.d |
6 |
miniupnpd-20090214-iptables.diff |
7 |
Removed: miniupnpd-20090129-conf.d |
8 |
miniupnpd-20090129-iptables.diff |
9 |
miniupnpd-20090129-init.d |
10 |
miniupnpd-20090129-iptables_path.diff |
11 |
Log: |
12 |
Bumping to 20090214 |
13 |
(Portage version: 2.2_rc29/cvs/Linux i686) |
14 |
|
15 |
Revision Changes Path |
16 |
1.1 net-misc/miniupnpd/files/miniupnpd-20090214-iptables_compile.diff |
17 |
|
18 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/miniupnpd/files/miniupnpd-20090214-iptables_compile.diff?rev=1.1&view=markup |
19 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/miniupnpd/files/miniupnpd-20090214-iptables_compile.diff?rev=1.1&content-type=text/plain |
20 |
|
21 |
Index: miniupnpd-20090214-iptables_compile.diff |
22 |
=================================================================== |
23 |
--- netfilter/iptcrdr.c.old 2009-04-16 17:09:17.000000000 +0000 |
24 |
+++ netfilter/iptcrdr.c 2009-04-16 17:09:35.000000000 +0000 |
25 |
@@ -30,6 +30,8 @@ |
26 |
#include "iptcrdr.h" |
27 |
#include "../upnpglobalvars.h" |
28 |
|
29 |
+typedef struct iptc_handle *iptc_handle_t; |
30 |
+ |
31 |
/* dummy init and shutdown functions */ |
32 |
int init_redirect(void) |
33 |
{ |
34 |
|
35 |
|
36 |
|
37 |
1.1 net-misc/miniupnpd/files/miniupnpd-20090214-iptables_path.diff |
38 |
|
39 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/miniupnpd/files/miniupnpd-20090214-iptables_path.diff?rev=1.1&view=markup |
40 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/miniupnpd/files/miniupnpd-20090214-iptables_path.diff?rev=1.1&content-type=text/plain |
41 |
|
42 |
Index: miniupnpd-20090214-iptables_path.diff |
43 |
=================================================================== |
44 |
diff -aurp old/netfilter/iptables_display.sh new/netfilter/iptables_display.sh |
45 |
--- old/netfilter/iptables_display.sh 2008-10-27 20:53:09.000000000 +0000 |
46 |
+++ new/netfilter/iptables_display.sh 2008-10-27 20:53:38.000000000 +0000 |
47 |
@@ -1,6 +1,6 @@ |
48 |
#! /bin/sh |
49 |
# $Id: iptables_display.sh,v 1.3 2006/11/23 12:32:56 nanard Exp $ |
50 |
-IPTABLES=iptables |
51 |
+IPTABLES=/sbin/iptables |
52 |
|
53 |
#display all chains relative to miniupnpd |
54 |
$IPTABLES -v -n -t nat -L PREROUTING |
55 |
diff -aurp old/netfilter/iptables_flush.sh new/netfilter/iptables_flush.sh |
56 |
--- old/netfilter/iptables_flush.sh 2008-10-27 20:53:09.000000000 +0000 |
57 |
+++ new/netfilter/iptables_flush.sh 2008-10-27 20:53:46.000000000 +0000 |
58 |
@@ -1,6 +1,6 @@ |
59 |
#! /bin/sh |
60 |
# $Id: iptables_flush.sh,v 1.2 2006/11/23 12:32:57 nanard Exp $ |
61 |
-IPTABLES=iptables |
62 |
+IPTABLES=/sbin/iptables |
63 |
|
64 |
#flush all rules owned by miniupnpd |
65 |
$IPTABLES -t nat -F MINIUPNPD |
66 |
diff -aurp old/netfilter/iptables_init.sh new/netfilter/iptables_init.sh |
67 |
--- old/netfilter/iptables_init.sh 2008-10-27 20:53:09.000000000 +0000 |
68 |
+++ new/netfilter/iptables_init.sh 2008-10-27 20:54:39.000000000 +0000 |
69 |
@@ -1,6 +1,6 @@ |
70 |
#! /bin/sh |
71 |
# $Id: iptables_init.sh,v 1.4 2008/04/25 18:15:08 nanard Exp $ |
72 |
-IPTABLES=iptables |
73 |
+IPTABLES=/sbin/iptables |
74 |
|
75 |
#change this parameters : |
76 |
EXTIF=eth0 |
77 |
diff -aurp old/netfilter/iptables_removeall.sh new/netfilter/iptables_removeall.sh |
78 |
--- old/netfilter/iptables_removeall.sh 2008-10-27 20:53:09.000000000 +0000 |
79 |
+++ new/netfilter/iptables_removeall.sh 2008-10-27 20:54:48.000000000 +0000 |
80 |
@@ -1,6 +1,6 @@ |
81 |
#! /bin/sh |
82 |
# $Id: iptables_removeall.sh,v 1.4 2008/04/25 18:15:09 nanard Exp $ |
83 |
-IPTABLES=iptables |
84 |
+IPTABLES=/sbin/iptables |
85 |
|
86 |
#change this parameters : |
87 |
EXTIF=eth0 |
88 |
|
89 |
|
90 |
|
91 |
1.1 net-misc/miniupnpd/files/miniupnpd-20090214-conf.d |
92 |
|
93 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/miniupnpd/files/miniupnpd-20090214-conf.d?rev=1.1&view=markup |
94 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/miniupnpd/files/miniupnpd-20090214-conf.d?rev=1.1&content-type=text/plain |
95 |
|
96 |
Index: miniupnpd-20090214-conf.d |
97 |
=================================================================== |
98 |
ARGS='-f /etc/miniupnpd/miniupnpd.conf' |
99 |
|
100 |
|
101 |
|
102 |
|
103 |
1.1 net-misc/miniupnpd/files/miniupnpd-20090214-init.d |
104 |
|
105 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/miniupnpd/files/miniupnpd-20090214-init.d?rev=1.1&view=markup |
106 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/miniupnpd/files/miniupnpd-20090214-init.d?rev=1.1&content-type=text/plain |
107 |
|
108 |
Index: miniupnpd-20090214-init.d |
109 |
=================================================================== |
110 |
#!/sbin/runscript |
111 |
# Copyright 1999-2008 Gentoo Foundation |
112 |
# Distributed under the terms of the GNU General Public License v2 |
113 |
# $Header: /var/cvsroot/gentoo-x86/net-misc/miniupnpd/files/miniupnpd-20090214-init.d,v 1.1 2009/04/16 17:33:30 gurligebis Exp $ |
114 |
|
115 |
depend() { |
116 |
need net iptables |
117 |
} |
118 |
|
119 |
start() { |
120 |
ebegin "Starting miniupnpd" |
121 |
/etc/miniupnpd/iptables_init.sh |
122 |
start-stop-daemon --start --pidfile /var/run/miniupnpd.pid --startas /usr/sbin/miniupnpd -- ${ARGS} |
123 |
eend $? |
124 |
} |
125 |
|
126 |
stop() { |
127 |
ebegin "Stopping miniupnpd" |
128 |
start-stop-daemon --stop --pidfile /var/run/miniupnpd.pid |
129 |
eend $? |
130 |
/etc/miniupnpd/iptables_removeall.sh |
131 |
} |
132 |
|
133 |
|
134 |
|
135 |
1.1 net-misc/miniupnpd/files/miniupnpd-20090214-iptables.diff |
136 |
|
137 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/miniupnpd/files/miniupnpd-20090214-iptables.diff?rev=1.1&view=markup |
138 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/miniupnpd/files/miniupnpd-20090214-iptables.diff?rev=1.1&content-type=text/plain |
139 |
|
140 |
Index: miniupnpd-20090214-iptables.diff |
141 |
=================================================================== |
142 |
diff -dupr miniupnpd-old/netfilter/iptcrdr.c miniupnpd-20080427/netfilter/iptcrdr.c |
143 |
--- miniupnpd-old/netfilter/iptcrdr.c 2008-09-07 18:24:13.108005833 +0200 |
144 |
+++ miniupnpd-20080427/netfilter/iptcrdr.c 2008-09-07 18:41:11.956007153 +0200 |
145 |
@@ -20,11 +20,13 @@ |
146 |
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22) |
147 |
#include <linux/netfilter_ipv4/ip_nat.h> |
148 |
#else |
149 |
-#include <linux/netfilter/nf_nat.h> |
150 |
-/* |
151 |
+#include <stdbool.h> /* bool */ |
152 |
+ /* below is in <kerneldir>/include/linux/kernel.h, but not in /usr/include/linux/kernel.h, |
153 |
+ * which gcc uses */ |
154 |
+#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0])) |
155 |
+#include <net/netfilter/nf_nat.h> |
156 |
#define ip_nat_multi_range nf_nat_multi_range |
157 |
#define ip_nat_range nf_nat_range |
158 |
-*/ |
159 |
#endif |
160 |
|
161 |
#include "iptcrdr.h" |