summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Savchenko <bircoph@gmail.com>2012-05-11 15:35:28 +0400
committerAndrew Savchenko <bircoph@gmail.com>2012-05-11 15:35:28 +0400
commit1745f180e27484b3c6542c9c3b69fb480638e5e3 (patch)
treeeabd62ebdbc0125d4eb1848d9485a188f11d86ca /net-misc
parentFix pbs_track with cpuset (diff)
downloadbircoph-1745f180e27484b3c6542c9c3b69fb480638e5e3.tar.gz
bircoph-1745f180e27484b3c6542c9c3b69fb480638e5e3.tar.bz2
bircoph-1745f180e27484b3c6542c9c3b69fb480638e5e3.zip
l7-filter-userspace: bumped in portage
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/l7-filter-userspace/ChangeLog84
-rw-r--r--net-misc/l7-filter-userspace/Manifest6
-rw-r--r--net-misc/l7-filter-userspace/files/l7-filter-userspace-0.11-datatype.patch11
-rw-r--r--net-misc/l7-filter-userspace/files/l7-filter-userspace-0.11-libnetfilter_conntrack-0.0.100.patch104
-rw-r--r--net-misc/l7-filter-userspace/l7-filter-userspace-0.12_beta1.ebuild34
-rw-r--r--net-misc/l7-filter-userspace/metadata.xml5
6 files changed, 0 insertions, 244 deletions
diff --git a/net-misc/l7-filter-userspace/ChangeLog b/net-misc/l7-filter-userspace/ChangeLog
deleted file mode 100644
index 6e8246c..0000000
--- a/net-misc/l7-filter-userspace/ChangeLog
+++ /dev/null
@@ -1,84 +0,0 @@
-# ChangeLog for net-misc/l7-filter-userspace
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/l7-filter-userspace/ChangeLog,v 1.13 2012/03/03 15:31:46 pacho Exp $
-
- 03 Mar 2012; Pacho Ramos <pacho@gentoo.org>
- +files/l7-filter-userspace-0.11-arm-ppc-getopt-help-fix.patch,
- +files/l7-filter-userspace-0.11-map-access-threadsafe.patch,
- +files/l7-filter-userspace-0.11-pattern-loading-leak.patch,
- l7-filter-userspace-0.11.ebuild:
- Include fixes from debian and ppc/arm compatibility, bug #329397 (by Gavin
- Pryke).
-
- 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
deleted file mode 100644
index 140ae92..0000000
--- a/net-misc/l7-filter-userspace/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-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.12-beta1.tar.gz 130254 RMD160 458837b6308c6fcde59bb7ec60094a09bb561924 SHA1 e9628632ff55f5ef8c15041bc74eaa16e59f45d5 SHA256 1f4503c219334fba9c696c2243a3e926e5b299916baf1512ff6969da2d399d29
-EBUILD l7-filter-userspace-0.12_beta1.ebuild 937 RMD160 3995efba18c6ca73fc9926146969437f1a9cfc30 SHA1 f7fff4b33cb3a21fbc6ea23a79894a11b4a00474 SHA256 61de9de503f87d36426fbd736c7f460cc0fd512a2e7300e3062807a7ccdfa5cd
-MISC ChangeLog 3176 RMD160 36e867ae925db0084cc242526fc7adf65f3a7819 SHA1 4efda6a9c93d5b3827fc494f8e3c30c5073561f5 SHA256 aa509e606dc2cd8341e73370c1d098ea051419d2f711119514745ac10bc39e6a
-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
deleted file mode 100644
index eb49c59..0000000
--- a/net-misc/l7-filter-userspace/files/l7-filter-userspace-0.11-datatype.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 6cc941d..0000000
--- a/net-misc/l7-filter-userspace/files/l7-filter-userspace-0.11-libnetfilter_conntrack-0.0.100.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-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.12_beta1.ebuild b/net-misc/l7-filter-userspace/l7-filter-userspace-0.12_beta1.ebuild
deleted file mode 100644
index e438da8..0000000
--- a/net-misc/l7-filter-userspace/l7-filter-userspace-0.12_beta1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2012 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.3 2012/03/03 15:31:46 pacho Exp $
-
-EAPI=4
-
-inherit eutils versionator
-
-MY_P="${PN}-$(replace_version_separator 2 '-')"
-
-DESCRIPTION="Userspace utilities for layer 7 iptables QoS"
-HOMEPAGE="http://l7-filter.clearfoundation.com/"
-SRC_URI="http://download.clearfoundation.com/l7-filter/${MY_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}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-0.11-libnetfilter_conntrack-0.0.100.patch"
- epatch "${FILESDIR}/${PN}-0.11-datatype.patch"
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- dodoc README TODO BUGS THANKS AUTHORS
-}
diff --git a/net-misc/l7-filter-userspace/metadata.xml b/net-misc/l7-filter-userspace/metadata.xml
deleted file mode 100644
index 4538a68..0000000
--- a/net-misc/l7-filter-userspace/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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>