The branch, master has been updated
via 80115f9be1b gitlab-ci: Add Fedora 35 and drop Fedora 33
via e556b4067e0 waf: Fix resolv_wrapper with glibc 2.34
from e9495d2ed28 s3-winexe: Fix winexe core dump (use-after-free)
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 80115f9be1b21dfc92e3e23fd624decb1a5496f5
Author: Andreas Schneider <a...@samba.org>
Date: Thu Nov 4 09:31:08 2021 +0100
gitlab-ci: Add Fedora 35 and drop Fedora 33
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Andreas Schneider <a...@cryptomilk.org>
Reviewed-by: Alexander Bokovoy <a...@samba.org>
Autobuild-User(master): Andreas Schneider <a...@cryptomilk.org>
Autobuild-Date(master): Fri Nov 5 12:36:55 UTC 2021 on sn-devel-184
commit e556b4067e0c4036e20fc26523e3b4d6d5c6be42
Author: Andreas Schneider <a...@samba.org>
Date: Thu Oct 7 15:55:37 2021 +0200
waf: Fix resolv_wrapper with glibc 2.34
With glibc 2.34 we are not able to talk to the DNS server via socket_wrapper
anymore. The res_* symbols have been moved from libresolv to libc. We are
not
able to intercept any traffic inside of libc.
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Andreas Schneider <a...@cryptomilk.org>
Reviewed-by: Alexander Bokovoy <a...@samba.org>
-----------------------------------------------------------------------
Summary of changes:
.gitlab-ci-main.yml | 22 ++--
bootstrap/.gitlab-ci.yml | 4 +-
bootstrap/config.py | 30 +++---
bootstrap/generated-dists/Vagrantfile | 14 +--
bootstrap/generated-dists/centos7/bootstrap.sh | 4 +-
bootstrap/generated-dists/centos7/packages.yml | 4 +-
bootstrap/generated-dists/fedora33/Dockerfile | 27 -----
bootstrap/generated-dists/fedora33/bootstrap.sh | 118 ---------------------
bootstrap/generated-dists/fedora33/packages.yml | 105 ------------------
.../{centos7 => fedora35}/Dockerfile | 2 +-
.../{fedora34 => fedora35}/bootstrap.sh | 0
.../{fedora33 => fedora35}/locale.sh | 0
.../{fedora34 => fedora35}/packages.yml | 0
bootstrap/generated-dists/opensuse151/bootstrap.sh | 2 +-
bootstrap/generated-dists/opensuse151/packages.yml | 2 +-
bootstrap/generated-dists/opensuse152/bootstrap.sh | 2 +-
bootstrap/generated-dists/opensuse152/packages.yml | 2 +-
bootstrap/sha1sum.txt | 2 +-
selftest/wscript | 2 +-
third_party/resolv_wrapper/wscript | 13 +++
20 files changed, 57 insertions(+), 298 deletions(-)
delete mode 100644 bootstrap/generated-dists/fedora33/Dockerfile
delete mode 100755 bootstrap/generated-dists/fedora33/bootstrap.sh
delete mode 100644 bootstrap/generated-dists/fedora33/packages.yml
copy bootstrap/generated-dists/{centos7 => fedora35}/Dockerfile (92%)
copy bootstrap/generated-dists/{fedora34 => fedora35}/bootstrap.sh (100%)
rename bootstrap/generated-dists/{fedora33 => fedora35}/locale.sh (100%)
copy bootstrap/generated-dists/{fedora34 => fedora35}/packages.yml (100%)
Changeset truncated at 500 lines:
diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml
index cc48ec12a64..2fea7ef2eff 100644
--- a/.gitlab-ci-main.yml
+++ b/.gitlab-ci-main.yml
@@ -42,7 +42,7 @@ variables:
# Set this to the contents of bootstrap/sha1sum.txt
# which is generated by bootstrap/template.py --render
#
- SAMBA_CI_CONTAINER_TAG: dd885c72c8615e2d6166a04f3709d9ceaa728f84
+ SAMBA_CI_CONTAINER_TAG: 791e89a43f2b287635e128c8f5aed924b757c4bd
#
# We use the ubuntu1804 image as default as
# it matches what we have on sn-devel-184.
@@ -61,8 +61,8 @@ variables:
SAMBA_CI_CONTAINER_IMAGE_debian11: debian11
SAMBA_CI_CONTAINER_IMAGE_opensuse151: opensuse151
SAMBA_CI_CONTAINER_IMAGE_opensuse152: opensuse152
- SAMBA_CI_CONTAINER_IMAGE_fedora33: fedora33
SAMBA_CI_CONTAINER_IMAGE_fedora34: fedora34
+ SAMBA_CI_CONTAINER_IMAGE_fedora35: fedora35
SAMBA_CI_CONTAINER_IMAGE_centos7: centos7
SAMBA_CI_CONTAINER_IMAGE_centos8: centos8
@@ -253,13 +253,13 @@ samba-def-build:
samba-mit-build:
extends: .shared_template_build_only
variables:
- SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora34}
+ SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora35}
stage: build_first
.needs_samba-mit-build:
extends: .shared_template_test_only
variables:
- SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora34}
+ SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora35}
needs:
- job: samba-mit-build
artifacts: true
@@ -297,7 +297,7 @@ samba:
samba-mitkrb5:
extends: .shared_template
variables:
- SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora34}
+ SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora35}
samba-minimal-smbd:
extends: .shared_template
@@ -366,7 +366,7 @@ samba-addc-mit-4b:
samba-fips:
extends: .shared_template
variables:
- SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora34}
+ SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora35}
.private_test_only:
extends: .private_runner_test
@@ -488,7 +488,7 @@ pages:
coverity:
extends: .shared_runner_build_image
variables:
- SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora34}
+ SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora35}
stage: build
script:
- wget https://scan.coverity.com/download/linux64 --post-data
"token=$COVERITY_SCAN_TOKEN&project=$COVERITY_SCAN_PROJECT_NAME" -O
/tmp/coverity_tool.tgz
@@ -599,15 +599,15 @@ centos8-samba-o3:
variables:
SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_centos8}
-fedora33-samba-o3:
+fedora34-samba-o3:
extends: .samba-o3-template
variables:
- SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora33}
+ SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora34}
-fedora34-samba-o3:
+fedora35-samba-o3:
extends: .samba-o3-template
variables:
- SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora34}
+ SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora35}
#
# Keep the samba-o3 sections at the end ...
diff --git a/bootstrap/.gitlab-ci.yml b/bootstrap/.gitlab-ci.yml
index 01da6106b53..f3ec2e98dff 100644
--- a/bootstrap/.gitlab-ci.yml
+++ b/bootstrap/.gitlab-ci.yml
@@ -100,10 +100,10 @@ debian10:
debian11:
extends: .build_image_template
-fedora33:
+fedora34:
extends: .build_image_template
-fedora34:
+fedora35:
extends: .build_image_template
centos8:
diff --git a/bootstrap/config.py b/bootstrap/config.py
index 2cf754782a1..d9943dd515a 100644
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -145,8 +145,8 @@ PKGS = [
('python3-pyasn1', 'python3-pyasn1'), # for krb5 tests
('python3-setproctitle', 'python3-setproctitle'),
- ('', 'libsemanage-python'),
- ('', 'policycoreutils-python'),
+ ('', 'python3-libsemanage'),
+ ('', 'python3-policycoreutils'),
# perl
('libparse-yapp-perl', 'perl-Parse-Yapp'),
@@ -467,37 +467,33 @@ RPM_DISTS = {
'replace': {
'lsb-release': 'redhat-lsb',
'@development-tools': '"@Development Tools"', # add quotes
- 'libsemanage-python': 'python3-libsemanage',
'lcov': '', # does not exist
'perl-JSON-Parse': '', # does not exist?
'perl-Test-Base': 'perl-Test-Simple',
'perl-FindBin': '',
- 'policycoreutils-python': 'python3-policycoreutils',
'liburing-devel': '', # not available yet, Add me back, once
available!
}
},
- 'fedora33': {
- 'docker_image': 'fedora:33',
- 'vagrant_box': 'fedora/33-cloud-base',
+ 'fedora34': {
+ 'docker_image': 'fedora:34',
+ 'vagrant_box': 'fedora/34-cloud-base',
'bootstrap': DNF_BOOTSTRAP,
'replace': {
'lsb-release': 'redhat-lsb',
- 'libsemanage-python': 'python3-libsemanage',
- 'policycoreutils-python': 'python3-policycoreutils',
+ 'perl-FindBin': '',
'python3-iso8601': 'python3-dateutil',
+ 'libtracker-sparql-2.0-dev': '', # only tracker 3.x is available
}
},
- 'fedora34': {
- 'docker_image': 'fedora:34',
- 'vagrant_box': 'fedora/34-cloud-base',
+ 'fedora35': {
+ 'docker_image': 'fedora:35',
+ 'vagrant_box': 'fedora/35-cloud-base',
'bootstrap': DNF_BOOTSTRAP,
'replace': {
'lsb-release': 'redhat-lsb',
- 'libsemanage-python': 'python3-libsemanage',
- 'policycoreutils-python': 'python3-policycoreutils',
'perl-FindBin': '',
'python3-iso8601': 'python3-dateutil',
- 'libtracker-sparql-2.0-dev': '', # only tracker 3.x is available
+ 'libtracker-sparql-2.0-dev': '', # only tracker 3.x is available
}
},
'opensuse151': {
@@ -514,7 +510,7 @@ RPM_DISTS = {
'jansson-devel': 'libjansson-devel',
'keyutils-libs-devel': 'keyutils-devel',
'krb5-workstation': 'krb5-client',
- 'libsemanage-python': 'python2-semanage',
+ 'python3-libsemanage': 'python2-semanage',
'openldap-devel': 'openldap2-devel',
'perl-Archive-Tar': 'perl-Archive-Tar-Wrapper',
'perl-JSON-Parse': 'perl-JSON-XS',
@@ -545,7 +541,7 @@ RPM_DISTS = {
'jansson-devel': 'libjansson-devel',
'keyutils-libs-devel': 'keyutils-devel',
'krb5-workstation': 'krb5-client',
- 'libsemanage-python': 'python2-semanage',
+ 'python3-libsemanage': 'python2-semanage',
'openldap-devel': 'openldap2-devel',
'perl-Archive-Tar': 'perl-Archive-Tar-Wrapper',
'perl-JSON-Parse': 'perl-JSON-XS',
diff --git a/bootstrap/generated-dists/Vagrantfile
b/bootstrap/generated-dists/Vagrantfile
index 358d8e23d59..6d29c774cc9 100644
--- a/bootstrap/generated-dists/Vagrantfile
+++ b/bootstrap/generated-dists/Vagrantfile
@@ -38,13 +38,6 @@ Vagrant.configure("2") do |config|
v.vm.provision :shell, path: "debian11/locale.sh"
end
- config.vm.define "fedora33" do |v|
- v.vm.box = "fedora/33-cloud-base"
- v.vm.hostname = "fedora33"
- v.vm.provision :shell, path: "fedora33/bootstrap.sh"
- v.vm.provision :shell, path: "fedora33/locale.sh"
- end
-
config.vm.define "fedora34" do |v|
v.vm.box = "fedora/34-cloud-base"
v.vm.hostname = "fedora34"
@@ -52,6 +45,13 @@ Vagrant.configure("2") do |config|
v.vm.provision :shell, path: "fedora34/locale.sh"
end
+ config.vm.define "fedora35" do |v|
+ v.vm.box = "fedora/35-cloud-base"
+ v.vm.hostname = "fedora35"
+ v.vm.provision :shell, path: "fedora35/bootstrap.sh"
+ v.vm.provision :shell, path: "fedora35/locale.sh"
+ end
+
config.vm.define "opensuse151" do |v|
v.vm.box = "opensuse/openSUSE-15.1-x86_64"
v.vm.hostname = "opensuse151"
diff --git a/bootstrap/generated-dists/centos7/bootstrap.sh
b/bootstrap/generated-dists/centos7/bootstrap.sh
index 36913f40b44..c31137e75c2 100755
--- a/bootstrap/generated-dists/centos7/bootstrap.sh
+++ b/bootstrap/generated-dists/centos7/bootstrap.sh
@@ -55,7 +55,6 @@ yum install -y \
libcap-devel \
libicu-devel \
libpcap-devel \
- libsemanage-python \
libtasn1-devel \
libtasn1-tools \
libtirpc-devel \
@@ -80,10 +79,11 @@ yum install -y \
perl-generators \
perl-interpreter \
pkgconfig \
- policycoreutils-python \
popt-devel \
procps-ng \
psmisc \
+ python3-libsemanage \
+ python3-policycoreutils \
python36 \
python36-cryptography \
python36-devel \
diff --git a/bootstrap/generated-dists/centos7/packages.yml
b/bootstrap/generated-dists/centos7/packages.yml
index 4da3d61441f..eebeb2feaa3 100644
--- a/bootstrap/generated-dists/centos7/packages.yml
+++ b/bootstrap/generated-dists/centos7/packages.yml
@@ -41,7 +41,6 @@ packages:
- libcap-devel
- libicu-devel
- libpcap-devel
- - libsemanage-python
- libtasn1-devel
- libtasn1-tools
- libtirpc-devel
@@ -66,10 +65,11 @@ packages:
- perl-generators
- perl-interpreter
- pkgconfig
- - policycoreutils-python
- popt-devel
- procps-ng
- psmisc
+ - python3-libsemanage
+ - python3-policycoreutils
- python36
- python36-cryptography
- python36-devel
diff --git a/bootstrap/generated-dists/fedora33/Dockerfile
b/bootstrap/generated-dists/fedora33/Dockerfile
deleted file mode 100644
index c4632344a09..00000000000
--- a/bootstrap/generated-dists/fedora33/Dockerfile
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# This file is generated by 'bootstrap/template.py --render'
-# See also bootstrap/config.py
-#
-
-FROM fedora:33
-
-# 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/fedora33/bootstrap.sh
b/bootstrap/generated-dists/fedora33/bootstrap.sh
deleted file mode 100755
index 52e199f6b88..00000000000
--- a/bootstrap/generated-dists/fedora33/bootstrap.sh
+++ /dev/null
@@ -1,118 +0,0 @@
-#!/bin/bash
-
-#
-# This file is generated by 'bootstrap/template.py --render'
-# See also bootstrap/config.py
-#
-
-set -xueo pipefail
-
-dnf update -y
-
-dnf install -y \
- --setopt=install_weak_deps=False \
- @development-tools \
- acl \
- attr \
- autoconf \
- avahi-devel \
- bind-utils \
- binutils \
- bison \
- ccache \
- chrpath \
- cups-devel \
- curl \
- dbus-devel \
- docbook-dtds \
- docbook-style-xsl \
- flex \
- gawk \
- gcc \
- gdb \
- git \
- glib2-devel \
- glibc-common \
- glibc-langpack-en \
- glusterfs-api-devel \
- glusterfs-devel \
- gnutls-devel \
- gpgme-devel \
- gzip \
- hostname \
- htop \
- jansson-devel \
- keyutils-libs-devel \
- krb5-devel \
- krb5-server \
- krb5-workstation \
- lcov \
- libacl-devel \
- libarchive-devel \
- libattr-devel \
- libblkid-devel \
- libbsd-devel \
- libcap-devel \
- libcephfs-devel \
- libicu-devel \
- libpcap-devel \
- libtasn1-devel \
- libtasn1-tools \
- libtirpc-devel \
- libunwind-devel \
- liburing-devel \
- libuuid-devel \
- libxslt \
- lmdb \
- lmdb-devel \
- make \
- mingw64-gcc \
- ncurses-devel \
- openldap-devel \
- pam-devel \
- patch \
- perl \
- perl-Archive-Tar \
- perl-ExtUtils-MakeMaker \
- perl-FindBin \
- perl-JSON \
- perl-JSON-Parse \
- perl-Parse-Yapp \
- perl-Test-Base \
- perl-generators \
- perl-interpreter \
- pkgconfig \
- popt-devel \
- procps-ng \
- psmisc \
- python3 \
- python3-cryptography \
- python3-dateutil \
- python3-devel \
- python3-dns \
- python3-gpg \
- python3-libsemanage \
- python3-markdown \
- python3-policycoreutils \
- python3-pyasn1 \
- python3-setproctitle \
- quota-devel \
- readline-devel \
- redhat-lsb \
- rng-tools \
- rpcgen \
- rpcsvc-proto-devel \
- rsync \
- sed \
- sudo \
- systemd-devel \
- tar \
- tracker-devel \
- tree \
- wget \
- which \
- xfsprogs-devel \
- yum-utils \
- zlib-devel
-
-dnf clean all
\ No newline at end of file
diff --git a/bootstrap/generated-dists/fedora33/packages.yml
b/bootstrap/generated-dists/fedora33/packages.yml
deleted file mode 100644
index d9cbfbd80db..00000000000
--- a/bootstrap/generated-dists/fedora33/packages.yml
+++ /dev/null
@@ -1,105 +0,0 @@
----
-packages:
- - @development-tools
- - acl
- - attr
- - autoconf
- - avahi-devel
- - bind-utils
- - binutils
- - bison
- - ccache
- - chrpath
- - cups-devel
- - curl
- - dbus-devel
- - docbook-dtds
- - docbook-style-xsl
- - flex
- - gawk
- - gcc
- - gdb
- - git
- - glib2-devel
- - glibc-common
- - glibc-langpack-en
- - glusterfs-api-devel
- - glusterfs-devel
- - gnutls-devel
- - gpgme-devel
- - gzip
- - hostname
- - htop
- - jansson-devel
- - keyutils-libs-devel
- - krb5-devel
- - krb5-server
- - krb5-workstation
- - lcov
- - libacl-devel
- - libarchive-devel
- - libattr-devel
- - libblkid-devel
- - libbsd-devel
- - libcap-devel
- - libcephfs-devel
- - libicu-devel
- - libpcap-devel
- - libtasn1-devel
- - libtasn1-tools
- - libtirpc-devel
- - libunwind-devel
- - liburing-devel
- - libuuid-devel
- - libxslt
- - lmdb
- - lmdb-devel
- - make
- - mingw64-gcc
- - ncurses-devel
- - openldap-devel
- - pam-devel
- - patch
- - perl
- - perl-Archive-Tar
- - perl-ExtUtils-MakeMaker
- - perl-FindBin
- - perl-JSON
- - perl-JSON-Parse
- - perl-Parse-Yapp
- - perl-Test-Base
--
Samba Shared Repository
