diff options
Diffstat (limited to 'net-misc')
9 files changed, 129 insertions, 151 deletions
diff --git a/net-misc/l7-filter-userspace/ChangeLog b/net-misc/l7-filter-userspace/ChangeLog index aec3b5c88bbc..877fed77d8e7 100644 --- a/net-misc/l7-filter-userspace/ChangeLog +++ b/net-misc/l7-filter-userspace/ChangeLog @@ -1,6 +1,15 @@ # 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.10 2009/03/01 09:40:59 pva Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/l7-filter-userspace/ChangeLog,v 1.11 2010/07/18 02:47:57 dragonheart Exp $ + + 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) diff --git a/net-misc/l7-filter-userspace/Manifest b/net-misc/l7-filter-userspace/Manifest index 1a260cf7db80..45f29c45bd48 100644 --- a/net-misc/l7-filter-userspace/Manifest +++ b/net-misc/l7-filter-userspace/Manifest @@ -1,12 +1,5 @@ -AUX l7-filter-userspace-in-fix.patch 912 RMD160 f1c414bb75a9bceee488a6fefc83f814a3e4d04d SHA1 a8719e28d95a1deae2de49c81d2d3821454a9922 SHA256 0a04bc3b04f662d44a8709095835c99e88b67b87fbe25b9b145599451a3b5a35 -AUX l7-filter-userspace-order-in-fix.patch 756 RMD160 a680c5c36653e74b089fc82f0b7525954ea2244c SHA1 0da471cfb907676cd45e54c023030912bffb5af1 SHA256 62d032efdd55efce71d10a04057acff9f9fcf54157975076c48032b20ecdaf7c -DIST l7-filter-userspace-0.10.tar.gz 129937 RMD160 fddfebac58b06b08a6cdadc02474d0fd55bfbaf1 SHA1 4640c77db294c0bb95fef2785e042914f4dcc07d SHA256 cb78c598a05d27fe973b3c725665cabdee2346609d1da9c1599a3527f97abe65 +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 -DIST l7-filter-userspace-0.7.tar.gz 128899 RMD160 eab99b338900c20e769e069886097ff708bc0635 SHA1 abe202c7d3245308eb89927a099d6589b324d702 SHA256 29a6a161d9e743dbcb5a3e84608866b3c5a4d8271f38f6de95232f3c0bdd4e5d -DIST l7-filter-userspace-0.8.tar.gz 129127 RMD160 b2517c75ed452e4946956a4e39e077683cb205ec SHA1 a7af6c0f656cb64ac54c4bde1a14806c4f5ed2a3 SHA256 60e384c4293a9a75663928b0597e97190847157ca1f4415ce149592f25d5b310 -EBUILD l7-filter-userspace-0.10.ebuild 771 RMD160 3141a4b00c346722dab2425235b179b165243e30 SHA1 07ebd5981d70a5d18b1b5c12bf9a24844a96568b SHA256 19d73994c00534c122b94157265eb644fab5828825849f25c5af0a9ae33dbdb9 -EBUILD l7-filter-userspace-0.11.ebuild 666 RMD160 21dbb3efd31f85e031365321774adb22d2b0f6a5 SHA1 bd6f4ab2f85900b993c0a3b932c56c2aa796f8d3 SHA256 9e5c3f371b482bc49c2bf59d87f1eda0e4dea74ca64c2843e40caa67f434ce24 -EBUILD l7-filter-userspace-0.7.ebuild 689 RMD160 6487e3251eba4a0b0eb6e4d6e3aaafa847f6ccdf SHA1 593eaeaa6654fc9302bd2619af89af7670da371b SHA256 29282ee3aea69a1cad52dbb0c2e2f4d64cc1ac0ccc8ab32bfa5908e07f781625 -EBUILD l7-filter-userspace-0.8.ebuild 777 RMD160 fb2d67ff38a156dc19187a287c9c174d59c448b0 SHA1 5d94842a6a82c4c88e80d0702f5671f9ea13392b SHA256 b87626e18a4bcea2a6cbb113798b3261ad71c08d6bc4e494a0ee0a70624232ee -MISC ChangeLog 2283 RMD160 23aa1f0b0aaf588f0c559b73a6d9a226c8f7b2b7 SHA1 6aade3bbdae60bf6db73a11accdc8e6b0e48baf2 SHA256 416eb4221a3fc1a2cd195f7176a4e40a958f147cfefe24c9e41ad2542f245af3 +EBUILD l7-filter-userspace-0.11.ebuild 813 RMD160 41ee67d9e00c6a5dda645b86c51dee88b54f13f6 SHA1 a59920cab8af151fbb677cb9580de136ce528980 SHA256 e428b9d861ef515af13239e522df669fec09852454722a6668f599e2b93fdfb2 +MISC ChangeLog 2717 RMD160 f23b413e28f5204068a7917c4a35ab8cf412bc47 SHA1 434981c9ea0392e16a63ea6475ab31b95531030d SHA256 486ed43a8fbc1338296250aee47201a956b668b21a6b97f7f1abb4daaf968439 MISC metadata.xml 223 RMD160 cff01eb73aa788a3f9b500b8e062baff25f98969 SHA1 620bcbfe3e4f48937207c8c4d03a1c5ae594632c SHA256 a7a47d67e632d5aa22da27dd605894f524342fe0475ddae5113d037f81a6c180 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 000000000000..6cc941ddd1a6 --- /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/files/l7-filter-userspace-in-fix.patch b/net-misc/l7-filter-userspace/files/l7-filter-userspace-in-fix.patch deleted file mode 100644 index 856d303d64c8..000000000000 --- a/net-misc/l7-filter-userspace/files/l7-filter-userspace-in-fix.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -rN -U3 l7-filter-userspace-0.8.old/l7-conntrack.cpp l7-filter-userspace-0.8/l7-conntrack.cpp ---- l7-filter-userspace-0.8.old/l7-conntrack.cpp 2008-10-26 13:47:53.000000000 +0100 -+++ l7-filter-userspace-0.8/l7-conntrack.cpp 2008-10-26 13:48:43.000000000 +0100 -@@ -24,6 +24,7 @@ - #include <cstring> - - extern "C" { -+#include <netinet/in.h> - #include <linux/netfilter.h> - #include <libnetfilter_conntrack/libnetfilter_conntrack.h> - } -diff -rN -U3 l7-filter-userspace-0.8.old/l7-filter.cpp l7-filter-userspace-0.8/l7-filter.cpp ---- l7-filter-userspace-0.8.old/l7-filter.cpp 2008-10-26 13:47:53.000000000 +0100 -+++ l7-filter-userspace-0.8/l7-filter.cpp 2008-10-26 13:48:49.000000000 +0100 -@@ -39,6 +39,7 @@ - #include "config.h" - - extern "C" { -+#include <netinet/in.h> - #include <linux/netfilter.h> - #include <libnetfilter_conntrack/libnetfilter_conntrack.h> - #include <libnetfilter_queue/libnetfilter_queue.h> 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 deleted file mode 100644 index 5d55c0bded6e..000000000000 --- a/net-misc/l7-filter-userspace/files/l7-filter-userspace-order-in-fix.patch +++ /dev/null @@ -1,30 +0,0 @@ -=== 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 deleted file mode 100644 index afd6e9b936ca..000000000000 --- a/net-misc/l7-filter-userspace/l7-filter-userspace-0.10.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# 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.2 2009/02/17 16:08:56 pva Exp $ - -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 - net-libs/libnetfilter_queue" -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 -} 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 index bb75f43a1309..1d94f6e2f6aa 100644 --- a/net-misc/l7-filter-userspace/l7-filter-userspace-0.11.ebuild +++ b/net-misc/l7-filter-userspace/l7-filter-userspace-0.11.ebuild @@ -1,6 +1,10 @@ -# Copyright 1999-2009 Gentoo Foundation +# 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.1 2009/03/01 09:40:59 pva Exp $ +# $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" @@ -11,11 +15,15 @@ KEYWORDS="~amd64 ~x86" IUSE="" SLOT="0" DEPEND=" - net-libs/libnetfilter_conntrack + >=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 +} + src_install() { emake DESTDIR="${D}" install || die dodoc README TODO BUGS THANKS AUTHORS diff --git a/net-misc/l7-filter-userspace/l7-filter-userspace-0.7.ebuild b/net-misc/l7-filter-userspace/l7-filter-userspace-0.7.ebuild deleted file mode 100644 index 533b6458623a..000000000000 --- a/net-misc/l7-filter-userspace/l7-filter-userspace-0.7.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2008 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.7.ebuild,v 1.1 2008/08/02 14:13:06 dragonheart Exp $ - -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 - net-libs/libnetfilter_queue" -RDEPEND="net-misc/l7-protocols - ${DEPEND}" - -src_install() { - emake DESTDIR="${D}" install || die - dodoc README TODO BUGS THANKS AUTHORS -} diff --git a/net-misc/l7-filter-userspace/l7-filter-userspace-0.8.ebuild b/net-misc/l7-filter-userspace/l7-filter-userspace-0.8.ebuild deleted file mode 100644 index f655cb7283db..000000000000 --- a/net-misc/l7-filter-userspace/l7-filter-userspace-0.8.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2008 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.8.ebuild,v 1.2 2008/11/15 21:11:15 pva Exp $ - -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 - net-libs/libnetfilter_queue" -RDEPEND="net-misc/l7-protocols - ${DEPEND}" - -src_unpack() { - unpack ${A} - cd"${S}" - epatch "${FILESDIR}/l7-filter-userspace-in-fix.patch" -} - -src_install() { - emake DESTDIR="${D}" install || die - dodoc README TODO BUGS THANKS AUTHORS -} |