bootstrap: Remove nettle-devel from package list

nettle is required as dependency for newer gnutls libraries. The gnutls
development package already depends on the nettle development package,
no need to explicitly list it.

Signed-off-by: Christof Schmit <cs@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e12f9ebf903c6288dce820251c21cbe004633f11..32d6621f4c39c31490243a76a260ace8c37a5398 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: 539cd9023fee0703a42dc82e8778a01149fcb679
+  SAMBA_CI_CONTAINER_TAG: 03db699647966be88fc347206474f3579faae671
   #
   # 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 eb1d2b4a9a01fb9dbc8f1c1b273aa19696fef00b..f6a7dd1123f10a49194c17658d661249f68e1324 100644 (file)
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -66,7 +66,6 @@ PKGS = [
     # NAME1-dev, NAME2-devel
     ('lmdb-utils', 'lmdb'),
     ('mingw-w64', 'mingw64-gcc'),
-    ('nettle-dev', 'nettle-devel'),
     ('zlib1g-dev', 'zlib-devel'),
     ('libbsd-dev', 'libbsd-devel'),
     ('libaio-dev', 'libaio-devel'),
@@ -487,7 +486,6 @@ RPM_DISTS = {
             'glusterfs-api-devel': '',
             'glusterfs-devel': '',
             'libcephfs-devel': '',
-            'nettle-devel': 'compat-nettle32-devel',
             'gnutls-devel': 'compat-gnutls34-devel',
         }
     },
@@ -549,7 +547,6 @@ RPM_DISTS = {
             'krb5-workstation': 'krb5-client',
             'libnsl2-devel': 'libnsl-devel',
             'libsemanage-python': 'python2-semanage',
-            'nettle-devel': 'libnettle-devel',
             'openldap-devel': 'openldap2-devel',
             'perl-Archive-Tar': 'perl-Archive-Tar-Wrapper',
             'perl-JSON-Parse': 'perl-JSON-XS',
@@ -582,7 +579,6 @@ RPM_DISTS = {
             'krb5-workstation': 'krb5-client',
             'libnsl2-devel': 'libnsl-devel',
             'libsemanage-python': 'python2-semanage',
-            'nettle-devel': 'libnettle-devel',
             'openldap-devel': 'openldap2-devel',
             'perl-Archive-Tar': 'perl-Archive-Tar-Wrapper',
             'perl-JSON-Parse': 'perl-JSON-XS',

diff --git a/bootstrap/generated-dists/centos6/bootstrap.sh b/bootstrap/generated-dists/centos6/bootstrap.sh
index 1082825e19023fcfeb7adbdd4111ddfa157c6a46..129cc3d557b9cefc0c9975d04f8e6ce822653c9b 100755 (executable)
--- a/bootstrap/generated-dists/centos6/bootstrap.sh
+++ b/bootstrap/generated-dists/centos6/bootstrap.sh
@@ -66,7 +66,6 @@ yum install -y \
     make \
     mingw64-gcc \
     ncurses-devel \
-    nettle-devel \
     openldap-devel \
     pam-devel \
     patch \

diff --git a/bootstrap/generated-dists/centos6/packages.yml b/bootstrap/generated-dists/centos6/packages.yml
index 76ad25de37cd96b5e5cbd667cc2344073a18845f..a9225035e0265dd3ef7e5c79b681d53976f66231 100644 (file)
--- a/bootstrap/generated-dists/centos6/packages.yml
+++ b/bootstrap/generated-dists/centos6/packages.yml
@@ -52,7 +52,6 @@ packages:
   - make
   - mingw64-gcc
   - ncurses-devel
-  - nettle-devel
   - openldap-devel
   - pam-devel
   - patch

diff --git a/bootstrap/generated-dists/centos7/bootstrap.sh b/bootstrap/generated-dists/centos7/bootstrap.sh
index 6e3bbd288b18cacf7fb8700135970548ae21f0fd..fb8ee8b72f6f81d2222f514df4ab0ed887fbd89a 100755 (executable)
--- a/bootstrap/generated-dists/centos7/bootstrap.sh
+++ b/bootstrap/generated-dists/centos7/bootstrap.sh
@@ -23,7 +23,6 @@ yum install -y \
     binutils \
     bison \
     compat-gnutls34-devel \
-    compat-nettle32-devel \
     cups-devel \
     curl \
     dbus-devel \

diff --git a/bootstrap/generated-dists/centos7/packages.yml b/bootstrap/generated-dists/centos7/packages.yml
index 3c095961b2af4be255f1d59567d77703fa670b0a..3d37fd52d5177449eeb6e57e6d2a1be5e2bd4f90 100644 (file)
--- a/bootstrap/generated-dists/centos7/packages.yml
+++ b/bootstrap/generated-dists/centos7/packages.yml
@@ -9,7 +9,6 @@ packages:
   - binutils
   - bison
   - compat-gnutls34-devel
-  - compat-nettle32-devel
   - cups-devel
   - curl
   - dbus-devel

diff --git a/bootstrap/generated-dists/centos8/bootstrap.sh b/bootstrap/generated-dists/centos8/bootstrap.sh
index 05972764d9b0a236774f7e83263f05c1c3b8614b..4b12476dd3612eac7e245ae1b9ddeb64e6f5770c 100755 (executable)
--- a/bootstrap/generated-dists/centos8/bootstrap.sh
+++ b/bootstrap/generated-dists/centos8/bootstrap.sh
@@ -69,7 +69,6 @@ yum install -y \
     make \
     mingw64-gcc \
     ncurses-devel \
-    nettle-devel \
     openldap-devel \
     pam-devel \
     patch \

diff --git a/bootstrap/generated-dists/centos8/packages.yml b/bootstrap/generated-dists/centos8/packages.yml
index 5df66b5bd0f40cfaa03c325a3faff392ef9df9fa..d8e2d02391f420768e182231157de6595f550ea9 100644 (file)
--- a/bootstrap/generated-dists/centos8/packages.yml
+++ b/bootstrap/generated-dists/centos8/packages.yml
@@ -54,7 +54,6 @@ packages:
   - make
   - mingw64-gcc
   - ncurses-devel
-  - nettle-devel
   - openldap-devel
   - pam-devel
   - patch

diff --git a/bootstrap/generated-dists/debian7/bootstrap.sh b/bootstrap/generated-dists/debian7/bootstrap.sh
index afbed5cf699284aa35c402ae62a090973f7f04bc..544d2e9fb5276bb00ccfc624462e4345d4f1c0f8 100755 (executable)
--- a/bootstrap/generated-dists/debian7/bootstrap.sh
+++ b/bootstrap/generated-dists/debian7/bootstrap.sh
@@ -70,7 +70,6 @@ apt-get -y install \
     make \
     mawk \
     mingw-w64 \
-    nettle-dev \
     patch \
     perl \
     perl-modules \

diff --git a/bootstrap/generated-dists/debian7/packages.yml b/bootstrap/generated-dists/debian7/packages.yml
index 958130da942fb1fd571ad6a43ccdaacdfe51e309..e9fc331d387bd6894a1ceda7eb362d8f81071312 100644 (file)
--- a/bootstrap/generated-dists/debian7/packages.yml
+++ b/bootstrap/generated-dists/debian7/packages.yml
@@ -59,7 +59,6 @@ packages:
   - make
   - mawk
   - mingw-w64
-  - nettle-dev
   - patch
   - perl
   - perl-modules

diff --git a/bootstrap/generated-dists/debian8/bootstrap.sh b/bootstrap/generated-dists/debian8/bootstrap.sh
index c28b8c75af13e8146cd54adbf3f70dbeba69a650..1c6e1df442b51d6e8e6d018f3c870e71aea1c066 100755 (executable)
--- a/bootstrap/generated-dists/debian8/bootstrap.sh
+++ b/bootstrap/generated-dists/debian8/bootstrap.sh
@@ -73,7 +73,6 @@ apt-get -y install \
     make \
     mawk \
     mingw-w64 \
-    nettle-dev \
     patch \
     perl \
     perl-modules \

diff --git a/bootstrap/generated-dists/debian8/packages.yml b/bootstrap/generated-dists/debian8/packages.yml
index ac02aaa98fe704cd7dc109b4157ac579d880dad0..48de01ff2bbbddfaffec59fb24048fc7b0c1c1c5 100644 (file)
--- a/bootstrap/generated-dists/debian8/packages.yml
+++ b/bootstrap/generated-dists/debian8/packages.yml
@@ -62,7 +62,6 @@ packages:
   - make
   - mawk
   - mingw-w64
-  - nettle-dev
   - patch
   - perl
   - perl-modules

diff --git a/bootstrap/generated-dists/debian9/bootstrap.sh b/bootstrap/generated-dists/debian9/bootstrap.sh
index 06943efaae00d0922b127860a1cb97c2f8d77134..d1bc05093610a6523ded7ed5ad3d6e148db166d2 100755 (executable)
--- a/bootstrap/generated-dists/debian9/bootstrap.sh
+++ b/bootstrap/generated-dists/debian9/bootstrap.sh
@@ -73,7 +73,6 @@ apt-get -y install \
     make \
     mawk \
     mingw-w64 \
-    nettle-dev \
     patch \
     perl \
     perl-modules \

diff --git a/bootstrap/generated-dists/debian9/packages.yml b/bootstrap/generated-dists/debian9/packages.yml
index 81b76bbf6f3605426fc2322100028fc902438aea..ee0e239eaf0ab855a4b4c2bed7f2d8cf014b7849 100644 (file)
--- a/bootstrap/generated-dists/debian9/packages.yml
+++ b/bootstrap/generated-dists/debian9/packages.yml
@@ -62,7 +62,6 @@ packages:
   - make
   - mawk
   - mingw-w64
-  - nettle-dev
   - patch
   - perl
   - perl-modules

diff --git a/bootstrap/generated-dists/fedora29/bootstrap.sh b/bootstrap/generated-dists/fedora29/bootstrap.sh
index a46bb5f6fcfb373e7d0db1b61eee562b9c42dbe9..1c8357c5cb5b513f4dbaf1221b4e0dd802c488cd 100755 (executable)
--- a/bootstrap/generated-dists/fedora29/bootstrap.sh
+++ b/bootstrap/generated-dists/fedora29/bootstrap.sh
@@ -67,7 +67,6 @@ dnf install -y \
     make \
     mingw64-gcc \
     ncurses-devel \
-    nettle-devel \
     openldap-devel \
     pam-devel \
     patch \

diff --git a/bootstrap/generated-dists/fedora29/packages.yml b/bootstrap/generated-dists/fedora29/packages.yml
index 023889bcb4c00dccc67a11a97821d43e3edf9dda..dc37c6f15dd0741db04e80ab4dae2f3fed466056 100644 (file)
--- a/bootstrap/generated-dists/fedora29/packages.yml
+++ b/bootstrap/generated-dists/fedora29/packages.yml
@@ -56,7 +56,6 @@ packages:
   - make
   - mingw64-gcc
   - ncurses-devel
-  - nettle-devel
   - openldap-devel
   - pam-devel
   - patch

diff --git a/bootstrap/generated-dists/fedora30/bootstrap.sh b/bootstrap/generated-dists/fedora30/bootstrap.sh
index a46bb5f6fcfb373e7d0db1b61eee562b9c42dbe9..1c8357c5cb5b513f4dbaf1221b4e0dd802c488cd 100755 (executable)
--- a/bootstrap/generated-dists/fedora30/bootstrap.sh
+++ b/bootstrap/generated-dists/fedora30/bootstrap.sh
@@ -67,7 +67,6 @@ dnf install -y \
     make \
     mingw64-gcc \
     ncurses-devel \
-    nettle-devel \
     openldap-devel \
     pam-devel \
     patch \

diff --git a/bootstrap/generated-dists/fedora30/packages.yml b/bootstrap/generated-dists/fedora30/packages.yml
index 023889bcb4c00dccc67a11a97821d43e3edf9dda..dc37c6f15dd0741db04e80ab4dae2f3fed466056 100644 (file)
--- a/bootstrap/generated-dists/fedora30/packages.yml
+++ b/bootstrap/generated-dists/fedora30/packages.yml
@@ -56,7 +56,6 @@ packages:
   - make
   - mingw64-gcc
   - ncurses-devel
-  - nettle-devel
   - openldap-devel
   - pam-devel
   - patch

diff --git a/bootstrap/generated-dists/fedora31/bootstrap.sh b/bootstrap/generated-dists/fedora31/bootstrap.sh
index 548bba30f223f0e8206a569c050e6f4bb034c657..b423481af679652b59b4604d3745865ada8a8334 100755 (executable)
--- a/bootstrap/generated-dists/fedora31/bootstrap.sh
+++ b/bootstrap/generated-dists/fedora31/bootstrap.sh
@@ -66,7 +66,6 @@ dnf install -y \
     make \
     mingw64-gcc \
     ncurses-devel \
-    nettle-devel \
     openldap-devel \
     pam-devel \
     patch \

diff --git a/bootstrap/generated-dists/fedora31/packages.yml b/bootstrap/generated-dists/fedora31/packages.yml
index f6d71871938e439df360c6d91078d313b7c65485..d56faf8a859516a12c47ad50bff617f4a80abd59 100644 (file)
--- a/bootstrap/generated-dists/fedora31/packages.yml
+++ b/bootstrap/generated-dists/fedora31/packages.yml
@@ -55,7 +55,6 @@ packages:
   - make
   - mingw64-gcc
   - ncurses-devel
-  - nettle-devel
   - openldap-devel
   - pam-devel
   - patch

diff --git a/bootstrap/generated-dists/opensuse150/bootstrap.sh b/bootstrap/generated-dists/opensuse150/bootstrap.sh
index 940bd3dc1770b5fb6a61f6b753324791119ce544..a970cde767984cfd269b37f7b85f41838904f4e0 100755 (executable)
--- a/bootstrap/generated-dists/opensuse150/bootstrap.sh
+++ b/bootstrap/generated-dists/opensuse150/bootstrap.sh
@@ -51,7 +51,6 @@ zypper --non-interactive install \
     libcephfs-devel \
     libicu-devel \
     libjansson-devel \
-    libnettle-devel \
     libnsl-devel \
     libpcap-devel \
     libtasn1-devel \

diff --git a/bootstrap/generated-dists/opensuse150/packages.yml b/bootstrap/generated-dists/opensuse150/packages.yml
index f108d386a0a261754ebd0ae8f209c49dc2e88686..62a4270600ace86f82891a3ebb887524fb328322 100644 (file)
--- a/bootstrap/generated-dists/opensuse150/packages.yml
+++ b/bootstrap/generated-dists/opensuse150/packages.yml
@@ -39,7 +39,6 @@ packages:
   - libcephfs-devel
   - libicu-devel
   - libjansson-devel
-  - libnettle-devel
   - libnsl-devel
   - libpcap-devel
   - libtasn1-devel

diff --git a/bootstrap/generated-dists/opensuse151/bootstrap.sh b/bootstrap/generated-dists/opensuse151/bootstrap.sh
index 940bd3dc1770b5fb6a61f6b753324791119ce544..a970cde767984cfd269b37f7b85f41838904f4e0 100755 (executable)
--- a/bootstrap/generated-dists/opensuse151/bootstrap.sh
+++ b/bootstrap/generated-dists/opensuse151/bootstrap.sh
@@ -51,7 +51,6 @@ zypper --non-interactive install \
     libcephfs-devel \
     libicu-devel \
     libjansson-devel \
-    libnettle-devel \
     libnsl-devel \
     libpcap-devel \
     libtasn1-devel \

diff --git a/bootstrap/generated-dists/opensuse151/packages.yml b/bootstrap/generated-dists/opensuse151/packages.yml
index f108d386a0a261754ebd0ae8f209c49dc2e88686..62a4270600ace86f82891a3ebb887524fb328322 100644 (file)
--- a/bootstrap/generated-dists/opensuse151/packages.yml
+++ b/bootstrap/generated-dists/opensuse151/packages.yml
@@ -39,7 +39,6 @@ packages:
   - libcephfs-devel
   - libicu-devel
   - libjansson-devel
-  - libnettle-devel
   - libnsl-devel
   - libpcap-devel
   - libtasn1-devel

diff --git a/bootstrap/generated-dists/ubuntu1404/bootstrap.sh b/bootstrap/generated-dists/ubuntu1404/bootstrap.sh
index 78a1379d14014c15c9f5e9b4a72fda401a524b01..656c056b5e5c9a9dda8b5ff928bd30125ff28294 100755 (executable)
--- a/bootstrap/generated-dists/ubuntu1404/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu1404/bootstrap.sh
@@ -71,7 +71,6 @@ apt-get -y install \
     make \
     mawk \
     mingw-w64 \
-    nettle-dev \
     patch \
     perl \
     perl-modules \

diff --git a/bootstrap/generated-dists/ubuntu1404/packages.yml b/bootstrap/generated-dists/ubuntu1404/packages.yml
index 5a67ba7b8ecafa19089c8bdbc71c7fcd8664b532..d45866773e30a5b2e1cc9c19edce4a9af1218294 100644 (file)
--- a/bootstrap/generated-dists/ubuntu1404/packages.yml
+++ b/bootstrap/generated-dists/ubuntu1404/packages.yml
@@ -60,7 +60,6 @@ packages:
   - make
   - mawk
   - mingw-w64
-  - nettle-dev
   - patch
   - perl
   - perl-modules

diff --git a/bootstrap/generated-dists/ubuntu1604/bootstrap.sh b/bootstrap/generated-dists/ubuntu1604/bootstrap.sh
index 6226b51a6dbd9dd8f99371daa45bd78da08774ee..f4f3ac23d5591634c4f25cf1a7eec8c52c3028ad 100755 (executable)
--- a/bootstrap/generated-dists/ubuntu1604/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu1604/bootstrap.sh
@@ -72,7 +72,6 @@ apt-get -y install \
     make \
     mawk \
     mingw-w64 \
-    nettle-dev \
     patch \
     perl \
     perl-modules \

diff --git a/bootstrap/generated-dists/ubuntu1604/packages.yml b/bootstrap/generated-dists/ubuntu1604/packages.yml
index b9b145488aacf576732e629f88f5d59e6f7a99c8..8330b9b8059c2fd6f683cfc005e0e8fa14dd800f 100644 (file)
--- a/bootstrap/generated-dists/ubuntu1604/packages.yml
+++ b/bootstrap/generated-dists/ubuntu1604/packages.yml
@@ -61,7 +61,6 @@ packages:
   - make
   - mawk
   - mingw-w64
-  - nettle-dev
   - patch
   - perl
   - perl-modules

diff --git a/bootstrap/generated-dists/ubuntu1804/bootstrap.sh b/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
index f5a1edddf31e677c2ed0521f421e46f15094d201..0f473661e6b661e42232b0e9d23f151e9f65b0df 100755 (executable)
--- a/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
@@ -74,7 +74,6 @@ apt-get -y install \
     make \
     mawk \
     mingw-w64 \
-    nettle-dev \
     patch \
     perl \
     perl-modules \

diff --git a/bootstrap/generated-dists/ubuntu1804/packages.yml b/bootstrap/generated-dists/ubuntu1804/packages.yml
index 0e37e70bc97975b0e280dffee59ae2b79bf09691..a723aad16c117af71caca471b2ee2bda21c833cb 100644 (file)
--- a/bootstrap/generated-dists/ubuntu1804/packages.yml
+++ b/bootstrap/generated-dists/ubuntu1804/packages.yml
@@ -63,7 +63,6 @@ packages:
   - make
   - mawk
   - mingw-w64
-  - nettle-dev
   - patch
   - perl
   - perl-modules

diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index 02df7bd88eaee2a7ecd37f556db3f77090694dd5..bb8e1d4a31add35e8f61df50c6acff7878651ab5 100644 (file)
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-539cd9023fee0703a42dc82e8778a01149fcb679
+03db699647966be88fc347206474f3579faae671