Bumping to 1.6

Package-Manager: portage-2.2.0_alpha46/cvs/Linux i686

4 files changed, 87 insertions, 8 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/Manifest b/net-misc/miniupnpd/Manifest
index 5744ec451f90..d192403c190b 100644
--- a/net-misc/miniupnpd/Manifest
+++ b/net-misc/miniupnpd/Manifest
@@ -1,12 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX miniupnpd-1.3-Makefile_fix.diff 330 RMD160 cd41e8270a54d47efcb92cad729d7d6d7e6781bb SHA1 c0d9538e2c47421e9688b4f2d6a51941fe800999 SHA256 3c59afd314685be72d8a527c8979768e46d9cf3ebeb72064c8e26de91c71d9b5
 AUX miniupnpd-1.3-iptables_path.diff 2309 RMD160 e244817a4f7f4f7dc4abfaef44df017734f3c21a SHA1 23b92910e58238cf31ad77cb746f28bb36bcb608 SHA256 6fecac3acd2f773110a8f22db931d2b77dd75ec1894e15b33e0747f0aa66154c
 AUX miniupnpd-1.5-iptables_buildfix.diff 385 RMD160 71a8be15991cac43747142c15f2a05ae4a40532e SHA1 68c3cf38b74c04aaeee3e53ae98a97d235dbcddd SHA256 e45364117dd5b6cc64935bc0398678941df9e7ea63f520ce4709c2fbc01415b2
 AUX miniupnpd-1.5-iptcrdr.diff 618 RMD160 a6df16d7d31c6bb8f7e75b5f5fd4480258808a6f SHA1 182efbd7ef4a1c27c055b7c7673aa4a159f70361 SHA256 a307065ba8bb76127939083e169f1d209a3db6549a99e7abe46611805b48713c
 AUX miniupnpd-conf.d 41 RMD160 6ce4c17365bbb0b993613c9bd7392fa97545cd21 SHA1 7e1d95a80f62a01928ac49497127e98755ca7d08 SHA256 8c6dae8588e21208a2f0a17965548e0b0708ceeea1157e2506f745e28913f9b3
 AUX miniupnpd-init.d 614 RMD160 28bcb84f9488659df5c895d51cdfc6d0e3d22c4f SHA1 89deee2ac9b6eb40844b39eb4aec56cf0c34865f SHA256 5632ffcc31a149d6bf117d9b33fbeb478c2ff30e5878e9752bf3a42befa9c1c5
-DIST miniupnpd-1.5.20110623.tar.gz 123529 RMD160 09a43e8e1b1e74dffc2e5af40469868e42511780 SHA1 a70a6f7b2a0fd6fd73460d846e9294157f125f1c SHA256 b291030ae86f28c6532c20a4ec12cdee7cad5028450c9273578c0f81286447ab
+AUX miniupnpd-nf_nat-fix.diff 1784 RMD160 3d7a420653a76f4adab6307e3f775ef673a4f930 SHA1 51ecbe42771a258b4436b16f05c16cfcd537d864 SHA256 370eefe9a81e3dc17e1a41adbcb085bd496f1a41d929bcfd26638b7b2e3fb96c
 DIST miniupnpd-1.5.tar.gz 98993 RMD160 22813f9b8d31e4d4906b7dbfd516889dbc70f270 SHA1 6762b69ab9d0bb9158318b436957227cb4dbb2a9 SHA256 402db10f46d23ffcafbb655ad7333daf1271fb115f92aa293e22cc974fa8da30
+DIST miniupnpd-1.6.tar.gz 124917 RMD160 11ef50d02983d19e7d6eaa07eea5eb77f76cce04 SHA1 d8469ba820487fcbf5260556ec2974dd9db69f40 SHA256 a26744025038a207d96a2dce96aa76db095886eb68dee87321b9da55cb1c8585
 EBUILD miniupnpd-1.5.ebuild 1637 RMD160 9dfb28c79955d05617a7a2403ea4ee8d7e8e712e SHA1 78b81086fbb61daf58f518014eb95e5f7a4520b2 SHA256 be2157ced08eff767467d013a08bf0a4b02b6ee6c8b8a90d3960c232588cc971
-EBUILD miniupnpd-1.6_pre20110623.ebuild 1507 RMD160 9217aeefac0351a74e0bc4d80c96fa8a40943be8 SHA1 8634bd0f2b154f9a8aa3cc6efafc7970d9640b59 SHA256 28cdcc76a65e6fd9ef34ae800dc9c1c2d6e5c366c87594711f7bb2f7ee5d345a
-MISC ChangeLog 4767 RMD160 e1822351bf29533797d7d06caf558944c24a763d SHA1 f258c605e9dff4e33c3f1b1f3d6030e29f44d2db SHA256 47807a7ac96a088af132706e9d2b6bcce7a2596ecc2a6532efabe0f7a795f730
+EBUILD miniupnpd-1.6.ebuild 1510 RMD160 bee61271d7abaa94abd9577f4c3c21f3138ac1ce SHA1 63eab69df78efea9c21477f4f215b9bd2adc5220 SHA256 1779e26b4138b1e30b62dfb167f27a2e66fe0fae0d8a6014b2356d6fa73eb021
+MISC ChangeLog 4969 RMD160 9a78dea42e671dda029162b4f8605b7a00d49409 SHA1 26d1a32eae114f7d0508be4a48767ad3f3de778c SHA256 99e1f988a20f0b956dda18fcce9752d705d0ecdaa3b7143751cae36eed603d80
 MISC metadata.xml 401 RMD160 b4f2959a8b2aa1f97df19bbc675decd518ae1457 SHA1 aded6feda295e161854ba5c305bd0711d0f1ca13 SHA256 18377435ab021c2ab7967a14249da4a0c1c89a027b38e3ade7f73ae430448380
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk4zC8AACgkQsR7PQhRXYEkWLQCfReKVTl6T/5MpjOFF3KcYiFqR
+rG0An0LBjXvlVO/qrcvpLyF4k4IxwnHm
+=n2K3
+-----END PGP SIGNATURE-----
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||//' \