commit: 78c775afa54f223bd01b2cb143ef36a32ec92aa8 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> AuthorDate: Mon Feb 3 19:28:04 2020 +0000 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> CommitDate: Mon Feb 3 19:28:33 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78c775af
net-analyzer/flow-tools: Fix CFLAGS=-fno-common Package-Manager: Portage-2.3.87, Repoman-2.3.20 Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> Closes: https://bugs.gentoo.org/show_bug.cgi?id=708038 Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> .../files/flow-tools-0.68.5.1-fno-common.patch | 42 ++++++++++++++++++++++ .../flow-tools/flow-tools-0.68.5.1-r10.ebuild | 3 +- 2 files changed, 44 insertions(+), 1 deletion(-) 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 new file mode 100644 index 00000000000..14623fa93f3 --- /dev/null +++ b/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-fno-common.patch @@ -0,0 +1,42 @@ +--- ./src/acl2.h ++++ ./src/acl2.h +@@ -48,7 +48,7 @@ + #define ACL_TYPE_STD 1 + #define ACL_TYPE_EXT 2 + +-struct acl_list { ++typedef struct acl_list { + int num; /* number of entries */ + int num_std; /* number of standard acl entries */ + int num_ext; /* number of extended acl entries */ +@@ -59,6 +59,8 @@ + /* num_ext of these */ + }; + ++extern struct acl_list acl_list; ++ + struct acl_names { + int num; /* index into standard or extended list */ + char *name; /* name of this acl */ +--- a/src/aclyacc.y ++++ b/src/aclyacc.y +@@ -7,8 +7,6 @@ + unsigned char fmt_buf[32]; + unsigned char fmt_buf2[32]; + +-extern struct acl_list acl_list; +- + int x; + + %} +--- a/src/flow-filter.c ++++ b/src/flow-filter.c +@@ -56,8 +56,6 @@ + int debug; + int ip_net_only; + +-struct acl_list acl_list; +- + int yyparse (void); + void usage(void); + void yyerror(const char *msg); 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 index 4a048f0d81c..8656ded0568 100644 --- 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 @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -32,6 +32,7 @@ PATCHES=( "${FILESDIR}"/${P}-run.patch "${FILESDIR}"/${P}-syslog.patch "${FILESDIR}"/${P}-openssl11.patch + "${FILESDIR}"/${P}-fno-common.patch ) pkg_setup() {
