Bumping to 1.3, which is stable from upstream and fixes compiling with

iptables >=1.4.3
Package-Manager: portage-2.2_rc31/cvs/Linux i686

9 files changed, 35 insertions, 54 deletions

diff --git a/net-misc/miniupnpd/ChangeLog b/net-misc/miniupnpd/ChangeLog
index 8a42f2aafc96..7f6da9dc5769 100644
--- a/net-misc/miniupnpd/ChangeLog
+++ b/net-misc/miniupnpd/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for net-misc/miniupnpd
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/miniupnpd/ChangeLog,v 1.6 2009/04/19 21:12:03 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/miniupnpd/ChangeLog,v 1.7 2009/04/24 23:43:24 gurligebis Exp $
+
+*miniupnpd-1.3 (24 Apr 2009)
+
+  24 Apr 2009; Bjarke Istrup Pedersen <gurligebis@gentoo.org>
+  +files/miniupnpd-1.3-Makefile_fix.diff, +files/miniupnpd-1.3-conf.d,
+  +files/miniupnpd-1.3-init.d, +files/miniupnpd-1.3-iptables_path.diff,
+  -files/miniupnpd-20090214-conf.d, -files/miniupnpd-20090214-init.d,
+  -files/miniupnpd-20090214-iptables.diff,
+  -files/miniupnpd-20090214-iptables_compile.diff,
+  -files/miniupnpd-20090214-iptables_path.diff, +miniupnpd-1.3.ebuild,
+  -miniupnpd-20090214.ebuild:
+  Bumping to 1.3, which is stable from upstream and fixes compiling with
+  iptables >=1.4.3
 
   19 Apr 2009; Bjarke Istrup Pedersen <gurligebis@gentoo.org>
   files/miniupnpd-20090214-iptables_path.diff:
diff --git a/net-misc/miniupnpd/Manifest b/net-misc/miniupnpd/Manifest
index 8e341d79e12e..d39f4ab162ad 100644
--- a/net-misc/miniupnpd/Manifest
+++ b/net-misc/miniupnpd/Manifest
@@ -1,19 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX miniupnpd-20090214-conf.d 41 RMD160 6ce4c17365bbb0b993613c9bd7392fa97545cd21 SHA1 7e1d95a80f62a01928ac49497127e98755ca7d08 SHA256 8c6dae8588e21208a2f0a17965548e0b0708ceeea1157e2506f745e28913f9b3
-AUX miniupnpd-20090214-init.d 626 RMD160 5ef339c5847953da917429dbb9109b7caa50f5e1 SHA1 acf22a603d5cc34aaeb5b9d2c12fdb28ae46b027 SHA256 81d7c1c13cdc5e83a9f9b628e3ce7e42e0ea6ce43df5f8b56ca3e534ffa4205e
-AUX miniupnpd-20090214-iptables.diff 757 RMD160 7921a9782b4f8bb98060661b3a4c13f2186ba6ba SHA1 342d1493e9385659b9950d30f4df52d5a3f9e080 SHA256 14f474f20265ca2d38da57d54401cfac0e088a51e8885fe17705d49ea8eef99d
-AUX miniupnpd-20090214-iptables_compile.diff 313 RMD160 c5ebf80db28460afe7bb06ec96b12ba96c1670bd SHA1 d54f4eb632c984f1df1ec48d9e494e79199cbafc SHA256 87b986d7a802b306bd07e38f3ded799846c59446d1a690e6cc00505130b637ea
-AUX miniupnpd-20090214-iptables_path.diff 2309 RMD160 e244817a4f7f4f7dc4abfaef44df017734f3c21a SHA1 23b92910e58238cf31ad77cb746f28bb36bcb608 SHA256 6fecac3acd2f773110a8f22db931d2b77dd75ec1894e15b33e0747f0aa66154c
-DIST miniupnpd-20090214.tar.gz 82921 RMD160 61fc48b32d8d842cc526231f102a5f8e30677191 SHA1 7006b1bc7e0df4493536369fb5a5c01a1c9669a1 SHA256 347c057d61226673df9811126830d4f279cbad3bd9efce1875ef4a561356a56f
-EBUILD miniupnpd-20090214.ebuild 1131 RMD160 54956b35aa13f9ab1d703bcba32d8f0ce34e85a2 SHA1 6159fbaeff5497c2231531b9648576d839f479f2 SHA256 4f7228c513f846c12042af0a1a771669e0a52a206c93ee38e351e91b74ab1e2a
-MISC ChangeLog 1968 RMD160 5eafb56a7a94900d48f9c1185d8ae269154baad1 SHA1 0aefc52ab5376166b0698d0763e7c885aadf607b SHA256 de0dce6db2d0ad730ef88f3266950e78fe17aec582eb6c85fcfdb71e99d15602
+AUX miniupnpd-1.3-Makefile_fix.diff 330 RMD160 cd41e8270a54d47efcb92cad729d7d6d7e6781bb SHA1 c0d9538e2c47421e9688b4f2d6a51941fe800999 SHA256 3c59afd314685be72d8a527c8979768e46d9cf3ebeb72064c8e26de91c71d9b5
+AUX miniupnpd-1.3-conf.d 41 RMD160 6ce4c17365bbb0b993613c9bd7392fa97545cd21 SHA1 7e1d95a80f62a01928ac49497127e98755ca7d08 SHA256 8c6dae8588e21208a2f0a17965548e0b0708ceeea1157e2506f745e28913f9b3
+AUX miniupnpd-1.3-init.d 621 RMD160 2834661061bd2d7c0d4ad26779dc02eb6985e8ee SHA1 c0826044b2868ce13beadc937d11972722e95cdf SHA256 b2e5908231ad494c3eb408aed54536c897729b9f5c973244206f03b7dc8b8288
+AUX miniupnpd-1.3-iptables_path.diff 2309 RMD160 e244817a4f7f4f7dc4abfaef44df017734f3c21a SHA1 23b92910e58238cf31ad77cb746f28bb36bcb608 SHA256 6fecac3acd2f773110a8f22db931d2b77dd75ec1894e15b33e0747f0aa66154c
+DIST miniupnpd-1.3.tar.gz 83464 RMD160 ae3dd9f7012adc47d65da73af19f989b0f3a9441 SHA1 f9de317b6cf69506a33ad771198802a5fabe2c5c SHA256 b4585c77ac5a7fb00a687772db95996dd2e8854db9d628c9bb85e5ecfd67f2ff
+EBUILD miniupnpd-1.3.ebuild 1081 RMD160 b6eeb9da778f749abd6f710c8d8ab3baf3ae517a SHA1 54124d76d755758a31c0cd9e067d86dfbf92def5 SHA256 a3d3ae9551c5154b4d2e7c9637d27096362f49b094de4c7cf227765a67151c72
+MISC ChangeLog 2561 RMD160 3f7597aa31d80ea3b83e23734863a92c2595c452 SHA1 bee84410a3a9e738f4967c60f2b06c52a733d29d SHA256 521a4431469dcb2dc545c1f34c5eb6c68b23a59e787e6c8e9b4b9c3cc1f9b2c6
 MISC metadata.xml 401 RMD160 b4f2959a8b2aa1f97df19bbc675decd518ae1457 SHA1 aded6feda295e161854ba5c305bd0711d0f1ca13 SHA256 18377435ab021c2ab7967a14249da4a0c1c89a027b38e3ade7f73ae430448380
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAknrk64ACgkQsR7PQhRXYEl4VACePD9Uzg4HsGkPSIaowT4f5iez
-SocAnRHDjnbSvIq/N722/torKfRQs38g
-=RS+r
------END PGP SIGNATURE-----
diff --git a/net-misc/miniupnpd/files/miniupnpd-1.3-Makefile_fix.diff b/net-misc/miniupnpd/files/miniupnpd-1.3-Makefile_fix.diff
new file mode 100644
index 000000000000..5c5a232b5cdc
--- /dev/null
+++ b/net-misc/miniupnpd/files/miniupnpd-1.3-Makefile_fix.diff
@@ -0,0 +1,11 @@
+--- Makefile.old	2009-04-23 11:43:02.000000000 +0000
++++ Makefile	2009-04-23 11:43:16.000000000 +0000
+@@ -59,6 +59,8 @@ LIBS = $(IPTABLESPATH)/libiptc/libiptc.a
+ endif
+ endif
+ 
++CFLAGS := $(CFLAGS) -DIPTABLES_143
++
+ TESTUPNPDESCGENOBJS = testupnpdescgen.o upnpdescgen.o
+ 
+ EXECUTABLES = miniupnpd testupnpdescgen testgetifstats \
diff --git a/net-misc/miniupnpd/files/miniupnpd-20090214-conf.d b/net-misc/miniupnpd/files/miniupnpd-1.3-conf.d
index 8482ef2d185b..8482ef2d185b 100644
--- a/net-misc/miniupnpd/files/miniupnpd-20090214-conf.d
+++ b/net-misc/miniupnpd/files/miniupnpd-1.3-conf.d
diff --git a/net-misc/miniupnpd/files/miniupnpd-20090214-init.d b/net-misc/miniupnpd/files/miniupnpd-1.3-init.d
index 128d8348563e..b84261bf38fb 100644
--- a/net-misc/miniupnpd/files/miniupnpd-20090214-init.d
+++ b/net-misc/miniupnpd/files/miniupnpd-1.3-init.d
@@ -1,7 +1,7 @@
 #!/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-20090214-init.d,v 1.1 2009/04/16 17:33:30 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/miniupnpd/files/miniupnpd-1.3-init.d,v 1.1 2009/04/24 23:43:23 gurligebis Exp $
 
 depend() {
 	need net iptables
diff --git a/net-misc/miniupnpd/files/miniupnpd-20090214-iptables_path.diff b/net-misc/miniupnpd/files/miniupnpd-1.3-iptables_path.diff
index 05b02efb09b2..05b02efb09b2 100644
--- a/net-misc/miniupnpd/files/miniupnpd-20090214-iptables_path.diff
+++ b/net-misc/miniupnpd/files/miniupnpd-1.3-iptables_path.diff
diff --git a/net-misc/miniupnpd/files/miniupnpd-20090214-iptables.diff b/net-misc/miniupnpd/files/miniupnpd-20090214-iptables.diff
deleted file mode 100644
index 25067c8a7667..000000000000
--- a/net-misc/miniupnpd/files/miniupnpd-20090214-iptables.diff
+++ /dev/null
@@ -1,20 +0,0 @@
-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"
diff --git a/net-misc/miniupnpd/files/miniupnpd-20090214-iptables_compile.diff b/net-misc/miniupnpd/files/miniupnpd-20090214-iptables_compile.diff
deleted file mode 100644
index 043f585629b4..000000000000
--- a/net-misc/miniupnpd/files/miniupnpd-20090214-iptables_compile.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- netfilter/iptcrdr.c.old	2009-04-16 17:09:17.000000000 +0000
-+++ netfilter/iptcrdr.c	2009-04-16 17:09:35.000000000 +0000
-@@ -30,6 +30,8 @@
- #include "iptcrdr.h"
- #include "../upnpglobalvars.h"
- 
-+typedef struct iptc_handle *iptc_handle_t;
-+
- /* dummy init and shutdown functions */
- int init_redirect(void)
- {
diff --git a/net-misc/miniupnpd/miniupnpd-20090214.ebuild b/net-misc/miniupnpd/miniupnpd-1.3.ebuild
index 263ee9c825bf..a1943d4c596d 100644
--- a/net-misc/miniupnpd/miniupnpd-20090214.ebuild
+++ b/net-misc/miniupnpd/miniupnpd-1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/miniupnpd/miniupnpd-20090214.ebuild,v 1.1 2009/04/16 17:33:31 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/miniupnpd/miniupnpd-1.3.ebuild,v 1.1 2009/04/24 23:43:24 gurligebis Exp $
 
 EAPI="2"
 
@@ -21,9 +21,8 @@ RDEPEND="${DEPEND}"
 
 src_prepare() {
 	mv Makefile.linux Makefile
-	epatch "${FILESDIR}/${P}-iptables.diff"
 	epatch "${FILESDIR}/${P}-iptables_path.diff"
-	epatch "${FILESDIR}/${P}-iptables_compile.diff"
+	epatch "${FILESDIR}/${P}-Makefile_fix.diff"
 	sed -i -e "s#^CFLAGS = #CFLAGS = -I${KV_OUT_DIR}/include #" Makefile
 		# we don't use netfilter/Makefile
 	gmake config.h