From: | "Bjarke Istrup Pedersen (gurligebis)" <gurligebis@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] gentoo-x86 commit in net-misc/miniupnpd/files: miniupnpd-conf.d miniupnpd-init.d miniupnpd-1.5-iptcrdr.diff miniupnpd-1.3-conf.d miniupnpd-1.3-init.d |
Date: | Sun, 28 Feb 2010 19:36:09 |
Message-Id: | E1Nlovv-0002B5-6V@stork.gentoo.org |
1 | gurligebis 10/02/28 19:36:07 |
2 | |
3 | Added: miniupnpd-conf.d miniupnpd-init.d |
4 | miniupnpd-1.5-iptcrdr.diff |
5 | Removed: miniupnpd-1.3-conf.d miniupnpd-1.3-init.d |
6 | Log: |
7 | Bumping to version 20091222 and fixing bug #287644 |
8 | (Portage version: 2.2_rc63/cvs/Linux i686) |
9 | |
10 | Revision Changes Path |
11 | 1.1 net-misc/miniupnpd/files/miniupnpd-conf.d |
12 | |
13 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/miniupnpd/files/miniupnpd-conf.d?rev=1.1&view=markup |
14 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/miniupnpd/files/miniupnpd-conf.d?rev=1.1&content-type=text/plain |
15 | |
16 | Index: miniupnpd-conf.d |
17 | =================================================================== |
18 | ARGS='-f /etc/miniupnpd/miniupnpd.conf' |
19 | |
20 | |
21 | |
22 | |
23 | 1.1 net-misc/miniupnpd/files/miniupnpd-init.d |
24 | |
25 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/miniupnpd/files/miniupnpd-init.d?rev=1.1&view=markup |
26 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/miniupnpd/files/miniupnpd-init.d?rev=1.1&content-type=text/plain |
27 | |
28 | Index: miniupnpd-init.d |
29 | =================================================================== |
30 | #!/sbin/runscript |
31 | # Copyright 1999-2008 Gentoo Foundation |
32 | # Distributed under the terms of the GNU General Public License v2 |
33 | # $Header: /var/cvsroot/gentoo-x86/net-misc/miniupnpd/files/miniupnpd-init.d,v 1.1 2010/02/28 19:36:06 gurligebis Exp $ |
34 | |
35 | depend() { |
36 | need net iptables |
37 | } |
38 | |
39 | start() { |
40 | ebegin "Starting miniupnpd" |
41 | /etc/miniupnpd/iptables_init.sh |
42 | start-stop-daemon --start --pidfile /var/run/miniupnpd.pid --startas /usr/sbin/miniupnpd -- ${ARGS} |
43 | eend $? |
44 | } |
45 | |
46 | stop() { |
47 | ebegin "Stopping miniupnpd" |
48 | start-stop-daemon --stop --pidfile /var/run/miniupnpd.pid |
49 | eend $? |
50 | /etc/miniupnpd/iptables_removeall.sh |
51 | } |
52 | |
53 | |
54 | |
55 | 1.1 net-misc/miniupnpd/files/miniupnpd-1.5-iptcrdr.diff |
56 | |
57 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/miniupnpd/files/miniupnpd-1.5-iptcrdr.diff?rev=1.1&view=markup |
58 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/miniupnpd/files/miniupnpd-1.5-iptcrdr.diff?rev=1.1&content-type=text/plain |
59 | |
60 | Index: miniupnpd-1.5-iptcrdr.diff |
61 | =================================================================== |
62 | --- netfilter/iptcrdr.c.old 2010-02-24 14:22:23.000000000 +0100 |
63 | +++ netfilter/iptcrdr.c 2010-02-24 14:48:00.000000000 +0100 |
64 | @@ -20,6 +20,13 @@ |
65 | |
66 | #if IPTABLES_143 |
67 | /* IPTABLES API version >= 1.4.3 */ |
68 | + |
69 | +#define BUILD_BUG_ON_ZERO(e) (sizeof(struct { int:-!!(e); })) |
70 | +#define __must_be_array(a) \ |
71 | + BUILD_BUG_ON_ZERO(__builtin_types_compatible_p(typeof(a), typeof(&a[0]))) |
72 | +#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr)) |
73 | +#define LIST_POISON2 ((void *) 0x00200200 ) |
74 | + |
75 | #include <net/netfilter/nf_nat.h> |
76 | #define ip_nat_multi_range nf_nat_multi_range |
77 | #define ip_nat_range nf_nat_range |