[SCM] Samba Shared Repository - branch master updated

Andreas Schneider asn at samba.org
Thu Apr 25 11:47:01 UTC 2019


The branch, master has been updated
       via  b1426d0657c gitlab-ci: Enable fedora29 and update generated dists
       via  dfa4d3cdf7d bootstrap: Add glusterfs and cephfs packages
       via  ae21dc7163c bootstrap: Add missing packages for XFS quota support
       via  8b2fbd7983e bootstrap: Add missing packages on RPM distributions
       via  a6aff7333b9 bootstrap: Fix dnf commands
       via  fefb84b5b13 s4:heimdal: Disable format truncation warnings
       via  bd5b4a16c7e s3:modules: Fix size types
       via  f1bf02c78aa autobuild: Build also Samba AD with MIT Kerberos
      from  94f2ed3eb35 wscript: Remove checks for shm_open and shmget

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


- Log -----------------------------------------------------------------
commit b1426d0657c1c550d368fb35406e57f7bc58995d
Author: Andreas Schneider <asn at samba.org>
Date:   Wed Apr 17 08:54:52 2019 +0200

    gitlab-ci: Enable fedora29 and update generated dists
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>
    
    Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
    Autobuild-Date(master): Thu Apr 25 11:46:23 UTC 2019 on sn-devel-184

commit dfa4d3cdf7dc541969e7452a6a325dece73bc5a7
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Apr 25 10:23:45 2019 +0200

    bootstrap: Add glusterfs and cephfs packages
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>

commit ae21dc7163c00929ffd3292e390f1badcd86a2dd
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Apr 25 11:10:15 2019 +0200

    bootstrap: Add missing packages for XFS quota support
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>

commit 8b2fbd7983e4c7c8cb946851231eab641fedd463
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Apr 25 10:14:44 2019 +0200

    bootstrap: Add missing packages on RPM distributions
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>

commit a6aff7333b95cc450918c69a2a563d473acf043c
Author: Andreas Schneider <asn at samba.org>
Date:   Tue Apr 23 11:40:07 2019 +0200

    bootstrap: Fix dnf commands
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>

commit fefb84b5b137e20d1cfb5436702ef6a8aa8ac79b
Author: Andreas Schneider <asn at samba.org>
Date:   Tue Mar 26 21:14:13 2019 +0100

    s4:heimdal: Disable format truncation warnings
    
    We build that code and do not treat warnings as errors anyway,
    so just disable format truncation.
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>

commit bd5b4a16c7e45b4deafb9071d915b90740d45543
Author: Andreas Schneider <asn at samba.org>
Date:   Tue Apr 23 12:57:02 2019 +0200

    s3:modules: Fix size types
    
    error: assuming signed overflow does not occur when simplifying
    conditional to constant [-Werror=strict-overflow]
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>

commit f1bf02c78aaef71cf55be055f46a626c06bdb495
Author: Andreas Schneider <asn at samba.org>
Date:   Tue Apr 23 18:10:04 2019 +0200

    autobuild: Build also Samba AD with MIT Kerberos
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>

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

Summary of changes:
 .gitlab-ci.yml                                     |  7 ++++++-
 bootstrap/.gitlab-ci.yml                           |  2 +-
 bootstrap/config.py                                | 24 ++++++++++++++++++++--
 bootstrap/generated-dists/centos6/bootstrap.sh     |  1 +
 bootstrap/generated-dists/centos6/packages.yml     |  1 +
 bootstrap/generated-dists/centos7/bootstrap.sh     |  1 +
 bootstrap/generated-dists/centos7/packages.yml     |  1 +
 bootstrap/generated-dists/debian7/bootstrap.sh     |  3 +++
 bootstrap/generated-dists/debian7/packages.yml     |  3 +++
 bootstrap/generated-dists/debian8/bootstrap.sh     |  3 +++
 bootstrap/generated-dists/debian8/packages.yml     |  3 +++
 bootstrap/generated-dists/debian9/bootstrap.sh     |  3 +++
 bootstrap/generated-dists/debian9/packages.yml     |  3 +++
 bootstrap/generated-dists/fedora28/bootstrap.sh    |  9 ++++++--
 bootstrap/generated-dists/fedora28/packages.yml    |  5 +++++
 bootstrap/generated-dists/fedora29/bootstrap.sh    |  9 ++++++--
 bootstrap/generated-dists/fedora29/packages.yml    |  5 +++++
 bootstrap/generated-dists/opensuse150/bootstrap.sh |  4 ++++
 bootstrap/generated-dists/opensuse150/packages.yml |  4 ++++
 bootstrap/generated-dists/ubuntu1404/bootstrap.sh  |  1 +
 bootstrap/generated-dists/ubuntu1404/packages.yml  |  1 +
 bootstrap/generated-dists/ubuntu1604/bootstrap.sh  |  1 +
 bootstrap/generated-dists/ubuntu1604/packages.yml  |  1 +
 bootstrap/generated-dists/ubuntu1804/bootstrap.sh  |  3 +++
 bootstrap/generated-dists/ubuntu1804/packages.yml  |  3 +++
 bootstrap/sha1sum.txt                              |  2 +-
 script/autobuild.py                                |  2 +-
 source3/modules/vfs_glusterfs.c                    |  8 ++++----
 source4/heimdal_build/wscript_build                |  5 +++++
 29 files changed, 104 insertions(+), 14 deletions(-)


Changeset truncated at 500 lines:

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e43000548ca..82d8859e30d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,7 +19,7 @@ variables:
   # Set this to the contents of bootstrap/sha1sum.txt
   # which is generated by bootstrap/template.py --render
   #
-  SAMBA_CI_CONTAINER_TAG: 5c2b831fb6aef8abd25dbdc6ade53ba2ebad1a1c
+  SAMBA_CI_CONTAINER_TAG: 735b9b509e6928bc71fe4442798e4fe110a98788
   #
   # The following images are available
   # Please see the samba-o3 sections at the end of this file!
@@ -30,6 +30,7 @@ variables:
   SAMBA_CI_CONTAINER_IMAGE_ubuntu1404: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-ubuntu1404:${SAMBA_CI_CONTAINER_TAG}
   SAMBA_CI_CONTAINER_IMAGE_debian9: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-debian9:${SAMBA_CI_CONTAINER_TAG}
   SAMBA_CI_CONTAINER_IMAGE_opensuse150: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-opensuse150:${SAMBA_CI_CONTAINER_TAG}
+  SAMBA_CI_CONTAINER_IMAGE_fedora29: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-fedora29:${SAMBA_CI_CONTAINER_TAG}
 
 include:
   # The image creation details are specified in a separate file
@@ -205,6 +206,10 @@ opensuse150-samba-o3:
   extends: .samba-o3-template
   image: $SAMBA_CI_CONTAINER_IMAGE_opensuse150
 
+fedora29-samba-o3:
+  extends: .samba-o3-template
+  image: $SAMBA_CI_CONTAINER_IMAGE_fedora29
+
 #
 # Keep the samba-o3 sections at the end ...
 #
diff --git a/bootstrap/.gitlab-ci.yml b/bootstrap/.gitlab-ci.yml
index f6bbd9e0285..515b6ac66db 100644
--- a/bootstrap/.gitlab-ci.yml
+++ b/bootstrap/.gitlab-ci.yml
@@ -101,7 +101,7 @@ debian7:
   extends: .build_image_template_force_broken
 
 fedora29:
-  extends: .build_image_template_force_broken
+  extends: .build_image_template
 
 fedora28:
   extends: .build_image_template_force_broken
diff --git a/bootstrap/config.py b/bootstrap/config.py
index d8bb7cf9654..c0f3b37cfbf 100644
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -122,6 +122,7 @@ PKGS = [
     # refer: https://fedoraproject.org/wiki/Changes/SunRPCRemoval
     ('', 'libtirpc-devel'),  # for <rpc/rpc.h> header on fedora
     ('', 'libnsl2-devel'),  # for <rpcsvc/yp_prot.h> header on fedora
+    ('', 'rpcsvc-proto-devel'), # for <rpcsvc/rquota.h> header
     ('mawk', 'gawk'),
 
     # python
@@ -157,6 +158,12 @@ PKGS = [
     ('', 'perl-generators'),
     ('', 'perl-interpreter'),
 
+    # fs
+    ('xfslibs-dev', 'xfsprogs-devel'), # for xfs quota support
+    ('', 'glusterfs-api-devel'),
+    ('glusterfs-common', 'glusterfs-devel'),
+    ('libcephfs-dev', 'libcephfs-devel'),
+
     # misc
     # @ means group for rpm, use fedora as rpm default
     ('build-essential', '@development-tools'),
@@ -218,9 +225,9 @@ DNF_BOOTSTRAP = r"""
 {GENERATED_MARKER}
 set -xueo pipefail
 
-dnf -y -q update
+dnf update -y
 
-dnf -y -q --verbose install \
+dnf install -y \
     {pkgs}
 
 dnf clean all
@@ -389,6 +396,8 @@ DEB_DISTS = {
             'lmdb-utils': 'lmdb-utils/trusty-backports',
             'liblmdb-dev': 'liblmdb-dev/trusty-backports',
             'libunwind-dev': 'libunwind8-dev',
+            'glusterfs-common': '',
+            'libcephfs-dev': '',
         }
     },
     'ubuntu1604': {
@@ -397,6 +406,8 @@ DEB_DISTS = {
         'replace': {
             'python-gpg': 'python-gpgme',
             'python3-gpg': 'python3-gpgme',
+            'glusterfs-common': '',
+            'libcephfs-dev': '',
         }
     },
     'ubuntu1804': {
@@ -423,6 +434,10 @@ RPM_DISTS = {
             # 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': '',
         }
     },
     'centos7': {
@@ -443,6 +458,10 @@ RPM_DISTS = {
             # 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': '',
         }
     },
     'fedora28': {
@@ -489,6 +508,7 @@ RPM_DISTS = {
             'python3-dns': 'python3-dnspython',
             'python3-markdown': 'python3-Markdown',
             'quota-devel': '',
+            'glusterfs-api-devel': '',
         }
     }
 }
diff --git a/bootstrap/generated-dists/centos6/bootstrap.sh b/bootstrap/generated-dists/centos6/bootstrap.sh
index be21d8bec69..fdd04385a02 100755
--- a/bootstrap/generated-dists/centos6/bootstrap.sh
+++ b/bootstrap/generated-dists/centos6/bootstrap.sh
@@ -99,6 +99,7 @@ yum -y -q --verbose install \
     tar \
     tree \
     which \
+    xfsprogs-devel \
     yum-utils \
     zlib-devel
 
diff --git a/bootstrap/generated-dists/centos6/packages.yml b/bootstrap/generated-dists/centos6/packages.yml
index c7953bd60f9..307d31826e6 100644
--- a/bootstrap/generated-dists/centos6/packages.yml
+++ b/bootstrap/generated-dists/centos6/packages.yml
@@ -87,5 +87,6 @@ packages:
   - tar
   - tree
   - which
+  - xfsprogs-devel
   - yum-utils
   - zlib-devel
\ No newline at end of file
diff --git a/bootstrap/generated-dists/centos7/bootstrap.sh b/bootstrap/generated-dists/centos7/bootstrap.sh
index 08a11b7ee93..122025df729 100755
--- a/bootstrap/generated-dists/centos7/bootstrap.sh
+++ b/bootstrap/generated-dists/centos7/bootstrap.sh
@@ -99,6 +99,7 @@ yum -y -q --verbose install \
     tar \
     tree \
     which \
+    xfsprogs-devel \
     yum-utils \
     zlib-devel
 
diff --git a/bootstrap/generated-dists/centos7/packages.yml b/bootstrap/generated-dists/centos7/packages.yml
index c3bbe7ba4a6..93aa4db8a11 100644
--- a/bootstrap/generated-dists/centos7/packages.yml
+++ b/bootstrap/generated-dists/centos7/packages.yml
@@ -87,5 +87,6 @@ packages:
   - tar
   - tree
   - which
+  - xfsprogs-devel
   - yum-utils
   - zlib-devel
\ No newline at end of file
diff --git a/bootstrap/generated-dists/debian7/bootstrap.sh b/bootstrap/generated-dists/debian7/bootstrap.sh
index a860caf330e..a5cb63ace15 100755
--- a/bootstrap/generated-dists/debian7/bootstrap.sh
+++ b/bootstrap/generated-dists/debian7/bootstrap.sh
@@ -28,6 +28,7 @@ apt-get -y install \
     gcc \
     gdb \
     git \
+    glusterfs-common \
     gzip \
     hostname \
     htop \
@@ -41,6 +42,7 @@ apt-get -y install \
     libblkid-dev \
     libbsd-dev \
     libcap-dev \
+    libcephfs-dev \
     libcups2-dev \
     libdbus-1-dev \
     libglib2.0-dev \
@@ -95,6 +97,7 @@ apt-get -y install \
     tar \
     tree \
     uuid-dev \
+    xfslibs-dev \
     xsltproc \
     zlib1g-dev
 
diff --git a/bootstrap/generated-dists/debian7/packages.yml b/bootstrap/generated-dists/debian7/packages.yml
index 80ddb1d2dbd..03862993de3 100644
--- a/bootstrap/generated-dists/debian7/packages.yml
+++ b/bootstrap/generated-dists/debian7/packages.yml
@@ -17,6 +17,7 @@ packages:
   - gcc
   - gdb
   - git
+  - glusterfs-common
   - gzip
   - hostname
   - htop
@@ -30,6 +31,7 @@ packages:
   - libblkid-dev
   - libbsd-dev
   - libcap-dev
+  - libcephfs-dev
   - libcups2-dev
   - libdbus-1-dev
   - libglib2.0-dev
@@ -84,5 +86,6 @@ packages:
   - tar
   - tree
   - uuid-dev
+  - xfslibs-dev
   - xsltproc
   - zlib1g-dev
\ No newline at end of file
diff --git a/bootstrap/generated-dists/debian8/bootstrap.sh b/bootstrap/generated-dists/debian8/bootstrap.sh
index 5194507f447..73db186c1d9 100755
--- a/bootstrap/generated-dists/debian8/bootstrap.sh
+++ b/bootstrap/generated-dists/debian8/bootstrap.sh
@@ -28,6 +28,7 @@ apt-get -y install \
     gcc \
     gdb \
     git \
+    glusterfs-common \
     gzip \
     hostname \
     htop \
@@ -41,6 +42,7 @@ apt-get -y install \
     libblkid-dev \
     libbsd-dev \
     libcap-dev \
+    libcephfs-dev \
     libcups2-dev \
     libdbus-1-dev \
     libglib2.0-dev \
@@ -99,6 +101,7 @@ apt-get -y install \
     tar \
     tree \
     uuid-dev \
+    xfslibs-dev \
     xsltproc \
     zlib1g-dev
 
diff --git a/bootstrap/generated-dists/debian8/packages.yml b/bootstrap/generated-dists/debian8/packages.yml
index 5655fb57d7c..7aaeb2a2f09 100644
--- a/bootstrap/generated-dists/debian8/packages.yml
+++ b/bootstrap/generated-dists/debian8/packages.yml
@@ -17,6 +17,7 @@ packages:
   - gcc
   - gdb
   - git
+  - glusterfs-common
   - gzip
   - hostname
   - htop
@@ -30,6 +31,7 @@ packages:
   - libblkid-dev
   - libbsd-dev
   - libcap-dev
+  - libcephfs-dev
   - libcups2-dev
   - libdbus-1-dev
   - libglib2.0-dev
@@ -88,5 +90,6 @@ packages:
   - tar
   - tree
   - uuid-dev
+  - xfslibs-dev
   - xsltproc
   - zlib1g-dev
\ No newline at end of file
diff --git a/bootstrap/generated-dists/debian9/bootstrap.sh b/bootstrap/generated-dists/debian9/bootstrap.sh
index a765307ab7c..7fa82c9f042 100755
--- a/bootstrap/generated-dists/debian9/bootstrap.sh
+++ b/bootstrap/generated-dists/debian9/bootstrap.sh
@@ -28,6 +28,7 @@ apt-get -y install \
     gcc \
     gdb \
     git \
+    glusterfs-common \
     gzip \
     hostname \
     htop \
@@ -41,6 +42,7 @@ apt-get -y install \
     libblkid-dev \
     libbsd-dev \
     libcap-dev \
+    libcephfs-dev \
     libcups2-dev \
     libdbus-1-dev \
     libglib2.0-dev \
@@ -99,6 +101,7 @@ apt-get -y install \
     tar \
     tree \
     uuid-dev \
+    xfslibs-dev \
     xsltproc \
     zlib1g-dev
 
diff --git a/bootstrap/generated-dists/debian9/packages.yml b/bootstrap/generated-dists/debian9/packages.yml
index b4e2013eb47..85736819f58 100644
--- a/bootstrap/generated-dists/debian9/packages.yml
+++ b/bootstrap/generated-dists/debian9/packages.yml
@@ -17,6 +17,7 @@ packages:
   - gcc
   - gdb
   - git
+  - glusterfs-common
   - gzip
   - hostname
   - htop
@@ -30,6 +31,7 @@ packages:
   - libblkid-dev
   - libbsd-dev
   - libcap-dev
+  - libcephfs-dev
   - libcups2-dev
   - libdbus-1-dev
   - libglib2.0-dev
@@ -88,5 +90,6 @@ packages:
   - tar
   - tree
   - uuid-dev
+  - xfslibs-dev
   - xsltproc
   - zlib1g-dev
\ No newline at end of file
diff --git a/bootstrap/generated-dists/fedora28/bootstrap.sh b/bootstrap/generated-dists/fedora28/bootstrap.sh
index 6793a37b8c9..aa9d64c492a 100755
--- a/bootstrap/generated-dists/fedora28/bootstrap.sh
+++ b/bootstrap/generated-dists/fedora28/bootstrap.sh
@@ -7,9 +7,9 @@
 
 set -xueo pipefail
 
-dnf -y -q update
+dnf update -y
 
-dnf -y -q --verbose install \
+dnf install -y \
     @development-tools \
     acl \
     attr \
@@ -31,6 +31,8 @@ dnf -y -q --verbose install \
     glib2-devel \
     glibc-common \
     glibc-langpack-en \
+    glusterfs-api-devel \
+    glusterfs-devel \
     gnutls-devel \
     gpgme-devel \
     gzip \
@@ -47,6 +49,7 @@ dnf -y -q --verbose install \
     libblkid-devel \
     libbsd-devel \
     libcap-devel \
+    libcephfs-devel \
     libicu-devel \
     libnsl2-devel \
     libpcap-devel \
@@ -92,6 +95,7 @@ dnf -y -q --verbose install \
     redhat-lsb \
     rng-tools \
     rpcgen \
+    rpcsvc-proto-devel \
     rsync \
     sed \
     sudo \
@@ -99,6 +103,7 @@ dnf -y -q --verbose install \
     tar \
     tree \
     which \
+    xfsprogs-devel \
     yum-utils \
     zlib-devel
 
diff --git a/bootstrap/generated-dists/fedora28/packages.yml b/bootstrap/generated-dists/fedora28/packages.yml
index a37f78b33d2..8c81c565351 100644
--- a/bootstrap/generated-dists/fedora28/packages.yml
+++ b/bootstrap/generated-dists/fedora28/packages.yml
@@ -21,6 +21,8 @@ packages:
   - glib2-devel
   - glibc-common
   - glibc-langpack-en
+  - glusterfs-api-devel
+  - glusterfs-devel
   - gnutls-devel
   - gpgme-devel
   - gzip
@@ -37,6 +39,7 @@ packages:
   - libblkid-devel
   - libbsd-devel
   - libcap-devel
+  - libcephfs-devel
   - libicu-devel
   - libnsl2-devel
   - libpcap-devel
@@ -82,6 +85,7 @@ packages:
   - redhat-lsb
   - rng-tools
   - rpcgen
+  - rpcsvc-proto-devel
   - rsync
   - sed
   - sudo
@@ -89,5 +93,6 @@ packages:
   - tar
   - tree
   - which
+  - xfsprogs-devel
   - yum-utils
   - zlib-devel
\ No newline at end of file
diff --git a/bootstrap/generated-dists/fedora29/bootstrap.sh b/bootstrap/generated-dists/fedora29/bootstrap.sh
index 6793a37b8c9..aa9d64c492a 100755
--- a/bootstrap/generated-dists/fedora29/bootstrap.sh
+++ b/bootstrap/generated-dists/fedora29/bootstrap.sh
@@ -7,9 +7,9 @@
 
 set -xueo pipefail
 
-dnf -y -q update
+dnf update -y
 
-dnf -y -q --verbose install \
+dnf install -y \
     @development-tools \
     acl \
     attr \
@@ -31,6 +31,8 @@ dnf -y -q --verbose install \
     glib2-devel \
     glibc-common \
     glibc-langpack-en \
+    glusterfs-api-devel \
+    glusterfs-devel \
     gnutls-devel \
     gpgme-devel \
     gzip \
@@ -47,6 +49,7 @@ dnf -y -q --verbose install \
     libblkid-devel \
     libbsd-devel \
     libcap-devel \
+    libcephfs-devel \
     libicu-devel \
     libnsl2-devel \
     libpcap-devel \
@@ -92,6 +95,7 @@ dnf -y -q --verbose install \
     redhat-lsb \
     rng-tools \
     rpcgen \
+    rpcsvc-proto-devel \
     rsync \
     sed \
     sudo \
@@ -99,6 +103,7 @@ dnf -y -q --verbose install \
     tar \
     tree \
     which \
+    xfsprogs-devel \
     yum-utils \
     zlib-devel
 
diff --git a/bootstrap/generated-dists/fedora29/packages.yml b/bootstrap/generated-dists/fedora29/packages.yml
index a37f78b33d2..8c81c565351 100644
--- a/bootstrap/generated-dists/fedora29/packages.yml
+++ b/bootstrap/generated-dists/fedora29/packages.yml
@@ -21,6 +21,8 @@ packages:
   - glib2-devel
   - glibc-common
   - glibc-langpack-en
+  - glusterfs-api-devel
+  - glusterfs-devel
   - gnutls-devel
   - gpgme-devel
   - gzip
@@ -37,6 +39,7 @@ packages:
   - libblkid-devel
   - libbsd-devel
   - libcap-devel
+  - libcephfs-devel
   - libicu-devel


-- 
Samba Shared Repository



More information about the samba-cvs mailing list