[SCM] Samba Shared Repository - branch master updated

Andrew Bartlett abartlet at samba.org
Mon Mar 9 23:43:02 UTC 2020


The branch, master has been updated
       via  54f26cfcf25 autobuild: Run the none env in the samba-o3 build
       via  609c9903473 Require Python 3.6 for Samba 4.13
       via  e9ce0f13e69 .gitlab-ci.yml: Do not build Samba for Ubuntu 16.04 or Debian 9 any longer
       via  d048d7e17d7 bootstrap: Remove long-unsupported OS versions
      from  0ae4f368c6c smbd: reuse close_free_pending_aio() in close_directory()

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


- Log -----------------------------------------------------------------
commit 54f26cfcf2587a2b1d97f466a886fa89a116eea1
Author: Andreas Schneider <asn at samba.org>
Date:   Fri Nov 22 15:23:35 2019 +0100

    autobuild: Run the none env in the samba-o3 build
    
    This includes tests which should make sure that certain code is not
    optimized away, like memset_s().
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    
    Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
    Autobuild-Date(master): Mon Mar  9 23:42:26 UTC 2020 on sn-devel-184

commit 609c9903473b139fdf1b2ed02b9c93b648eeea8c
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Wed Mar 4 13:51:23 2020 +1300

    Require Python 3.6 for Samba 4.13
    
    This allows Samba to use formatted string literals, which
    are quite handy.
    
    REF: https://docs.python.org/3/whatsnew/3.6.html#whatsnew36-pep498
    
    Signed-off-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>

commit e9ce0f13e695f1d7e719923628255ea786a90c20
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Wed Mar 4 13:55:27 2020 +1300

    .gitlab-ci.yml: Do not build Samba for Ubuntu 16.04 or Debian 9 any longer
    
    These only have Python 3.5 and we want to increase the minimum to Python 3.6.
    
    Signed-off-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>

commit d048d7e17d756099e208fa4d6b931a147b0b1489
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Wed Mar 4 13:58:48 2020 +1300

    bootstrap: Remove long-unsupported OS versions
    
    Samba has not built on these versions for quite some time due to
    the need for Python 3.5 and GnuTLS 3.4.7
    
    These were always marked as broken, but given the requirements
    these are never likely to come back.
    
    Signed-off-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>

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

Summary of changes:
 .gitlab-ci.yml                                    |  14 +--
 WHATSNEW.txt                                      |  11 +++
 bootstrap/.gitlab-ci.yml                          |  18 ----
 bootstrap/config.py                               |  83 ----------------
 bootstrap/generated-dists/Vagrantfile             |  42 ---------
 bootstrap/generated-dists/centos6/Dockerfile      |  27 ------
 bootstrap/generated-dists/centos6/bootstrap.sh    | 109 ----------------------
 bootstrap/generated-dists/centos6/locale.sh       |  55 -----------
 bootstrap/generated-dists/centos6/packages.yml    |  89 ------------------
 bootstrap/generated-dists/debian7/Dockerfile      |  27 ------
 bootstrap/generated-dists/debian7/bootstrap.sh    | 101 --------------------
 bootstrap/generated-dists/debian7/locale.sh       |  55 -----------
 bootstrap/generated-dists/debian7/packages.yml    |  86 -----------------
 bootstrap/generated-dists/debian8/Dockerfile      |  27 ------
 bootstrap/generated-dists/debian8/bootstrap.sh    | 105 ---------------------
 bootstrap/generated-dists/debian8/locale.sh       |  55 -----------
 bootstrap/generated-dists/debian8/packages.yml    |  90 ------------------
 bootstrap/generated-dists/debian9/Dockerfile      |  27 ------
 bootstrap/generated-dists/debian9/bootstrap.sh    | 105 ---------------------
 bootstrap/generated-dists/debian9/locale.sh       |  55 -----------
 bootstrap/generated-dists/debian9/packages.yml    |  90 ------------------
 bootstrap/generated-dists/ubuntu1404/Dockerfile   |  27 ------
 bootstrap/generated-dists/ubuntu1404/bootstrap.sh | 103 --------------------
 bootstrap/generated-dists/ubuntu1404/locale.sh    |  55 -----------
 bootstrap/generated-dists/ubuntu1404/packages.yml |  88 -----------------
 bootstrap/generated-dists/ubuntu1604/Dockerfile   |  27 ------
 bootstrap/generated-dists/ubuntu1604/bootstrap.sh | 104 ---------------------
 bootstrap/generated-dists/ubuntu1604/locale.sh    |  55 -----------
 bootstrap/generated-dists/ubuntu1604/packages.yml |  89 ------------------
 bootstrap/sha1sum.txt                             |   2 +-
 buildtools/wafsamba/samba_python.py               |   2 +-
 script/autobuild.py                               |  11 +--
 32 files changed, 16 insertions(+), 1818 deletions(-)
 delete mode 100644 bootstrap/generated-dists/centos6/Dockerfile
 delete mode 100755 bootstrap/generated-dists/centos6/bootstrap.sh
 delete mode 100755 bootstrap/generated-dists/centos6/locale.sh
 delete mode 100644 bootstrap/generated-dists/centos6/packages.yml
 delete mode 100644 bootstrap/generated-dists/debian7/Dockerfile
 delete mode 100755 bootstrap/generated-dists/debian7/bootstrap.sh
 delete mode 100755 bootstrap/generated-dists/debian7/locale.sh
 delete mode 100644 bootstrap/generated-dists/debian7/packages.yml
 delete mode 100644 bootstrap/generated-dists/debian8/Dockerfile
 delete mode 100755 bootstrap/generated-dists/debian8/bootstrap.sh
 delete mode 100755 bootstrap/generated-dists/debian8/locale.sh
 delete mode 100644 bootstrap/generated-dists/debian8/packages.yml
 delete mode 100644 bootstrap/generated-dists/debian9/Dockerfile
 delete mode 100755 bootstrap/generated-dists/debian9/bootstrap.sh
 delete mode 100755 bootstrap/generated-dists/debian9/locale.sh
 delete mode 100644 bootstrap/generated-dists/debian9/packages.yml
 delete mode 100644 bootstrap/generated-dists/ubuntu1404/Dockerfile
 delete mode 100755 bootstrap/generated-dists/ubuntu1404/bootstrap.sh
 delete mode 100755 bootstrap/generated-dists/ubuntu1404/locale.sh
 delete mode 100644 bootstrap/generated-dists/ubuntu1404/packages.yml
 delete mode 100644 bootstrap/generated-dists/ubuntu1604/Dockerfile
 delete mode 100755 bootstrap/generated-dists/ubuntu1604/bootstrap.sh
 delete mode 100755 bootstrap/generated-dists/ubuntu1604/locale.sh
 delete mode 100644 bootstrap/generated-dists/ubuntu1604/packages.yml


Changeset truncated at 500 lines:

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 56adf10c7be..6114ccced99 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,7 +22,7 @@ variables:
   # Set this to the contents of bootstrap/sha1sum.txt
   # which is generated by bootstrap/template.py --render
   #
-  SAMBA_CI_CONTAINER_TAG: 41319f2580c026f66b2750604a0eb15d6b6f7b50
+  SAMBA_CI_CONTAINER_TAG: 2b0275df23424240774afcd61fae8abed8663996
   #
   # We use the ubuntu1804 image as default as
   # it matches what we have on sn-devel-184.
@@ -119,9 +119,6 @@ samba:
 samba-mitkrb5:
   extends: .shared_template
 
-samba-none-env:
-  extends: .shared_template
-
 samba-nopython:
   extends: .shared_template
 
@@ -221,7 +218,6 @@ pages:
     - others
     - samba
     - samba-mitkrb5
-    - samba-none-env
     - samba-nopython
     - samba-nopython-py2
     - samba-xc
@@ -277,14 +273,6 @@ ubuntu1804-samba-o3:
   extends: .samba-o3-template
   image: $SAMBA_CI_CONTAINER_IMAGE_ubuntu1804
 
-ubuntu1604-samba-o3:
-  extends: .samba-o3-template
-  image: $SAMBA_CI_CONTAINER_IMAGE_ubuntu1604
-
-debian9-samba-o3:
-  extends: .samba-o3-template
-  image: $SAMBA_CI_CONTAINER_IMAGE_debian9
-
 debian10-samba-o3:
   extends: .samba-o3-template
   image: $SAMBA_CI_CONTAINER_IMAGE_debian10
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 93341756593..e9b269209f0 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -16,6 +16,17 @@ UPGRADING
 NEW FEATURES/CHANGES
 ====================
 
+Python 3.6 Required
+-------------------
+
+Samba's minimum runtime requirement for python was raised to Python
+3.5 with samba 4.12.  Samba 4.13 raises this minimum version to Python
+3.6 both to access new features and because this is the oldest version
+we test with in our CI infrastructure.
+
+(Build time support for the file server with Python 2.6 has not
+changed)
+
 
 REMOVED FEATURES
 ================
diff --git a/bootstrap/.gitlab-ci.yml b/bootstrap/.gitlab-ci.yml
index aa0b6448d74..4e52da09dcc 100644
--- a/bootstrap/.gitlab-ci.yml
+++ b/bootstrap/.gitlab-ci.yml
@@ -86,24 +86,9 @@ services:
 ubuntu1804:
   extends: .build_image_template
 
-ubuntu1604:
-  extends: .build_image_template
-
-ubuntu1404:
-  extends: .build_image_template_force_broken
-
 debian10:
   extends: .build_image_template
 
-debian9:
-  extends: .build_image_template
-
-debian8:
-  extends: .build_image_template_force_broken
-
-debian7:
-  extends: .build_image_template_force_broken
-
 fedora31:
   extends: .build_image_template
 
@@ -124,9 +109,6 @@ centos7:
     # We install a compat-gnutls34 package for GnuTLS >= 3.4.7
     PKG_CONFIG_PATH: /usr/lib64/compat-gnutls34/pkgconfig:/usr/lib64/compat-nettle32/pkgconfig
 
-centos6:
-  extends: .build_image_template_force_broken
-
 opensuse150:
   extends: .build_image_template
 
diff --git a/bootstrap/config.py b/bootstrap/config.py
index bcada1dc628..19a2cf08b9d 100644
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -374,38 +374,6 @@ end
 
 
 DEB_DISTS = {
-    'debian7': {
-        'docker_image': 'debian:7',
-        'vagrant_box': 'debian/wheezy64',
-        'replace': {
-            'libgnutls28-dev': 'libgnutls-dev',
-            'libsystemd-dev': '',  # not available, remove
-            'lmdb-utils': '',  # not available, remove
-            'liblmdb-dev': '',  # not available, remove
-            'python-gpg': 'python-gpgme',
-            'python3-gpg': '',  # no python3 gpg pkg available, remove
-            'language-pack-en': '',   # included in locales
-            'liburing-dev': '',   # not available
-        }
-    },
-    'debian8': {
-        'docker_image': 'debian:8',
-        'vagrant_box': 'debian/jessie64',
-        'replace': {
-            'python-gpg': 'python-gpgme',
-            'python3-gpg': 'python3-gpgme',
-            'language-pack-en': '',   # included in locales
-            'liburing-dev': '',   # not available
-        }
-    },
-    'debian9': {
-        'docker_image': 'debian:9',
-        'vagrant_box': 'debian/stretch64',
-        'replace': {
-            'language-pack-en': '',   # included in locales
-            'liburing-dev': '',   # not available
-        }
-    },
     'debian10': {
         'docker_image': 'debian:10',
         'vagrant_box': 'debian/buster64',
@@ -414,33 +382,6 @@ DEB_DISTS = {
             'liburing-dev': '',   # not available
         }
     },
-    'ubuntu1404': {
-        'docker_image': 'ubuntu:14.04',
-        'vagrant_box': 'ubuntu/trusty64',
-        'replace': {
-            'libsystemd-dev': '',  # remove
-            'libgnutls28-dev': 'libgnutls-dev',
-            'python-gpg': 'python-gpgme',
-            'python3-gpg': 'python3-gpgme',
-            'lmdb-utils': 'lmdb-utils/trusty-backports',
-            'liblmdb-dev': 'liblmdb-dev/trusty-backports',
-            'libunwind-dev': 'libunwind8-dev',
-            'glusterfs-common': '',
-            'libcephfs-dev': '',
-            'liburing-dev': '',   # not available
-        }
-    },
-    'ubuntu1604': {
-        'docker_image': 'ubuntu:16.04',
-        'vagrant_box': 'ubuntu/xenial64',
-        'replace': {
-            'python-gpg': 'python-gpgme',
-            'python3-gpg': 'python3-gpgme',
-            'glusterfs-common': '',
-            'libcephfs-dev': '',
-            'liburing-dev': '',   # not available
-        }
-    },
     'ubuntu1804': {
         'docker_image': 'ubuntu:18.04',
         'vagrant_box': 'ubuntu/bionic64',
@@ -452,30 +393,6 @@ DEB_DISTS = {
 
 
 RPM_DISTS = {
-    'centos6': {
-        'docker_image': 'centos:6',
-        'vagrant_box': 'centos/6',
-        'bootstrap': YUM_BOOTSTRAP,
-        'replace': {
-            'lsb-release': 'redhat-lsb',
-            'python3': 'python36',
-            'python3-devel': 'python36-devel',
-            'python2-gpg': 'pygpgme',
-            'python3-gpg': '',  # no python3-gpg yet
-            '@development-tools': '"@Development Tools"',  # add quotes
-            'glibc-langpack-en': '',  # included in glibc-common
-            'glibc-locale-source': '',  # included in glibc-common
-            'procps-ng': 'procps',  # centos6 still use old name
-            # update perl core modules on centos
-            # fix: Can't locate Archive/Tar.pm in @INC
-            'perl': 'perl-core',
-            'rpcsvc-proto-devel': '',
-            'glusterfs-api-devel': '',
-            'glusterfs-devel': '',
-            'libcephfs-devel': '',
-            'liburing-devel': '',   # not available
-        }
-    },
     'centos7': {
         'docker_image': 'centos:7',
         'vagrant_box': 'centos/7',
diff --git a/bootstrap/generated-dists/Vagrantfile b/bootstrap/generated-dists/Vagrantfile
index b3cb6bea485..091c65488cb 100644
--- a/bootstrap/generated-dists/Vagrantfile
+++ b/bootstrap/generated-dists/Vagrantfile
@@ -10,13 +10,6 @@ Vagrant.configure("2") do |config|
     config.ssh.insert_key = false
 
 
-    config.vm.define "centos6" do |v|
-        v.vm.box = "centos/6"
-        v.vm.hostname = "centos6"
-        v.vm.provision :shell, path: "centos6/bootstrap.sh"
-        v.vm.provision :shell, path: "centos6/locale.sh"
-    end
-
     config.vm.define "centos7" do |v|
         v.vm.box = "centos/7"
         v.vm.hostname = "centos7"
@@ -38,27 +31,6 @@ Vagrant.configure("2") do |config|
         v.vm.provision :shell, path: "debian10/locale.sh"
     end
 
-    config.vm.define "debian7" do |v|
-        v.vm.box = "debian/wheezy64"
-        v.vm.hostname = "debian7"
-        v.vm.provision :shell, path: "debian7/bootstrap.sh"
-        v.vm.provision :shell, path: "debian7/locale.sh"
-    end
-
-    config.vm.define "debian8" do |v|
-        v.vm.box = "debian/jessie64"
-        v.vm.hostname = "debian8"
-        v.vm.provision :shell, path: "debian8/bootstrap.sh"
-        v.vm.provision :shell, path: "debian8/locale.sh"
-    end
-
-    config.vm.define "debian9" do |v|
-        v.vm.box = "debian/stretch64"
-        v.vm.hostname = "debian9"
-        v.vm.provision :shell, path: "debian9/bootstrap.sh"
-        v.vm.provision :shell, path: "debian9/locale.sh"
-    end
-
     config.vm.define "fedora29" do |v|
         v.vm.box = "fedora/29-cloud-base"
         v.vm.hostname = "fedora29"
@@ -94,20 +66,6 @@ Vagrant.configure("2") do |config|
         v.vm.provision :shell, path: "opensuse151/locale.sh"
     end
 
-    config.vm.define "ubuntu1404" do |v|
-        v.vm.box = "ubuntu/trusty64"
-        v.vm.hostname = "ubuntu1404"
-        v.vm.provision :shell, path: "ubuntu1404/bootstrap.sh"
-        v.vm.provision :shell, path: "ubuntu1404/locale.sh"
-    end
-
-    config.vm.define "ubuntu1604" do |v|
-        v.vm.box = "ubuntu/xenial64"
-        v.vm.hostname = "ubuntu1604"
-        v.vm.provision :shell, path: "ubuntu1604/bootstrap.sh"
-        v.vm.provision :shell, path: "ubuntu1604/locale.sh"
-    end
-
     config.vm.define "ubuntu1804" do |v|
         v.vm.box = "ubuntu/bionic64"
         v.vm.hostname = "ubuntu1804"
diff --git a/bootstrap/generated-dists/centos6/Dockerfile b/bootstrap/generated-dists/centos6/Dockerfile
deleted file mode 100644
index 2716eebdd35..00000000000
--- a/bootstrap/generated-dists/centos6/Dockerfile
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# This file is generated by 'bootstrap/template.py --render'
-# See also bootstrap/config.py
-#
-
-FROM centos:6
-
-# pass in with --build-arg while build
-ARG SHA1SUM
-RUN [ -n $SHA1SUM ] && echo $SHA1SUM > /sha1sum.txt
-
-ADD *.sh /tmp/
-# need root permission, do it before USER samba
-RUN /tmp/bootstrap.sh && /tmp/locale.sh
-
-# if ld.gold exists, force link it to ld
-RUN set -x; LD=$(which ld); LD_GOLD=$(which ld.gold); test -x $LD_GOLD && ln -sf $LD_GOLD $LD && test -x $LD && echo "$LD is now $LD_GOLD"
-
-# make test can not work with root, so we have to create a new user
-RUN useradd -m -U -s /bin/bash samba && \
-    mkdir -p /etc/sudoers.d && \
-    echo "samba ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/samba
-
-USER samba
-WORKDIR /home/samba
-# samba tests rely on this
-ENV USER=samba LC_ALL=en_US.utf8 LANG=en_US.utf8
\ No newline at end of file
diff --git a/bootstrap/generated-dists/centos6/bootstrap.sh b/bootstrap/generated-dists/centos6/bootstrap.sh
deleted file mode 100755
index ee6fcc33799..00000000000
--- a/bootstrap/generated-dists/centos6/bootstrap.sh
+++ /dev/null
@@ -1,109 +0,0 @@
-#!/bin/bash
-
-#
-# This file is generated by 'bootstrap/template.py --render'
-# See also bootstrap/config.py
-#
-
-set -xueo pipefail
-
-yum update -y
-yum install -y epel-release
-yum install -y yum-plugin-copr
-yum copr enable -y sergiomb/SambaAD
-yum update -y
-
-yum install -y \
-    "@Development Tools" \
-    acl \
-    attr \
-    autoconf \
-    avahi-devel \
-    bind-utils \
-    binutils \
-    bison \
-    chrpath \
-    cups-devel \
-    curl \
-    dbus-devel \
-    docbook-dtds \
-    docbook-style-xsl \
-    flex \
-    gawk \
-    gcc \
-    gdb \
-    git \
-    glib2-devel \
-    glibc-common \
-    gnutls-devel \
-    gpgme-devel \
-    gzip \
-    hostname \
-    htop \
-    jansson-devel \
-    keyutils-libs-devel \
-    krb5-devel \
-    krb5-server \
-    lcov \
-    libacl-devel \
-    libarchive-devel \
-    libattr-devel \
-    libblkid-devel \
-    libbsd-devel \
-    libcap-devel \
-    libicu-devel \
-    libnsl2-devel \
-    libpcap-devel \
-    libsemanage-python \
-    libtasn1-devel \
-    libtasn1-tools \
-    libtirpc-devel \
-    libunwind-devel \
-    libuuid-devel \
-    libxslt \
-    lmdb \
-    lmdb-devel \
-    make \
-    mingw64-gcc \
-    ncurses-devel \
-    openldap-devel \
-    pam-devel \
-    patch \
-    perl-Archive-Tar \
-    perl-ExtUtils-MakeMaker \
-    perl-JSON-Parse \
-    perl-Parse-Yapp \
-    perl-Test-Base \
-    perl-core \
-    perl-generators \
-    perl-interpreter \
-    pkgconfig \
-    policycoreutils-python \
-    popt-devel \
-    procps \
-    psmisc \
-    python3-dns \
-    python3-markdown \
-    python36 \
-    python36-devel \
-    quota-devel \
-    readline-devel \
-    redhat-lsb \
-    rng-tools \
-    rpcgen \
-    rsync \
-    sed \
-    sudo \
-    systemd-devel \
-    tar \
-    tree \
-    which \
-    xfsprogs-devel \
-    yum-utils \
-    zlib-devel
-
-yum clean all
-
-if [ ! -f /usr/bin/python3 ]; then
-    ln -sf /usr/bin/python3.6 /usr/bin/python3
-fi
\ No newline at end of file
diff --git a/bootstrap/generated-dists/centos6/locale.sh b/bootstrap/generated-dists/centos6/locale.sh
deleted file mode 100755
index cc64e180483..00000000000
--- a/bootstrap/generated-dists/centos6/locale.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/bash
-
-#
-# This file is generated by 'bootstrap/template.py --render'
-# See also bootstrap/config.py
-#
-
-set -xueo pipefail
-
-# refer to /usr/share/i18n/locales
-INPUTFILE=en_US
-# refer to /usr/share/i18n/charmaps
-CHARMAP=UTF-8
-# locale to generate in /usr/lib/locale
-# glibc/localedef will normalize UTF-8 to utf8, follow the naming style
-LOCALE=$INPUTFILE.utf8
-
-# if locale is already correct, exit
-( locale | grep LC_ALL | grep -i $LOCALE ) && exit 0
-
-# if locale not available, generate locale into /usr/lib/locale
-if ! ( locale --all-locales | grep -i $LOCALE )
-then
-    # no-archive means create its own dir
-    localedef --inputfile $INPUTFILE --charmap $CHARMAP --no-archive $LOCALE
-fi
-
-# update locale conf and global env file
-# set both LC_ALL and LANG for safe
-
-# update conf for Debian family
-FILE=/etc/default/locale
-if [ -f $FILE ]
-then
-    echo LC_ALL="$LOCALE" > $FILE
-    echo LANG="$LOCALE" >> $FILE
-fi
-
-# update conf for RedHat family
-FILE=/etc/locale.conf
-if [ -f $FILE ]
-then
-    # LC_ALL is not valid in this file, set LANG only
-    echo LANG="$LOCALE" > $FILE
-fi
-
-# update global env file
-FILE=/etc/environment
-if [ -f $FILE ]
-then
-    # append LC_ALL if not exist
-    grep LC_ALL $FILE || echo LC_ALL="$LOCALE" >> $FILE
-    # append LANG if not exist
-    grep LANG $FILE || echo LANG="$LOCALE" >> $FILE
-fi
\ No newline at end of file
diff --git a/bootstrap/generated-dists/centos6/packages.yml b/bootstrap/generated-dists/centos6/packages.yml
deleted file mode 100644
index 1e2b5a98fa6..00000000000
--- a/bootstrap/generated-dists/centos6/packages.yml
+++ /dev/null
@@ -1,89 +0,0 @@


-- 
Samba Shared Repository



More information about the samba-cvs mailing list