bootstrap: Remove un-used dependency python3-crypto

This became unused in bbeef554f2c15e739f6095fcb57d9ef6646b411c
(except for repl_cleartext_pwd.py, a development script) and we now use
GnuTLS via a Samba wrapper.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14255

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 78710f55796b9e75cf427983236a8ab3ced416bf..df91d7dadb19322a9f1b03153a42f71a5d2e903a 100644 (file)
--- 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: 36dd95324f5406f62312648e83fde78a8267b386
+  SAMBA_CI_CONTAINER_TAG: cffd3e4d9ad505cbf2b6732d2e3021d60e4159ad
   #
   # We use the ubuntu1804 image as default as
   # it matches what we have on sn-devel-184.

diff --git a/bootstrap/config.py b/bootstrap/config.py
index b7ad2f68a53fa10f1f5573c958e119beb983822a..ecead21da29ae7c76ff2dccdacb9e447ee8a7271 100644 (file)
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -133,7 +133,6 @@ PKGS = [
     ('python3-dbg', ''),
     ('python3-iso8601', ''),
     ('python3-gpg', 'python3-gpg'),  # defaults to ubuntu/fedora latest
-    ('python3-crypto', 'python3-crypto'),
     ('python3-markdown', 'python3-markdown'),
     ('python3-matplotlib', ''),
     ('python3-dnspython', 'python3-dns'),

diff --git a/bootstrap/generated-dists/centos6/bootstrap.sh b/bootstrap/generated-dists/centos6/bootstrap.sh
index 551d9e773a3928d8a98d2dcbbf8c0f8719057e5b..b1fb2536fa902a02a86f8522be676569769173f0 100755 (executable)
--- a/bootstrap/generated-dists/centos6/bootstrap.sh
+++ b/bootstrap/generated-dists/centos6/bootstrap.sh
@@ -83,7 +83,6 @@ yum install -y \
     popt-devel \
     procps \
     psmisc \
-    python3-crypto \
     python3-dns \
     python3-markdown \
     python36 \

diff --git a/bootstrap/generated-dists/centos6/packages.yml b/bootstrap/generated-dists/centos6/packages.yml
index 86eb719d641490f6ba2f5bddb0e9ebfa7aeedd7e..cba40f3b93d988aad6c850848e583961e7d963e1 100644 (file)
--- a/bootstrap/generated-dists/centos6/packages.yml
+++ b/bootstrap/generated-dists/centos6/packages.yml
@@ -69,7 +69,6 @@ packages:
   - popt-devel
   - procps
   - psmisc
-  - python3-crypto
   - python3-dns
   - python3-markdown
   - python36

diff --git a/bootstrap/generated-dists/centos7/bootstrap.sh b/bootstrap/generated-dists/centos7/bootstrap.sh
index 08debda480b77c2039e2c491b374e5eb7b8af29f..f97c77d2a6bc105353071e32e7b7aaa31f3c59f0 100755 (executable)
--- a/bootstrap/generated-dists/centos7/bootstrap.sh
+++ b/bootstrap/generated-dists/centos7/bootstrap.sh
@@ -84,7 +84,6 @@ yum install -y \
     procps-ng \
     psmisc \
     python36 \
-    python36-crypto \
     python36-devel \
     python36-dns \
     python36-markdown \

diff --git a/bootstrap/generated-dists/centos7/packages.yml b/bootstrap/generated-dists/centos7/packages.yml
index 9b93461ff2c1dd4fb8f3e78998d50349a11408bc..87efa4330d1be49c05bc0f1c3708c0e60980c07b 100644 (file)
--- a/bootstrap/generated-dists/centos7/packages.yml
+++ b/bootstrap/generated-dists/centos7/packages.yml
@@ -70,7 +70,6 @@ packages:
   - procps-ng
   - psmisc
   - python36
-  - python36-crypto
   - python36-devel
   - python36-dns
   - python36-markdown

diff --git a/bootstrap/generated-dists/debian10/bootstrap.sh b/bootstrap/generated-dists/debian10/bootstrap.sh
index 758c86f22afb95354ff5d454b01363ef07e383ea..eb610c5ee79f409dba7121efef59274a24d9ea9f 100755 (executable)
--- a/bootstrap/generated-dists/debian10/bootstrap.sh
+++ b/bootstrap/generated-dists/debian10/bootstrap.sh
@@ -82,7 +82,6 @@ apt-get -y install \
     procps \
     psmisc \
     python3 \
-    python3-crypto \
     python3-dbg \
     python3-dev \
     python3-dnspython \

diff --git a/bootstrap/generated-dists/debian10/packages.yml b/bootstrap/generated-dists/debian10/packages.yml
index f5115e99025b845c5c9b13f17c3dee2719da5cf1..8440e143f620ecc854b4d28b5c8dcc6494ae958f 100644 (file)
--- a/bootstrap/generated-dists/debian10/packages.yml
+++ b/bootstrap/generated-dists/debian10/packages.yml
@@ -71,7 +71,6 @@ packages:
   - procps
   - psmisc
   - python3
-  - python3-crypto
   - python3-dbg
   - python3-dev
   - python3-dnspython

diff --git a/bootstrap/generated-dists/debian7/bootstrap.sh b/bootstrap/generated-dists/debian7/bootstrap.sh
index d201695fc0321cc4e110b2970b1fbdcc23f8bff5..ea8a9ad8afcf9ef31127f83227279f48b02f8f3e 100755 (executable)
--- a/bootstrap/generated-dists/debian7/bootstrap.sh
+++ b/bootstrap/generated-dists/debian7/bootstrap.sh
@@ -79,7 +79,6 @@ apt-get -y install \
     procps \
     psmisc \
     python3 \
-    python3-crypto \
     python3-dbg \
     python3-dev \
     python3-dnspython \

diff --git a/bootstrap/generated-dists/debian7/packages.yml b/bootstrap/generated-dists/debian7/packages.yml
index 541704e8b217c792a24a08c15369e511bb6578eb..e531b5822ed3f60bd2537c3e101b5c62d330dd01 100644 (file)
--- a/bootstrap/generated-dists/debian7/packages.yml
+++ b/bootstrap/generated-dists/debian7/packages.yml
@@ -68,7 +68,6 @@ packages:
   - procps
   - psmisc
   - python3
-  - python3-crypto
   - python3-dbg
   - python3-dev
   - python3-dnspython

diff --git a/bootstrap/generated-dists/debian8/bootstrap.sh b/bootstrap/generated-dists/debian8/bootstrap.sh
index c810ad890097af6eef2c909229537a3bdbf9b06d..6c720adcd1ac783e485c422fa83e277ff206f0c4 100755 (executable)
--- a/bootstrap/generated-dists/debian8/bootstrap.sh
+++ b/bootstrap/generated-dists/debian8/bootstrap.sh
@@ -82,7 +82,6 @@ apt-get -y install \
     procps \
     psmisc \
     python3 \
-    python3-crypto \
     python3-dbg \
     python3-dev \
     python3-dnspython \

diff --git a/bootstrap/generated-dists/debian8/packages.yml b/bootstrap/generated-dists/debian8/packages.yml
index 170733a19f6b45d1a6a611cad67f03611faf58e2..53052141cf5d4df120ed2237a12fa39d74ee6b00 100644 (file)
--- a/bootstrap/generated-dists/debian8/packages.yml
+++ b/bootstrap/generated-dists/debian8/packages.yml
@@ -71,7 +71,6 @@ packages:
   - procps
   - psmisc
   - python3
-  - python3-crypto
   - python3-dbg
   - python3-dev
   - python3-dnspython

diff --git a/bootstrap/generated-dists/debian9/bootstrap.sh b/bootstrap/generated-dists/debian9/bootstrap.sh
index 758c86f22afb95354ff5d454b01363ef07e383ea..eb610c5ee79f409dba7121efef59274a24d9ea9f 100755 (executable)
--- a/bootstrap/generated-dists/debian9/bootstrap.sh
+++ b/bootstrap/generated-dists/debian9/bootstrap.sh
@@ -82,7 +82,6 @@ apt-get -y install \
     procps \
     psmisc \
     python3 \
-    python3-crypto \
     python3-dbg \
     python3-dev \
     python3-dnspython \

diff --git a/bootstrap/generated-dists/debian9/packages.yml b/bootstrap/generated-dists/debian9/packages.yml
index f5115e99025b845c5c9b13f17c3dee2719da5cf1..8440e143f620ecc854b4d28b5c8dcc6494ae958f 100644 (file)
--- a/bootstrap/generated-dists/debian9/packages.yml
+++ b/bootstrap/generated-dists/debian9/packages.yml
@@ -71,7 +71,6 @@ packages:
   - procps
   - psmisc
   - python3
-  - python3-crypto
   - python3-dbg
   - python3-dev
   - python3-dnspython

diff --git a/bootstrap/generated-dists/fedora29/bootstrap.sh b/bootstrap/generated-dists/fedora29/bootstrap.sh
index 9c094aae396c4145d4783bb7ec4b315258c8f509..c82c86166e5d3e76022cc43b227279cb08172687 100755 (executable)
--- a/bootstrap/generated-dists/fedora29/bootstrap.sh
+++ b/bootstrap/generated-dists/fedora29/bootstrap.sh
@@ -85,7 +85,6 @@ dnf install -y \
     procps-ng \
     psmisc \
     python3 \
-    python3-crypto \
     python3-devel \
     python3-dns \
     python3-gpg \

diff --git a/bootstrap/generated-dists/fedora29/packages.yml b/bootstrap/generated-dists/fedora29/packages.yml
index be10535bfa1ea4f1b2344b9ac90dbc32434d13d2..35aaa53c1179143384cbf39a5a07fcebde727fd9 100644 (file)
--- a/bootstrap/generated-dists/fedora29/packages.yml
+++ b/bootstrap/generated-dists/fedora29/packages.yml
@@ -74,7 +74,6 @@ packages:
   - procps-ng
   - psmisc
   - python3
-  - python3-crypto
   - python3-devel
   - python3-dns
   - python3-gpg

diff --git a/bootstrap/generated-dists/fedora30/bootstrap.sh b/bootstrap/generated-dists/fedora30/bootstrap.sh
index 9c094aae396c4145d4783bb7ec4b315258c8f509..c82c86166e5d3e76022cc43b227279cb08172687 100755 (executable)
--- a/bootstrap/generated-dists/fedora30/bootstrap.sh
+++ b/bootstrap/generated-dists/fedora30/bootstrap.sh
@@ -85,7 +85,6 @@ dnf install -y \
     procps-ng \
     psmisc \
     python3 \
-    python3-crypto \
     python3-devel \
     python3-dns \
     python3-gpg \

diff --git a/bootstrap/generated-dists/fedora30/packages.yml b/bootstrap/generated-dists/fedora30/packages.yml
index be10535bfa1ea4f1b2344b9ac90dbc32434d13d2..35aaa53c1179143384cbf39a5a07fcebde727fd9 100644 (file)
--- a/bootstrap/generated-dists/fedora30/packages.yml
+++ b/bootstrap/generated-dists/fedora30/packages.yml
@@ -74,7 +74,6 @@ packages:
   - procps-ng
   - psmisc
   - python3
-  - python3-crypto
   - python3-devel
   - python3-dns
   - python3-gpg

diff --git a/bootstrap/generated-dists/fedora31/bootstrap.sh b/bootstrap/generated-dists/fedora31/bootstrap.sh
index b882489baa22aebceb761705ff68f966a2498c38..fd6eecd1ab7d6f538edfb5ee8e9179d274d16272 100755 (executable)
--- a/bootstrap/generated-dists/fedora31/bootstrap.sh
+++ b/bootstrap/generated-dists/fedora31/bootstrap.sh
@@ -83,7 +83,6 @@ dnf install -y \
     procps-ng \
     psmisc \
     python3 \
-    python3-crypto \
     python3-devel \
     python3-dns \
     python3-gpg \

diff --git a/bootstrap/generated-dists/fedora31/packages.yml b/bootstrap/generated-dists/fedora31/packages.yml
index d407300b3ef001b2d999adf7421d270cc237503a..8a2e2c785ad4f4a11e58dd57689bb1e8d0a3a745 100644 (file)
--- a/bootstrap/generated-dists/fedora31/packages.yml
+++ b/bootstrap/generated-dists/fedora31/packages.yml
@@ -72,7 +72,6 @@ packages:
   - procps-ng
   - psmisc
   - python3
-  - python3-crypto
   - python3-devel
   - python3-dns
   - python3-gpg

diff --git a/bootstrap/generated-dists/opensuse150/bootstrap.sh b/bootstrap/generated-dists/opensuse150/bootstrap.sh
index 591da07b1d8051b49e16a78ab888f2dfc49d0fc4..0e229caacb5adddbcb5227915bd97f491f5e7387 100755 (executable)
--- a/bootstrap/generated-dists/opensuse150/bootstrap.sh
+++ b/bootstrap/generated-dists/opensuse150/bootstrap.sh
@@ -84,7 +84,6 @@ zypper --non-interactive install \
     python3-devel \
     python3-dnspython \
     python3-gpg \
-    python3-pycrypto \
     readline-devel \
     rng-tools \
     rpcgen \

diff --git a/bootstrap/generated-dists/opensuse150/packages.yml b/bootstrap/generated-dists/opensuse150/packages.yml
index ba60caba8684c806bfffba68e263640e2acaf661..910f95cf55fc6cba984f3d15bc42e0a398398c13 100644 (file)
--- a/bootstrap/generated-dists/opensuse150/packages.yml
+++ b/bootstrap/generated-dists/opensuse150/packages.yml
@@ -72,7 +72,6 @@ packages:
   - python3-devel
   - python3-dnspython
   - python3-gpg
-  - python3-pycrypto
   - readline-devel
   - rng-tools
   - rpcgen

diff --git a/bootstrap/generated-dists/opensuse151/bootstrap.sh b/bootstrap/generated-dists/opensuse151/bootstrap.sh
index 591da07b1d8051b49e16a78ab888f2dfc49d0fc4..0e229caacb5adddbcb5227915bd97f491f5e7387 100755 (executable)
--- a/bootstrap/generated-dists/opensuse151/bootstrap.sh
+++ b/bootstrap/generated-dists/opensuse151/bootstrap.sh
@@ -84,7 +84,6 @@ zypper --non-interactive install \
     python3-devel \
     python3-dnspython \
     python3-gpg \
-    python3-pycrypto \
     readline-devel \
     rng-tools \
     rpcgen \

diff --git a/bootstrap/generated-dists/opensuse151/packages.yml b/bootstrap/generated-dists/opensuse151/packages.yml
index ba60caba8684c806bfffba68e263640e2acaf661..910f95cf55fc6cba984f3d15bc42e0a398398c13 100644 (file)
--- a/bootstrap/generated-dists/opensuse151/packages.yml
+++ b/bootstrap/generated-dists/opensuse151/packages.yml
@@ -72,7 +72,6 @@ packages:
   - python3-devel
   - python3-dnspython
   - python3-gpg
-  - python3-pycrypto
   - readline-devel
   - rng-tools
   - rpcgen

diff --git a/bootstrap/generated-dists/ubuntu1404/bootstrap.sh b/bootstrap/generated-dists/ubuntu1404/bootstrap.sh
index 01dddb852861e6ed2f679eaaac3d658173f291c2..9c707de566d4d321f6e469e20d7a8c6b04e7baa8 100755 (executable)
--- a/bootstrap/generated-dists/ubuntu1404/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu1404/bootstrap.sh
@@ -80,7 +80,6 @@ apt-get -y install \
     procps \
     psmisc \
     python3 \
-    python3-crypto \
     python3-dbg \
     python3-dev \
     python3-dnspython \

diff --git a/bootstrap/generated-dists/ubuntu1404/packages.yml b/bootstrap/generated-dists/ubuntu1404/packages.yml
index 52e2b0c783f29486ef2284a33df05c1e30e0793b..f8d2ab8fc4c3de7ea0b0f71f5831b3291d6d18e9 100644 (file)
--- a/bootstrap/generated-dists/ubuntu1404/packages.yml
+++ b/bootstrap/generated-dists/ubuntu1404/packages.yml
@@ -69,7 +69,6 @@ packages:
   - procps
   - psmisc
   - python3
-  - python3-crypto
   - python3-dbg
   - python3-dev
   - python3-dnspython

diff --git a/bootstrap/generated-dists/ubuntu1604/bootstrap.sh b/bootstrap/generated-dists/ubuntu1604/bootstrap.sh
index 04ceb1822c4fe8803b4e1379a1a510e8953816a6..d7540d31a386145dc90f6dca7bec1b30c31d4495 100755 (executable)
--- a/bootstrap/generated-dists/ubuntu1604/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu1604/bootstrap.sh
@@ -81,7 +81,6 @@ apt-get -y install \
     procps \
     psmisc \
     python3 \
-    python3-crypto \
     python3-dbg \
     python3-dev \
     python3-dnspython \

diff --git a/bootstrap/generated-dists/ubuntu1604/packages.yml b/bootstrap/generated-dists/ubuntu1604/packages.yml
index c6cb5e460ae346a89451e867da208e3fe1b60029..da1c540bf3f4e6730e8788ddf35bdd3ab0512e4a 100644 (file)
--- a/bootstrap/generated-dists/ubuntu1604/packages.yml
+++ b/bootstrap/generated-dists/ubuntu1604/packages.yml
@@ -70,7 +70,6 @@ packages:
   - procps
   - psmisc
   - python3
-  - python3-crypto
   - python3-dbg
   - python3-dev
   - python3-dnspython

diff --git a/bootstrap/generated-dists/ubuntu1804/bootstrap.sh b/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
index e07f1863c31ae9e8aa39ad5a9e64b41b365fbe6f..f0b3e3120d010e312a44d644573248f81c675150 100755 (executable)
--- a/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
@@ -83,7 +83,6 @@ apt-get -y install \
     procps \
     psmisc \
     python3 \
-    python3-crypto \
     python3-dbg \
     python3-dev \
     python3-dnspython \

diff --git a/bootstrap/generated-dists/ubuntu1804/packages.yml b/bootstrap/generated-dists/ubuntu1804/packages.yml
index d70426ca5f255f9780d8ef81fc7a82614c82617e..eda09ec5c7c1c624724f39bde9a3b04ca1509d0e 100644 (file)
--- a/bootstrap/generated-dists/ubuntu1804/packages.yml
+++ b/bootstrap/generated-dists/ubuntu1804/packages.yml
@@ -72,7 +72,6 @@ packages:
   - procps
   - psmisc
   - python3
-  - python3-crypto
   - python3-dbg
   - python3-dev
   - python3-dnspython

diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index c9bf561e666b34964e28d33ebe76e2a7a4473eb4..5f1e8108f7102fa058fa0b90ad0d334bbd66296b 100644 (file)
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-36dd95324f5406f62312648e83fde78a8267b386
+cffd3e4d9ad505cbf2b6732d2e3021d60e4159ad