Index: head/dns/knot2/Makefile =================================================================== --- head/dns/knot2/Makefile (revision 409360) +++ head/dns/knot2/Makefile (revision 409361) @@ -1,80 +1,79 @@ # Created by: Leo Vandewoestijne # $FreeBSD$ PORTNAME= knot -DISTVERSION= 2.0.2 -PORTREVISION= 2 +DISTVERSION= 2.1.1 CATEGORIES= dns ipv6 MASTER_SITES= https://secure.nic.cz/files/knot-dns/ \ http://dns-lab.com/downloads/knot-dns/ PKGNAMESUFFIX= 2 MAINTAINER= freebsd@dns-lab.com COMMENT= High performance authoritative-only DNS server LICENSE= GPLv3 LIB_DEPENDS= libfstrm.so:${PORTSDIR}/devel/fstrm \ libgnutls.so:${PORTSDIR}/security/gnutls \ libjansson.so:${PORTSDIR}/devel/jansson \ liblmdb.so:${PORTSDIR}/databases/lmdb \ libnettle.so:${PORTSDIR}/security/nettle \ liburcu.so:${PORTSDIR}/sysutils/liburcu CONFLICTS= knot-1.* knot1-[0-6].* USES= alias libtool pkgconfig tar:xz USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-rundir=/var/run/knot \ --with-storage=/var/db/knot \ --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig .if defined(BATCH) || defined(PACKAGE_BUILDING) CONFIGURE_ARGS+= --disable-silent-rules .endif 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_LIB_DEPENDS= libprotobuf-c.so:${PORTSDIR}/devel/protobuf-c # 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:${PORTSDIR}/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} -rf ${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 Index: head/dns/knot2/distinfo =================================================================== --- head/dns/knot2/distinfo (revision 409360) +++ head/dns/knot2/distinfo (revision 409361) @@ -1,2 +1,2 @@ -SHA256 (knot-2.0.2.tar.xz) = 0418a22f9e801503993b3c872f2403bf73eab5ef7266128789b0531b41ea0c7e -SIZE (knot-2.0.2.tar.xz) = 958800 +SHA256 (knot-2.1.1.tar.xz) = e110d11d4a4c4b5abb091b32fcb073934fb840046e975234323e0fc15f2f8f5b +SIZE (knot-2.1.1.tar.xz) = 998820 Index: head/dns/knot2/files/patch-src_dnssec_lib_binary.c =================================================================== --- head/dns/knot2/files/patch-src_dnssec_lib_binary.c (revision 409360) +++ head/dns/knot2/files/patch-src_dnssec_lib_binary.c (nonexistent) @@ -1,22 +0,0 @@ ---- src/dnssec/lib/binary.c.orig 2016-02-08 15:31:05 UTC -+++ src/dnssec/lib/binary.c -@@ -22,18 +22,7 @@ - #include "error.h" - #include "shared.h" - --typedef --#ifdef HAVE_NETTLE_VERSION_H -- #include -- #if NETTLE_VERSION_MAJOR >= 3 -- size_t -- #else -- unsigned -- #endif --#else -- unsigned --#endif --nettle_len; -+typedef size_t nettle_len; - - static size_t base64_decode_raw(const uint8_t *src, size_t src_len, - uint8_t *dst, size_t dst_max_size) Property changes on: head/dns/knot2/files/patch-src_dnssec_lib_binary.c ___________________________________________________________________ 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-plist =================================================================== --- head/dns/knot2/pkg-plist (revision 409360) +++ head/dns/knot2/pkg-plist (revision 409361) @@ -1,114 +1,95 @@ -%%ETCDIR%%/example.com.zone -@sample %%ETCDIR%%/knot.conf.sample bin/kdig bin/khost bin/knsec3hash bin/knsupdate +%%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/event.h include/dnssec/kasp.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/libknot/attribute.h include/libknot/binary.h +include/libknot/codes.h include/libknot/consts.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/dnssec/rrset-sign.h include/libknot/errcode.h -include/libknot/internal/array-sort.h -include/libknot/internal/base32hex.h -include/libknot/internal/base64.h -include/libknot/internal/binsearch.h -include/libknot/internal/consts.h -include/libknot/internal/endian.h -include/libknot/internal/errcode.h -include/libknot/internal/getline.h -include/libknot/internal/heap.h -include/libknot/internal/hhash.h -include/libknot/internal/lists.h -include/libknot/internal/macros.h -include/libknot/internal/mem.h -include/libknot/internal/mempattern.h -include/libknot/internal/mempool.h -include/libknot/internal/namedb/namedb.h -include/libknot/internal/namedb/namedb_lmdb.h -include/libknot/internal/namedb/namedb_trie.h -include/libknot/internal/net.h -include/libknot/internal/print.h -include/libknot/internal/sockaddr.h -include/libknot/internal/strlcat.h -include/libknot/internal/strlcpy.h -include/libknot/internal/tolower.h -include/libknot/internal/trie/hat-trie.h -include/libknot/internal/trie/murmurhash3.h -include/libknot/internal/utils.h -include/libknot/internal/wire_ctx.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/processing/layer.h include/libknot/processing/overlay.h include/libknot/processing/requestor.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.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/yparser/yparser.h -include/libknot/yparser/ypformat.h -include/libknot/yparser/ypscheme.h -include/libknot/yparser/yptrafo.h +include/libknot/version.h include/zscanner/error.h include/zscanner/scanner.h +include/zscanner/version.h lib/libdnssec.a lib/libdnssec.so -lib/libdnssec.so.0 -lib/libdnssec.so.0.0.0 +lib/libdnssec.so.1 +lib/libdnssec.so.1.0.0 lib/libknot.a lib/libknot.so -lib/libknot.so.1 -lib/libknot.so.1.0.0 +lib/libknot.so.2 +lib/libknot.so.2.0.0 lib/libzscanner.a lib/libzscanner.so -lib/libzscanner.so.0 -lib/libzscanner.so.0.0.1 +lib/libzscanner.so.1 +lib/libzscanner.so.1.0.0 libdata/pkgconfig/libdnssec.pc libdata/pkgconfig/libknot.pc libdata/pkgconfig/libzscanner.pc libexec/knot1to2 man/man1/kdig.1.gz man/man1/khost.1.gz man/man1/knot1to2.1.gz man/man1/knsec3hash.1.gz man/man1/knsupdate.1.gz man/man5/knot.conf.5.gz man/man8/keymgr.8.gz man/man8/knotc.8.gz man/man8/knotd.8.gz sbin/keymgr sbin/knotc sbin/knotd