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

iptables >=1.4.3
(Portage version: 2.2_rc31/cvs/Linux i686)

8 files changed, 28 insertions, 36 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/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