diff options
| author |   Bjarke Istrup Pedersen <gurligebis@gentoo.org> | 2011-07-29 19:36:58 +0000 |
|---|---|---|
| committer | Bjarke Istrup Pedersen <gurligebis@gentoo.org> | 2011-07-29 19:36:58 +0000 |
| commit | adc4b2c55f7c6585ffcb7f967b54a3a01b1f0248 (patch) | |
| tree | da546d110c0cd6c65bf440203ef61ff399db8e21 /net-misc | |
| parent | Version bump; remove old (diff) | |
| download | gentoo-2-adc4b2c55f7c6585ffcb7f967b54a3a01b1f0248.tar.gz gentoo-2-adc4b2c55f7c6585ffcb7f967b54a3a01b1f0248.tar.bz2 gentoo-2-adc4b2c55f7c6585ffcb7f967b54a3a01b1f0248.zip | |
Bumping to 1.6
(Portage version: 2.2.0_alpha46/cvs/Linux i686)
Diffstat (limited to 'net-misc')
| -rw-r--r-- | net-misc/miniupnpd/ChangeLog | 8 | ||||
| -rw-r--r-- | net-misc/miniupnpd/files/miniupnpd-nf_nat-fix.diff | 61 | ||||
| -rw-r--r-- | net-misc/miniupnpd/miniupnpd-1.6.ebuild (renamed from net-misc/miniupnpd/miniupnpd-1.6_pre20110623.ebuild) | 9 |
3 files changed, 73 insertions, 5 deletions
diff --git a/net-misc/miniupnpd/ChangeLog b/net-misc/miniupnpd/ChangeLog index 0952a1e95cb2..c31434b49d42 100644 --- a/net-misc/miniupnpd/ChangeLog +++ b/net-misc/miniupnpd/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-misc/miniupnpd # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/miniupnpd/ChangeLog,v 1.18 2011/07/02 09:33:02 gurligebis Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/miniupnpd/ChangeLog,v 1.19 2011/07/29 19:36:58 gurligebis Exp $ + +*miniupnpd-1.6 (29 Jul 2011) + + 29 Jul 2011; <gurligebis@gentoo.org> -miniupnpd-1.6_pre20110623.ebuild, + +miniupnpd-1.6.ebuild, +files/miniupnpd-nf_nat-fix.diff: + Bumping to 1.6 , fixing bug #376631 02 Jul 2011; <gurligebis@gentoo.org> miniupnpd-1.5.ebuild, +files/miniupnpd-1.5-iptables_buildfix.diff: diff --git a/net-misc/miniupnpd/files/miniupnpd-nf_nat-fix.diff b/net-misc/miniupnpd/files/miniupnpd-nf_nat-fix.diff new file mode 100644 index 000000000000..95f3b0f90903 --- /dev/null +++ b/net-misc/miniupnpd/files/miniupnpd-nf_nat-fix.diff @@ -0,0 +1,61 @@ +diff -Naurp netfilter/iptcrdr.c netfilter.new/iptcrdr.c +--- netfilter/iptcrdr.c 2011-06-22 20:34:51.000000000 +0000 ++++ netfilter/iptcrdr.c 2011-07-29 19:26:50.703120526 +0000 +@@ -29,7 +29,7 @@ + #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr)) + #define LIST_POISON2 ((void *) 0x00200200 ) + +-#include <net/netfilter/nf_nat.h> ++#include "tiny_nf_nat.h" + #define ip_nat_multi_range nf_nat_multi_range + #define ip_nat_range nf_nat_range + #define IPTC_HANDLE struct iptc_handle * +@@ -38,7 +38,7 @@ + #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22) + #include <linux/netfilter_ipv4/ip_nat.h> + #else +-#include <linux/netfilter/nf_nat.h> ++#include "tiny_nf_nat.h" + #endif + #define IPTC_HANDLE iptc_handle_t + #endif +diff -Naurp netfilter/tiny_nf_nat.h netfilter.new/tiny_nf_nat.h +--- netfilter/tiny_nf_nat.h 1970-01-01 00:00:00.000000000 +0000 ++++ netfilter/tiny_nf_nat.h 2011-07-29 19:26:26.895119616 +0000 +@@ -0,0 +1,36 @@ ++/* Only what miniupnpd needs, until linux-libc-dev gains nf_nat.h */ ++ ++#ifndef TINY_NF_NAT_H ++#define TINY_NF_NAT_H ++ ++#include <linux/types.h> ++ ++#define IP_NAT_RANGE_MAP_IPS 1 ++#define IP_NAT_RANGE_PROTO_SPECIFIED 2 ++#define IP_NAT_RANGE_PROTO_RANDOM 4 ++#define IP_NAT_RANGE_PERSISTENT 8 ++ ++union nf_conntrack_man_proto { ++ __be16 all; ++ struct { __be16 port; } tcp; ++ struct { __be16 port; } udp; ++ struct { __be16 id; } icmp; ++ struct { __be16 port; } dccp; ++ struct { __be16 port; } sctp; ++ struct { __be16 key; } gre; ++}; ++ ++struct nf_nat_range { ++ unsigned int flags; ++ __be32 min_ip, max_ip; ++ union nf_conntrack_man_proto min, max; ++}; ++ ++struct nf_nat_multi_range_compat { ++ unsigned int rangesize; ++ struct nf_nat_range range[1]; ++}; ++ ++#define nf_nat_multi_range nf_nat_multi_range_compat ++ ++#endif /*TINY_NF_NAT_H*/ diff --git a/net-misc/miniupnpd/miniupnpd-1.6_pre20110623.ebuild b/net-misc/miniupnpd/miniupnpd-1.6.ebuild index af15c44eac73..27eff0178dd8 100644 --- a/net-misc/miniupnpd/miniupnpd-1.6_pre20110623.ebuild +++ b/net-misc/miniupnpd/miniupnpd-1.6.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/miniupnpd/miniupnpd-1.6_pre20110623.ebuild,v 1.1 2011/06/30 20:02:17 gurligebis Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/miniupnpd/miniupnpd-1.6.ebuild,v 1.1 2011/07/29 19:36:58 gurligebis Exp $ EAPI=2 -inherit eutils linux-info toolchain-funcs +inherit eutils toolchain-funcs -MY_PV=1.5.20110623 +MY_PV=1.6 S="${WORKDIR}/${PN}-${MY_PV}" DESCRIPTION="MiniUPnP IGD Daemon" @@ -27,8 +27,9 @@ DEPEND="${RDEPEND} src_prepare() { mv Makefile.linux Makefile epatch "${FILESDIR}/${PN}-1.3-Makefile_fix.diff" + epatch "${FILESDIR}/${PN}-nf_nat-fix.diff" sed -i \ - -e "s#^CFLAGS = .*-D#CPPFLAGS += -I${KERNEL_DIR}/include -D#" \ + -e "s#^CFLAGS = .*-D#CPPFLAGS += -I/usr/include -D#" \ -e '/^CFLAGS :=/s/CFLAGS/CPPFLAGS/g' \ -e "s/LIBS = -liptc/LIBS = -lip4tc/g" \ -e 's/genuuid||//' \ |