View | Details | Raw Unified | Return to bug 200960 | Differences between
and this patch

Collapse All | Expand All

(-)/usr/ports/dns/knot/Makefile (-9 / +2 lines)
Lines 2-9 Link Here
2
# $FreeBSD: head/dns/knot/Makefile 386670 2015-05-18 11:21:06Z erwin $
2
# $FreeBSD: head/dns/knot/Makefile 386670 2015-05-18 11:21:06Z erwin $
3
3
4
PORTNAME=	knot
4
PORTNAME=	knot
5
PORTVERSION=	1.6.3
5
PORTVERSION=	1.6.4
6
PORTREVISION=	1
7
CATEGORIES=	dns ipv6
6
CATEGORIES=	dns ipv6
8
MASTER_SITES=	https://secure.nic.cz/files/knot-dns/ \
7
MASTER_SITES=	https://secure.nic.cz/files/knot-dns/ \
9
		http://dns-lab.com/downloads/knot-dns/
8
		http://dns-lab.com/downloads/knot-dns/
Lines 42-68 Link Here
42
41
43
PORTDOCS=	AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS
42
PORTDOCS=	AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS
44
43
45
OPTIONS_DEFINE=	DNSTAP FASTPARSER IDN LMDB
44
OPTIONS_DEFINE=	DNSTAP IDN LMDB
46
45
47
DNSTAP_DESC=		dnstap support (see dnstap.info)
46
DNSTAP_DESC=		dnstap support (see dnstap.info)
48
FASTPARSER_DESC=	Fast zone parser (demanding compilation)
49
GOST_DESC=		Enable GOST ciphers (requires OpenSSL >= 1.0.0)
50
LMDB_DESC=		Enable LMDB backend
47
LMDB_DESC=		Enable LMDB backend
51
48
52
DNSTAP_CONFIGURE_ENABLE=	dnstap
49
DNSTAP_CONFIGURE_ENABLE=	dnstap
53
DNSTAP_LIB_DEPENDS=	libfstrm.so:${PORTSDIR}/devel/fstrm \
50
DNSTAP_LIB_DEPENDS=	libfstrm.so:${PORTSDIR}/devel/fstrm \
54
			libprotobuf-c.so:${PORTSDIR}/devel/protobuf-c
51
			libprotobuf-c.so:${PORTSDIR}/devel/protobuf-c
55
52
56
FASTPARSER_CONFIGURE_ENABLE=	fastparser
57
58
IDN_CONFIGURE_WITH=	libidn
53
IDN_CONFIGURE_WITH=	libidn
59
IDN_LIB_DEPENDS=	libidn.so:${PORTSDIR}/dns/libidn
54
IDN_LIB_DEPENDS=	libidn.so:${PORTSDIR}/dns/libidn
60
55
61
LMDB_CONFIGURE_ENABLE=	lmdb
56
LMDB_CONFIGURE_ENABLE=	lmdb
62
LMDB_LIB_DEPENDS=	liblmdb.so:${PORTSDIR}/databases/lmdb
57
LMDB_LIB_DEPENDS=	liblmdb.so:${PORTSDIR}/databases/lmdb
63
58
64
.include <bsd.port.options.mk>
65
66
post-patch:
59
post-patch:
67
	@${REINPLACE_CMD} 's|$$(INSTALL) -d $$(DESTDIR)/\@run_dir\@|#$$(INSTALL) -d $$(DESTDIR)/\@run_dir\@|' \
60
	@${REINPLACE_CMD} 's|$$(INSTALL) -d $$(DESTDIR)/\@run_dir\@|#$$(INSTALL) -d $$(DESTDIR)/\@run_dir\@|' \
68
		${WRKSRC}/src/Makefile.in
61
		${WRKSRC}/src/Makefile.in
(-)/usr/ports/dns/knot/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (knot-1.6.3.tar.xz) = 48da608e29c2c1ef5937eb692f8ef0462ebb50fa7d128478a23e0a9788533e86
1
SHA256 (knot-1.6.4.tar.xz) = 7d0809ad489bbbc3f7904687559ee750f3c1f3a7180fab238ba06fcedd00d8af
2
SIZE (knot-1.6.3.tar.xz) = 785052
2
SIZE (knot-1.6.4.tar.xz) = 786904
(-)/usr/ports/dns/knot/files/patch-src_libknot_dnssec_crypto.c (-50 lines)
Lines 1-50 Link Here
1
--- src/libknot/dnssec/crypto.c.orig	2015-04-08 11:57:44 UTC
2
+++ src/libknot/dnssec/crypto.c
3
@@ -122,7 +122,14 @@ static unsigned long openssl_threadid_cb(void)
4
 
5
 /*- pluggable engines -------------------------------------------------------*/
6
 
7
-#if KNOT_ENABLE_GOST
8
+#if KNOT_ENABLE_GOST && !defined(LIBRESSL_VERSION_NUMBER)
9
+  #define KNOT_LOAD_GOST 1
10
+#else
11
+  #undef KNOT_LOAD_GOST
12
+#endif
13
+
14
+
15
+#if KNOT_LOAD_GOST
16
 
17
 static ENGINE *gost_engine = NULL;
18
 
19
@@ -130,6 +137,8 @@ static void init_gost_engine(void)
20
 {
21
 	assert(gost_engine == NULL);
22
 
23
+	ENGINE_load_builtin_engines();
24
+
25
 #ifndef OPENSSL_NO_STATIC_ENGINE
26
 	ENGINE_load_gost();
27
 #else
28
@@ -206,16 +215,19 @@ void knot_crypto_cleanup_threads(void)
29
 
30
 void knot_crypto_load_engines(void)
31
 {
32
-#if KNOT_ENABLE_GOST
33
+#if KNOT_LOAD_GOST
34
 	if (!gost_engine) {
35
 		init_gost_engine();
36
 	}
37
 #endif
38
+#if KNOT_ENABLE_GOST
39
+	OpenSSL_add_all_algorithms();
40
+#endif
41
 }
42
 
43
 void knot_crypto_unload_engines(void)
44
 {
45
-#if KNOT_ENABLE_GOST
46
+#if KNOT_LOAD_GOST
47
 	if (gost_engine) {
48
 		deinit_gost_engine();
49
 	}
50

Return to bug 200960