Attachment 155170 Details for Bug 198981 – libressl patch, lmdb backend, and minor cleanups

[patch] libressl patch, lmdb backend, and minor cleanups

knot.diff.txt (text/plain), 3.09 KB, created by Leo Vandewoestijne on 2015-04-04 00:27:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Leo Vandewoestijne

Created: 2015-04-04 00:27:35 UTC

Size: 3.09 KB

patch

obsolete

>diff -urN dns/knot.old/Makefile dns/knot/Makefile
>--- dns/knot.old/Makefile	2015-03-13 20:04:21.000000000 +0000
>+++ dns/knot/Makefile	2015-04-03 17:52:27.513442719 +0000
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	knot
> PORTVERSION=	1.6.2
>+PORTREVISION=	1
> CATEGORIES=	dns ipv6
> MASTER_SITES=	https://secure.nic.cz/files/knot-dns/ \
> 		http://dns-lab.com/downloads/knot-dns/
>@@ -20,9 +21,6 @@
> 
> USE_LDCONFIG=	yes
> 
>-USE_OPENSSL=		yes
>-WITH_OPENSSL_PORT=	yes
>-
> INSTALL_TARGET=	install-strip
> 
> GNU_CONFIGURE=	yes
>@@ -30,15 +28,43 @@
> CONFIGURE_ARGS+=	--with-storage=/var/db/knot
> CONFIGURE_ARGS+=	--with-rundir=/var/run/knot
> 
>-OPTIONS_DEFINE=	FASTPARSER IDNA
>+OPTIONS_DEFINE=		FASTPARSER GOST IDNA LMDB
>+OPTIONS_SINGLE=		SSL
>+OPTIONS_SINGLE_SSL=	LIBRESSL OPENSSL
>+OPTIONS_DEFAULT=	GOST OPENSSL
> 
>+FASTPARSER_DESC=	Fast zone parser (demanding compilation)
> FASTPARSER_CONFIGURE_ENABLE=	fastparser
>-FASTPARSER_DESC=		Fast zone parser (demanding compilation)
> 
>-IDNA_CONFIGURE_WITH=	libidn
>+GOST_DESC=		Enable GOST ciphers (requires OpenSSL >= 1.0.0)
>+
> IDNA_DESC=		IDN support in knot utilities
>+IDNA_CONFIGURE_WITH=	libidn
> IDNA_LIB_DEPENDS=	libidn.so:${PORTSDIR}/dns/libidn
> 
>+LMDB_DESC=		LMDB backend
>+LMDB_CONFIGURE_ENABLE=	lmdb
>+LMDB_LIB_DEPENDS=	liblmdb.so:${PORTSDIR}/databases/lmdb
>+
>+SSL_DESC=		DNSSEC support using:
>+
>+LIBRESSL_DESC=		LibreSSL (experimental)
>+LIBRESSL_LIB_DEPENDS=	libressl.so:${PORTSDIR}/security/libressl
>+
>+OPENSSL_DESC=		OpenSSL (default)
>+OPENSSL_USE=		OPENSSL=yes
>+OPENSSL_CONFIGURE_ON=	--with-openssl=${OPENSSLBASE}
>+
>+.include <bsd.port.options.mk>
>+
>+.if ${PORT_OPTIONS:MLIBRESSL} && ${PORT_OPTIONS:MGOST}
>+IGNORE=			The (not impossible) combination of LibreSSL and GOST is not implemented (yet). Either disable GOST or use OpenSSL
>+.endif
>+
>+.if ${PORT_OPTIONS:MOPENSSL} && ${PORT_OPTIONS:MGOST} && ${OSVERSION} < 1000015
>+WITH_OPENSSL_PORT=	yes
>+.endif
>+
> SUB_FILES=	pkg-message
> 
> USE_RC_SUBR=	${PORTNAME}
>diff -urN dns/knot.old/files/patch-src_libknot_dnssec_config.h dns/knot/files/patch-src_libknot_dnssec_config.h
>--- dns/knot.old/files/patch-src_libknot_dnssec_config.h	1970-01-01 00:00:00.000000000 +0000
>+++ dns/knot/files/patch-src_libknot_dnssec_config.h	2015-04-02 14:47:53.450160097 +0000
>@@ -0,0 +1,11 @@
>+--- src/libknot/dnssec/config.h.orig	2015-02-19 09:43:56 UTC
>++++ src/libknot/dnssec/config.h
>+@@ -40,7 +40,7 @@
>+   #undef KNOT_ENABLE_ECDSA
>+ #endif
>+ 
>+-#if !defined(OPENSSL_NO_GOST) && OPENSSL_VERSION_NUMBER >= 0x1000001fL
>++#if !defined(OPENSSL_NO_GOST) && OPENSSL_VERSION_NUMBER >= 0x1000001fL && !defined(LIBRESSL_VERSION_NUMBER)
>+   #define KNOT_ENABLE_GOST 1
>+ #else
>+   #undef KNOT_ENABLE_GOST
>diff -urN dns/knot.old/files/pkg-message.in dns/knot/files/pkg-message.in
>--- dns/knot.old/files/pkg-message.in	2014-02-13 13:26:03.000000000 +0000
>+++ dns/knot/files/pkg-message.in	2015-04-03 15:46:59.567961386 +0000
>@@ -1,6 +1,6 @@
> ####################################################################
> #
>-# To start using Knot DNS, you should complete the following tasks:
>+# Complete the following tasks to start using Knot DNS:
> #
> # cp %%ETCDIR%%/knot.sample.conf %%ETCDIR%%/knot.conf
> # $EDITOR %%ETCDIR%%/knot.conf

Actions: View | Diff

Attachments on bug 198981: 154909 | 154910 | 155170