Index: head/dns/knot2/Makefile =================================================================== --- head/dns/knot2/Makefile (revision 462773) +++ head/dns/knot2/Makefile (revision 462774) @@ -1,84 +1,75 @@ # Created by: Leo Vandewoestijne # $FreeBSD$ PORTNAME= knot -PORTVERSION= 2.6.4 +DISTVERSION= 2.6.5 CATEGORIES= dns ipv6 MASTER_SITES= https://secure.nic.cz/files/knot-dns/ \ - http://dns-lab.com/downloads/knot-dns/ + https://dns.company/downloads/knot-dns/ PKGNAMESUFFIX= 2 MAINTAINER= freebsd@dns-lab.com COMMENT= High performance authoritative-only DNS server LICENSE= GPLv3 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= autoreconf alias compiler:c11 libedit libtool localbase pkgconfig python shebangfix tar:xz -SHEBANG_FILES= src/utils/pykeymgr/pykeymgr.in -USE_LDCONFIG= yes +USES= alias compiler:c11 libedit libtool localbase ncurses pkgconfig python shebangfix 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 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 OPTIONS_DEFINE= DNSTAP FASTPARSER IDN 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 -# starting at 2.6.5 this block will already be absolete -.include -.if ${ARCH} == "i386" -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-configure.ac -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-src_Makefile.am -.endif - 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} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/ -#.include -.include +.include Index: head/dns/knot2/distinfo =================================================================== --- head/dns/knot2/distinfo (revision 462773) +++ head/dns/knot2/distinfo (revision 462774) @@ -1,3 +1,3 @@ -TIMESTAMP = 1517244504 -SHA256 (knot-2.6.4.tar.xz) = 1d0d37b5047ecd554d927519d5565c29c1ba9b501c100eb5f3a5af184d75386a -SIZE (knot-2.6.4.tar.xz) = 1116928 +TIMESTAMP = 1518797968 +SHA256 (knot-2.6.5.tar.xz) = 33cd676706e2baeb37cf3879ccbc91a1e1cd1ee5d7a082adff4d1e753ce49d46 +SIZE (knot-2.6.5.tar.xz) = 1118084 Index: head/dns/knot2/files/extra-patch-configure.ac =================================================================== --- head/dns/knot2/files/extra-patch-configure.ac (revision 462773) +++ head/dns/knot2/files/extra-patch-configure.ac (nonexistent) @@ -1,24 +0,0 @@ ---- configure.ac.orig 2018-01-29 16:11:32 UTC -+++ configure.ac -@@ -501,19 +501,11 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#inclu - AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], [[cpuset_t* set = cpuset_create(); cpuset_destroy(set);]])], - [AC_DEFINE(HAVE_CPUSET_NETBSD, 1, [Define if cpuset_t and cpuset(3) exists.])]) - --AC_COMPILE_IFELSE( -+AC_LINK_IFELSE( - [AC_LANG_PROGRAM([[#include ]], - [[uint64_t val = 0; __atomic_add_fetch(&val, 1, __ATOMIC_RELAXED);]])], -- [AC_DEFINE(HAVE_ATOMIC, 1, [Define to 1 if you have '__atomic' functions.]) -- AC_LINK_IFELSE( -- [AC_LANG_PROGRAM([[#include ]], -- [[uint64_t val = 0; __atomic_add_fetch(&val, 1, __ATOMIC_RELAXED);]])], -- [atomic_LIBS=""], -- [atomic_LIBS="-latomic"] -- )], -- [atomic_LIBS=""] -+ [AC_DEFINE(HAVE_ATOMIC, 1, [Define to 1 if you have '__atomic' functions.])] - ) --AC_SUBST([atomic_LIBS]) - - # Prepare CFLAG_VISIBILITY to be used where needed - gl_VISIBILITY() Property changes on: head/dns/knot2/files/extra-patch-configure.ac ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/dns/knot2/files/extra-patch-src_Makefile.am =================================================================== --- head/dns/knot2/files/extra-patch-src_Makefile.am (revision 462773) +++ head/dns/knot2/files/extra-patch-src_Makefile.am (nonexistent) @@ -1,11 +0,0 @@ ---- src/Makefile.am.orig 2018-01-29 16:11:17 UTC -+++ src/Makefile.am -@@ -399,7 +399,7 @@ libknotd_la_CPPFLAGS = $(AM_CPPFLAGS) $( - $(liburcu_CFLAGS) -DKNOTD_MOD_STATIC - libknotd_la_LDFLAGS = $(AM_LDFLAGS) -export-symbols-regex '^knotd_' - libknotd_la_LIBADD = libknot.la zscanner/libzscanner.la $(systemd_LIBS) \ -- $(liburcu_LIBS) $(atomic_LIBS) -+ $(liburcu_LIBS) - - ################### - # Knot DNS Daemon # Property changes on: head/dns/knot2/files/extra-patch-src_Makefile.am ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/dns/knot2/pkg-descr =================================================================== --- head/dns/knot2/pkg-descr (revision 462773) +++ head/dns/knot2/pkg-descr (revision 462774) @@ -1,14 +1,14 @@ Knot DNS is a high-performance authoritative-only DNS server which supports all key features of the domain name system including zone AXFR and IXFR, DDNS and DNSSEC. Its key features: * Open source * High-performance, multi-threaded, and mostly lock-free implementation which scales well on SMPs * Object-oriented design * Support for all important DNS protocols: - Full and incremental zone transfers - EDNS0 and DNSSEC extensions, including NSEC3 - NSID -WWW: http://www.knot-dns.cz/ +WWW: https://www.knot-dns.cz/ Index: head/dns/knot2/pkg-plist =================================================================== --- head/dns/knot2/pkg-plist (revision 462773) +++ head/dns/knot2/pkg-plist (revision 462774) @@ -1,106 +1,104 @@ 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 include/knot/module.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/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/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/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 lib/libdnssec.a lib/libdnssec.so lib/libdnssec.so.5 lib/libdnssec.so.5.0.0 lib/libknot.a lib/libknot.so lib/libknot.so.7 lib/libknot.so.7.0.0 lib/libzscanner.a lib/libzscanner.so lib/libzscanner.so.1 lib/libzscanner.so.1.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/knotc.8.gz man/man8/knotd.8.gz man/man8/pykeymgr.8.gz sbin/keymgr sbin/knotc sbin/knotd sbin/pykeymgr -@dir(knot,knot,) /var/db/knot -@dir(knot,knot,) /var/run/knot