From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1F1C1138350 for ; Mon, 3 Feb 2020 19:28:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 52D73E086A; Mon, 3 Feb 2020 19:28:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 20FF6E086A for ; Mon, 3 Feb 2020 19:28:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 85A7634E618 for ; Mon, 3 Feb 2020 19:28:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 111F235 for ; Mon, 3 Feb 2020 19:28:39 +0000 (UTC) From: "Jeroen Roovers" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" Message-ID: <1580758113.78c775afa54f223bd01b2cb143ef36a32ec92aa8.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/flow-tools/files/, net-analyzer/flow-tools/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/flow-tools/files/flow-tools-0.68.5.1-fno-common.patch net-analyzer/flow-tools/flow-tools-0.68.5.1-r10.ebuild X-VCS-Directories: net-analyzer/flow-tools/files/ net-analyzer/flow-tools/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: 78c775afa54f223bd01b2cb143ef36a32ec92aa8 X-VCS-Branch: master Date: Mon, 3 Feb 2020 19:28:39 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f3564166-1238-49bc-8520-b8856cd7f626 X-Archives-Hash: 3b3a362ed4ae9d97d4ad026ced24aacf commit: 78c775afa54f223bd01b2cb143ef36a32ec92aa8 Author: Jeroen Roovers gentoo org> AuthorDate: Mon Feb 3 19:28:04 2020 +0000 Commit: Jeroen Roovers gentoo 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 gentoo.org> Closes: https://bugs.gentoo.org/show_bug.cgi?id=708038 Signed-off-by: Jeroen Roovers 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() {