Date: Mon, 11 Sep 2023 07:11:00 +0800 From: Vanilla Hsu <vanilla@fatpipi.com> To: Don Lewis <truckman@freebsd.org> Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Subject: Re: git: c08c8db7796e - main - net/nmsg: 1.1.0 Message-ID: <CAB_qb68ESbWW%2B_fdDgVm-BbuSwVhb3o_mHVSrh8D9XPipq-New@mail.gmail.com> In-Reply-To: <202309100546.38A5kppG078170@gitrepo.freebsd.org>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --] Maybe you should mark json-c as default lib_depends, not as an option? Don Lewis <truckman@freebsd.org> 於 2023年9月10日 週日 下午1:46寫道： > The branch main has been updated by truckman: > > URL: > https://cgit.FreeBSD.org/ports/commit/?id=c08c8db7796ec3ca70573a363ff34a909cee5105 > > commit c08c8db7796ec3ca70573a363ff34a909cee5105 > Author: Don Lewis <truckman@FreeBSD.org> > AuthorDate: 2023-09-09 21:52:45 +0000 > Commit: Don Lewis <truckman@FreeBSD.org> > CommitDate: 2023-09-10 05:35:14 +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 > --- > 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 > > [-- Attachment #2 --] <div dir="ltr"><br><div>Maybe you should mark json-c as default lib_depends,</div><div><br></div><div>not as an option?</div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">Don Lewis <<a href="mailto:truckman@freebsd.org">truckman@freebsd.org</a>> 於 2023年9月10日 週日 下午1:46寫道：<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-style:solid;border-left-color:rgb(204,204,204);padding-left:1ex">The branch main has been updated by truckman:<br> <br> URL: <a href="https://cgit.FreeBSD.org/ports/commit/?id=c08c8db7796ec3ca70573a363ff34a909cee5105" rel="noreferrer" target="_blank">https://cgit.FreeBSD.org/ports/commit/?id=c08c8db7796ec3ca70573a363ff34a909cee5105</a><br>; <br> commit c08c8db7796ec3ca70573a363ff34a909cee5105<br> Author: Don Lewis <truckman@FreeBSD.org><br> AuthorDate: 2023-09-09 21:52:45 +0000<br> Commit: Don Lewis <truckman@FreeBSD.org><br> CommitDate: 2023-09-10 05:35:14 +0000<br> <br> net/nmsg: 1.1.0<br> <br> 1.1.0:<br> * Multiple performance improvements to JSON formatting.<br> <br> * Multiple performance and concurrency improvements in nmsg_io loop.<br> <br> * Add new dnsobs message type for raw passive DNS observations.<br> <br> * Format DNS messages as JSON in base:dnsqr, base:dnstap, and<br> base:dnsobs.<br> <br> * Format base:encode payload in human readable form in JSON output.<br> <br> * Replace yajl with json-c for JSON parsing.<br> <br> * nmsgtool: exit with nonzero status when interrupted by signal.<br> <br> * Correct container size calculation when sequencing.<br> <br> * Address doxygen deprecations.<br> <br> Build fails with JSON_C option turned off, mark BROKEN. Reported<br> upstream.<br> <br> Bump PORTREVISION of dependent ports<br> <br> MFH: 2023Q3<br> Sponsored by: DomainTools LLC<br> ---<br> dns/dnstable-convert/Makefile | 2 +-<br> net/axa/Makefile | 2 +-<br> net/nmsg/Makefile | 13 +++++++------<br> net/nmsg/distinfo | 6 +++---<br> net/nmsg/pkg-plist | 4 +++-<br> net/p5-Net-Nmsg/Makefile | 2 +-<br> net/py-pynmsg/Makefile | 2 +-<br> net/sie-nmsg/Makefile | 2 +-<br> 8 files changed, 18 insertions(+), 15 deletions(-)<br> <br> diff --git a/dns/dnstable-convert/Makefile b/dns/dnstable-convert/Makefile<br> index 80760dbd6f5f..b6ce8e38b034 100644<br> --- a/dns/dnstable-convert/Makefile<br> +++ b/dns/dnstable-convert/Makefile<br> @@ -1,6 +1,6 @@<br> PORTNAME= dnstable-convert<br> PORTVERSION= 0.12.0<br> -PORTREVISION= 1<br> +PORTREVISION= 2<br> CATEGORIES= dns<br> MASTER_SITES= FARSIGHT LOCAL/truckman/farsight<br> <br> diff --git a/net/axa/Makefile b/net/axa/Makefile<br> index 754aa293dd4f..acccfdfa38bb 100644<br> --- a/net/axa/Makefile<br> +++ b/net/axa/Makefile<br> @@ -1,6 +1,6 @@<br> PORTNAME= axa<br> PORTVERSION= 3.0.1<br> -PORTREVISION= 0<br> +PORTREVISION= 1<br> CATEGORIES= net dns<br> MASTER_SITES= FARSIGHT LOCAL/truckman/farsight<br> <br> diff --git a/net/nmsg/Makefile b/net/nmsg/Makefile<br> index 07dd14e3311f..1a6868c14c56 100644<br> --- a/net/nmsg/Makefile<br> +++ b/net/nmsg/Makefile<br> @@ -1,5 +1,5 @@<br> PORTNAME= nmsg<br> -PORTVERSION= 1.0.1<br> +PORTVERSION= 1.1.0<br> PORTREVISION= 1<br> CATEGORIES= net<br> MASTER_SITES= FARSIGHT LOCAL/truckman/farsight<br> @@ -24,13 +24,14 @@ PORTDOCS= *<br> <br> # The DOXYGEN option is best effort.<br> # If doxygen is installed, it will get used if the option is set to NO.<br> -OPTIONS_DEFINE= YAJL ZEROMQ DOXYGEN EXAMPLES MANPAGES DOCS<br> -OPTIONS_DEFAULT= YAJL ZEROMQ DOXYGEN MANPAGES<br> +OPTIONS_DEFINE= JSON_C ZEROMQ DOXYGEN EXAMPLES MANPAGES DOCS<br> +OPTIONS_DEFAULT= JSON_C ZEROMQ DOXYGEN MANPAGES<br> OPTIONS_SUB= yes<br> <br> -YAJL_DESC= JSON support via libyajl<br> -YAJL_CONFIGURE_WITH= yajl<br> -YAJL_LIB_DEPENDS= libyajl.so:devel/yajl<br> +JSON_C_DESC= JSON support via libjson-c<br> +JSON_C_CONFIGURE_WITH= json-c<br> +JSON_C_LIB_DEPENDS= libjson-c.so:devel/json-c<br> +JSON_C_BROKEN_OFF= Does not build without json-c<br> ZEROMQ_DESC= ZeroMQ support<br> ZEROMQ_CONFIGURE_WITH= libzmq<br> ZEROMQ_LIB_DEPENDS= libzmq.so:net/libzmq4<br> diff --git a/net/nmsg/distinfo b/net/nmsg/distinfo<br> index 47112988930b..11f2f81bcc1a 100644<br> --- a/net/nmsg/distinfo<br> +++ b/net/nmsg/distinfo<br> @@ -1,3 +1,3 @@<br> -TIMESTAMP = 1633491704<br> -SHA256 (nmsg-1.0.1.tar.gz) = 6d9c950b2bd8c507b40ccd925a85b095738f9d036abe6b0d595c1f3eba31ef35<br> -SIZE (nmsg-1.0.1.tar.gz) = 664217<br> +TIMESTAMP = 1694205089<br> +SHA256 (nmsg-1.1.0.tar.gz) = e5931b0cfa38e50f3f9cb7100ffdef454400c5901468c6014a6a602c9215a6d8<br> +SIZE (nmsg-1.1.0.tar.gz) = 721466<br> diff --git a/net/nmsg/pkg-plist b/net/nmsg/pkg-plist<br> index 238f89542ceb..40cbd6896fad 100644<br> --- a/net/nmsg/pkg-plist<br> +++ b/net/nmsg/pkg-plist<br> @@ -4,6 +4,7 @@ include/nmsg/alias.h<br> include/nmsg/asprintf.h<br> include/nmsg/base/defs.h<br> include/nmsg/base/dns.pb-c.h<br> +include/nmsg/base/dnsobs.pb-c.h<br> include/nmsg/base/dnsqr.pb-c.h<br> include/nmsg/base/dnstap.pb-c.h<br> include/nmsg/base/email.pb-c.h<br> @@ -45,12 +46,13 @@ include/nmsg/zbuf.h<br> lib/libnmsg.a<br> lib/libnmsg.so<br> lib/libnmsg.so.8<br> -lib/libnmsg.so.8.0.0<br> +lib/libnmsg.so.8.1.0<br> lib/nmsg/nmsg_flt1_sample.so<br> lib/nmsg/nmsg_msg9_base.so<br> libdata/pkgconfig/libnmsg.pc<br> %%MANPAGES%%man/man1/nmsgtool.1.gz<br> %%DATADIR%%/base/dns.proto<br> +%%DATADIR%%/base/dnsobs.proto<br> %%DATADIR%%/base/dnsqr.proto<br> %%DATADIR%%/base/dnstap.proto<br> %%DATADIR%%/base/email.proto<br> diff --git a/net/p5-Net-Nmsg/Makefile b/net/p5-Net-Nmsg/Makefile<br> index 2bdff64213b6..b78301920cc5 100644<br> --- a/net/p5-Net-Nmsg/Makefile<br> +++ b/net/p5-Net-Nmsg/Makefile<br> @@ -1,6 +1,6 @@<br> PORTNAME= Net-Nmsg<br> PORTVERSION= 0.17<br> -PORTREVISION= 1<br> +PORTREVISION= 2<br> CATEGORIES= net perl5<br> MASTER_SITES= <a href="https://tools.netsa.cert.org/confluence/download/attachments/12320770/" rel="noreferrer" target="_blank">https://tools.netsa.cert.org/confluence/download/attachments/12320770/</a>; \<br> CPAN<br> diff --git a/net/py-pynmsg/Makefile b/net/py-pynmsg/Makefile<br> index 5a27f3dd40c1..36a287d7ca34 100644<br> --- a/net/py-pynmsg/Makefile<br> +++ b/net/py-pynmsg/Makefile<br> @@ -1,6 +1,6 @@<br> PORTNAME= pynmsg<br> PORTVERSION= 0.5.0<br> -PORTREVISION= 1<br> +PORTREVISION= 2<br> CATEGORIES= net python<br> MASTER_SITES= FARSIGHT LOCAL/truckman/farsight<br> PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}<br> diff --git a/net/sie-nmsg/Makefile b/net/sie-nmsg/Makefile<br> index 527ef7ac56e3..9aebbfe992b8 100644<br> --- a/net/sie-nmsg/Makefile<br> +++ b/net/sie-nmsg/Makefile<br> @@ -1,6 +1,6 @@<br> PORTNAME= sie-nmsg<br> PORTVERSION= 1.2.1<br> -PORTREVISION= 2<br> +PORTREVISION= 3<br> CATEGORIES= net dns<br> MASTER_SITES= FARSIGHT LOCAL/truckman/farsight<br> <br> </blockquote></div>home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAB_qb68ESbWW%2B_fdDgVm-BbuSwVhb3o_mHVSrh8D9XPipq-New>