| 1 |
commit: 78c775afa54f223bd01b2cb143ef36a32ec92aa8 |
| 2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Feb 3 19:28:04 2020 +0000 |
| 4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Feb 3 19:28:33 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78c775af |
| 7 |
|
| 8 |
net-analyzer/flow-tools: Fix CFLAGS=-fno-common |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.87, Repoman-2.3.20 |
| 11 |
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> |
| 12 |
Closes: https://bugs.gentoo.org/show_bug.cgi?id=708038 |
| 13 |
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> |
| 14 |
|
| 15 |
.../files/flow-tools-0.68.5.1-fno-common.patch | 42 ++++++++++++++++++++++ |
| 16 |
.../flow-tools/flow-tools-0.68.5.1-r10.ebuild | 3 +- |
| 17 |
2 files changed, 44 insertions(+), 1 deletion(-) |
| 18 |
|
| 19 |
diff --git a/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-fno-common.patch b/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-fno-common.patch |
| 20 |
new file mode 100644 |
| 21 |
index 00000000000..14623fa93f3 |
| 22 |
--- /dev/null |
| 23 |
+++ b/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-fno-common.patch |
| 24 |
@@ -0,0 +1,42 @@ |
| 25 |
+--- ./src/acl2.h |
| 26 |
++++ ./src/acl2.h |
| 27 |
+@@ -48,7 +48,7 @@ |
| 28 |
+ #define ACL_TYPE_STD 1 |
| 29 |
+ #define ACL_TYPE_EXT 2 |
| 30 |
+ |
| 31 |
+-struct acl_list { |
| 32 |
++typedef struct acl_list { |
| 33 |
+ int num; /* number of entries */ |
| 34 |
+ int num_std; /* number of standard acl entries */ |
| 35 |
+ int num_ext; /* number of extended acl entries */ |
| 36 |
+@@ -59,6 +59,8 @@ |
| 37 |
+ /* num_ext of these */ |
| 38 |
+ }; |
| 39 |
+ |
| 40 |
++extern struct acl_list acl_list; |
| 41 |
++ |
| 42 |
+ struct acl_names { |
| 43 |
+ int num; /* index into standard or extended list */ |
| 44 |
+ char *name; /* name of this acl */ |
| 45 |
+--- a/src/aclyacc.y |
| 46 |
++++ b/src/aclyacc.y |
| 47 |
+@@ -7,8 +7,6 @@ |
| 48 |
+ unsigned char fmt_buf[32]; |
| 49 |
+ unsigned char fmt_buf2[32]; |
| 50 |
+ |
| 51 |
+-extern struct acl_list acl_list; |
| 52 |
+- |
| 53 |
+ int x; |
| 54 |
+ |
| 55 |
+ %} |
| 56 |
+--- a/src/flow-filter.c |
| 57 |
++++ b/src/flow-filter.c |
| 58 |
+@@ -56,8 +56,6 @@ |
| 59 |
+ int debug; |
| 60 |
+ int ip_net_only; |
| 61 |
+ |
| 62 |
+-struct acl_list acl_list; |
| 63 |
+- |
| 64 |
+ int yyparse (void); |
| 65 |
+ void usage(void); |
| 66 |
+ void yyerror(const char *msg); |
| 67 |
|
| 68 |
diff --git a/net-analyzer/flow-tools/flow-tools-0.68.5.1-r10.ebuild b/net-analyzer/flow-tools/flow-tools-0.68.5.1-r10.ebuild |
| 69 |
index 4a048f0d81c..8656ded0568 100644 |
| 70 |
--- a/net-analyzer/flow-tools/flow-tools-0.68.5.1-r10.ebuild |
| 71 |
+++ b/net-analyzer/flow-tools/flow-tools-0.68.5.1-r10.ebuild |
| 72 |
@@ -1,4 +1,4 @@ |
| 73 |
-# Copyright 1999-2019 Gentoo Authors |
| 74 |
+# Copyright 1999-2020 Gentoo Authors |
| 75 |
# Distributed under the terms of the GNU General Public License v2 |
| 76 |
|
| 77 |
EAPI=7 |
| 78 |
@@ -32,6 +32,7 @@ PATCHES=( |
| 79 |
"${FILESDIR}"/${P}-run.patch |
| 80 |
"${FILESDIR}"/${P}-syslog.patch |
| 81 |
"${FILESDIR}"/${P}-openssl11.patch |
| 82 |
+ "${FILESDIR}"/${P}-fno-common.patch |
| 83 |
) |
| 84 |
|
| 85 |
pkg_setup() { |
Archives