[SCM] Samba Shared Repository - branch master updated

[Andreas Schneider]

The branch, master has been updated
       via  94808cc50e4 waf: Only use gnutls_aead_cipher_encryptv2() for GnuTLS > 3.6.14
       via  4d63a1a79f3 bootstrap: Fix the spelling of README.md (again) and get a new GnuTLS
      from  d98f68f9182 ctdb-daemon: Drop implementation of old-style database pull/push controls

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


- Log -----------------------------------------------------------------
commit 94808cc50e4350a8c3bc250a886e8d4e7802dd12
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Sep 10 11:34:50 2020 +0200

    waf: Only use gnutls_aead_cipher_encryptv2() for GnuTLS > 3.6.14
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14399
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    
    Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
    Autobuild-Date(master): Fri Sep 11 08:27:26 UTC 2020 on sn-devel-184

commit 4d63a1a79f372d4be6633bb1053a1934629da1df
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Fri Sep 11 09:36:29 2020 +1200

    bootstrap: Fix the spelling of README.md (again) and get a new GnuTLS
    
    We re-run ./bootstrap/template.py --render to get a new GnuTLS on Fedora 32
    
    This was missed with 7dc535995bbdb42b1b053c22acff5978cb5da516
    and so caused e0e51632cf77be439ebcbcba025a42e8558fa824 to
    break the sha1sum and so require 7077be01a3cc860ce1fcfafd9e5028829f0c1887
    to fix it.
    
    The sha1sum changes because we fixed the bug about the spelling of
    README.md, which is helpful because otherwise we would not get a
    new image.
    
    This provides a GnuTLS 3.6.15 so that we still test using GnuTLS's
    gnutls_aead_cipher_encryptv2() for the SMB encryption codepath.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14399
    
    Signed-off-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>

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

Summary of changes:
 .gitlab-ci.yml                  | 2 +-
 bootstrap/sha1sum.txt           | 2 +-
 bootstrap/template.py           | 2 +-
 wscript_configure_system_gnutls | 5 ++++-
 4 files changed, 7 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 569120f6f44..c9bc00c4ddf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,7 +23,7 @@ variables:
   # Set this to the contents of bootstrap/sha1sum.txt
   # which is generated by bootstrap/template.py --render
   #
-  SAMBA_CI_CONTAINER_TAG: 0ff8e6d23f6f418ee5af48921754f4073300c1a5
+  SAMBA_CI_CONTAINER_TAG: 86279163d150fb95742f4b34fce0dfc1a639f5de
   #
   # We use the ubuntu1804 image as default as
   # it matches what we have on sn-devel-184.
diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index fb3adc00797..7d4891b02e7 100644
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-0ff8e6d23f6f418ee5af48921754f4073300c1a5
+86279163d150fb95742f4b34fce0dfc1a639f5de
diff --git a/bootstrap/template.py b/bootstrap/template.py
index e12e2e0dc82..0acfaa21e08 100755
--- a/bootstrap/template.py
+++ b/bootstrap/template.py
@@ -32,7 +32,7 @@ from config import DISTS, VAGRANTFILE, OUT
 
 HERE = os.path.abspath(os.path.dirname(__file__))
 SHA1SUM_FILE_PATH = os.path.join(HERE, 'sha1sum.txt')
-README_FILE_PATH = os.path.join(HERE, 'READMD.md')
+README_FILE_PATH = os.path.join(HERE, 'README.md')
 
 logging.basicConfig(level='INFO')
 log = logging.getLogger(__file__)
diff --git a/wscript_configure_system_gnutls b/wscript_configure_system_gnutls
index 9eabd0da75c..2ec217fb9dc 100644
--- a/wscript_configure_system_gnutls
+++ b/wscript_configure_system_gnutls
@@ -29,7 +29,10 @@ conf.CHECK_FUNCS_IN('gnutls_set_default_priority_append', 'gnutls')
 # in 3.6.11, see:
 #
 #     https://gitlab.com/gnutls/gnutls/-/merge_requests/1085
-if (parse_version('3.6.10') != parse_version(gnutls_version)):
+#
+# 3.6.10 - 3.6.14 have a severe memory leak with AES-CCM
+#     https://gitlab.com/gnutls/gnutls/-/merge_requests/1278
+if (parse_version(gnutls_version) > parse_version('3.6.14')):
     conf.CHECK_FUNCS_IN('gnutls_aead_cipher_encryptv2', 'gnutls')
 
 # Check if we have support for crypto policies


-- 
Samba Shared Repository