Attachment 158021 Details for Bug 200960 – knot update to 1.6.4

[patch] knot update to 1.6.4

knot.diff.txt (text/plain), 3.27 KB, created by Leo Vandewoestijne on 2015-06-23 17:38:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Leo Vandewoestijne

Created: 2015-06-23 17:38:32 UTC

Size: 3.27 KB

patch

obsolete

>diff -ruN /usr/ports.old/dns/knot/Makefile /usr/ports/dns/knot/Makefile
>--- /usr/ports.old/dns/knot/Makefile	2015-06-18 13:22:38.479235349 +0000
>+++ /usr/ports/dns/knot/Makefile	2015-06-19 00:36:55.675927945 +0000
>@@ -2,8 +2,7 @@
> # $FreeBSD: head/dns/knot/Makefile 386670 2015-05-18 11:21:06Z erwin $
> 
> PORTNAME=	knot
>-PORTVERSION=	1.6.3
>-PORTREVISION=	1
>+PORTVERSION=	1.6.4
> CATEGORIES=	dns ipv6
> MASTER_SITES=	https://secure.nic.cz/files/knot-dns/ \
> 		http://dns-lab.com/downloads/knot-dns/
>@@ -42,27 +41,21 @@
> 
> PORTDOCS=	AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS
> 
>-OPTIONS_DEFINE=	DNSTAP FASTPARSER IDN LMDB
>+OPTIONS_DEFINE=	DNSTAP IDN LMDB
> 
> DNSTAP_DESC=		dnstap support (see dnstap.info)
>-FASTPARSER_DESC=	Fast zone parser (demanding compilation)
>-GOST_DESC=		Enable GOST ciphers (requires OpenSSL >= 1.0.0)
> LMDB_DESC=		Enable LMDB backend
> 
> DNSTAP_CONFIGURE_ENABLE=	dnstap
> DNSTAP_LIB_DEPENDS=	libfstrm.so:${PORTSDIR}/devel/fstrm \
> 			libprotobuf-c.so:${PORTSDIR}/devel/protobuf-c
> 
>-FASTPARSER_CONFIGURE_ENABLE=	fastparser
>-
> IDN_CONFIGURE_WITH=	libidn
> IDN_LIB_DEPENDS=	libidn.so:${PORTSDIR}/dns/libidn
> 
> LMDB_CONFIGURE_ENABLE=	lmdb
> LMDB_LIB_DEPENDS=	liblmdb.so:${PORTSDIR}/databases/lmdb
> 
>-.include <bsd.port.options.mk>
>-
> post-patch:
> 	@${REINPLACE_CMD} 's|$$(INSTALL) -d $$(DESTDIR)/\@run_dir\@|#$$(INSTALL) -d $$(DESTDIR)/\@run_dir\@|' \
> 		${WRKSRC}/src/Makefile.in
>diff -ruN /usr/ports.old/dns/knot/distinfo /usr/ports/dns/knot/distinfo
>--- /usr/ports.old/dns/knot/distinfo	2015-06-18 13:22:38.479235349 +0000
>+++ /usr/ports/dns/knot/distinfo	2015-06-19 00:36:55.675927945 +0000
>@@ -1,2 +1,2 @@
>-SHA256 (knot-1.6.3.tar.xz) = 48da608e29c2c1ef5937eb692f8ef0462ebb50fa7d128478a23e0a9788533e86
>-SIZE (knot-1.6.3.tar.xz) = 785052
>+SHA256 (knot-1.6.4.tar.xz) = 7d0809ad489bbbc3f7904687559ee750f3c1f3a7180fab238ba06fcedd00d8af
>+SIZE (knot-1.6.4.tar.xz) = 786904
>diff -ruN /usr/ports.old/dns/knot/files/patch-src_libknot_dnssec_crypto.c /usr/ports/dns/knot/files/patch-src_libknot_dnssec_crypto.c
>--- /usr/ports.old/dns/knot/files/patch-src_libknot_dnssec_crypto.c	2015-06-18 13:22:38.479235349 +0000
>+++ /usr/ports/dns/knot/files/patch-src_libknot_dnssec_crypto.c	1970-01-01 00:00:00.000000000 +0000
>@@ -1,50 +0,0 @@
>---- src/libknot/dnssec/crypto.c.orig	2015-04-08 11:57:44 UTC
>-+++ src/libknot/dnssec/crypto.c
>-@@ -122,7 +122,14 @@ static unsigned long openssl_threadid_cb(void)
>- 
>- /*- pluggable engines -------------------------------------------------------*/
>- 
>--#if KNOT_ENABLE_GOST
>-+#if KNOT_ENABLE_GOST && !defined(LIBRESSL_VERSION_NUMBER)
>-+  #define KNOT_LOAD_GOST 1
>-+#else
>-+  #undef KNOT_LOAD_GOST
>-+#endif
>-+
>-+
>-+#if KNOT_LOAD_GOST
>- 
>- static ENGINE *gost_engine = NULL;
>- 
>-@@ -130,6 +137,8 @@ static void init_gost_engine(void)
>- {
>- 	assert(gost_engine == NULL);
>- 
>-+	ENGINE_load_builtin_engines();
>-+
>- #ifndef OPENSSL_NO_STATIC_ENGINE
>- 	ENGINE_load_gost();
>- #else
>-@@ -206,16 +215,19 @@ void knot_crypto_cleanup_threads(void)
>- 
>- void knot_crypto_load_engines(void)
>- {
>--#if KNOT_ENABLE_GOST
>-+#if KNOT_LOAD_GOST
>- 	if (!gost_engine) {
>- 		init_gost_engine();
>- 	}
>- #endif
>-+#if KNOT_ENABLE_GOST
>-+	OpenSSL_add_all_algorithms();
>-+#endif
>- }
>- 
>- void knot_crypto_unload_engines(void)
>- {
>--#if KNOT_ENABLE_GOST
>-+#if KNOT_LOAD_GOST
>- 	if (gost_engine) {
>- 		deinit_gost_engine();
>- 	}
>-

Flags:

freebsd: maintainer-approval+

Actions: View | Diff

Attachments on bug 200960: 157870 | 157871 | 157872 | 157873 | 158021