diff options
| author | amdmi3 <amdmi3@FreeBSD.org> | 2015-06-25 17:46:00 +0800 |
|---|---|---|
| committer | amdmi3 <amdmi3@FreeBSD.org> | 2015-06-25 17:46:00 +0800 |
| commit | 84cb4095c0f956c112ececce86d488821a5c824d (patch) | |
| tree | 3a03c0f8548270317d3db96052a257598d7324aa /dns | |
| parent | 69618ac7d00e00a0da17541186d22f87768437f7 (diff) | |
| download | freebsd-ports-gnome-84cb4095c0f956c112ececce86d488821a5c824d.tar.gz freebsd-ports-gnome-84cb4095c0f956c112ececce86d488821a5c824d.tar.zst freebsd-ports-gnome-84cb4095c0f956c112ececce86d488821a5c824d.zip | |
- Update to 1.6.4
PR: 200960
Submitted by: freebsd@dns-lab.com (maintainer)
Diffstat (limited to 'dns')
| -rw-r--r-- | dns/knot/Makefile | 11 | ||||
| -rw-r--r-- | dns/knot/distinfo | 4 | ||||
| -rw-r--r-- | dns/knot/files/patch-src_libknot_dnssec_crypto.c | 50 |
3 files changed, 4 insertions, 61 deletions
diff --git a/dns/knot/Makefile b/dns/knot/Makefile index 7dfb7af81a06..a582aa3c349d 100644 --- a/dns/knot/Makefile +++ b/dns/knot/Makefile @@ -2,8 +2,7 @@ # $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/ @@ -42,27 +41,21 @@ 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 <bsd.port.options.mk> - post-patch: @${REINPLACE_CMD} 's|$$(INSTALL) -d $$(DESTDIR)/\@run_dir\@|#$$(INSTALL) -d $$(DESTDIR)/\@run_dir\@|' \ ${WRKSRC}/src/Makefile.in diff --git a/dns/knot/distinfo b/dns/knot/distinfo index 53735e4c6794..b05715036fb4 100644 --- a/dns/knot/distinfo +++ b/dns/knot/distinfo @@ -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 --git a/dns/knot/files/patch-src_libknot_dnssec_crypto.c b/dns/knot/files/patch-src_libknot_dnssec_crypto.c deleted file mode 100644 index e13f63a19cd4..000000000000 --- a/dns/knot/files/patch-src_libknot_dnssec_crypto.c +++ /dev/null @@ -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(); - } - |