From nobody Sun Jun 23 04:18:29 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W6Hs12Vm5z5NkWK; Sun, 23 Jun 2024 04:18:29 +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 4W6Hs11zRvz4vjd; Sun, 23 Jun 2024 04:18:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719116309; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VlNjAYPDsymt+oTTpKIxA9MO6gx/9/XxhX7M5if4UiI=; b=uMQ/cZOlKmiJXPQnbjEqdTIYWI648rgH8B10IRYWuR/dfAUNqOR1BauquZyBseSOKrA5A0 MTrZoheHBChD4OhK89dojq3Dr2e4iZn9yLqicdfXFse/4KmScT0wluOA8kKSwVwWBTbyZ1 gfD7mbqXQUltS5DXCcbC5aJ0s8GooAi3Mt767SSEZrpU+qAXQ6wvjEU+M84dbikNz9Y1xG updr+mrqcP9E8BNX+t22N56bp6KbGbyvOr1r7+PYOcN8NKfMbsfgfDBbMATjvclRilE9Ig ZZaLt2nlGTP/Cw/ni9xaZeMDZ1kRHBuQse++Ig1aa/fFWUaYdiK4ThsXd5sr/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719116309; a=rsa-sha256; cv=none; b=XyBDQlUFXfsB66Hhyzw/R4xMFQE1VzO1/YBHCQ1e0DJ45nPFRZIgNtnMKs2SjAgJC/Crrd oMlrdaD4vTO5VhjsLtVO8jg0VvQwuR7qWN5NJ6/GBbXlMNU2GjNgZoAGMXEG1+6ZllQcXM wlD9BR1xAixJ1cAPNy7B0u2c4bgHfmRCYTKNbh9c/xs5TK/0+82C2mSZD1L9vvZcAYGNBo EjR1yd5gxfT6TQnFj8ZVSZISXWLvLyN+xrx4936RzA4VajoPFAou8BpXKIvpbISuL4HAQX +GuJOdnmskHLh1mx876pu0YJNLdtEXL/h/bXund4KfY161XJ6Hz3hdFzAolr7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719116309; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VlNjAYPDsymt+oTTpKIxA9MO6gx/9/XxhX7M5if4UiI=; b=qUQJXxJIYD+BCnpMOGzRy/ECK7XVE56HWAE1r4d/bKT2Sv5WaPk58PJsWDKoWzZhyMh3w+ ykKgIy8jBGUJ0z3J3SX1gtkM/F8+YPO4NhjTdZUd5q3jinHprBWE4Rqmivu4FLGEB7idGE GIvX1oVJ/h+tNgFg63UGYbtUgR7vGOD6YF3UdMm5U7Ey66kDkYyiFs3J7UteKpSUi2FfND Zd7FcB4xwM7ELSCOFtmuBeLO/Lklx++HS26Ni+uFoBKX9xGvbykcTmg+dfc3fUaJOi7gsU 1skWIHBHhUEJRn/soWRTujZt27HKi4a/u9RaHdngletPdB2gYXRyg875KjPzPA== 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 4W6Hs11SMVzKp8; Sun, 23 Jun 2024 04:18:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45N4ITS0084756; Sun, 23 Jun 2024 04:18:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45N4ITST084753; Sun, 23 Jun 2024 04:18:29 GMT (envelope-from git) Date: Sun, 23 Jun 2024 04:18:29 GMT Message-Id: <202406230418.45N4ITST084753@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Philip Paeps Subject: git: f77077d79748 - main - net/fort: Update to 1.6.2 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: philip X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f77077d7974847b80e96a436dddd33bb961f7503 Auto-Submitted: auto-generated The branch main has been updated by philip: URL: https://cgit.FreeBSD.org/ports/commit/?id=f77077d7974847b80e96a436dddd33bb961f7503 commit f77077d7974847b80e96a436dddd33bb961f7503 Author: Philip Paeps AuthorDate: 2024-06-23 04:12:24 +0000 Commit: Philip Paeps CommitDate: 2024-06-23 04:12:24 +0000 net/fort: Update to 1.6.2 - Update to 1.6.2 - Changelog: https://github.com/NICMx/FORT-validator/releases/tag/1.6.2 While here, fix building with libxml2 2.13.1 [1]. This patch will be in the next upstream release. Approved by: Toni Kalombo (maintainer, implicit) Reported by: diizzy [1] PR: 279898 [1] --- net/fort/Makefile | 3 +-- net/fort/distinfo | 6 +++--- net/fort/files/patch-src_Makefile.am | 8 ++++---- net/fort/files/patch-src_xml_relax__ng.c | 19 +++++++++++++++++++ 4 files changed, 27 insertions(+), 9 deletions(-) diff --git a/net/fort/Makefile b/net/fort/Makefile index ed7d500c8d38..9729473d8cf8 100644 --- a/net/fort/Makefile +++ b/net/fort/Makefile @@ -1,6 +1,5 @@ PORTNAME= fort -DISTVERSION= 1.6.1 -PORTREVISION= 1 +DISTVERSION= 1.6.2 CATEGORIES= net MAINTAINER= toni@devboks.com diff --git a/net/fort/distinfo b/net/fort/distinfo index 1eae28584c55..0c852fdede0e 100644 --- a/net/fort/distinfo +++ b/net/fort/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1707198406 -SHA256 (NICMx-FORT-validator-1.6.1_GH0.tar.gz) = 0bed82f75bd6c4fffa4f5dc4118a706560f5eab27d85b9704380e570db8ff050 -SIZE (NICMx-FORT-validator-1.6.1_GH0.tar.gz) = 455892 +TIMESTAMP = 1719114666 +SHA256 (NICMx-FORT-validator-1.6.2_GH0.tar.gz) = aa6149256b0557e617cb0ff7f290464ee5fd930a02e7f9169f42ce157db025bf +SIZE (NICMx-FORT-validator-1.6.2_GH0.tar.gz) = 397203 diff --git a/net/fort/files/patch-src_Makefile.am b/net/fort/files/patch-src_Makefile.am index 0066f76f3587..b57ee7a99f05 100644 --- a/net/fort/files/patch-src_Makefile.am +++ b/net/fort/files/patch-src_Makefile.am @@ -1,9 +1,9 @@ ---- src/Makefile.am.orig 2023-12-14 01:43:09 UTC +--- src/Makefile.am.orig 2024-06-23 03:52:55 UTC +++ src/Makefile.am -@@ -118,7 +118,7 @@ fort_CFLAGS = -Wall -Wpedantic - # Feel free to temporarily remove this one if you're not using gcc 7.3.0. +@@ -118,7 +118,7 @@ fort_SOURCES += $(ASN_MODULE_SRCS) $(ASN_MODULE_HDRS) + fort_CFLAGS = -Wall -Wpedantic #fort_CFLAGS += $(GCC_WARNS) - fort_CFLAGS += -std=c99 -D_POSIX_C_SOURCE=200809 -D_XOPEN_SOURCE=700 + fort_CFLAGS += -std=c99 -D_DEFAULT_SOURCE=1 -D_XOPEN_SOURCE=700 -D_BSD_SOURCE=1 -fort_CFLAGS += -O2 -g $(FORT_FLAGS) ${XML2_CFLAGS} +fort_CFLAGS += -O2 -g $(FORT_FLAGS) ${XML2_CFLAGS} ${JANSSON_CFLAGS} if BACKTRACE_ENABLED diff --git a/net/fort/files/patch-src_xml_relax__ng.c b/net/fort/files/patch-src_xml_relax__ng.c new file mode 100644 index 000000000000..952d7b59a197 --- /dev/null +++ b/net/fort/files/patch-src_xml_relax__ng.c @@ -0,0 +1,19 @@ +--- src/xml/relax_ng.c.orig 2024-06-23 04:09:22 UTC ++++ src/xml/relax_ng.c +@@ -35,8 +35,15 @@ relax_ng_log_warn(void *ctx, const char *msg, ...) + VLOG_MSG(warn) + } + ++/* Signature changed at libxml2 commit 61034116d0a3c8b295c6137956adc3ae55720. */ ++#if LIBXML_VERSION >= 21200 ++#define XMLERROR_PARAMTYPE const xmlError * ++#else ++#define XMLERROR_PARAMTYPE xmlErrorPtr ++#endif ++ + static void +-relax_ng_log_str_err(void *userData, xmlErrorPtr error) ++relax_ng_log_str_err(void *userData, XMLERROR_PARAMTYPE error) + { + char *ptr; +