diff options
| author |   Bjarke Istrup Pedersen <gurligebis@gentoo.org> | 2011-07-02 09:33:02 +0000 |
|---|---|---|
| committer | Bjarke Istrup Pedersen <gurligebis@gentoo.org> | 2011-07-02 09:33:02 +0000 |
| commit | 4d8f9b0755f0f5259e5fd8bd7900fe27fa3798b7 (patch) | |
| tree | a989598aad16e98a44e1fe13e76c76a2259b0d7a /net-misc | |
| parent | Use pkg-config to detect mmdb and lapack libs (diff) | |
| download | gentoo-2-4d8f9b0755f0f5259e5fd8bd7900fe27fa3798b7.tar.gz gentoo-2-4d8f9b0755f0f5259e5fd8bd7900fe27fa3798b7.tar.bz2 gentoo-2-4d8f9b0755f0f5259e5fd8bd7900fe27fa3798b7.zip | |
Fixing bug #373371
(Portage version: 2.2.0_alpha41/cvs/Linux i686)
Diffstat (limited to 'net-misc')
| -rw-r--r-- | net-misc/miniupnpd/ChangeLog | 6 | ||||
| -rw-r--r-- | net-misc/miniupnpd/files/miniupnpd-1.5-iptables_buildfix.diff | 14 | ||||
| -rw-r--r-- | net-misc/miniupnpd/miniupnpd-1.5.ebuild | 3 |
3 files changed, 21 insertions, 2 deletions
diff --git a/net-misc/miniupnpd/ChangeLog b/net-misc/miniupnpd/ChangeLog index a684e2daefd9..0952a1e95cb2 100644 --- a/net-misc/miniupnpd/ChangeLog +++ b/net-misc/miniupnpd/ChangeLog @@ -1,6 +1,10 @@ # 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.17 2011/06/30 20:02:17 gurligebis Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/miniupnpd/ChangeLog,v 1.18 2011/07/02 09:33:02 gurligebis Exp $ + + 02 Jul 2011; <gurligebis@gentoo.org> miniupnpd-1.5.ebuild, + +files/miniupnpd-1.5-iptables_buildfix.diff: + Fixed building with iptables-1.4.11 - fixing bug #373371 *miniupnpd-1.6_pre20110623 (30 Jun 2011) diff --git a/net-misc/miniupnpd/files/miniupnpd-1.5-iptables_buildfix.diff b/net-misc/miniupnpd/files/miniupnpd-1.5-iptables_buildfix.diff new file mode 100644 index 000000000000..ad89e01ec459 --- /dev/null +++ b/net-misc/miniupnpd/files/miniupnpd-1.5-iptables_buildfix.diff @@ -0,0 +1,14 @@ +--- netfilter/iptcrdr.c 4 Jun 2011 08:57:41 -0000 1.43
++++ netfilter/iptcrdr.c 20 Jun 2011 14:03:24 -0000 1.44
+@@ -43,6 +43,11 @@
+ #define IPTC_HANDLE iptc_handle_t
+ #endif
+
++/* IPT_ALIGN was renamed XT_ALIGN in iptables-1.4.11 */
++#ifndef IPT_ALIGN
++#define IPT_ALIGN XT_ALIGN
++#endif
++
+ #include "iptcrdr.h"
+ #include "../upnpglobalvars.h"
+
diff --git a/net-misc/miniupnpd/miniupnpd-1.5.ebuild b/net-misc/miniupnpd/miniupnpd-1.5.ebuild index 8e3fe7ae0f60..7c59d9d52fc4 100644 --- a/net-misc/miniupnpd/miniupnpd-1.5.ebuild +++ b/net-misc/miniupnpd/miniupnpd-1.5.ebuild @@ -1,6 +1,6 @@ # 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.5.ebuild,v 1.1 2011/01/21 16:09:48 gurligebis Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/miniupnpd/miniupnpd-1.5.ebuild,v 1.2 2011/07/02 09:33:02 gurligebis Exp $ EAPI=2 inherit eutils linux-info toolchain-funcs @@ -29,6 +29,7 @@ src_prepare() { epatch "${FILESDIR}/${PN}-1.3-iptables_path.diff" epatch "${FILESDIR}/${PN}-1.3-Makefile_fix.diff" epatch "${FILESDIR}/${PN}-1.5-iptcrdr.diff" + epatch "${FILESDIR}/${PN}-1.5-iptables_buildfix.diff" sed -i \ -e "s#^CFLAGS = .*-D#CPPFLAGS += -I${KERNEL_DIR}/include -D#" \ -e '/^CFLAGS :=/s/CFLAGS/CPPFLAGS/g' \ |