git: 29a38528ec03 - main - security/fwknop: Fix compilation on FreeBSD 13+

[Kevin Bowling]

The branch main has been updated by kbowling:

URL: https://cgit.FreeBSD.org/ports/commit/?id=29a38528ec03a278dbad9e165195570ad575be0d

commit 29a38528ec03a278dbad9e165195570ad575be0d
Author:     Kevin Bowling <kbowling at FreeBSD.org>
AuthorDate: 2021-04-08 18:56:17 +0000
Commit:     Kevin Bowling <kbowling at FreeBSD.org>
CommitDate: 2021-04-08 18:58:07 +0000

    security/fwknop: Fix compilation on FreeBSD 13+
    
    PR:             254570
    Reported by:    Jens Grassel <freebsd-ports at jan0sch.de>
    Approved by:    Sean Greven <sean.greven at gmail.com> (maintainer)
---
 security/fwknop/Makefile                      |  5 +----
 security/fwknop/files/patch-client_log__msg.h | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/security/fwknop/Makefile b/security/fwknop/Makefile
index a6e01b4db9b1..5ba13dae2a08 100644
--- a/security/fwknop/Makefile
+++ b/security/fwknop/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	fwknop
 PORTVERSION=	2.6.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	http://www.cipherdyne.org/fwknop/download/
 
@@ -11,9 +11,6 @@ COMMENT=	SPA implementation for Linux and FreeBSD
 
 LICENSE=	GPLv2
 
-BROKEN_FreeBSD_13=	ld: error: duplicate symbol: log_level_t
-BROKEN_FreeBSD_14=	ld: error: duplicate symbol: log_level_t
-
 BUILD_DEPENDS= wget:ftp/wget
 RUN_DEPENDS=   wget:ftp/wget
 LIB_DEPENDS+=  libassuan.so:security/libassuan
diff --git a/security/fwknop/files/patch-client_log__msg.h b/security/fwknop/files/patch-client_log__msg.h
new file mode 100644
index 000000000000..d1d61a6e6681
--- /dev/null
+++ b/security/fwknop/files/patch-client_log__msg.h
@@ -0,0 +1,19 @@
+*** client/log_msg.h.orig	Sat Apr  3 21:59:58 2021
+--- client/log_msg.h	Sat Apr  3 22:00:14 2021
+***************
+*** 38,44 ****
+      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 */
+
+--- 38,44 ----
+      LOG_VERBOSITY_INFO,         /*!< Constant to define a INFO message */
+      LOG_VERBOSITY_DEBUG,        /*!< Constant to define a DEBUG message */
+      LOG_LAST_VERBOSITY
+! };
+
+  #define LOG_DEFAULT_VERBOSITY   LOG_VERBOSITY_NORMAL    /*!< Default verbosity to use */
+