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 6CE8C138351 for ; Fri, 10 Apr 2020 14:58:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 98EECE09BA; Fri, 10 Apr 2020 14:58:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 7FA2BE09BA for ; Fri, 10 Apr 2020 14:58:08 +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 DB61C34F00E for ; Fri, 10 Apr 2020 14:58:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 01A9B18F for ; Fri, 10 Apr 2020 14:58:05 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1586530664.023eef270a7c2239cb7bca2c0b059aff6a52eda3.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-firewall/fwknop/files/, net-firewall/fwknop/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-firewall/fwknop/files/fwknop-2.6.10_fno-common_fix.patch net-firewall/fwknop/fwknop-2.6.10-r1.ebuild X-VCS-Directories: net-firewall/fwknop/files/ net-firewall/fwknop/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 023eef270a7c2239cb7bca2c0b059aff6a52eda3 X-VCS-Branch: master Date: Fri, 10 Apr 2020 14:58:05 +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: 04383352-8576-4aec-a08d-7f3d502566b2 X-Archives-Hash: 183b06a8d22a2272844f8d8f38faf499 commit: 023eef270a7c2239cb7bca2c0b059aff6a52eda3 Author: Hank Leininger korelogic com> AuthorDate: Tue Feb 25 06:35:19 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Apr 10 14:57:44 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=023eef27 net-firewall/fwknop: fix build with -fno-common or gcc-10 Cherry-picked fix from https://github.com/Jakuje/fwknop/commit/a87325b0816a79329cf0b4d4f9ebf247ead117db Signed-off-by: Hank Leininger korelogic.com> Closes: https://bugs.gentoo.org/706816 Package-Manager: Portage-2.3.89, Repoman-2.3.20 Closes: https://github.com/gentoo/gentoo/pull/14766 Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/fwknop-2.6.10_fno-common_fix.patch | 23 ++++++++++++++++++++++ net-firewall/fwknop/fwknop-2.6.10-r1.ebuild | 2 ++ 2 files changed, 25 insertions(+) diff --git a/net-firewall/fwknop/files/fwknop-2.6.10_fno-common_fix.patch b/net-firewall/fwknop/files/fwknop-2.6.10_fno-common_fix.patch new file mode 100644 index 00000000000..9c144cc1edd --- /dev/null +++ b/net-firewall/fwknop/files/fwknop-2.6.10_fno-common_fix.patch @@ -0,0 +1,23 @@ +From a87325b0816a79329cf0b4d4f9ebf247ead117db Mon Sep 17 00:00:00 2001 +From: Jakub Jelen +Date: Mon, 10 Feb 2020 15:21:56 +0100 +Subject: [PATCH] Unbreak build with gcc10 (-fno-common) + +Signed-off-by: Jakub Jelen +--- + client/log_msg.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/client/log_msg.h b/client/log_msg.h +index cc17716b..3dda1614 100644 +--- a/client/log_msg.h ++++ b/client/log_msg.h +@@ -38,7 +38,7 @@ enum + LOG_VERBOSITY_INFO, /*!< Constant to define a INFO message */ + LOG_VERBOSITY_DEBUG, /*!< Constant to define a DEBUG message */ + LOG_LAST_VERBOSITY +-} log_level_t; ++}; + + #define LOG_DEFAULT_VERBOSITY LOG_VERBOSITY_NORMAL /*!< Default verbosity to use */ + diff --git a/net-firewall/fwknop/fwknop-2.6.10-r1.ebuild b/net-firewall/fwknop/fwknop-2.6.10-r1.ebuild index 52c57d2312c..786366d6895 100644 --- a/net-firewall/fwknop/fwknop-2.6.10-r1.ebuild +++ b/net-firewall/fwknop/fwknop-2.6.10-r1.ebuild @@ -43,6 +43,8 @@ REQUIRED_USE=" udp-server? ( server ) " +PATCHES=( "${FILESDIR}/${PN}-2.6.10_fno-common_fix.patch" ) + DOCS=( AUTHORS ChangeLog README ) DISABLE_AUTOFORMATTING=1