[SCM] Samba Shared Repository - branch master updated

Jeremy Allison jra at samba.org
Mon Apr 4 19:32:01 UTC 2022


The branch, master has been updated
       via  a543d38cd1e third_party:waf: Do not recurse in aesni-intel if GnuTLS provides the cipher
       via  efc2de0d8de waf: Check for GnuTLS earlier
       via  7b98e6fcb44 waf: Import Logs in wscript_configure_system_gnutls
      from  4171736339b lib: Stay ASCII-compatible for toupper_m/tolower_m

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit a543d38cd1e6c59758005d83e5469d2bc3eb2c75
Author: Andreas Schneider <asn at samba.org>
Date:   Mon Apr 4 11:25:31 2022 +0200

    third_party:waf: Do not recurse in aesni-intel if GnuTLS provides the cipher
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Mon Apr  4 19:31:28 UTC 2022 on sn-devel-184

commit efc2de0d8ded28d0d7e489f3b4f00c0d422f3747
Author: Andreas Schneider <asn at samba.org>
Date:   Mon Apr 4 11:24:04 2022 +0200

    waf: Check for GnuTLS earlier
    
    As GnuTLS is an essential part we need to check for it early so we can react on
    GnuTLS features in other wscripts.
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit 7b98e6fcb440d4f6b28825ba79d313f7fbbaa51e
Author: Andreas Schneider <asn at samba.org>
Date:   Mon Apr 4 12:30:55 2022 +0200

    waf: Import Logs in wscript_configure_system_gnutls
    
    We do not use Options, but we do use Logs.warn()
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 third_party/wscript             | 6 ++++--
 wscript                         | 4 ++--
 wscript_configure_system_gnutls | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/third_party/wscript b/third_party/wscript
index 1f4bc1ce1d7..a17c15bcaa7 100644
--- a/third_party/wscript
+++ b/third_party/wscript
@@ -5,7 +5,8 @@ from waflib import Options
 def configure(conf):
     conf.RECURSE('cmocka')
     conf.RECURSE('popt')
-    conf.RECURSE('aesni-intel')
+    if not conf.CONFIG_SET('HAVE_GNUTLS_AES_CMAC'):
+        conf.RECURSE('aesni-intel')
     if conf.CONFIG_GET('ENABLE_SELFTEST'):
         conf.RECURSE('socket_wrapper')
         conf.RECURSE('nss_wrapper')
@@ -18,7 +19,8 @@ def configure(conf):
 def build(bld):
     bld.RECURSE('cmocka')
     bld.RECURSE('popt')
-    bld.RECURSE('aesni-intel')
+    if not bld.CONFIG_SET('HAVE_GNUTLS_AES_CMAC'):
+        bld.RECURSE('aesni-intel')
     if bld.CONFIG_GET('SOCKET_WRAPPER'):
         bld.RECURSE('socket_wrapper')
     if bld.CONFIG_GET('NSS_WRAPPER'):
diff --git a/wscript b/wscript
index d8220b35095..5b85d9a1682 100644
--- a/wscript
+++ b/wscript
@@ -189,6 +189,8 @@ def configure(conf):
     conf.RECURSE('dynconfig')
     conf.RECURSE('selftest')
 
+    conf.PROCESS_SEPARATE_RULE('system_gnutls')
+
     conf.CHECK_CFG(package='zlib', minversion='1.2.3',
                    args='--cflags --libs',
                    mandatory=True)
@@ -297,8 +299,6 @@ def configure(conf):
     if not conf.CONFIG_GET('KRB5_VENDOR'):
         conf.PROCESS_SEPARATE_RULE('embedded_heimdal')
 
-    conf.PROCESS_SEPARATE_RULE('system_gnutls')
-
     conf.RECURSE('source4/dsdb/samdb/ldb_modules')
     conf.RECURSE('source4/ntvfs/sysdep')
     conf.RECURSE('lib/util')
diff --git a/wscript_configure_system_gnutls b/wscript_configure_system_gnutls
index c6eb9df7b64..329a1167272 100644
--- a/wscript_configure_system_gnutls
+++ b/wscript_configure_system_gnutls
@@ -1,4 +1,4 @@
-from waflib import Options
+from waflib import Logs
 import os
 
 def parse_version(v):


-- 
Samba Shared Repository



More information about the samba-cvs mailing list