From owner-dev-commits-ports-main@freebsd.org Thu Apr 8 18:58:18 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 056965BC2C8; Thu, 8 Apr 2021 18:58:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FGVs56pSLz4RPT; Thu, 8 Apr 2021 18:58:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DC74B7874; Thu, 8 Apr 2021 18:58:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 138IwHIL002579; Thu, 8 Apr 2021 18:58:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 138IwHu2002578; Thu, 8 Apr 2021 18:58:17 GMT (envelope-from git) Date: Thu, 8 Apr 2021 18:58:17 GMT Message-Id: <202104081858.138IwHu2002578@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Kevin Bowling Subject: git: 29a38528ec03 - main - security/fwknop: Fix compilation on FreeBSD 13+ MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 29a38528ec03a278dbad9e165195570ad575be0d Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Apr 2021 18:58:18 -0000 The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/ports/commit/?id=29a38528ec03a278dbad9e165195570ad575be0d commit 29a38528ec03a278dbad9e165195570ad575be0d Author: Kevin Bowling AuthorDate: 2021-04-08 18:56:17 +0000 Commit: Kevin Bowling CommitDate: 2021-04-08 18:58:07 +0000 security/fwknop: Fix compilation on FreeBSD 13+ PR: 254570 Reported by: Jens Grassel Approved by: Sean Greven (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 */ +