commit: 023eef270a7c2239cb7bca2c0b059aff6a52eda3 Author: Hank Leininger <hlein <AT> korelogic <DOT> com> AuthorDate: Tue Feb 25 06:35:19 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> 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 <hlein <AT> 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 <asturm <AT> 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 <[email protected]> +Date: Mon, 10 Feb 2020 15:21:56 +0100 +Subject: [PATCH] Unbreak build with gcc10 (-fno-common) + +Signed-off-by: Jakub Jelen <[email protected]> +--- + 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
