Index: head/dns/knot/Makefile =================================================================== --- head/dns/knot/Makefile (revision 390544) +++ head/dns/knot/Makefile (revision 390545) @@ -1,79 +1,72 @@ # Created by: Leo Vandewoestijne # $FreeBSD$ 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/ MAINTAINER= freebsd@dns-lab.com COMMENT= High performance authoritative-only DNS server LICENSE= GPLv3 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 \ --with-rundir=/var/run/knot \ --with-openssl=${OPENSSLBASE} USE_LDCONFIG= yes USE_OPENSSL= yes WITH_OPENSSL_PORT= yes .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 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 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/knot/distinfo =================================================================== --- head/dns/knot/distinfo (revision 390544) +++ head/dns/knot/distinfo (revision 390545) @@ -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 Index: head/dns/knot/files/patch-src_libknot_dnssec_crypto.c =================================================================== --- head/dns/knot/files/patch-src_libknot_dnssec_crypto.c (revision 390544) +++ head/dns/knot/files/patch-src_libknot_dnssec_crypto.c (nonexistent) @@ -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(); - } - Property changes on: head/dns/knot/files/patch-src_libknot_dnssec_crypto.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