gentoo resync : 10.11.2019

7 files changed, 27 insertions, 156 deletions

diff --git a/net-misc/l7-filter-userspace/Manifest b/net-misc/l7-filter-userspace/Manifest
index 7cf27f59111a..2ce6a743e493 100644
--- a/net-misc/l7-filter-userspace/Manifest
+++ b/net-misc/l7-filter-userspace/Manifest
@@ -1,10 +1,5 @@
-AUX l7-filter-userspace-0.11-arm-ppc-getopt-help-fix.patch 544 BLAKE2B 25c82326213cb7ccfbd8b07bc356c61b86e23ee5a6adee13e81e5aedb0180c492215bcf4f1c58d4ebb2d07c0a70aedcfc3def3a86648a6e874842ea4b4a19345 SHA512 d541dc919d715bd591a145c0c39dfee86f953761461bef7cfe10c462d99115bac94ad32ebe2cb2f53acb4ae7a4e537a0039c805343f8f26bda3e74a3c6a71a62
 AUX l7-filter-userspace-0.11-datatype.patch 439 BLAKE2B 97c0e52452a672a5d4051c5b07ba5de1160d99f161639f2267baca1fadbcdf76b0cdee151b0ada98414f018aa42e03577f5a1821c316ce69167770fd6567dd3c SHA512 1dd2830ad2ad0e25a618d2e90c25b46d8c25b2753b5e82fde662abad95ec9135ca05defe2ce7519500a413c4dd996d86574a7225000fc1d2bcdeec7931254bc0
 AUX l7-filter-userspace-0.11-libnetfilter_conntrack-0.0.100.patch 3991 BLAKE2B a09bc37178b9c444e6a4f4d1b7234b714aee87b2f7dc005dc62c406f337e3d40c398b298657dfbc22b28f8cc753d88d58a167114794be2b12efbd1a984e177c8 SHA512 5c5addfa5887c280cb98ad72aa2c9f10b28055847593c21c90087a7330138e1b0a12b5ed962cd5fb08eddd7436a21694aaef5b298d862c328dda27471001d89a
-AUX l7-filter-userspace-0.11-map-access-threadsafe.patch 1642 BLAKE2B ab4b5a53558e05ba8ad13a0d2b1a04a2440ed9efef349f30eb419c429eccd7222056ac9b29915abde2597ecc3e90dd66e77de4e04f324c0669b9eeba97c59621 SHA512 f2c2f7d4c265648b4400f5bc955d8632ac54858f8adc26894b866044079b951e1146d8c09fa40fc3514005c6ed9f4cf86c595b3c24652aaf0d021f139d15dc25
-AUX l7-filter-userspace-0.11-pattern-loading-leak.patch 436 BLAKE2B bd67c606fc7ca096df854f811bb19ace610bee4ba09b56cd7e3871d8641197d15c69ab9e22a4f5e3b8e79ca75716ab9579fa45d723be0999a5e6f02a341ae3df SHA512 3cff06e0320eb2190f622367c9f0c59b81daf6c119ca0b2e0949741b9c1ef61d071a668cf85dbd524a8ed0f723fc61a95cd6ec3fd0fb9ad8ffa7e6c1153c9a07
-DIST l7-filter-userspace-0.11.tar.gz 129986 BLAKE2B 2bb5bd6794b01508da1f23dff44a242b17efd10e6f2b484aed34b32ea5ba3d787b2ea7ca8df9c57a1c20133337b4a1ac4ad4e7e400fbe97e044530f12e8673ad SHA512 5362a9e7392afd6dcb40bd9f602bddd34c040dcecbcc4570f56168310bd0e243561a1c946c7e912448518fe30c6bcff866c000b9e026dc96b2f3b47b4299cb81
 DIST l7-filter-userspace-0.12-beta1.tar.gz 130254 BLAKE2B 624f0af8c4acf8ad37b580d1488e6d09a82a01d8b2a77727074506ae9eb5d9c006f3ba79deeb5214a41db682b9bd8c3aa59bd81ff20daefcbf938476c6cc62ef SHA512 9c49b7e951ced6a44f8ee6f3a261ba14b1e3fe44a83e175f7f5a5821616ec8bc2b0a287f10b4485120e7783c9623c34aae2ee1d8997c258cdfb8230c1f87d137
-EBUILD l7-filter-userspace-0.11.ebuild 835 BLAKE2B 361d62c5304ed9cd835134ab6f082852391503af732fd28eb46ec11cb9e8f53a5e2e4bd91b0a117c342d6ae8b412f3d27269080b6357cce094af6f0a38de680c SHA512 a1208d48000c5d9059a4747bc9a9e026fc80c9687f4380d65fd34c15635e08141617220024da27af0a9270990e5dc9f305039c8b033291d88cd0e42e2f0ea50d
-EBUILD l7-filter-userspace-0.12_beta1.ebuild 784 BLAKE2B 637e3b4aa7f5740b0f59a1f249ac904a43742063e38d331c34735e6b746c4536369e2116dddf7c1fefd115c2b3c5f08a86b5fb6df0f21fc35deb6f4ad1899627 SHA512 ba9ea52595538ab267b21ef060c626c5ca50a0f4696430010c73a63ffe011ae62e6aa3e81a417267f9f351bf4d16fe1ff7de0d231c0f673debe63ed676b90556
+EBUILD l7-filter-userspace-0.12_beta1-r1.ebuild 697 BLAKE2B bcde9b2bb50e8a7bfedcc74e25cfddf51cd5ae704c343809577b22c9e18e6c02e16a0d1562077015eb1564bff9191fe8ab297dd502d678a1c2d251a3b0a2203f SHA512 518270293a95d52e42897920b99048eb2acc591102704a888dfc33e5231033ed56d1d3f597deb0ff4bce254218adc80072c628f670fe6536cdac19a12fb7c16f
 MISC metadata.xml 339 BLAKE2B 6688713ec765ac150f06f99a6851a17f64ac1fce862a0067ccfa7c0f4f8bae37a2574f452a470fb459d142d7bc7d4224456f613bb2997f81d473c223c8a0b320 SHA512 0469b7f26947f80af251def403ef1710c26ac6a0aab162fdfd2f506b5a3262aca62cca0540200702e8e865199d565ca3a782297eed2ba58e28f098145248280c
diff --git a/net-misc/l7-filter-userspace/files/l7-filter-userspace-0.11-arm-ppc-getopt-help-fix.patch b/net-misc/l7-filter-userspace/files/l7-filter-userspace-0.11-arm-ppc-getopt-help-fix.patch
deleted file mode 100644
index 29801ceed31a..000000000000
--- a/net-misc/l7-filter-userspace/files/l7-filter-userspace-0.11-arm-ppc-getopt-help-fix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- l7-filter-userspace-0.11/l7-filter.cpp.old	2010-07-12 10:43:58.485002456 +0100
-+++ l7-filter-userspace-0.11/l7-filter.cpp	2010-07-12 11:14:38.825001868 +0100
-@@ -186,15 +186,11 @@
-   conffilename = ""; 
-   const char *opts = "f:q:vh?sb:dn:p:m:cz";
- 
--  int done = 0;
--  while(!done)
-+  int c;
-+  while ((c = getopt (argc, argv, opts)) != -1)
-   {
--    char c;
--    switch(c = getopt(argc, argv, opts))
-+    switch(c)
-     {
--      case -1:
--        done = 1;
--        break;
-       case 'f':
-         conffilename = optarg;
-         break;
diff --git a/net-misc/l7-filter-userspace/files/l7-filter-userspace-0.11-map-access-threadsafe.patch b/net-misc/l7-filter-userspace/files/l7-filter-userspace-0.11-map-access-threadsafe.patch
deleted file mode 100644
index fea0f5bbb5a6..000000000000
--- a/net-misc/l7-filter-userspace/files/l7-filter-userspace-0.11-map-access-threadsafe.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- l7-filter-userspace-0.11/l7-conntrack.cpp.orig	2009-02-26 21:40:28.000000000 +0000
-+++ l7-filter-userspace-0.11/l7-conntrack.cpp	2010-07-23 13:03:23.000000000 +0100
-@@ -195,11 +195,13 @@
- {
-   nfct_conntrack_free(ct);
-   nfct_close(cth);
-+  pthread_mutex_destroy(&map_mutex);
- }
- 
- l7_conntrack::l7_conntrack(void* l7_classifier_in) 
- {
-   l7_classifier = (l7_classify *)l7_classifier_in;
-+  pthread_mutex_init(&map_mutex, NULL);
-   
-   // Now open a handler that is subscribed to all possible events
-   cth = nfct_open(CONNTRACK, NFCT_ALL_CT_GROUPS);
-@@ -211,19 +213,27 @@
- 
- l7_connection *l7_conntrack::get_l7_connection(const string key) 
- {
--  return l7_connections[key];
-+  l7_connection *conn;
-+  pthread_mutex_lock(&map_mutex);
-+  conn = l7_connections[key];
-+  pthread_mutex_unlock(&map_mutex);
-+  return conn;
- }
- 
- void l7_conntrack::add_l7_connection(l7_connection* connection, 
- 					const string key) 
- {
-+  pthread_mutex_lock(&map_mutex);
-   l7_connections[key] = connection;
-+  pthread_mutex_unlock(&map_mutex);
- }
- 
- void l7_conntrack::remove_l7_connection(const string key) 
- {
-+  pthread_mutex_lock(&map_mutex);
-   delete l7_connections[key];
-   l7_connections.erase(l7_connections.find(key));
-+  pthread_mutex_unlock(&map_mutex);
- }
- 
- void l7_conntrack::start() 
---- l7-filter-userspace-0.11/l7-conntrack.h.orig	2010-07-23 13:04:49.000000000 +0100
-+++ l7-filter-userspace-0.11/l7-conntrack.h	2010-07-23 13:05:56.000000000 +0100
-@@ -52,6 +52,7 @@
-   l7_map l7_connections;
-   struct nfct_conntrack *ct;
-   struct nfct_handle *cth; // the callback
-+  pthread_mutex_t map_mutex;
- 
-  public:
-   l7_conntrack(void * foo);
diff --git a/net-misc/l7-filter-userspace/files/l7-filter-userspace-0.11-pattern-loading-leak.patch b/net-misc/l7-filter-userspace/files/l7-filter-userspace-0.11-pattern-loading-leak.patch
deleted file mode 100644
index 835fc8ffb9f1..000000000000
--- a/net-misc/l7-filter-userspace/files/l7-filter-userspace-0.11-pattern-loading-leak.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff --git a/l7-filter-userspace/trunk/l7-classify.cpp b/l7-filter-userspace/trunk/l7-classify.cpp
-index 8b5b77e..1c80d4d 100644
---- a/l7-filter-userspace/trunk/l7-classify.cpp
-+++ b/l7-filter-userspace/trunk/l7-classify.cpp
-@@ -59,6 +59,7 @@ l7_pattern::l7_pattern(string name, string pattern_string, int eflags,
-     cerr << "error compiling " << name << " -- " << pattern_string << endl;
-     exit(1);
-   }
-+  free(preprocessed);
- }
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
deleted file mode 100644
index d5178dfc6379..000000000000
--- a/net-misc/l7-filter-userspace/l7-filter-userspace-0.11.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils autotools
-
-DESCRIPTION="Userspace utilities for layer 7 iptables QoS"
-HOMEPAGE="http://l7-filter.clearfoundation.com/"
-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}/${P}-map-access-threadsafe.patch"
-	epatch "${FILESDIR}/${P}-arm-ppc-getopt-help-fix.patch"
-	epatch "${FILESDIR}/${P}-libnetfilter_conntrack-0.0.100.patch"
-	epatch "${FILESDIR}/${P}-pattern-loading-leak.patch"
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc README TODO BUGS THANKS AUTHORS
-}
diff --git a/net-misc/l7-filter-userspace/l7-filter-userspace-0.12_beta1-r1.ebuild b/net-misc/l7-filter-userspace/l7-filter-userspace-0.12_beta1-r1.ebuild
new file mode 100644
index 000000000000..d531f85630ca
--- /dev/null
+++ b/net-misc/l7-filter-userspace/l7-filter-userspace-0.12_beta1-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P=${PN}-$(ver_rs 2 -)
+
+DESCRIPTION="Userspace utilities for layer 7 iptables QoS"
+HOMEPAGE="https://l7-filter.clearos.com http://l7-filter.sourceforge.net"
+SRC_URI="https://dev.gentoo.org/~bircoph/distfiles/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+SLOT="0"
+
+DEPEND=">=net-libs/libnetfilter_conntrack-0.0.100
+	>=net-libs/libnetfilter_queue-1.0.0
+	net-libs/libnfnetlink"
+RDEPEND="${DEPEND}
+	net-misc/l7-protocols"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=( "${FILESDIR}/${PN}-0.11-libnetfilter_conntrack-0.0.100.patch"
+		  "${FILESDIR}/${PN}-0.11-datatype.patch" )
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 1a02e9456171..000000000000
--- a/net-misc/l7-filter-userspace/l7-filter-userspace-0.12_beta1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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 ~arm ~x86"
-IUSE=""
-SLOT="0"
-
-DEPEND=">=net-libs/libnetfilter_conntrack-0.0.100
-	>=net-libs/libnetfilter_queue-1.0.0
-	net-libs/libnfnetlink"
-RDEPEND="${DEPEND}
-	net-misc/l7-protocols"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( README TODO BUGS THANKS AUTHORS )
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-0.11-libnetfilter_conntrack-0.0.100.patch" \
-		"${FILESDIR}/${PN}-0.11-datatype.patch"
-}