gentoo resync : 10.11.2019

3 files changed, 0 insertions, 86 deletions

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);
- }