[SCM] Samba Shared Repository - branch master updated
Stefan Metzmacher
metze at samba.org
Fri Mar 27 19:55:03 UTC 2020
The branch, master has been updated
via c4ccdf4b30d s4:selftest: run samba.tests.krb5.simple_tests against ad_dc_default
via 4f6d26609a6 python/tests/krb5: add simple_tests.py with the first simple test
via fb7cba50ae3 python/tests/krb5: add raw_testcase.py as the base for our Kerberos protocol testing
via 94d068427f6 python/tests/krb5: modify rfc4120.asn1 in order to generate pyasn1 code
via a2f75c314e9 python/tests/krb5: add rfc4120.asn1
via 47385248c8e python/tests/krb5: add support for Cksumtype.MD5
via 7010a1311d1 s4:selftest: run samba.tests.krb5.kcrypto test
via 8bdd3799768 python/tests/krb5: convert kcrypto.py to python3-cryptography and a few Samba helpers
via 679bb52c957 python/tests/krb5: add crypto.py from greghudson/pyk5 as kcrypto.py
via 0f805db40a4 python/tests: let usage.py be more verbose on errors
via 99b64424874 bootstrap: add python3-pyasn1/python3-cryptography for kerberos testing
via 53402b35300 bootstrap: add ubuntu2004 Ubuntu Focal Fossa (development branch)
from a85fadaefc6 selftest: we no longer need '--use-dns-faking' on Linux and FreeBSD
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit c4ccdf4b30de1b1e63d3fd99d33b924b816a5d37
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Feb 13 16:29:38 2020 +0100
s4:selftest: run samba.tests.krb5.simple_tests against ad_dc_default
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Isaac Boukris <iboukris at samba.org>
Autobuild-User(master): Stefan Metzmacher <metze at samba.org>
Autobuild-Date(master): Fri Mar 27 19:54:25 UTC 2020 on sn-devel-184
commit 4f6d26609a66a42df671a540677af15e67efc0df
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Feb 13 16:29:38 2020 +0100
python/tests/krb5: add simple_tests.py with the first simple test
This just demonstrates that the infrastructure works:-)
I'm running this as:
SERVER=172.31.9.188 DOMAIN=W2012R2-L6 REALM=W2012R2-L6.BASE \
USERNAME=administrator PASSWORD=A1b2C3d4 SERVICE_USERNAME="w2012r2-188" \
python/samba/tests/krb5/simple_tests.py
Pair-Programmed-With: Isaac Boukris <iboukris at samba.org>
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Signed-off-by: Isaac Boukris <iboukris at samba.org>
Reviewed-by: Isaac Boukris <iboukris at samba.org>
commit fb7cba50ae3472b29aa806208badc1ded8979073
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Feb 13 16:29:38 2020 +0100
python/tests/krb5: add raw_testcase.py as the base for our Kerberos protocol testing
Pair-Programmed-With: Isaac Boukris <iboukris at samba.org>
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Signed-off-by: Isaac Boukris <iboukris at samba.org>
Reviewed-by: Isaac Boukris <iboukris at samba.org>
commit 94d068427f6cf23ab68c135ed9833db4b9155b65
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Feb 13 16:29:38 2020 +0100
python/tests/krb5: modify rfc4120.asn1 in order to generate pyasn1 code
The pyasn1 bindings are generated by pyasn1gen.py from
https://github.com/kimgr/asn1ate.git
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Isaac Boukris <iboukris at samba.org>
commit a2f75c314e9946f74e9dacceac690295999925b5
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Feb 13 16:29:38 2020 +0100
python/tests/krb5: add rfc4120.asn1
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Isaac Boukris <iboukris at samba.org>
commit 47385248c8e462162e01afc3d3d68b97dff3542c
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Mar 23 08:53:54 2020 +0100
python/tests/krb5: add support for Cksumtype.MD5
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Isaac Boukris <iboukris at samba.org>
commit 7010a1311d193c78e9f26adeafe98458217edbca
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed Mar 25 22:07:39 2020 +0100
s4:selftest: run samba.tests.krb5.kcrypto test
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Isaac Boukris <iboukris at samba.org>
commit 8bdd37997686d4ca60584bdfda78440be8432405
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Mar 20 12:47:39 2020 +0100
python/tests/krb5: convert kcrypto.py to python3-cryptography and a few Samba helpers
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Isaac Boukris <iboukris at samba.org>
commit 679bb52c957dafcec96ff37f87d8c3496996b909
Author: Isaac Boukris <iboukris at gmail.com>
Date: Sat Feb 15 18:33:33 2020 +0100
python/tests/krb5: add crypto.py from greghudson/pyk5 as kcrypto.py
This is crypto.py of commit f0612aa908062fb239d1c3873595e7204ae1691d
from https://github.com/greghudson/pyk5.git
This will be used in order to do raw protocol testing against
[MS-KILE] KDCs.
Pair-Programmed-With: Stefan Metzmacher <metze at samba.org>
Signed-off-by: Isaac Boukris <iboukris at samba.org>
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
commit 0f805db40a4948f9902733aa03ed6ae2789dabb3
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Mar 24 14:02:58 2020 +0100
python/tests: let usage.py be more verbose on errors
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Isaac Boukris <iboukris at samba.org>
commit 99b644248746a8a038d6f4b15aa621a907adc987
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Mar 24 15:36:48 2020 +0100
bootstrap: add python3-pyasn1/python3-cryptography for kerberos testing
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Isaac Boukris <iboukris at samba.org>
commit 53402b353007893f3851afbf574c2a67f9f6a44b
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed Mar 25 22:17:46 2020 +0100
bootstrap: add ubuntu2004 Ubuntu Focal Fossa (development branch)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Isaac Boukris <iboukris at samba.org>
-----------------------------------------------------------------------
Summary of changes:
.gitlab-ci.yml | 9 +-
bootstrap/.gitlab-ci.yml | 3 +
bootstrap/config.py | 15 +-
bootstrap/generated-dists/Vagrantfile | 7 +
bootstrap/generated-dists/centos7/bootstrap.sh | 2 +
bootstrap/generated-dists/centos7/packages.yml | 2 +
bootstrap/generated-dists/centos8/bootstrap.sh | 2 +
bootstrap/generated-dists/centos8/packages.yml | 2 +
bootstrap/generated-dists/debian10/bootstrap.sh | 2 +
bootstrap/generated-dists/debian10/packages.yml | 2 +
bootstrap/generated-dists/fedora31/bootstrap.sh | 2 +
bootstrap/generated-dists/fedora31/packages.yml | 2 +
bootstrap/generated-dists/fedora32/bootstrap.sh | 2 +
bootstrap/generated-dists/fedora32/packages.yml | 2 +
bootstrap/generated-dists/opensuse150/bootstrap.sh | 2 +
bootstrap/generated-dists/opensuse150/packages.yml | 2 +
bootstrap/generated-dists/opensuse151/bootstrap.sh | 2 +
bootstrap/generated-dists/opensuse151/packages.yml | 2 +
bootstrap/generated-dists/ubuntu1604/bootstrap.sh | 2 +
bootstrap/generated-dists/ubuntu1604/packages.yml | 2 +
bootstrap/generated-dists/ubuntu1804/bootstrap.sh | 2 +
bootstrap/generated-dists/ubuntu1804/packages.yml | 2 +
.../{debian10 => ubuntu2004}/Dockerfile | 2 +-
.../{ubuntu1804 => ubuntu2004}/bootstrap.sh | 2 +
.../{centos7 => ubuntu2004}/locale.sh | 0
.../{ubuntu1804 => ubuntu2004}/packages.yml | 2 +
bootstrap/sha1sum.txt | 2 +-
python/samba/tests/krb5/kcrypto.py | 840 +++++++++++++++++++
python/samba/tests/krb5/raw_testcase.py | 869 ++++++++++++++++++++
python/samba/tests/krb5/rfc4120.asn1 | 663 +++++++++++++++
python/samba/tests/krb5/rfc4120_pyasn1.py | 914 +++++++++++++++++++++
python/samba/tests/krb5/rfc4120_pyasn1_regen.sh | 41 +
python/samba/tests/krb5/simple_tests.py | 171 ++++
python/samba/tests/source.py | 12 +
python/samba/tests/usage.py | 10 +-
source4/selftest/tests.py | 4 +
36 files changed, 3591 insertions(+), 11 deletions(-)
copy bootstrap/generated-dists/{debian10 => ubuntu2004}/Dockerfile (91%)
copy bootstrap/generated-dists/{ubuntu1804 => ubuntu2004}/bootstrap.sh (96%)
copy bootstrap/generated-dists/{centos7 => ubuntu2004}/locale.sh (100%)
copy bootstrap/generated-dists/{ubuntu1804 => ubuntu2004}/packages.yml (95%)
create mode 100755 python/samba/tests/krb5/kcrypto.py
create mode 100644 python/samba/tests/krb5/raw_testcase.py
create mode 100644 python/samba/tests/krb5/rfc4120.asn1
create mode 100644 python/samba/tests/krb5/rfc4120_pyasn1.py
create mode 100755 python/samba/tests/krb5/rfc4120_pyasn1_regen.sh
create mode 100755 python/samba/tests/krb5/simple_tests.py
Changeset truncated at 500 lines:
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 06890ee9c99..0fcbf80cef1 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: 9061307e79ad13733c69352a965eeb4f44bef4b7
+ SAMBA_CI_CONTAINER_TAG: 7414ad7ef9108d406b1f6b17ebce19e32aee9f70
#
# We use the ubuntu1804 image as default as
# it matches what we have on sn-devel-184.
@@ -33,8 +33,9 @@ variables:
# Please see the samba-o3 sections at the end of this file!
# We should run that for each available image
#
- SAMBA_CI_CONTAINER_IMAGE_ubuntu1804: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-ubuntu1804:${SAMBA_CI_CONTAINER_TAG}
SAMBA_CI_CONTAINER_IMAGE_ubuntu1604: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-ubuntu1604:${SAMBA_CI_CONTAINER_TAG}
+ SAMBA_CI_CONTAINER_IMAGE_ubuntu1804: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-ubuntu1804:${SAMBA_CI_CONTAINER_TAG}
+ SAMBA_CI_CONTAINER_IMAGE_ubuntu2004: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-ubuntu2004:${SAMBA_CI_CONTAINER_TAG}
SAMBA_CI_CONTAINER_IMAGE_debian9: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-debian9:${SAMBA_CI_CONTAINER_TAG}
SAMBA_CI_CONTAINER_IMAGE_debian10: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-debian10:${SAMBA_CI_CONTAINER_TAG}
SAMBA_CI_CONTAINER_IMAGE_opensuse150: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-opensuse150:${SAMBA_CI_CONTAINER_TAG}
@@ -262,6 +263,10 @@ ubuntu1804-samba-o3:
extends: .samba-o3-template
image: $SAMBA_CI_CONTAINER_IMAGE_ubuntu1804
+.ubuntu2004-samba-o3:
+ extends: .samba-o3-template
+ image: $SAMBA_CI_CONTAINER_IMAGE_ubuntu2004
+
debian10-samba-o3:
extends: .samba-o3-template
image: $SAMBA_CI_CONTAINER_IMAGE_debian10
diff --git a/bootstrap/.gitlab-ci.yml b/bootstrap/.gitlab-ci.yml
index 8427dbdc314..d6cf02109fd 100644
--- a/bootstrap/.gitlab-ci.yml
+++ b/bootstrap/.gitlab-ci.yml
@@ -93,6 +93,9 @@ ubuntu1604:
ubuntu1804:
extends: .build_image_template
+ubuntu2004:
+ extends: .build_image_template
+
debian10:
extends: .build_image_template
diff --git a/bootstrap/config.py b/bootstrap/config.py
index 093b84676f0..196f9bdf8eb 100644
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -129,6 +129,7 @@ PKGS = [
('mawk', 'gawk'),
('python3', 'python3'),
+ ('python3-cryptography', 'python3-cryptography'), # for krb5 tests
('python3-dev', 'python3-devel'),
('python3-dbg', ''),
('python3-iso8601', ''),
@@ -137,6 +138,7 @@ PKGS = [
('python3-matplotlib', ''),
('python3-dnspython', 'python3-dns'),
('python3-pexpect', ''), # for wintest only
+ ('python3-pyasn1', 'python3-pyasn1'), # for krb5 tests
('', 'libsemanage-python'),
('', 'policycoreutils-python'),
@@ -400,6 +402,13 @@ DEB_DISTS = {
'liburing-dev': '', # not available
}
},
+ 'ubuntu2004': {
+ 'docker_image': 'ubuntu:20.04',
+ 'vagrant_box': 'ubuntu/focal64',
+ 'replace': {
+ 'liburing-dev': '', # not available
+ }
+ },
}
@@ -411,9 +420,10 @@ RPM_DISTS = {
'replace': {
'lsb-release': 'redhat-lsb',
'python3': 'python36',
- 'python3-crypto': 'python36-crypto',
+ 'python3-cryptography': 'python36-cryptography',
'python3-devel': 'python36-devel',
'python3-dns': 'python36-dns',
+ 'python3-pyasn1': 'python36-pyasn1',
'python3-gpg': 'python36-gpg',
'python3-iso8601' : 'python36-iso8601',
'python3-markdown': 'python36-markdown',
@@ -448,7 +458,6 @@ RPM_DISTS = {
'perl-JSON-Parse': '', # does not exist?
'perl-Test-Base': 'perl-Test-Simple',
'policycoreutils-python': 'python3-policycoreutils',
- 'python3-crypto': '',
'quota-devel': '', # FIXME: Add me back, once available!
'liburing-devel': '', # not available yet, Add me back, once available!
}
@@ -496,7 +505,6 @@ RPM_DISTS = {
'perl-interpreter': '',
'procps-ng': 'procps',
'python-dns': 'python2-dnspython',
- 'python3-crypto': 'python3-pycrypto',
'python3-dns': 'python3-dnspython',
'python3-markdown': 'python3-Markdown',
'quota-devel': '',
@@ -529,7 +537,6 @@ RPM_DISTS = {
'perl-interpreter': '',
'procps-ng': 'procps',
'python-dns': 'python2-dnspython',
- 'python3-crypto': 'python3-pycrypto',
'python3-dns': 'python3-dnspython',
'python3-markdown': 'python3-Markdown',
'quota-devel': '',
diff --git a/bootstrap/generated-dists/Vagrantfile b/bootstrap/generated-dists/Vagrantfile
index 15fc686f584..e01c20bc161 100644
--- a/bootstrap/generated-dists/Vagrantfile
+++ b/bootstrap/generated-dists/Vagrantfile
@@ -73,5 +73,12 @@ Vagrant.configure("2") do |config|
v.vm.provision :shell, path: "ubuntu1804/locale.sh"
end
+ config.vm.define "ubuntu2004" do |v|
+ v.vm.box = "ubuntu/focal64"
+ v.vm.hostname = "ubuntu2004"
+ v.vm.provision :shell, path: "ubuntu2004/bootstrap.sh"
+ v.vm.provision :shell, path: "ubuntu2004/locale.sh"
+ end
+
end
diff --git a/bootstrap/generated-dists/centos7/bootstrap.sh b/bootstrap/generated-dists/centos7/bootstrap.sh
index 2f0bb1bcc28..37f5d684663 100755
--- a/bootstrap/generated-dists/centos7/bootstrap.sh
+++ b/bootstrap/generated-dists/centos7/bootstrap.sh
@@ -83,9 +83,11 @@ yum install -y \
procps-ng \
psmisc \
python36 \
+ python36-cryptography \
python36-devel \
python36-dns \
python36-markdown \
+ python36-pyasn1 \
quota-devel \
readline-devel \
redhat-lsb \
diff --git a/bootstrap/generated-dists/centos7/packages.yml b/bootstrap/generated-dists/centos7/packages.yml
index 475326b6db7..1b80882bd8c 100644
--- a/bootstrap/generated-dists/centos7/packages.yml
+++ b/bootstrap/generated-dists/centos7/packages.yml
@@ -69,9 +69,11 @@ packages:
- procps-ng
- psmisc
- python36
+ - python36-cryptography
- python36-devel
- python36-dns
- python36-markdown
+ - python36-pyasn1
- quota-devel
- readline-devel
- redhat-lsb
diff --git a/bootstrap/generated-dists/centos8/bootstrap.sh b/bootstrap/generated-dists/centos8/bootstrap.sh
index 22484b3f6ad..61debd5e2ee 100755
--- a/bootstrap/generated-dists/centos8/bootstrap.sh
+++ b/bootstrap/generated-dists/centos8/bootstrap.sh
@@ -84,12 +84,14 @@ yum install -y \
procps-ng \
psmisc \
python3 \
+ python3-cryptography \
python3-devel \
python3-dns \
python3-gpg \
python3-libsemanage \
python3-markdown \
python3-policycoreutils \
+ python3-pyasn1 \
readline-devel \
redhat-lsb \
rng-tools \
diff --git a/bootstrap/generated-dists/centos8/packages.yml b/bootstrap/generated-dists/centos8/packages.yml
index 07be0deeceb..2467b35dafb 100644
--- a/bootstrap/generated-dists/centos8/packages.yml
+++ b/bootstrap/generated-dists/centos8/packages.yml
@@ -69,12 +69,14 @@ packages:
- procps-ng
- psmisc
- python3
+ - python3-cryptography
- python3-devel
- python3-dns
- python3-gpg
- python3-libsemanage
- python3-markdown
- python3-policycoreutils
+ - python3-pyasn1
- readline-devel
- redhat-lsb
- rng-tools
diff --git a/bootstrap/generated-dists/debian10/bootstrap.sh b/bootstrap/generated-dists/debian10/bootstrap.sh
index f0847eb3c20..9391c1ca815 100755
--- a/bootstrap/generated-dists/debian10/bootstrap.sh
+++ b/bootstrap/generated-dists/debian10/bootstrap.sh
@@ -81,6 +81,7 @@ apt-get -y install \
procps \
psmisc \
python3 \
+ python3-cryptography \
python3-dbg \
python3-dev \
python3-dnspython \
@@ -89,6 +90,7 @@ apt-get -y install \
python3-markdown \
python3-matplotlib \
python3-pexpect \
+ python3-pyasn1 \
rng-tools \
rsync \
sed \
diff --git a/bootstrap/generated-dists/debian10/packages.yml b/bootstrap/generated-dists/debian10/packages.yml
index a242cd8b362..dee4d5cef20 100644
--- a/bootstrap/generated-dists/debian10/packages.yml
+++ b/bootstrap/generated-dists/debian10/packages.yml
@@ -70,6 +70,7 @@ packages:
- procps
- psmisc
- python3
+ - python3-cryptography
- python3-dbg
- python3-dev
- python3-dnspython
@@ -78,6 +79,7 @@ packages:
- python3-markdown
- python3-matplotlib
- python3-pexpect
+ - python3-pyasn1
- rng-tools
- rsync
- sed
diff --git a/bootstrap/generated-dists/fedora31/bootstrap.sh b/bootstrap/generated-dists/fedora31/bootstrap.sh
index 18c58092eff..09d36e88058 100755
--- a/bootstrap/generated-dists/fedora31/bootstrap.sh
+++ b/bootstrap/generated-dists/fedora31/bootstrap.sh
@@ -83,12 +83,14 @@ dnf install -y \
procps-ng \
psmisc \
python3 \
+ python3-cryptography \
python3-devel \
python3-dns \
python3-gpg \
python3-libsemanage \
python3-markdown \
python3-policycoreutils \
+ python3-pyasn1 \
quota-devel \
readline-devel \
redhat-lsb \
diff --git a/bootstrap/generated-dists/fedora31/packages.yml b/bootstrap/generated-dists/fedora31/packages.yml
index 3165af8dd82..a2fbd0eb83b 100644
--- a/bootstrap/generated-dists/fedora31/packages.yml
+++ b/bootstrap/generated-dists/fedora31/packages.yml
@@ -72,12 +72,14 @@ packages:
- procps-ng
- psmisc
- python3
+ - python3-cryptography
- python3-devel
- python3-dns
- python3-gpg
- python3-libsemanage
- python3-markdown
- python3-policycoreutils
+ - python3-pyasn1
- quota-devel
- readline-devel
- redhat-lsb
diff --git a/bootstrap/generated-dists/fedora32/bootstrap.sh b/bootstrap/generated-dists/fedora32/bootstrap.sh
index 18c58092eff..09d36e88058 100755
--- a/bootstrap/generated-dists/fedora32/bootstrap.sh
+++ b/bootstrap/generated-dists/fedora32/bootstrap.sh
@@ -83,12 +83,14 @@ dnf install -y \
procps-ng \
psmisc \
python3 \
+ python3-cryptography \
python3-devel \
python3-dns \
python3-gpg \
python3-libsemanage \
python3-markdown \
python3-policycoreutils \
+ python3-pyasn1 \
quota-devel \
readline-devel \
redhat-lsb \
diff --git a/bootstrap/generated-dists/fedora32/packages.yml b/bootstrap/generated-dists/fedora32/packages.yml
index 3165af8dd82..a2fbd0eb83b 100644
--- a/bootstrap/generated-dists/fedora32/packages.yml
+++ b/bootstrap/generated-dists/fedora32/packages.yml
@@ -72,12 +72,14 @@ packages:
- procps-ng
- psmisc
- python3
+ - python3-cryptography
- python3-devel
- python3-dns
- python3-gpg
- python3-libsemanage
- python3-markdown
- python3-policycoreutils
+ - python3-pyasn1
- quota-devel
- readline-devel
- redhat-lsb
diff --git a/bootstrap/generated-dists/opensuse150/bootstrap.sh b/bootstrap/generated-dists/opensuse150/bootstrap.sh
index 3fbcaacb24f..341b0ef9d35 100755
--- a/bootstrap/generated-dists/opensuse150/bootstrap.sh
+++ b/bootstrap/generated-dists/opensuse150/bootstrap.sh
@@ -80,9 +80,11 @@ zypper --non-interactive install \
python2-semanage \
python3 \
python3-Markdown \
+ python3-cryptography \
python3-devel \
python3-dnspython \
python3-gpg \
+ python3-pyasn1 \
readline-devel \
rng-tools \
rpcgen \
diff --git a/bootstrap/generated-dists/opensuse150/packages.yml b/bootstrap/generated-dists/opensuse150/packages.yml
index 0eb19244677..b8c469cadca 100644
--- a/bootstrap/generated-dists/opensuse150/packages.yml
+++ b/bootstrap/generated-dists/opensuse150/packages.yml
@@ -68,9 +68,11 @@ packages:
- python2-semanage
- python3
- python3-Markdown
+ - python3-cryptography
- python3-devel
- python3-dnspython
- python3-gpg
+ - python3-pyasn1
- readline-devel
- rng-tools
- rpcgen
diff --git a/bootstrap/generated-dists/opensuse151/bootstrap.sh b/bootstrap/generated-dists/opensuse151/bootstrap.sh
index 3fbcaacb24f..341b0ef9d35 100755
--- a/bootstrap/generated-dists/opensuse151/bootstrap.sh
+++ b/bootstrap/generated-dists/opensuse151/bootstrap.sh
@@ -80,9 +80,11 @@ zypper --non-interactive install \
python2-semanage \
python3 \
python3-Markdown \
+ python3-cryptography \
python3-devel \
python3-dnspython \
python3-gpg \
+ python3-pyasn1 \
readline-devel \
rng-tools \
rpcgen \
diff --git a/bootstrap/generated-dists/opensuse151/packages.yml b/bootstrap/generated-dists/opensuse151/packages.yml
index 0eb19244677..b8c469cadca 100644
--- a/bootstrap/generated-dists/opensuse151/packages.yml
+++ b/bootstrap/generated-dists/opensuse151/packages.yml
@@ -68,9 +68,11 @@ packages:
- python2-semanage
- python3
- python3-Markdown
+ - python3-cryptography
- python3-devel
- python3-dnspython
- python3-gpg
+ - python3-pyasn1
- readline-devel
- rng-tools
- rpcgen
diff --git a/bootstrap/generated-dists/ubuntu1604/bootstrap.sh b/bootstrap/generated-dists/ubuntu1604/bootstrap.sh
index a8f47762ded..f5791357d45 100755
--- a/bootstrap/generated-dists/ubuntu1604/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu1604/bootstrap.sh
@@ -80,6 +80,7 @@ apt-get -y install \
procps \
psmisc \
python3 \
+ python3-cryptography \
python3-dbg \
python3-dev \
python3-dnspython \
@@ -88,6 +89,7 @@ apt-get -y install \
python3-markdown \
python3-matplotlib \
python3-pexpect \
+ python3-pyasn1 \
rng-tools \
rsync \
sed \
diff --git a/bootstrap/generated-dists/ubuntu1604/packages.yml b/bootstrap/generated-dists/ubuntu1604/packages.yml
index c3cd9af9c3e..932cc162041 100644
--- a/bootstrap/generated-dists/ubuntu1604/packages.yml
+++ b/bootstrap/generated-dists/ubuntu1604/packages.yml
@@ -69,6 +69,7 @@ packages:
- procps
- psmisc
- python3
+ - python3-cryptography
- python3-dbg
- python3-dev
- python3-dnspython
@@ -77,6 +78,7 @@ packages:
- python3-markdown
- python3-matplotlib
- python3-pexpect
+ - python3-pyasn1
- rng-tools
- rsync
- sed
diff --git a/bootstrap/generated-dists/ubuntu1804/bootstrap.sh b/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
index 97d32815d72..e668057ea82 100755
--- a/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
@@ -82,6 +82,7 @@ apt-get -y install \
procps \
psmisc \
python3 \
+ python3-cryptography \
python3-dbg \
python3-dev \
python3-dnspython \
@@ -90,6 +91,7 @@ apt-get -y install \
python3-markdown \
python3-matplotlib \
python3-pexpect \
+ python3-pyasn1 \
rng-tools \
rsync \
sed \
diff --git a/bootstrap/generated-dists/ubuntu1804/packages.yml b/bootstrap/generated-dists/ubuntu1804/packages.yml
index f45deb2c808..edf5720f84c 100644
--- a/bootstrap/generated-dists/ubuntu1804/packages.yml
+++ b/bootstrap/generated-dists/ubuntu1804/packages.yml
@@ -71,6 +71,7 @@ packages:
- procps
- psmisc
- python3
+ - python3-cryptography
- python3-dbg
- python3-dev
- python3-dnspython
@@ -79,6 +80,7 @@ packages:
- python3-markdown
- python3-matplotlib
- python3-pexpect
+ - python3-pyasn1
- rng-tools
- rsync
- sed
diff --git a/bootstrap/generated-dists/debian10/Dockerfile b/bootstrap/generated-dists/ubuntu2004/Dockerfile
similarity index 91%
copy from bootstrap/generated-dists/debian10/Dockerfile
copy to bootstrap/generated-dists/ubuntu2004/Dockerfile
index a7141db7e17..f94e8801aad 100644
--- a/bootstrap/generated-dists/debian10/Dockerfile
+++ b/bootstrap/generated-dists/ubuntu2004/Dockerfile
@@ -3,7 +3,7 @@
# See also bootstrap/config.py
#
-FROM debian:10
+FROM ubuntu:20.04
# pass in with --build-arg while build
ARG SHA1SUM
diff --git a/bootstrap/generated-dists/ubuntu1804/bootstrap.sh b/bootstrap/generated-dists/ubuntu2004/bootstrap.sh
similarity index 96%
copy from bootstrap/generated-dists/ubuntu1804/bootstrap.sh
copy to bootstrap/generated-dists/ubuntu2004/bootstrap.sh
index 97d32815d72..e668057ea82 100755
--- a/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu2004/bootstrap.sh
@@ -82,6 +82,7 @@ apt-get -y install \
procps \
psmisc \
python3 \
+ python3-cryptography \
python3-dbg \
python3-dev \
python3-dnspython \
@@ -90,6 +91,7 @@ apt-get -y install \
python3-markdown \
python3-matplotlib \
--
Samba Shared Repository
More information about the samba-cvs
mailing list