From nobody Sun Sep 10 17:54:52 2023 X-Original-To: dev-commits-ports-all@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 4RkHYS5GjYz4t043; Sun, 10 Sep 2023 17:54:52 +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 4RkHYS3bRXz4Vnr; Sun, 10 Sep 2023 17:54:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694368492; 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=QI7IPZNWPos8bsdP6UTWRWjmMlkJqeshg0s81EEjI1A=; b=JUbbk/Qzfmd3rPc5F2illyDR1cpmajcAj9G9WqVk0nRGuGmKAumjdVHc8gPVn5aV7wbIHS xiuOVwK249E1fOkmjlgAJKOwofj64a8vIDQO5CGIYexkeEHzHBnooaCnq1Ka2XKMZ1FnET soihmlm4WWGXub6RB969ynuob8Guz1xceMvCEp8oVUQ0pfoUYIqh42g4QSoV3jcRRnkIGf Cr1FNW/blAkzINcNPlRMZsKmoykPC4HfUqZtulAF0LWXP+8VNmpJxNQuNvSw1va4R/vDa4 W+tKjbRZ+jFoHj4xws9JyQh8/xYaw7F8ta7jhR/5SAxaD5Rwef2jsNE6aYY43g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694368492; a=rsa-sha256; cv=none; b=s/ZyQPo6w+cOu05jyJfDthHuNdIGwdWpLpc+dm8zRYOw2zCmDdIcpiRQ0dt3o1BX6Z9Ala yH7l9hjqL/Dh4iOUYLVyFzW/Dt+0FMmlBn0ioGUliu7rgTKTjmU0MEGmpP8uxhxmT/gyEB P9vmeJSZfwC9MOmDR32zdVOr1/fqfX9Ig8zLS+gCamOn15nzWY26hTYQ6xPgT+DqC/CxjU pzr3oUqkp3Fr40UIkevsWi1j/kdLAOSvEYsHtmpH5oq3w9sz1Z1hZZhKH4lEU75m/dOF70 GUNTnVeurd6y3i/its2BjxpZkYKZ9pIWunlmUIL7LXBRwPM+ChcBV8tvN17C7Q== 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=1694368492; 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=QI7IPZNWPos8bsdP6UTWRWjmMlkJqeshg0s81EEjI1A=; b=K/OAKyq2YM8eLo13BzdW4seo98Zov8MSxAomUX05SoHxiogvY9QIQjFXcXPIQzKza8RhGt IOEFOTBdpP4kgd+WNgfhNt1i961BlB+FDbc0cqHGENQyIwNKCWWDc8kHMGxtgVNlcnk9n1 QNTfdRBKsz6Bdh88fxaVsyxrJitTmk9K4C/cpR+n8yFZ5LbEOU4rK9193IV7JnZ1x6cy/J To0742Z6HMCNMrv3VXHO8vA/fyQZsRT95L8+gSX3SaagZpD1SCvVq1pwhxFHSFh2l41cvY xfi0BoJq+MBZumkvE4xTVx8ay2lqNMmzihDtz/gMWA8WQ6IHhZmeuitQZaeqmQ== 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 4RkHYS2b4mz2JV; Sun, 10 Sep 2023 17:54:52 +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 38AHsqRM092544; Sun, 10 Sep 2023 17:54:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38AHsqiK092541; Sun, 10 Sep 2023 17:54:52 GMT (envelope-from git) Date: Sun, 10 Sep 2023 17:54:52 GMT Message-Id: <202309101754.38AHsqiK092541@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Don Lewis Subject: git: e908f239ca59 - 2023Q3 - net/nmsg: 1.1.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: truckman X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q3 X-Git-Reftype: branch X-Git-Commit: e908f239ca59ff9cc38613659a76960cfe5e02d0 Auto-Submitted: auto-generated The branch 2023Q3 has been updated by truckman: URL: https://cgit.FreeBSD.org/ports/commit/?id=e908f239ca59ff9cc38613659a76960cfe5e02d0 commit e908f239ca59ff9cc38613659a76960cfe5e02d0 Author: Don Lewis AuthorDate: 2023-09-09 21:52:45 +0000 Commit: Don Lewis CommitDate: 2023-09-10 17:52:49 +0000 net/nmsg: 1.1.0 1.1.0: * Multiple performance improvements to JSON formatting. * Multiple performance and concurrency improvements in nmsg_io loop. * Add new dnsobs message type for raw passive DNS observations. * Format DNS messages as JSON in base:dnsqr, base:dnstap, and base:dnsobs. * Format base:encode payload in human readable form in JSON output. * Replace yajl with json-c for JSON parsing. * nmsgtool: exit with nonzero status when interrupted by signal. * Correct container size calculation when sequencing. * Address doxygen deprecations. Build fails with JSON_C option turned off, mark BROKEN. Reported upstream. Bump PORTREVISION of dependent ports MFH: 2023Q3 Sponsored by: DomainTools LLC (cherry picked from commit c08c8db7796ec3ca70573a363ff34a909cee5105) --- dns/dnstable-convert/Makefile | 2 +- net/axa/Makefile | 2 +- net/nmsg/Makefile | 13 +++++++------ net/nmsg/distinfo | 6 +++--- net/nmsg/pkg-plist | 4 +++- net/p5-Net-Nmsg/Makefile | 2 +- net/py-pynmsg/Makefile | 2 +- net/sie-nmsg/Makefile | 2 +- 8 files changed, 18 insertions(+), 15 deletions(-) diff --git a/dns/dnstable-convert/Makefile b/dns/dnstable-convert/Makefile index 80760dbd6f5f..b6ce8e38b034 100644 --- a/dns/dnstable-convert/Makefile +++ b/dns/dnstable-convert/Makefile @@ -1,6 +1,6 @@ PORTNAME= dnstable-convert PORTVERSION= 0.12.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= dns MASTER_SITES= FARSIGHT LOCAL/truckman/farsight diff --git a/net/axa/Makefile b/net/axa/Makefile index 754aa293dd4f..acccfdfa38bb 100644 --- a/net/axa/Makefile +++ b/net/axa/Makefile @@ -1,6 +1,6 @@ PORTNAME= axa PORTVERSION= 3.0.1 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= net dns MASTER_SITES= FARSIGHT LOCAL/truckman/farsight diff --git a/net/nmsg/Makefile b/net/nmsg/Makefile index 07dd14e3311f..1a6868c14c56 100644 --- a/net/nmsg/Makefile +++ b/net/nmsg/Makefile @@ -1,5 +1,5 @@ PORTNAME= nmsg -PORTVERSION= 1.0.1 +PORTVERSION= 1.1.0 PORTREVISION= 1 CATEGORIES= net MASTER_SITES= FARSIGHT LOCAL/truckman/farsight @@ -24,13 +24,14 @@ PORTDOCS= * # The DOXYGEN option is best effort. # If doxygen is installed, it will get used if the option is set to NO. -OPTIONS_DEFINE= YAJL ZEROMQ DOXYGEN EXAMPLES MANPAGES DOCS -OPTIONS_DEFAULT= YAJL ZEROMQ DOXYGEN MANPAGES +OPTIONS_DEFINE= JSON_C ZEROMQ DOXYGEN EXAMPLES MANPAGES DOCS +OPTIONS_DEFAULT= JSON_C ZEROMQ DOXYGEN MANPAGES OPTIONS_SUB= yes -YAJL_DESC= JSON support via libyajl -YAJL_CONFIGURE_WITH= yajl -YAJL_LIB_DEPENDS= libyajl.so:devel/yajl +JSON_C_DESC= JSON support via libjson-c +JSON_C_CONFIGURE_WITH= json-c +JSON_C_LIB_DEPENDS= libjson-c.so:devel/json-c +JSON_C_BROKEN_OFF= Does not build without json-c ZEROMQ_DESC= ZeroMQ support ZEROMQ_CONFIGURE_WITH= libzmq ZEROMQ_LIB_DEPENDS= libzmq.so:net/libzmq4 diff --git a/net/nmsg/distinfo b/net/nmsg/distinfo index 47112988930b..11f2f81bcc1a 100644 --- a/net/nmsg/distinfo +++ b/net/nmsg/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1633491704 -SHA256 (nmsg-1.0.1.tar.gz) = 6d9c950b2bd8c507b40ccd925a85b095738f9d036abe6b0d595c1f3eba31ef35 -SIZE (nmsg-1.0.1.tar.gz) = 664217 +TIMESTAMP = 1694205089 +SHA256 (nmsg-1.1.0.tar.gz) = e5931b0cfa38e50f3f9cb7100ffdef454400c5901468c6014a6a602c9215a6d8 +SIZE (nmsg-1.1.0.tar.gz) = 721466 diff --git a/net/nmsg/pkg-plist b/net/nmsg/pkg-plist index 238f89542ceb..40cbd6896fad 100644 --- a/net/nmsg/pkg-plist +++ b/net/nmsg/pkg-plist @@ -4,6 +4,7 @@ include/nmsg/alias.h include/nmsg/asprintf.h include/nmsg/base/defs.h include/nmsg/base/dns.pb-c.h +include/nmsg/base/dnsobs.pb-c.h include/nmsg/base/dnsqr.pb-c.h include/nmsg/base/dnstap.pb-c.h include/nmsg/base/email.pb-c.h @@ -45,12 +46,13 @@ include/nmsg/zbuf.h lib/libnmsg.a lib/libnmsg.so lib/libnmsg.so.8 -lib/libnmsg.so.8.0.0 +lib/libnmsg.so.8.1.0 lib/nmsg/nmsg_flt1_sample.so lib/nmsg/nmsg_msg9_base.so libdata/pkgconfig/libnmsg.pc %%MANPAGES%%man/man1/nmsgtool.1.gz %%DATADIR%%/base/dns.proto +%%DATADIR%%/base/dnsobs.proto %%DATADIR%%/base/dnsqr.proto %%DATADIR%%/base/dnstap.proto %%DATADIR%%/base/email.proto diff --git a/net/p5-Net-Nmsg/Makefile b/net/p5-Net-Nmsg/Makefile index 2bdff64213b6..b78301920cc5 100644 --- a/net/p5-Net-Nmsg/Makefile +++ b/net/p5-Net-Nmsg/Makefile @@ -1,6 +1,6 @@ PORTNAME= Net-Nmsg PORTVERSION= 0.17 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net perl5 MASTER_SITES= https://tools.netsa.cert.org/confluence/download/attachments/12320770/ \ CPAN diff --git a/net/py-pynmsg/Makefile b/net/py-pynmsg/Makefile index 5a27f3dd40c1..36a287d7ca34 100644 --- a/net/py-pynmsg/Makefile +++ b/net/py-pynmsg/Makefile @@ -1,6 +1,6 @@ PORTNAME= pynmsg PORTVERSION= 0.5.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net python MASTER_SITES= FARSIGHT LOCAL/truckman/farsight PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/net/sie-nmsg/Makefile b/net/sie-nmsg/Makefile index 527ef7ac56e3..9aebbfe992b8 100644 --- a/net/sie-nmsg/Makefile +++ b/net/sie-nmsg/Makefile @@ -1,6 +1,6 @@ PORTNAME= sie-nmsg PORTVERSION= 1.2.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net dns MASTER_SITES= FARSIGHT LOCAL/truckman/farsight