Attachment 15270 Details for Bug 13844 – patch for 4.10 cherry-picked from master

[patch] patch for 4.10 cherry-picked from master

gnutls-disable-4.10.patch (text/plain), 1.38 KB, created by Andrew Bartlett on 2019-06-27 23:35:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Bartlett

Created: 2019-06-27 23:35:24 UTC

Size: 1.38 KB

patch

obsolete

>From a0d0df3eaeceaebd294582ed012e06633d567f85 Mon Sep 17 00:00:00 2001
>From: Andrew Bartlett <abartlet@samba.org>
>Date: Wed, 20 Mar 2019 13:57:50 +1300
>Subject: [PATCH] build: Allow build when --disable-gnutls is set
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=13844
>
>Signed-off-by: Andrew Bartlett <abartlet@samba.org>
>Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
>
>Autobuild-User(master): Douglas Bagnall <dbagnall@samba.org>
>Autobuild-Date(master): Wed Mar 20 05:25:48 UTC 2019 on sn-devel-144
>
>(cherry picked from commit a40b0f452af5f393aa33c9d52673994effd0e31f)
>---
> lib/mscat/wscript | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
>diff --git a/lib/mscat/wscript b/lib/mscat/wscript
>index 7ca9ef567ee..4d1f752a3c1 100644
>--- a/lib/mscat/wscript
>+++ b/lib/mscat/wscript
>@@ -12,7 +12,11 @@ def configure(conf):
>         if not conf.find_program('asn1Parser', var='ASN1PARSER'):
>             Logs.warn('WARNING: ans1Parser hasn\'t been found! Please install it (e.g. libtasn1-bin)')
> 
>-    conf.CHECK_FUNCS_IN('gnutls_pkcs7_get_embedded_data_oid', 'gnutls')
>+    # GnuTLS is currently able to be disabled
>+    if conf.env.enable_gnutls:
>+        conf.CHECK_FUNCS_IN('gnutls_pkcs7_get_embedded_data_oid', 'gnutls')
>+    else:
>+        Logs.warn('WARNING: gnutls disabled so dumpmscat will not be built')
> 
> def build(bld):
>     if (bld.CONFIG_SET('HAVE_LIBTASN1') and
>-- 
>2.17.1
>

Flags:

dbagnall: review+

Actions: View

Attachments on bug 13844: 14954 | 15248 | 15270