Bumping to version 20091222 and fixing bug #287644

(Portage version: 2.2_rc63/cvs/Linux i686)

5 files changed, 35 insertions, 7 deletions

diff --git a/net-misc/miniupnpd/ChangeLog b/net-misc/miniupnpd/ChangeLog
index 546bf06dd88f..ad210eeb479c 100644
--- a/net-misc/miniupnpd/ChangeLog
+++ b/net-misc/miniupnpd/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-misc/miniupnpd
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/miniupnpd/ChangeLog,v 1.12 2010/02/05 22:41:23 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/miniupnpd/ChangeLog,v 1.13 2010/02/28 19:36:07 gurligebis Exp $
+
+*miniupnpd-1.5_pre20091222 (28 Feb 2010)
+
+  28 Feb 2010; Bjarke Istrup Pedersen <gurligebis@gentoo.org>
+  -files/miniupnpd-1.3-conf.d, -files/miniupnpd-1.3-init.d,
+  -miniupnpd-1.4_pre20090921.ebuild, +miniupnpd-1.5_pre20091222.ebuild,
+  +files/miniupnpd-1.5-iptcrdr.diff, +files/miniupnpd-conf.d,
+  +files/miniupnpd-init.d:
+  Bumping to version 20091222 and fixing bug #287644
 
   05 Feb 2010; Ulrich Mueller <ulm@gentoo.org>
   miniupnpd-1.4_pre20090921.ebuild:
diff --git a/net-misc/miniupnpd/files/miniupnpd-1.5-iptcrdr.diff b/net-misc/miniupnpd/files/miniupnpd-1.5-iptcrdr.diff
new file mode 100644
index 000000000000..677043bdc37b
--- /dev/null
+++ b/net-misc/miniupnpd/files/miniupnpd-1.5-iptcrdr.diff
@@ -0,0 +1,16 @@
+--- netfilter/iptcrdr.c.old	2010-02-24 14:22:23.000000000 +0100
++++ netfilter/iptcrdr.c	2010-02-24 14:48:00.000000000 +0100
+@@ -20,6 +20,13 @@
+ 
+ #if IPTABLES_143
+ /* IPTABLES API version >= 1.4.3 */
++
++#define BUILD_BUG_ON_ZERO(e) (sizeof(struct { int:-!!(e); }))
++#define __must_be_array(a) \
++	BUILD_BUG_ON_ZERO(__builtin_types_compatible_p(typeof(a), typeof(&a[0])))
++#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr))
++#define LIST_POISON2  ((void *) 0x00200200 )
++
+ #include <net/netfilter/nf_nat.h>
+ #define ip_nat_multi_range	nf_nat_multi_range
+ #define ip_nat_range		nf_nat_range
diff --git a/net-misc/miniupnpd/files/miniupnpd-1.3-conf.d b/net-misc/miniupnpd/files/miniupnpd-conf.d
index 8482ef2d185b..8482ef2d185b 100644
--- a/net-misc/miniupnpd/files/miniupnpd-1.3-conf.d
+++ b/net-misc/miniupnpd/files/miniupnpd-conf.d
diff --git a/net-misc/miniupnpd/files/miniupnpd-1.3-init.d b/net-misc/miniupnpd/files/miniupnpd-init.d
index b84261bf38fb..ea08fc9c0fcb 100644
--- a/net-misc/miniupnpd/files/miniupnpd-1.3-init.d
+++ b/net-misc/miniupnpd/files/miniupnpd-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-1.3-init.d,v 1.1 2009/04/24 23:43:23 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/miniupnpd/files/miniupnpd-init.d,v 1.1 2010/02/28 19:36:06 gurligebis Exp $
 
 depend() {
 	need net iptables
diff --git a/net-misc/miniupnpd/miniupnpd-1.4_pre20090921.ebuild b/net-misc/miniupnpd/miniupnpd-1.5_pre20091222.ebuild
index 9ea69de13bdb..208b3c79e8b7 100644
--- a/net-misc/miniupnpd/miniupnpd-1.4_pre20090921.ebuild
+++ b/net-misc/miniupnpd/miniupnpd-1.5_pre20091222.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/miniupnpd/miniupnpd-1.4_pre20090921.ebuild,v 1.2 2010/02/05 22:41:23 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/miniupnpd/miniupnpd-1.5_pre20091222.ebuild,v 1.1 2010/02/28 19:36:07 gurligebis Exp $
 
 EAPI=2
 inherit eutils linux-info toolchain-funcs
 
-MY_PV=20090921
+MY_PV=1.4.20091222
 S="${WORKDIR}/${PN}-${MY_PV}"
 
 DESCRIPTION="MiniUPnP IGD Daemon"
@@ -18,14 +18,17 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=net-firewall/iptables-1.4.3
-	sys-apps/lsb-release"
+	sys-apps/lsb-release
+	>=sys-kernel/linux-headers-2.6.31"
 DEPEND="${RDEPEND}"
 
 src_prepare() {
 	mv Makefile.linux Makefile
 	epatch "${FILESDIR}/${PN}-1.3-iptables_path.diff"
 	epatch "${FILESDIR}/${PN}-1.3-Makefile_fix.diff"
+	epatch "${FILESDIR}/${PN}-1.5-iptcrdr.diff"
 	sed -i -e "s#^CFLAGS = #CFLAGS = -I${KV_OUT_DIR}/include #" Makefile
+	sed -i "s/LIBS = -liptc/LIBS = -lip4tc/g" Makefile
 	emake config.h
 }
 
@@ -36,8 +39,8 @@ src_compile() {
 src_install () {
 	einstall PREFIX="${D}" STRIP="true" || die "einstall failed"
 
-	newinitd "${FILESDIR}"/${PN}-1.3-init.d ${PN}
-	newconfd "${FILESDIR}"/${PN}-1.3-conf.d ${PN}
+	newinitd "${FILESDIR}"/${PN}-init.d ${PN}
+	newconfd "${FILESDIR}"/${PN}-conf.d ${PN}
 }
 
 pkg_postinst() {