Date: Mon, 18 May 2015 11:21:06 +0000 (UTC) From: Erwin Lansing <erwin@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r386670 - in head/dns/knot: . files Message-ID: <201505181121.t4IBL6ou036771@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: erwin Date: Mon May 18 11:21:06 2015 New Revision: 386670 URL: https://svnweb.freebsd.org/changeset/ports/386670 Log: The upstream came with a different temporarily solution than the patch in PR 199298. This one allows for GOST in DNSSEC. Add conflict with upcoming knot2 port. PR: 199866 Submitted by: Leo Vandewoestijne <freebsd@dns-lab.com> (maintainer) Added: head/dns/knot/files/patch-src_libknot_dnssec_crypto.c (contents, props changed) Deleted: head/dns/knot/files/patch-src_libknot_dnssec_config.h Modified: head/dns/knot/Makefile Modified: head/dns/knot/Makefile ============================================================================== --- head/dns/knot/Makefile Mon May 18 10:44:12 2015 (r386669) +++ head/dns/knot/Makefile Mon May 18 11:21:06 2015 (r386670) @@ -3,6 +3,7 @@ PORTNAME= knot PORTVERSION= 1.6.3 +PORTREVISION= 1 CATEGORIES= dns ipv6 MASTER_SITES= https://secure.nic.cz/files/knot-dns/ \ http://dns-lab.com/downloads/knot-dns/ @@ -12,11 +13,11 @@ COMMENT= High performance authoritative- LICENSE= GPLv3 -CONFLICTS= knot-devel-1.* - BUILD_DEPENDS= flex>=2.5.35_1:${PORTSDIR}/textproc/flex LIB_DEPENDS= liburcu.so:${PORTSDIR}/sysutils/liburcu +CONFLICTS= knot-2.* + USES= alias bison libtool pkgconfig tar:xz GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-storage=/var/db/knot \ @@ -41,7 +42,7 @@ SUB_LIST+= USERS="${USERS}" GROUPS="${GR PORTDOCS= AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS -OPTIONS_DEFINE= DNSTAP FASTPARSER GOST IDN LMDB +OPTIONS_DEFINE= DNSTAP FASTPARSER IDN LMDB DNSTAP_DESC= dnstap support (see dnstap.info) FASTPARSER_DESC= Fast zone parser (demanding compilation) @@ -62,10 +63,6 @@ LMDB_LIB_DEPENDS= liblmdb.so:${PORTSDIR} .include <bsd.port.options.mk> -.if ${PORT_OPTIONS:MGOST} && defined(OPENSSL_PORT) && ${OPENSSL_PORT} == security/libressl -IGNORE= cannot use both LibreSSL and GOST (not installing correctly); either don't use GOST or do use OpenSSL -.endif - post-patch: @${REINPLACE_CMD} 's|$$(INSTALL) -d $$(DESTDIR)/\@run_dir\@|#$$(INSTALL) -d $$(DESTDIR)/\@run_dir\@|' \ ${WRKSRC}/src/Makefile.in Added: head/dns/knot/files/patch-src_libknot_dnssec_crypto.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/dns/knot/files/patch-src_libknot_dnssec_crypto.c Mon May 18 11:21:06 2015 (r386670) @@ -0,0 +1,50 @@ +--- 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(); + } +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201505181121.t4IBL6ou036771>