diff --git a/dns/knot3/Makefile b/dns/knot3/Makefile index 82b54685fe52..18fbd0e13dab 100644 --- a/dns/knot3/Makefile +++ b/dns/knot3/Makefile @@ -1,175 +1,177 @@ PORTNAME= knot DISTVERSION= ${KNOT_VERSION} CATEGORIES= dns MASTER_SITES= https://secure.nic.cz/files/knot-dns/ \ https://dns.company/downloads/knot-dns/ PKGNAMESUFFIX?= 3 MAINTAINER= freebsd@dns.company COMMENT= High performance authoritative-only DNS server WWW= https://www.knot-dns.cz/ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= gsed:textproc/gsed +BUILD_DEPENDS= gsed:textproc/gsed \ + lmdb>=0.9.15:databases/lmdb LIB_DEPENDS= libgnutls.so:security/gnutls \ liblmdb.so:databases/lmdb -USES= alias libtool localbase pkgconfig tar:xz +USES= alias compiler:c11 libtool localbase pkgconfig tar:xz USE_LDCONFIG= yes HAS_CONFIGURE= yes -CONFIGURE_ARGS= --enable-recvmmsg=no \ +CONFIGURE_ARGS= --enable-cap-ng=no \ + --enable-recvmmsg=no \ + --enable-systemd=no \ --mandir=${PREFIX}/share/man \ --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig INSTALL_TARGET= install-strip CONFLICTS= knot-1.* knot1-[0-6].* knot2-[0-9].* DATADIR= /var/db/${PORTNAME} RUNDIR= /var/run/${PORTNAME} BINARY_ALIAS= sed=${LOCALBASE}/bin/gsed -SUB_LIST= DATADIR=${DATADIR} \ - ETCDIR=${ETCDIR} \ - GROUPS=${GROUPS} \ - RUNDIR=${RUNDIR} \ +SUB_LIST= GROUPS=${GROUPS} \ USERS=${USERS} -USERS= knot -GROUPS= knot +USERS= ${PORTNAME} +GROUPS= ${PORTNAME} -PLIST_SUB= DATADIR=${DATADIR} \ - ETCDIR=${ETCDIR} \ +PLIST_SUB= RUNDIR=${RUNDIR} \ GROUPS=${GROUPS} \ - RUNDIR=${RUNDIR} \ USERS=${USERS} PORTDOCS= COPYING NEWS OPTIONS_DEFINE= DAEMON UTILS DOCS EXAMPLES -OPTIONS_DEFAULT= DAEMON UTILS FASTPARSER DOH DOQ IDN MODACL MODAUTH MODCOOKIES -OPTIONS_DEFAULT+= MODPROXY MODNOUDP MODPROBE MODRRL MODSIGN MODSTATS MODSYNTH MODWHOAMI +OPTIONS_DEFAULT= DAEMON FASTPARSER DOH DOQ IDN MODACL MODAUTH \ + MODCOOKIES MODPROXY MODNOUDP MODPROBE MODRRL \ + MODSIGN MODSTATS MODSYNTH MODWHOAMI UTILS OPTIONS_GROUP= DAEMONGR UTILGR -OPTIONS_GROUP_DAEMONGR= DNSTAP FASTPARSER MODACL MODAUTH MODCOOKIES MODPROXY MODGEO -OPTIONS_GROUP_DAEMONGR+= MODNOUDP MODPROBE MODRRL MODSIGN MODSTATS MODSYNTH MODWHOAMI +OPTIONS_GROUP_DAEMONGR= DNSTAP FASTPARSER MODACL MODAUTH MODCOOKIES \ + MODPROXY MODGEO MODNOUDP MODPROBE MODRRL \ + MODSIGN MODSTATS MODSYNTH MODWHOAMI OPTIONS_GROUP_UTILGR= DOH DOQ IDN NO_OPTIONS_SORT= yes OPTIONS_SUB= yes DAEMONGR_DESC= Options for daemon DAEMON_DESC= Install daemon DNSTAP_DESC= dnstap support (see dnstap.info) DOCS_DESC= Install documentation DOH_DESC= Support for DNS over HTTPS (DoH) DOQ_DESC= Support for DNS over QUIC (DoQ) FASTPARSER_DESC= Fast zone parser (demands compiling) IDN_DESC= Support for International Domain Names (IDN) MODACL_DESC= Build 'queryacl' module MODAUTH_DESC= Build 'authsignal' module MODCOOKIES_DESC= Build 'cookies' module MODGEO_DESC= Build 'geodb' module MODNOUDP_DESC= Build 'noudp' module MODPROBE_DESC= Build 'probe' module MODPROXY_DESC= Build 'dnsproxy' module MODRRL_DESC= Build 'rrl' module MODSIGN_DESC= Build 'onlinesign' module MODSTATS_DESC= Build 'stats' module MODSYNTH_DESC= Build 'synthrecord' module MODWHOAMI_DESC= Build 'whoami' module UTILGR_DESC= Options for utilities UTILS_DESC= Install utulities DAEMON_LIB_DEPENDS= liburcu.so:sysutils/liburcu DAEMON_USES= libedit -DAEMON_CONFIGURE_ENABLE= daemon -DAEMON_CONFIGURE_ENABLE+= modules -DAEMON_CONFIGURE_WITH= rundir=${RUNDIR} -DAEMON_CONFIGURE_WITH+= storage=${DATADIR} +DAEMON_CONFIGURE_ENABLE= daemon modules +DAEMON_CONFIGURE_WITH= rundir=${RUNDIR} storage=${DATADIR} DAEMON_SUB_FILES= pkg-message DAEMON_VARS= USE_RC_SUBR=${PORTNAME} DNSTAP_LIB_DEPENDS= libfstrm.so:devel/fstrm \ libprotobuf-c.so:devel/protobuf-c DNSTAP_CONFIGURE_ENABLE= dnstap DNSTAP_CONFIGURE_WITH= module-dnstap=yes # # XXX: because `kdig_CPPFLAGS += $(DNSTAP_CFLAGS)' line is missing from # `src/Makefile.am' file (and thus pre-generated `src/Makefile.in') which # should contain "$libfstrm_CFLAGS $libprotobuf_c_CFLAGS" set by configure # script, provide it here explicitly as patching those files would result # in higher line count. Ideally this bug should be fixed upstream. DNSTAP_CPPFLAGS= -I${LOCALBASE}/include +DOCS_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx DOCS_CONFIGURE_ENABLE= documentation DOH_LIB_DEPENDS= libnghttp2.so:www/libnghttp2 -DOQ_LIB_DEPENDS= libngtcp2.so:net/libngtcp2 +DOQ_LIB_DEPENDS= libngtcp2.so:net/libngtcp2 \ + libngtcp2_crypto_gnutls.so:net/libngtcp2-gnutls +DOQ_CONFIGURE_ON= --enable-quic=yes +DOQ_CONFIGURE_OFF= --enable-quic=no FASTPARSER_CONFIGURE_ENABLE= fastparser IDN_LIB_DEPENDS= libidn2.so:dns/libidn2 IDN_CONFIGURE_WITH= libidn MODACL_CONFIGURE_WITH= module-queryacl=yes MODAUTH_CONFIGURE_WITH= module-authsignal=yes MODCOOKIES_CONFIGURE_WITH= module-cookies=yes MODGEO_LIB_DEPENDS= libmaxminddb.so:net/libmaxminddb MODGEO_CONFIGURE_ENABLE= maxminddb MODGEO_CONFIGURE_WITH= module-geoip=yes MODNOUDP_CONFIGURE_WITH= module-noudp=yes MODPROBE_CONFIGURE_WITH= module-probe=yes MODPROXY_CONFIGURE_WITH= module-dnsproxy=yes MODRRL_CONFIGURE_WITH= module-rrl=yes MODSIGN_CONFIGURE_WITH= module-onlinesign=yes MODSTATS_CONFIGURE_WITH= module-stats=yes MODSYNTH_CONFIGURE_WITH= module-synthrecord=yes MODWHOAMI_CONFIGURE_WITH= module-whoami=yes UTILS_CONFIGURE_ENABLE= utilities .include .if ${ARCH} == i386 USES+= autoreconf .endif -post-patch: -.if ${PORT_OPTIONS:MDAEMON} +post-patch-DAEMON-on: @${REINPLACE_CMD} 's|$$(INSTALL) -d $$(DESTDIR)/\@run_dir\@|#$$(INSTALL) -d $$(DESTDIR)/\@run_dir\@|' \ ${WRKSRC}/src/Makefile.in @${REINPLACE_CMD} 's|$$(INSTALL) -d $$(DESTDIR)/\@storage_dir\@|#$$(INSTALL) -d $$(DESTDIR)/\@storage_dir\@|' \ ${WRKSRC}/src/Makefile.in @${RM} -r ${WRKSRC}/src/zscanner/scanner.c -.endif -post-install: -.if ${PORT_OPTIONS:MDAEMON} +do-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/ + ${INSTALL_MAN} ${WRKSRC}/doc/man/*.1 ${STAGEDIR}${PREFIX}/share/man/man1 + ${INSTALL_MAN} ${WRKSRC}/doc/man/*.5 ${STAGEDIR}${PREFIX}/share/man/man5 + ${INSTALL_MAN} ${WRKSRC}/doc/man/*.8 ${STAGEDIR}${PREFIX}/share/man/man8 + +post-install-DAEMON-on: @${MKDIR} ${STAGEDIR}${DATADIR} ${STAGEDIR}${RUNDIR} -.endif + +post-install: .if ${PORT_OPTIONS:MDAEMON} && ${PORT_OPTIONS:MEXAMPLES} ${MV} ${STAGEDIR}${ETCDIR}/knot.sample.conf ${STAGEDIR}${ETCDIR}/knot.conf.sample .else ${RM} ${STAGEDIR}${ETCDIR}/knot.sample.conf .endif -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/ -.endif - .include "knotdns.mk" .include diff --git a/dns/knot3/distinfo b/dns/knot3/distinfo index cc9e32ed614e..525efd959032 100644 --- a/dns/knot3/distinfo +++ b/dns/knot3/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1721655384 -SHA256 (knot-3.3.8.tar.xz) = 498de8338489a625673797f7ecc921fa4490c826afbfa42fa66922b525089e6a -SIZE (knot-3.3.8.tar.xz) = 1608360 +TIMESTAMP = 1725278778 +SHA256 (knot-3.4.0.tar.xz) = 2730b11398944faa5151c51b0655cf26631090343c303597814f2a57df424736 +SIZE (knot-3.4.0.tar.xz) = 1628620 diff --git a/dns/knot3/distinfo.py-libknot b/dns/knot3/distinfo.py-libknot new file mode 100644 index 000000000000..8207a17f981f --- /dev/null +++ b/dns/knot3/distinfo.py-libknot @@ -0,0 +1,3 @@ +TIMESTAMP = 1727997340 +SHA256 (libknot-3.4.0.tar.gz) = 06d11273d04865e0cd34f258c8c2d378cb0d1e6fb105c2ee7b227bff5897168b +SIZE (libknot-3.4.0.tar.gz) = 11065 diff --git a/dns/knot3/knotdns.mk b/dns/knot3/knotdns.mk index 9246a507cca2..18c5c674c48c 100644 --- a/dns/knot3/knotdns.mk +++ b/dns/knot3/knotdns.mk @@ -1 +1 @@ -KNOT_VERSION= 3.3.8 +KNOT_VERSION= 3.4.0 diff --git a/dns/knot3/pkg-plist b/dns/knot3/pkg-plist index cd7c19c79c14..717315de8099 100644 --- a/dns/knot3/pkg-plist +++ b/dns/knot3/pkg-plist @@ -1,113 +1,118 @@ %%UTILS%%bin/kdig %%UTILS%%bin/khost %%UTILS%%bin/knsec3hash %%UTILS%%bin/knsupdate %%UTILS%%bin/kzonecheck %%UTILS%%bin/kzonesign %%DAEMON%%%%ETCDIR%%/example.com.zone %%DAEMON%%%%EXAMPLES%%@sample %%ETCDIR%%/knot.conf.sample include/knot/module.h include/libdnssec/binary.h include/libdnssec/crypto.h include/libdnssec/digest.h include/libdnssec/dnssec.h include/libdnssec/error.h include/libdnssec/key.h include/libdnssec/keyid.h include/libdnssec/keystore.h include/libdnssec/keytag.h include/libdnssec/nsec.h include/libdnssec/pem.h include/libdnssec/random.h include/libdnssec/sign.h include/libdnssec/tsig.h include/libdnssec/version.h include/libknot/attribute.h include/libknot/codes.h include/libknot/consts.h include/libknot/control/control.h include/libknot/cookies.h include/libknot/db/db.h include/libknot/db/db_lmdb.h include/libknot/db/db_trie.h include/libknot/descriptor.h include/libknot/dname.h include/libknot/dynarray.h include/libknot/endian.h include/libknot/errcode.h include/libknot/error.h include/libknot/libknot.h include/libknot/lookup.h include/libknot/mm_ctx.h include/libknot/packet/compr.h include/libknot/packet/pkt.h include/libknot/packet/rrset-wire.h include/libknot/packet/wire.h include/libknot/probe/data.h include/libknot/probe/probe.h +%%DOQ%%include/libknot/quic/quic.h +%%DOQ%%include/libknot/quic/quic_conn.h +%%DOQ%%include/libknot/quic/tls.h +%%DOQ%%include/libknot/quic/tls_common.h include/libknot/rdata.h include/libknot/rdataset.h include/libknot/rrset-dump.h include/libknot/rrset.h include/libknot/rrtype/dnskey.h include/libknot/rrtype/ds.h include/libknot/rrtype/naptr.h include/libknot/rrtype/nsec.h include/libknot/rrtype/nsec3.h include/libknot/rrtype/nsec3param.h include/libknot/rrtype/opt.h include/libknot/rrtype/rdname.h include/libknot/rrtype/rrsig.h include/libknot/rrtype/soa.h include/libknot/rrtype/svcb.h include/libknot/rrtype/tsig.h include/libknot/rrtype/zonemd.h include/libknot/tsig-op.h include/libknot/tsig.h include/libknot/version.h include/libknot/wire.h include/libknot/xdp.h include/libknot/xdp/tcp_iobuf.h include/libknot/yparser/yparser.h include/libknot/yparser/ypformat.h include/libknot/yparser/ypschema.h include/libknot/yparser/yptrafo.h include/libzscanner/error.h include/libzscanner/scanner.h include/libzscanner/version.h lib/libdnssec.a lib/libdnssec.so lib/libdnssec.so.9 lib/libdnssec.so.9.0.0 lib/libknot.a lib/libknot.so -lib/libknot.so.14 -lib/libknot.so.14.0.0 +lib/libknot.so.15 +lib/libknot.so.15.0.0 lib/libzscanner.a lib/libzscanner.so lib/libzscanner.so.4 lib/libzscanner.so.4.0.0 %%DAEMON%%libdata/pkgconfig/knotd.pc libdata/pkgconfig/libdnssec.pc libdata/pkgconfig/libknot.pc libdata/pkgconfig/libzscanner.pc %%DOCS%%share/man/man1/kdig.1.gz %%DOCS%%share/man/man1/khost.1.gz %%DOCS%%share/man/man1/knsec3hash.1.gz %%DOCS%%share/man/man1/knsupdate.1.gz %%DOCS%%share/man/man1/kzonecheck.1.gz %%DOCS%%share/man/man1/kzonesign.1.gz %%DOCS%%share/man/man5/knot.conf.5.gz %%DOCS%%share/man/man8/kcatalogprint.8.gz %%DOCS%%share/man/man8/keymgr.8.gz %%DOCS%%share/man/man8/kjournalprint.8.gz %%DOCS%%share/man/man8/knotc.8.gz %%DOCS%%share/man/man8/knotd.8.gz +%%DOCS%%share/man/man8/kxdpgun.8.gz %%DAEMON%%sbin/kcatalogprint %%DAEMON%%sbin/keymgr %%DAEMON%%sbin/kjournalprint %%DAEMON%%sbin/knotc %%DAEMON%%sbin/knotd %%DAEMON%%@dir(%%USERS%%,%%GROUPS%%,0750) %%DATADIR%% %%DAEMON%%@dir(%%USERS%%,%%GROUPS%%,0750) %%ETCDIR%% %%DAEMON%%@dir(%%USERS%%,%%GROUPS%%,0700) %%RUNDIR%% diff --git a/dns/py-libknot/Makefile b/dns/py-libknot/Makefile index d137a6ffefb8..25f8da50dab0 100644 --- a/dns/py-libknot/Makefile +++ b/dns/py-libknot/Makefile @@ -1,22 +1,24 @@ PORTNAME= libknot DISTVERSION= ${KNOT_VERSION} CATEGORIES= dns python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= freebsd@dns.company COMMENT= Python API using knot.sock to interact with the Knot DNS daemon WWW= https://gitlab.nic.cz/knot/knot-dns/-/tree/master/python/libknot LICENSE= GPLv3 BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hatchling>0:devel/py-hatchling@${PY_FLAVOR} LIB_DEPENDS= libknot.so:dns/knot3 -USES= python:3.5+ +USES= python USE_PYTHON= autoplist concurrent pep517 NO_ARCH= yes +DISTINFO_FILE= ${.CURDIR}/../knot3/distinfo.py-libknot + .include "${.CURDIR}/../knot3/knotdns.mk" .include diff --git a/dns/py-libknot/distinfo b/dns/py-libknot/distinfo deleted file mode 100644 index 05f0e8c3e6ab..000000000000 --- a/dns/py-libknot/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1721721718 -SHA256 (libknot-3.3.8.tar.gz) = 446d8d385402eabc5ebad6b09f702b672f6e34b9fe80f984aabbf5134618271e -SIZE (libknot-3.3.8.tar.gz) = 11110