Bumping to version 20091222 and fixing bug #287644

Package-Manager: portage-2.2_rc63/cvs/Linux i686

6 files changed, 41 insertions, 22 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/Manifest b/net-misc/miniupnpd/Manifest
index b4e83ac9fb0d..19b6f99c679e 100644
--- a/net-misc/miniupnpd/Manifest
+++ b/net-misc/miniupnpd/Manifest
@@ -1,18 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 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-20090921.tar.gz 89476 RMD160 a4c3193980498eb351565891929d1402c9341624 SHA1 1e0d7445e8c801340335dbd84d33a11e5264d545 SHA256 c1fc524765ab38cbc553da572dee5dd7b853a90c4cfd59a322c3ff8712c65851
-EBUILD miniupnpd-1.4_pre20090921.ebuild 1233 RMD160 551464dedf1e43889ca7ab60e6449b764dbcdcb7 SHA1 5f10b487ba4b9edf8ccfb88b615a920859ae0fef SHA256 a675485b9912deeda9def9d38d777c5ad062af970a118bd159b611a28d66c1fb
-MISC ChangeLog 3472 RMD160 73b280afcf9f6dabec0c5bb97ee5b55e8c93ae8c SHA1 cde8a9d7d072bcec8fc4dea630c0d219fae04e77 SHA256 3c699a10cb9e0d9a79cc8862840132269da013a8fc903894f036046f99462d6a
+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 617 RMD160 407c0a5bb09589195dd49954a373f87ac4622934 SHA1 4142dc4e2d9baa8963d6c18518c1c1ac77f63128 SHA256 f635466ababe9198b41188cc0bf7527f5b1e3904a4ff9a7d5600754e1fa939d1
+DIST miniupnpd-1.4.20091222.tar.gz 90993 RMD160 201af6bcb3148b0841aff0b18bd3cb1e64851e48 SHA1 54e1833962bf7ebc264e27f9f83285487f71f3f7 SHA256 b680cbf8619c551b801f846395f6bd68d64fd784df8e1138dbfd2a3f64b1dab8
+EBUILD miniupnpd-1.5_pre20091222.ebuild 1368 RMD160 b9cc0c7e878be324dbc0c97adde86ebb4d4fc8b7 SHA1 781cccbaf09ac25f4bbafd30a57108ac7fe0f5ab SHA256 e242c68ed403c75acbb99f28683df138ad2f1901c5bb70fe91c7fb95d138ba5e
+MISC ChangeLog 3858 RMD160 29801b3e18b12bc47d20d29b5694b962773ed0b7 SHA1 cd73ef143019f79436e8fd36f70637217a02174f SHA256 a1a6a42fb3269b9cf75e7b250d60bdb71c3372007a751d6dc6c2696ad56fee2d
 MISC metadata.xml 401 RMD160 b4f2959a8b2aa1f97df19bbc675decd518ae1457 SHA1 aded6feda295e161854ba5c305bd0711d0f1ca13 SHA256 18377435ab021c2ab7967a14249da4a0c1c89a027b38e3ade7f73ae430448380
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAktsnr0ACgkQOeoy/oIi7ux9dQCfSaLu+PMp7Xi5ngMtstDJRjCL
-szAAn3Lt62LzJxZxFrst1iFjdlWtLsuA
-=877y
------END PGP SIGNATURE-----
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() {