Attachment 196884 Details for Bug 231001 – knot 2.7.2 ...better?

[patch] knot 2.7.2 ...better?

knot2.diff.txt (text/plain), 6.33 KB, created by Leo Vandewoestijne on 2018-09-05 10:29:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Leo Vandewoestijne

Created: 2018-09-05 10:29:44 UTC

Size: 6.33 KB

patch

obsolete

>diff -ru dns/knot2.orig/distinfo dns/knot2/distinfo
>--- dns/knot2.orig/distinfo	2018-09-04 12:21:20.631383000 +0000
>+++ dns/knot2/distinfo	2018-09-04 12:22:27.042775000 +0000
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1531404143
>-SHA256 (knot-2.6.8.tar.xz) = 0daee8efd6262f10c54ee6f5fb99ca4d0f72e275513ec0902032af594cac1b15
>-SIZE (knot-2.6.8.tar.xz) = 1121740
>+TIMESTAMP = 1535557345
>+SHA256 (knot-2.7.2.tar.xz) = cb70b2ee1c7ecbaad8774a1e0c449a68c6a6f7c9d60595524f003201d6e38431
>+SIZE (knot-2.7.2.tar.xz) = 1148880
>diff -ru dns/knot2.orig/files/pkg-message.in dns/knot2/files/pkg-message.in
>--- dns/knot2.orig/files/pkg-message.in	2018-09-04 12:21:20.629806000 +0000
>+++ dns/knot2/files/pkg-message.in	2018-09-04 12:22:27.044409000 +0000
>@@ -13,7 +13,7 @@
>    - 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
> 
> ################################################################################
>diff -ru dns/knot2.orig/Makefile dns/knot2/Makefile
>--- dns/knot2.orig/Makefile	2018-09-04 12:21:20.630487000 +0000
>+++ dns/knot2/Makefile	2018-09-04 12:28:14.525232000 +0000
>@@ -2,8 +2,7 @@
> # $FreeBSD: head/dns/knot2/Makefile 475857 2018-07-29 22:18:44Z gerald $
> 
> PORTNAME=	knot
>-DISTVERSION=	2.6.8
>-PORTREVISION=	1
>+DISTVERSION=	2.7.2
> CATEGORIES=	dns ipv6
> MASTER_SITES=	https://secure.nic.cz/files/knot-dns/ \
> 		https://dns.company/downloads/knot-dns/
>@@ -14,6 +13,12 @@
> 
> LICENSE=	GPLv3
> 
>+.include <bsd.port.options.mk>
>+.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 \
>@@ -22,14 +27,14 @@
> 
> 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
>@@ -38,7 +43,7 @@
> 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
> 
>@@ -71,6 +76,7 @@
> 	${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 <bsd.port.mk>
>Only in dns/knot2: Makefile.orig
>diff -ru dns/knot2.orig/pkg-plist dns/knot2/pkg-plist
>--- dns/knot2.orig/pkg-plist	2018-09-04 12:21:20.627353000 +0000
>+++ dns/knot2/pkg-plist	2018-09-04 12:22:27.046229000 +0000
>@@ -1,39 +1,38 @@
>+@dir /var/db/knot
>+@dir /var/run/knot
> 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/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/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/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
>@@ -47,58 +46,55 @@
> 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

Actions: View | Diff

Attachments on bug 231001: 196685 | 196884