bootstrap: Remove libnsl as we dropped NIS support

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Guenther Deschner <gd@samba.org>

diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml
index b0f81e674bbafdbfd6c00c925515026fca6457a9..12024e01f94dd98d54c6038ed4dbd549cf73a5b8 100644 (file)
--- 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: f25e1fa0a828f428ade0e4f37d8a646ff1e207d4
+  SAMBA_CI_CONTAINER_TAG: d6f5c29855b1bf8173d2e75668487c49c7ee75ac
   #
   # 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 8383aeb392da4b8ebd0ffeb39aeb903f60d0eae0..39e1fafdeea451940ab0c2360f91ba1b60ef5a42 100644 (file)
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -126,7 +126,6 @@ PKGS = [
     ('', 'rpcgen'),  # required for test
     # refer: https://fedoraproject.org/wiki/Changes/SunRPCRemoval
     ('', 'libtirpc-devel'),  # for <rpc/rpc.h> header on fedora
-    ('', 'libnsl2-devel'),  # for <rpcsvc/yp_prot.h> header on fedora
     ('', 'rpcsvc-proto-devel'), # for <rpcsvc/rquota.h> header
     ('mawk', 'gawk'),
 
@@ -508,7 +507,6 @@ RPM_DISTS = {
             'jansson-devel': 'libjansson-devel',
             'keyutils-libs-devel': 'keyutils-devel',
             'krb5-workstation': 'krb5-client',
-            'libnsl2-devel': 'libnsl-devel',
             'libsemanage-python': 'python2-semanage',
             'openldap-devel': 'openldap2-devel',
             'perl-Archive-Tar': 'perl-Archive-Tar-Wrapper',
@@ -540,7 +538,6 @@ RPM_DISTS = {
             'jansson-devel': 'libjansson-devel',
             'keyutils-libs-devel': 'keyutils-devel',
             'krb5-workstation': 'krb5-client',
-            'libnsl2-devel': 'libnsl-devel',
             'libsemanage-python': 'python2-semanage',
             'openldap-devel': 'openldap2-devel',
             'perl-Archive-Tar': 'perl-Archive-Tar-Wrapper',

diff --git a/bootstrap/generated-dists/centos7/bootstrap.sh b/bootstrap/generated-dists/centos7/bootstrap.sh
index 7a6659d8e9a6f928600873a11a649782fd3dab5d..00dd22b891f90a6b038413c2b5bda8229140415d 100755 (executable)
--- a/bootstrap/generated-dists/centos7/bootstrap.sh
+++ b/bootstrap/generated-dists/centos7/bootstrap.sh
@@ -53,7 +53,6 @@ yum install -y \
     libbsd-devel \
     libcap-devel \
     libicu-devel \
-    libnsl2-devel \
     libpcap-devel \
     libsemanage-python \
     libtasn1-devel \

diff --git a/bootstrap/generated-dists/centos7/packages.yml b/bootstrap/generated-dists/centos7/packages.yml
index ef6bbf826704367ba85234a0c41fcb667f6e978d..3f5e8331b40ceb041781fd1d0720a5987ce6431b 100644 (file)
--- a/bootstrap/generated-dists/centos7/packages.yml
+++ b/bootstrap/generated-dists/centos7/packages.yml
@@ -39,7 +39,6 @@ packages:
   - libbsd-devel
   - libcap-devel
   - libicu-devel
-  - libnsl2-devel
   - libpcap-devel
   - libsemanage-python
   - libtasn1-devel

diff --git a/bootstrap/generated-dists/centos8/bootstrap.sh b/bootstrap/generated-dists/centos8/bootstrap.sh
index b9f2df676453d87b90bd63a1486d356a3b68f7ba..131a62fa6a95fc2e411b4b88e78f3305c93afb53 100755 (executable)
--- a/bootstrap/generated-dists/centos8/bootstrap.sh
+++ b/bootstrap/generated-dists/centos8/bootstrap.sh
@@ -62,7 +62,6 @@ yum install -y \
     libcap-devel \
     libcephfs-devel \
     libicu-devel \
-    libnsl2-devel \
     libpcap-devel \
     libtasn1-devel \
     libtasn1-tools \

diff --git a/bootstrap/generated-dists/centos8/packages.yml b/bootstrap/generated-dists/centos8/packages.yml
index 4e45f1c15e17f2449dc22721ed0429d8e546b7e4..54c80b53107e6d8e9ec85aca5ce3afe03a0c223c 100644 (file)
--- a/bootstrap/generated-dists/centos8/packages.yml
+++ b/bootstrap/generated-dists/centos8/packages.yml
@@ -42,7 +42,6 @@ packages:
   - libcap-devel
   - libcephfs-devel
   - libicu-devel
-  - libnsl2-devel
   - libpcap-devel
   - libtasn1-devel
   - libtasn1-tools

diff --git a/bootstrap/generated-dists/fedora32/bootstrap.sh b/bootstrap/generated-dists/fedora32/bootstrap.sh
index 1a585d2f13398d7c019db44bf80298af2f5bac59..104aaa6c44417d45201f2ecb2048f057a10a235f 100755 (executable)
--- a/bootstrap/generated-dists/fedora32/bootstrap.sh
+++ b/bootstrap/generated-dists/fedora32/bootstrap.sh
@@ -54,7 +54,6 @@ dnf install -y \
     libcap-devel \
     libcephfs-devel \
     libicu-devel \
-    libnsl2-devel \
     libpcap-devel \
     libtasn1-devel \
     libtasn1-tools \

diff --git a/bootstrap/generated-dists/fedora32/packages.yml b/bootstrap/generated-dists/fedora32/packages.yml
index ee3a0a6d2ff7e55a73fcec0c507c326324e26ec5..a5b4e3dd544f42e93183bf373895ee45ec861477 100644 (file)
--- a/bootstrap/generated-dists/fedora32/packages.yml
+++ b/bootstrap/generated-dists/fedora32/packages.yml
@@ -43,7 +43,6 @@ packages:
   - libcap-devel
   - libcephfs-devel
   - libicu-devel
-  - libnsl2-devel
   - libpcap-devel
   - libtasn1-devel
   - libtasn1-tools

diff --git a/bootstrap/generated-dists/fedora33/bootstrap.sh b/bootstrap/generated-dists/fedora33/bootstrap.sh
index fce2626eaeeda054a8b493fa7ac343a5962c232a..5d5e31aa534140527863c9f1be531df7075b5dc0 100755 (executable)
--- a/bootstrap/generated-dists/fedora33/bootstrap.sh
+++ b/bootstrap/generated-dists/fedora33/bootstrap.sh
@@ -54,7 +54,6 @@ dnf install -y \
     libcap-devel \
     libcephfs-devel \
     libicu-devel \
-    libnsl2-devel \
     libpcap-devel \
     libtasn1-devel \
     libtasn1-tools \

diff --git a/bootstrap/generated-dists/fedora33/packages.yml b/bootstrap/generated-dists/fedora33/packages.yml
index 9fb68c1c53995bf4a369b826ebd024f2c48ec91f..1a291ab1ff6b63cb2d816358e38e757a80268e56 100644 (file)
--- a/bootstrap/generated-dists/fedora33/packages.yml
+++ b/bootstrap/generated-dists/fedora33/packages.yml
@@ -43,7 +43,6 @@ packages:
   - libcap-devel
   - libcephfs-devel
   - libicu-devel
-  - libnsl2-devel
   - libpcap-devel
   - libtasn1-devel
   - libtasn1-tools

diff --git a/bootstrap/generated-dists/opensuse151/bootstrap.sh b/bootstrap/generated-dists/opensuse151/bootstrap.sh
index df136a64ae8ffecdceca3156f208e1dc88644be3..cc8aa11c95fa3a69c0907ca16801dad795db5611 100755 (executable)
--- a/bootstrap/generated-dists/opensuse151/bootstrap.sh
+++ b/bootstrap/generated-dists/opensuse151/bootstrap.sh
@@ -52,7 +52,6 @@ zypper --non-interactive install \
     libcephfs-devel \
     libicu-devel \
     libjansson-devel \
-    libnsl-devel \
     libpcap-devel \
     libtasn1-devel \
     libtirpc-devel \

diff --git a/bootstrap/generated-dists/opensuse151/packages.yml b/bootstrap/generated-dists/opensuse151/packages.yml
index 9f224e86c36858cbb7ffc5e26b3d005ade4eb62e..b0f7841443753a7a5f44f603cf00e5d6a701008f 100644 (file)
--- a/bootstrap/generated-dists/opensuse151/packages.yml
+++ b/bootstrap/generated-dists/opensuse151/packages.yml
@@ -40,7 +40,6 @@ packages:
   - libcephfs-devel
   - libicu-devel
   - libjansson-devel
-  - libnsl-devel
   - libpcap-devel
   - libtasn1-devel
   - libtirpc-devel

diff --git a/bootstrap/generated-dists/opensuse152/bootstrap.sh b/bootstrap/generated-dists/opensuse152/bootstrap.sh
index ab9b2e523709c5eb7b9e8767044a48bcfda69ab9..e71d8157f823b745d5c3afb9381d1b6d85e1909d 100755 (executable)
--- a/bootstrap/generated-dists/opensuse152/bootstrap.sh
+++ b/bootstrap/generated-dists/opensuse152/bootstrap.sh
@@ -52,7 +52,6 @@ zypper --non-interactive install \
     libcephfs-devel \
     libicu-devel \
     libjansson-devel \
-    libnsl-devel \
     libpcap-devel \
     libtasn1-devel \
     libtirpc-devel \

diff --git a/bootstrap/generated-dists/opensuse152/packages.yml b/bootstrap/generated-dists/opensuse152/packages.yml
index 8a65ed8c688cf116a2202a9c0181350ee73bfe65..0010d0b415dafed0caebcbe3851fc9fae6f74e69 100644 (file)
--- a/bootstrap/generated-dists/opensuse152/packages.yml
+++ b/bootstrap/generated-dists/opensuse152/packages.yml
@@ -40,7 +40,6 @@ packages:
   - libcephfs-devel
   - libicu-devel
   - libjansson-devel
-  - libnsl-devel
   - libpcap-devel
   - libtasn1-devel
   - libtirpc-devel

diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index af96c13b35e1efbb494b3efe269d2dc82b1e2995..186035eb906fab53445116bf2126ac7421bb6d40 100644 (file)
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-f25e1fa0a828f428ade0e4f37d8a646ff1e207d4
+d6f5c29855b1bf8173d2e75668487c49c7ee75ac