l7-filter-userspace: fix build with gcc-4.5.3

6 files changed, 233 insertions, 0 deletions

diff --git a/net-misc/l7-filter-userspace/ChangeLog b/net-misc/l7-filter-userspace/ChangeLog
new file mode 100644
index 0000000..01a3b6b
--- /dev/null
+++ b/net-misc/l7-filter-userspace/ChangeLog
@@ -0,0 +1,76 @@
+# ChangeLog for net-misc/l7-filter-userspace
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/l7-filter-userspace/ChangeLog,v 1.12 2011/07/20 14:54:17 pacho Exp $
+
+  20 Jul 2011; Pacho Ramos <pacho@gentoo.org> metadata.xml:
+  Drop maintainer due retirement, bug #34534
+
+  18 Jul 2010; Daniel Black <dragonheart@gentoo.org>
+  -l7-filter-userspace-0.7.ebuild, -l7-filter-userspace-0.8.ebuild,
+  l7-filter-userspace-0.11.ebuild,
+  +files/l7-filter-userspace-0.11-libnetfilter_conntrack-0.0.100.patch,
+  -files/l7-filter-userspace-in-fix.patch,
+  -files/l7-filter-userspace-order-in-fix.patch,
+  -l7-filter-userspace-0.10.ebuild:
+  build fix as per bug #280747 thanks to niv. Patch thanks to Debian
+
+*l7-filter-userspace-0.11 (01 Mar 2009)
+
+  01 Mar 2009; Peter Volkov <pva@gentoo.org>
+  +l7-filter-userspace-0.11.ebuild:
+  Version bump.
+
+  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)
+
+  03 Jan 2009; Daniel Black <dragonheart@gentoo.org>
+  +l7-filter-userspace-0.10.ebuild:
+  version bump
+
+  15 Nov 2008; Peter Volkov <pva@gentoo.org>
+  +files/l7-filter-userspace-in-fix.patch, l7-filter-userspace-0.8.ebuild:
+  Fixed build issue with >=linux-headers-2.6.27, bug #236650, thank
+  Guillaume Castagnino for the fix.
+
+*l7-filter-userspace-0.8 (01 Sep 2008)
+
+  01 Sep 2008; Daniel Black <dragonheart@gentoo.org>
+  -files/l7-filter-userspace-0.4-misc.patch,
+  -files/l7-filter-userspace-0.6-gcc4.3compat.patch, -files/Makefile.am,
+  -files/configure.ac, -l7-filter-userspace-0.4.ebuild,
+  -l7-filter-userspace-0.6.ebuild, +l7-filter-userspace-0.8.ebuild:
+  version bump and cleanout
+
+*l7-filter-userspace-0.7 (02 Aug 2008)
+
+  02 Aug 2008; Daniel Black <dragonheart@gentoo.org>
+  +l7-filter-userspace-0.7.ebuild:
+  version bump
+
+  29 Jun 2008; Peter Alfredsen <loki_val@gentoo.org>
+  files/l7-filter-userspace-0.6-gcc4.3compat.patch:
+  Update gcc-4.3 patches to really fix bug #225761
+
+  13 Jun 2008; Daniel Black <dragonheart@gentoo.org>
+  +files/l7-filter-userspace-0.6-gcc4.3compat.patch,
+  l7-filter-userspace-0.6.ebuild:
+  added gcc4.3 fixes as per bug #225761. Thanks Alois Hammer and Jeroen Roovers
+
+*l7-filter-userspace-0.6 (09 Jun 2008)
+
+  09 Jun 2008; Daniel Black <dragonheart@gentoo.org>
+  +l7-filter-userspace-0.6.ebuild:
+  version bump
+
+*l7-filter-userspace-0.4 (15 Apr 2007)
+
+  15 Apr 2007; Daniel Black <dragonheart@gentoo.org>
+  +files/l7-filter-userspace-0.4-misc.patch, +files/Makefile.am,
+  +files/configure.ac, +metadata.xml, +l7-filter-userspace-0.4.ebuild:
+  inital import thanks to Nebojsa Trpkovics request in bug 173390/
+
diff --git a/net-misc/l7-filter-userspace/Manifest b/net-misc/l7-filter-userspace/Manifest
new file mode 100644
index 0000000..e871f4a
--- /dev/null
+++ b/net-misc/l7-filter-userspace/Manifest
@@ -0,0 +1,6 @@
+AUX l7-filter-userspace-0.11-datatype.patch 439 RMD160 2ecd3ea09c39d4136f59b7747450aaad310955ee SHA1 d26d376fefccfcd2ea6fd60dcaf8f11cffb5d12a SHA256 b2f93241b82ba1b8181e189e8910f64db9bc01b49fba5693ac5fa9d249363d85
+AUX l7-filter-userspace-0.11-libnetfilter_conntrack-0.0.100.patch 3991 RMD160 ae00477bb9804b21de0a042ebe0768b676fbb2d3 SHA1 cfa82ea8f14b8115047abb6f68c7a9053748d0ca SHA256 bc3469249333f42df8f67226099d23d22c0fb640ad5b0b770fc846716a0f849e
+DIST l7-filter-userspace-0.11.tar.gz 129986 RMD160 bdba2c64a0e84518a575552ae53115be47923f69 SHA1 56cc5eb14e7a07603ee18391496658d8344e4836 SHA256 008a62430f95a162fd209d4bf3d7359c588ca4b27f89c7bcaa7a10ff48591d97
+EBUILD l7-filter-userspace-0.11.ebuild 875 RMD160 bac41fd44dea8e1ca00a602a31169a65dfba7d06 SHA1 2b8abd6d4631b1acf8d851381f9699074cad9d5e SHA256 158290f57c06e8ed612523452cde1cdda0e1a10d2ddda7bf3c5440031b672954
+MISC ChangeLog 2817 RMD160 ac9407847075b0c169527f21b09e26b35a07e835 SHA1 3e46b845ddd757458197de5489d5758e7ef63069 SHA256 668d75296f215173434b5f7dfd363c9befdd0cab2df74a999157dd2a97675f72
+MISC metadata.xml 208 RMD160 f781f417049ff1d018c5c597f65316ea8bfa72fc SHA1 977e35254e7bdc0a2d87ec41e96ccba00d9c0d82 SHA256 98f8aa3fb70533eeab6b09d5bc30bd8f649ec13d9b04363490082fb87bb6032e
diff --git a/net-misc/l7-filter-userspace/files/l7-filter-userspace-0.11-datatype.patch b/net-misc/l7-filter-userspace/files/l7-filter-userspace-0.11-datatype.patch
new file mode 100644
index 0000000..eb49c59
--- /dev/null
+++ b/net-misc/l7-filter-userspace/files/l7-filter-userspace-0.11-datatype.patch
@@ -0,0 +1,11 @@
+--- l7-filter-userspace-0.11/l7-queue.cpp.orig	2008-09-27 10:51:01.000000000 +0400
++++ l7-filter-userspace-0.11/l7-queue.cpp	2011-11-05 03:11:08.595773935 +0400
+@@ -196,7 +196,7 @@
+   ifi = nfq_get_outdev(tb);
+   if(ifi) l7printf(4, "outdev = %d ", ifi);
+ 
+-  ret = nfq_get_payload(tb, &data);
++  ret = nfq_get_payload(tb, (unsigned char**)&data);
+   if(ret >= 0) l7printf(4, "payload_len = %d\n", ret);
+   
+   char ip_protocol = data[9];
diff --git a/net-misc/l7-filter-userspace/files/l7-filter-userspace-0.11-libnetfilter_conntrack-0.0.100.patch b/net-misc/l7-filter-userspace/files/l7-filter-userspace-0.11-libnetfilter_conntrack-0.0.100.patch
new file mode 100644
index 0000000..6cc941d
--- /dev/null
+++ b/net-misc/l7-filter-userspace/files/l7-filter-userspace-0.11-libnetfilter_conntrack-0.0.100.patch
@@ -0,0 +1,104 @@
+diff -Naur l7-filter-userspace-0.11-orig/l7-conntrack.cpp l7-filter-userspace-0.11-ptch/l7-conntrack.cpp
+--- l7-filter-userspace-0.11-orig/l7-conntrack.cpp	2009-02-26 21:40:28.000000000 +0000
++++ l7-filter-userspace-0.11-ptch/l7-conntrack.cpp	2009-10-19 17:40:42.000000000 +0000
+@@ -121,25 +121,10 @@
+   return (char *)buffer;
+ }
+ 
+-static int sprintf_conntrack_key(char *buf, struct nfct_conntrack *ct, 
+-                          unsigned int flags) 
+-{
+-  int size = 0;
+-
+-  size += nfct_sprintf_protocol(buf, ct);
+-  size += nfct_sprintf_address(buf+size, &ct->tuple[NFCT_DIR_ORIGINAL]);
+-  size += nfct_sprintf_proto(buf+size, &ct->tuple[NFCT_DIR_ORIGINAL]);
+-
+-  /* Delete the last blank space */
+-  buf[size-1] = '\0';
+-
+-  return size;
+-}
+-
+-static string make_key(nfct_conntrack* ct, int flags)
++static string make_key(nfct_conntrack* ct, int flags, int type)
+ {
+   char key[512];
+-  int keysize = sprintf_conntrack_key(key, ct, flags);
++  int keysize = nfct_snprintf(key, sizeof(key), (const nf_conntrack *)ct, type, NFCT_O_DEFAULT, flags);
+   if(keysize >= 512){
+     cerr << "Yike! Overflowed key!\n";
+     exit(1);
+@@ -148,28 +133,28 @@
+   return key;
+ }
+ 
+-static int l7_handle_conntrack_event(void *arg, unsigned int flags, int type, 
++static int l7_handle_conntrack_event(enum nf_conntrack_msg_type type, struct nf_conntrack* arg,
+ 					void *data)
+ {
+   l7_conntrack * l7_conntrack_handler = (l7_conntrack *) data;
+ 
+   nfct_conntrack* ct = (nfct_conntrack*)arg;
++  u_int8_t protonum = *(u_int8_t *)nfct_get_attr((const nf_conntrack *)ct, ATTR_ORIG_L4PROTO);
+ 
+   // I don't think there is any demand for ICMP. These are enough work for now.
+-  if(ct->tuple[0].protonum != IPPROTO_TCP && 
+-     ct->tuple[0].protonum != IPPROTO_UDP) return 0;
++  if(protonum != IPPROTO_TCP && protonum != IPPROTO_UDP) return 0;
+ 
+-  if(type == NFCT_MSG_DESTROY) l7printf(3, "Got event: NFCT_MSG_DESTROY\n");
+-  if(type == NFCT_MSG_NEW)     l7printf(3, "Got event: NFCT_MSG_NEW\n");
+-  if(type == NFCT_MSG_UPDATE)  l7printf(3, "Got event: NFCT_MSG_UPDATE\n");
+-  if(type == NFCT_MSG_UNKNOWN) l7printf(3, "Got event: NFCT_MSG_UNKNOWN\n");
++  if(type == NFCT_T_DESTROY) l7printf(3, "Got event: NFCT_T_DESTROY\n");
++  if(type == NFCT_T_NEW)     l7printf(3, "Got event: NFCT_T_NEW\n");
++  if(type == NFCT_T_UPDATE)  l7printf(3, "Got event: NFCT_T_UPDATE\n");
++  if(type == NFCT_T_UNKNOWN) l7printf(3, "Got event: NFCT_T_UNKNOWN\n");
+ 
+   // On the first packet, create the connection buffer, etc.
+-  if(type == NFCT_MSG_NEW){
+-    string key = make_key(ct, flags);
++  if(type == NFCT_T_NEW){
++    string key = make_key(ct, 0, NFCT_T_NEW);
+     if (l7_conntrack_handler->get_l7_connection(key)){
+       // this happens sometimes
+-      cerr << "Received NFCT_MSG_NEW but already have a connection. Packets = " 
++      cerr << "Received NFCT_T_NEW but already have a connection. Packets = " 
+            << l7_conntrack_handler->get_l7_connection(key)->get_num_packets() 
+            << endl;
+       l7_conntrack_handler->remove_l7_connection(key);
+@@ -179,9 +164,9 @@
+     l7_conntrack_handler->add_l7_connection(thisconnection, key);
+     thisconnection->key = key;
+   }
+-  else if(type == NFCT_MSG_DESTROY){
++  else if(type == NFCT_T_DESTROY){
+     // clean up the connection buffer, etc.
+-    string key = make_key(ct, flags);
++    string key = make_key(ct, 0, NFCT_T_DESTROY);
+     if(l7_conntrack_handler->get_l7_connection(key)){
+       l7_conntrack_handler->remove_l7_connection(key);
+     }
+@@ -193,7 +178,7 @@
+ 
+ l7_conntrack::~l7_conntrack() 
+ {
+-  nfct_conntrack_free(ct);
++  free(ct);
+   nfct_close(cth);
+ }
+ 
+@@ -230,9 +215,9 @@
+ {
+   int ret;
+ 
+-  nfct_register_callback(cth, l7_handle_conntrack_event, (void *)this);
+-  ret = nfct_event_conntrack(cth); // this is the main loop
++  nfct_callback_register(cth, NFCT_T_NEW, l7_handle_conntrack_event, (void *)this);
++  ret = nfct_catch(cth); // this is the main loop
+   
+   nfct_close(cth);
+-  nfct_conntrack_free(ct);
++  free(ct);
+ }
diff --git a/net-misc/l7-filter-userspace/l7-filter-userspace-0.11.ebuild b/net-misc/l7-filter-userspace/l7-filter-userspace-0.11.ebuild
new file mode 100644
index 0000000..ee85ecf
--- /dev/null
+++ b/net-misc/l7-filter-userspace/l7-filter-userspace-0.11.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2010 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.11.ebuild,v 1.2 2010/07/18 02:47:57 dragonheart Exp $
+
+EAPI="2"
+
+inherit eutils
+
+DESCRIPTION="Userspace utilities for layer 7 iptables QoS"
+HOMEPAGE="http://l7-filter.sourceforge.net"
+SRC_URI="mirror://sourceforge/l7-filter/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+SLOT="0"
+DEPEND="
+		>=net-libs/libnetfilter_conntrack-0.0.100
+		net-libs/libnetfilter_queue"
+RDEPEND="net-misc/l7-protocols
+		${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/l7-filter-userspace-0.11-libnetfilter_conntrack-0.0.100.patch
+	epatch "${FILESDIR}"/l7-filter-userspace-0.11-datatype.patch
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc README TODO BUGS THANKS AUTHORS
+}
diff --git a/net-misc/l7-filter-userspace/metadata.xml b/net-misc/l7-filter-userspace/metadata.xml
new file mode 100644
index 0000000..4538a68
--- /dev/null
+++ b/net-misc/l7-filter-userspace/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
+</pkgmetadata>