Index: head/dns/knot2/Makefile =================================================================== --- head/dns/knot2/Makefile (revision 482402) +++ head/dns/knot2/Makefile (revision 482403) @@ -1,76 +1,82 @@ # Created by: Leo Vandewoestijne # $FreeBSD$ PORTNAME= knot -DISTVERSION= 2.6.8 -PORTREVISION= 1 +DISTVERSION= 2.7.3 CATEGORIES= dns ipv6 MASTER_SITES= https://secure.nic.cz/files/knot-dns/ \ https://dns.company/downloads/knot-dns/ PKGNAMESUFFIX= 2 MAINTAINER= freebsd@dns.company COMMENT= High performance authoritative-only DNS server LICENSE= GPLv3 +.include +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1120000 +NOT_FOR_ARCHS= i386 +NOT_FOR_ARCHS_REASON_i386=Uses 64 bit atomics that clang cannot generate on i386 on FreeBSD >= 11.2 +.endif + LIB_DEPENDS= libgnutls.so:security/gnutls \ libidn2.so:dns/libidn2 \ liblmdb.so:databases/lmdb \ libnettle.so:security/nettle \ liburcu.so:sysutils/liburcu CONFLICTS= knot-1.* knot1-[0-6].* -USES= alias compiler:c11 libedit libtool localbase ncurses pkgconfig python shebangfix tar:xz +USES= alias compiler:c11 libedit libtool localbase ncurses pkgconfig python tar:xz GNU_CONFIGURE= yes -SHEBANG_FILES= src/utils/pykeymgr/pykeymgr.in CONFIGURE_ARGS= --with-rundir=/var/run/knot \ --with-storage=/var/db/knot \ --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig \ --enable-recvmmsg=no USE_LDCONFIG= yes +LLD_UNSAFE= yes INSTALL_TARGET= install-strip USE_RC_SUBR= ${PORTNAME} SUB_FILES= pkg-message USERS= knot GROUPS= knot SUB_LIST+= USERS="${USERS}" GROUPS="${GROUPS}" -PORTDOCS= AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS +PORTDOCS= COPYING NEWS README OPTIONS_DEFINE= DNSTAP FASTPARSER IDN DOCS DNSTAP_DESC= dnstap support (see dnstap.info) DNSTAP_CONFIGURE_ENABLE= dnstap DNSTAP_CONFIGURE_WITH= module-dnstap=yes DNSTAP_LIB_DEPENDS= libprotobuf-c.so:devel/protobuf-c \ libfstrm.so:devel/fstrm # 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 FASTPARSER_DESC= Fast zone parser (demanding compilation) FASTPARSER_CONFIGURE_ENABLE= fastparser IDN_CONFIGURE_WITH= libidn IDN_LIB_DEPENDS= libidn.so:dns/libidn post-patch: @${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 post-install: ${MV} ${STAGEDIR}${ETCDIR}/knot.sample.conf \ ${STAGEDIR}${ETCDIR}/knot.conf.sample @${MKDIR} ${STAGEDIR}${DOCSDIR} + @${MKDIR} ${STAGEDIR}/var/run/knot ${STAGEDIR}/var/db/knot ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/ .include Index: head/dns/knot2/distinfo =================================================================== --- head/dns/knot2/distinfo (revision 482402) +++ head/dns/knot2/distinfo (revision 482403) @@ -1,3 +1,3 @@ -TIMESTAMP = 1531404143 -SHA256 (knot-2.6.8.tar.xz) = 0daee8efd6262f10c54ee6f5fb99ca4d0f72e275513ec0902032af594cac1b15 -SIZE (knot-2.6.8.tar.xz) = 1121740 +TIMESTAMP = 1539588047 +SHA256 (knot-2.7.3.tar.xz) = 8717c0f34e441e96bc32bc93b48333ea9c094c5075f91575e40ac30fcf6692df +SIZE (knot-2.7.3.tar.xz) = 1146456 Index: head/dns/knot2/files/pkg-message.in =================================================================== --- head/dns/knot2/files/pkg-message.in (revision 482402) +++ head/dns/knot2/files/pkg-message.in (revision 482403) @@ -1,20 +1,20 @@ ################################################################################ To start using Knot DNS, you should complete the following tasks: cp %%ETCDIR%%/knot.conf.sample %%ETCDIR%%/knot.conf $EDITOR %%ETCDIR%%/knot.conf sysrc knot_enable=YES sysrc knot_config=%%ETCDIR%%/knot.conf service knot start Please consult the documentation: - man knotd - https://www.knot-dns.cz/documentation/ - When upgrading from 2.4.x to 2.5.x read: + When upgrading from 2.4.x read: - https://www.knot-dns.cz/docs/2.5/html/migration.html#upgrade-2-4-x-to-2-5-x ################################################################################ Index: head/dns/knot2/pkg-plist =================================================================== --- head/dns/knot2/pkg-plist (revision 482402) +++ head/dns/knot2/pkg-plist (revision 482403) @@ -1,104 +1,100 @@ bin/kdig bin/khost -bin/kjournalprint bin/knsec3hash bin/knsupdate bin/kzonecheck %%ETCDIR%%/example.com.zone -@sample %%ETCDIR%%/knot.conf.sample -include/dnssec/binary.h -include/dnssec/crypto.h -include/dnssec/dnssec.h -include/dnssec/error.h -include/dnssec/key.h -include/dnssec/keyid.h -include/dnssec/keystore.h -include/dnssec/keytag.h -include/dnssec/list.h -include/dnssec/nsec.h -include/dnssec/random.h -include/dnssec/sign.h -include/dnssec/tsig.h -include/dnssec/version.h +%%ETCDIR%%/knot.conf.sample include/knot/module.h +include/libdnssec/binary.h +include/libdnssec/crypto.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/list.h +include/libdnssec/nsec.h +include/libdnssec/random.h +include/libdnssec/sign.h +include/libdnssec/tsig.h +include/libdnssec/version.h include/libknot/attribute.h -include/libknot/binary.h include/libknot/codes.h include/libknot/consts.h include/libknot/control/control.h -include/libknot/cookies/alg-fnv64.h -include/libknot/cookies/client.h -include/libknot/cookies/server.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/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/rdata.h include/libknot/rdataset.h include/libknot/rrset-dump.h include/libknot/rrset.h -include/libknot/rrtype/aaaa.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-cookie.h include/libknot/rrtype/opt.h include/libknot/rrtype/rdname.h include/libknot/rrtype/rrsig.h include/libknot/rrtype/soa.h include/libknot/rrtype/tsig.h -include/libknot/rrtype/txt.h include/libknot/tsig-op.h include/libknot/tsig.h include/libknot/version.h +include/libknot/wire.h include/libknot/yparser/yparser.h include/libknot/yparser/ypformat.h include/libknot/yparser/ypschema.h include/libknot/yparser/yptrafo.h -include/zscanner/error.h -include/zscanner/scanner.h -include/zscanner/version.h +include/libzscanner/error.h +include/libzscanner/scanner.h +include/libzscanner/version.h lib/libdnssec.a lib/libdnssec.so -lib/libdnssec.so.5 -lib/libdnssec.so.5.0.0 +lib/libdnssec.so.6 +lib/libdnssec.so.6.0.0 lib/libknot.a lib/libknot.so -lib/libknot.so.7 -lib/libknot.so.7.0.0 +lib/libknot.so.8 +lib/libknot.so.8.0.0 lib/libzscanner.a lib/libzscanner.so -lib/libzscanner.so.1 -lib/libzscanner.so.1.0.0 +lib/libzscanner.so.2 +lib/libzscanner.so.2.0.0 libdata/pkgconfig/knotd.pc libdata/pkgconfig/libdnssec.pc libdata/pkgconfig/libknot.pc libdata/pkgconfig/libzscanner.pc man/man1/kdig.1.gz man/man1/khost.1.gz -man/man1/kjournalprint.1.gz man/man1/knsec3hash.1.gz man/man1/knsupdate.1.gz man/man1/kzonecheck.1.gz man/man5/knot.conf.5.gz man/man8/keymgr.8.gz +man/man8/kjournalprint.8.gz man/man8/knotc.8.gz man/man8/knotd.8.gz -man/man8/pykeymgr.8.gz sbin/keymgr +sbin/kjournalprint sbin/knotc sbin/knotd -sbin/pykeymgr +@dir /var/db/knot +@dir /var/run/knot