gentoo resync : 25.08.2020

1 files changed, 36 insertions, 0 deletions

diff --git a/net-analyzer/flowgrind/files/flowgrind-0.8.0-fno-common.patch b/net-analyzer/flowgrind/files/flowgrind-0.8.0-fno-common.patch
new file mode 100644
index 000000000000..60835b858816
--- /dev/null
+++ b/net-analyzer/flowgrind/files/flowgrind-0.8.0-fno-common.patch
@@ -0,0 +1,36 @@
+--- a/src/daemon.c
++++ b/src/daemon.c
+@@ -86,6 +86,10 @@
+ 
+ int daemon_pipe[2];
+ 
++pthread_t daemon_thread;
++char *dump_prefix;
++char *dump_dir;
++
+ pthread_mutex_t mutex;
+ struct request *requests = 0, *requests_last = 0;
+ 
+--- a/src/daemon.h
++++ b/src/daemon.h
+@@ -252,7 +252,7 @@
+ 	int num_flows;
+ };
+ 
+-pthread_t daemon_thread;
++extern pthread_t daemon_thread;
+ 
+ /* Through this pipe we wakeup the thread from select */
+ extern int daemon_pipe[2];
+@@ -268,9 +268,8 @@
+  * large a reply can get */
+ struct report* get_reports(int *has_more);
+ 
+-/* FIXME: shouldn't be global? */
+-char *dump_prefix;
+-char *dump_dir;
++extern char *dump_prefix;
++extern char *dump_dir;
+ 
+ void *daemon_main(void* ptr);
+ void add_report(struct report* report);