summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Volkov <pva@gentoo.org>2009-02-17 16:08:57 +0000
committerPeter Volkov <pva@gentoo.org>2009-02-17 16:08:57 +0000
commit2d7d1a5a58e7ad4f128e4c76445f109e17bf3472 (patch)
treefa682dd801b59093eeeca6541adade5f1e09a889 /net-misc
parentMake gnome2.eclass EAPI 2 ready. Bug #239123 (diff)
downloadgentoo-2-2d7d1a5a58e7ad4f128e4c76445f109e17bf3472.tar.gz
gentoo-2-2d7d1a5a58e7ad4f128e4c76445f109e17bf3472.tar.bz2
gentoo-2-2d7d1a5a58e7ad4f128e4c76445f109e17bf3472.zip
Fixed build issue with linux-2.6.28, bug #255190, thank Andrew Savchenko for report.
(Portage version: 2.2_rc23/cvs/Linux i686)
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/l7-filter-userspace/ChangeLog8
-rw-r--r--net-misc/l7-filter-userspace/files/l7-filter-userspace-order-in-fix.patch30
-rw-r--r--net-misc/l7-filter-userspace/l7-filter-userspace-0.10.ebuild8
3 files changed, 44 insertions, 2 deletions
diff --git a/net-misc/l7-filter-userspace/ChangeLog b/net-misc/l7-filter-userspace/ChangeLog
index a4638cacd722..135f34d2830b 100644
--- a/net-misc/l7-filter-userspace/ChangeLog
+++ b/net-misc/l7-filter-userspace/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for net-misc/l7-filter-userspace
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/l7-filter-userspace/ChangeLog,v 1.8 2009/01/03 09:14:48 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/l7-filter-userspace/ChangeLog,v 1.9 2009/02/17 16:08:56 pva Exp $
+
+ 17 Feb 2009; Peter Volkov <pva@gentoo.org>
+ +files/l7-filter-userspace-order-in-fix.patch,
+ l7-filter-userspace-0.10.ebuild:
+ Fixed build issue with linux-2.6.28, bug #255190, thank Andrew Savchenko
+ for report.
*l7-filter-userspace-0.10 (03 Jan 2009)
diff --git a/net-misc/l7-filter-userspace/files/l7-filter-userspace-order-in-fix.patch b/net-misc/l7-filter-userspace/files/l7-filter-userspace-order-in-fix.patch
new file mode 100644
index 000000000000..5d55c0bded6e
--- /dev/null
+++ b/net-misc/l7-filter-userspace/files/l7-filter-userspace-order-in-fix.patch
@@ -0,0 +1,30 @@
+=== modified file 'l7-conntrack.cpp'
+--- l7-conntrack.cpp 2009-02-17 12:44:01 +0000
++++ l7-conntrack.cpp 2009-02-17 12:44:20 +0000
+@@ -24,9 +24,9 @@
+ #include <cstring>
+
+ extern "C" {
++#include <netinet/in.h>
+ #include <linux/netfilter.h>
+ #include <linux/types.h>
+-#include <netinet/in.h>
+ #include <libnetfilter_conntrack/libnetfilter_conntrack.h>
+ }
+
+
+=== modified file 'l7-filter.cpp'
+--- l7-filter.cpp 2009-02-17 12:44:01 +0000
++++ l7-filter.cpp 2009-02-17 12:44:12 +0000
+@@ -39,9 +39,9 @@
+ #include "config.h"
+
+ extern "C" {
++#include <netinet/in.h>
+ #include <linux/netfilter.h>
+ #include <linux/types.h>
+-#include <netinet/in.h>
+ #include <libnetfilter_conntrack/libnetfilter_conntrack.h>
+ #include <libnetfilter_queue/libnetfilter_queue.h>
+ }
+
diff --git a/net-misc/l7-filter-userspace/l7-filter-userspace-0.10.ebuild b/net-misc/l7-filter-userspace/l7-filter-userspace-0.10.ebuild
index d80dcac5c37b..afd6e9b936ca 100644
--- a/net-misc/l7-filter-userspace/l7-filter-userspace-0.10.ebuild
+++ b/net-misc/l7-filter-userspace/l7-filter-userspace-0.10.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/l7-filter-userspace/l7-filter-userspace-0.10.ebuild,v 1.1 2009/01/03 09:14:48 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/l7-filter-userspace/l7-filter-userspace-0.10.ebuild,v 1.2 2009/02/17 16:08:56 pva Exp $
inherit eutils
@@ -18,6 +18,12 @@ DEPEND="
RDEPEND="net-misc/l7-protocols
${DEPEND}"
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+ epatch "${FILESDIR}/${PN}-order-in-fix.patch"
+}
+
src_install() {
emake DESTDIR="${D}" install || die
dodoc README TODO BUGS THANKS AUTHORS