Attachment 15778 Details for Bug 14255 – patch for Samba 4.12 (cherry-picked from master patch)

[patch] patch for Samba 4.12 (cherry-picked from master patch)

0001-bootstrap-Remove-un-used-dependency-python3-crypto.patch (text/plain), 14.99 KB, created by Andrew Bartlett on 2020-02-10 01:02:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Bartlett

Created: 2020-02-10 01:02:08 UTC

Size: 14.99 KB

patch

obsolete

>From 79f369ba76caee30701f3bef491c63147bc6bb03 Mon Sep 17 00:00:00 2001
>From: Andrew Bartlett <abartlet@samba.org>
>Date: Sat, 14 Dec 2019 06:59:45 +1300
>Subject: [PATCH] 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>
>(cherry picked from commit 446c92017369007139af7532dae8503f9db40d48)
>---
> .gitlab-ci.yml                                     | 2 +-
> bootstrap/config.py                                | 1 -
> 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/debian10/bootstrap.sh    | 1 -
> bootstrap/generated-dists/debian10/packages.yml    | 1 -
> bootstrap/generated-dists/debian7/bootstrap.sh     | 1 -
> bootstrap/generated-dists/debian7/packages.yml     | 1 -
> bootstrap/generated-dists/debian8/bootstrap.sh     | 1 -
> bootstrap/generated-dists/debian8/packages.yml     | 1 -
> bootstrap/generated-dists/debian9/bootstrap.sh     | 1 -
> bootstrap/generated-dists/debian9/packages.yml     | 1 -
> bootstrap/generated-dists/fedora29/bootstrap.sh    | 1 -
> bootstrap/generated-dists/fedora29/packages.yml    | 1 -
> bootstrap/generated-dists/fedora30/bootstrap.sh    | 1 -
> bootstrap/generated-dists/fedora30/packages.yml    | 1 -
> bootstrap/generated-dists/fedora31/bootstrap.sh    | 1 -
> bootstrap/generated-dists/fedora31/packages.yml    | 1 -
> bootstrap/generated-dists/opensuse150/bootstrap.sh | 1 -
> bootstrap/generated-dists/opensuse150/packages.yml | 1 -
> bootstrap/generated-dists/opensuse151/bootstrap.sh | 1 -
> bootstrap/generated-dists/opensuse151/packages.yml | 1 -
> 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  | 1 -
> bootstrap/generated-dists/ubuntu1804/packages.yml  | 1 -
> bootstrap/sha1sum.txt                              | 2 +-
> 31 files changed, 2 insertions(+), 31 deletions(-)
>
>diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
>index 78710f55796..df91d7dadb1 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: 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 b7ad2f68a53..ecead21da29 100644
>--- 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 551d9e773a3..b1fb2536fa9 100755
>--- 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 86eb719d641..cba40f3b93d 100644
>--- 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 08debda480b..f97c77d2a6b 100755
>--- 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 9b93461ff2c..87efa4330d1 100644
>--- 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 758c86f22af..eb610c5ee79 100755
>--- 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 f5115e99025..8440e143f62 100644
>--- 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 d201695fc03..ea8a9ad8afc 100755
>--- 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 541704e8b21..e531b5822ed 100644
>--- 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 c810ad89009..6c720adcd1a 100755
>--- 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 170733a19f6..53052141cf5 100644
>--- 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 758c86f22af..eb610c5ee79 100755
>--- 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 f5115e99025..8440e143f62 100644
>--- 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 9c094aae396..c82c86166e5 100755
>--- 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 be10535bfa1..35aaa53c117 100644
>--- 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 9c094aae396..c82c86166e5 100755
>--- 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 be10535bfa1..35aaa53c117 100644
>--- 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 b882489baa2..fd6eecd1ab7 100755
>--- 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 d407300b3ef..8a2e2c785ad 100644
>--- 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 591da07b1d8..0e229caacb5 100755
>--- 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 ba60caba868..910f95cf55f 100644
>--- 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 591da07b1d8..0e229caacb5 100755
>--- 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 ba60caba868..910f95cf55f 100644
>--- 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 01dddb85286..9c707de566d 100755
>--- 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 52e2b0c783f..f8d2ab8fc4c 100644
>--- 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 04ceb1822c4..d7540d31a38 100755
>--- 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 c6cb5e460ae..da1c540bf3f 100644
>--- 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 e07f1863c31..f0b3e3120d0 100755
>--- 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 d70426ca5f2..eda09ec5c7c 100644
>--- 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 c9bf561e666..5f1e8108f71 100644
>--- a/bootstrap/sha1sum.txt
>+++ b/bootstrap/sha1sum.txt
>@@ -1 +1 @@
>-36dd95324f5406f62312648e83fde78a8267b386
>+cffd3e4d9ad505cbf2b6732d2e3021d60e4159ad
>-- 
>2.17.1
>

Flags:

dbagnall: review+

Actions: View

Attachments on bug 14255: 15778