bootstrap: fix dependencies for crypt/xcrypt and tirpc devel packages

crypt/xcrypt and tirpc devel packages had been implicitly installed previously,
newer distros need them explicitly though.

Signed-off-by: Bjoern Jacke <bjacke@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Martin Schwenke <martin@meltin.net>

diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml
index a89e188e46547b3e8ddd5e4c18708a504f76fe34..2691ccd65e28229c4bb1625c45b56dab4bc02a42 100644 (file)
--- a/.gitlab-ci-main.yml
+++ b/.gitlab-ci-main.yml
@@ -47,7 +47,7 @@ variables:
   # Set this to the contents of bootstrap/sha1sum.txt
   # which is generated by bootstrap/template.py --render
   #
-  SAMBA_CI_CONTAINER_TAG: c0e1131fbccc83ca191d64af7d29aab7ede1a129
+  SAMBA_CI_CONTAINER_TAG: 604d8f614b0e7eb59b995f4f7ff84a7cc2aa1f0d
   #
   # We use the ubuntu2204 image as default as
   # it matches what we have on atb-devel-224

diff --git a/bootstrap/config.py b/bootstrap/config.py
index d403a589f8c666a1038030414b57ea9cf2b8e859..a0e6e163755fc1cdcc9ff364575b9df4eae84781 100644 (file)
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -103,6 +103,7 @@ PKGS = [
     ('libcups2-dev', 'cups-devel'),
     ('libpam0g-dev', 'pam-devel'),
     ('libgpgme11-dev', 'gpgme-devel'),
+    ('libcrypt-dev', 'libxcrypt-devel'),
     # NOTE: Debian 8+ and Ubuntu 14.04+
     ('libgnutls28-dev', 'gnutls-devel'),
     ('gnutls-bin', 'gnutls-utils'),
@@ -139,7 +140,7 @@ PKGS = [
     ('lsb-release', 'lsb-release'),  # we need lsb_release to show info
     ('', 'rpcgen'),  # required for test
     # refer: https://fedoraproject.org/wiki/Changes/SunRPCRemoval
-    ('', 'libtirpc-devel'),  # for <rpc/rpc.h> header on fedora
+    ('libtirpc-dev', 'libtirpc-devel'),  # for <rpc/rpc.h> header
     ('', 'rpcsvc-proto-devel'), # for <rpcsvc/rquota.h> header
     ('mawk', 'gawk'),
     ('shellcheck', 'ShellCheck'),
@@ -494,6 +495,7 @@ DEB_DISTS = {
         'docker_image': 'ubuntu:22.04',
         'vagrant_box': 'ubuntu/jammy64',
         'replace': {
+            'libtirpc-dev': '',
         },
     },
     'ubuntu2404': {

diff --git a/bootstrap/generated-dists/centos9s/bootstrap.sh b/bootstrap/generated-dists/centos9s/bootstrap.sh
index 9fd164ed0da917af5db662b90b24fe3039412bb4..5faafe5e1af52659dc4d532c1687cc17ab2b31df 100755 (executable)
--- a/bootstrap/generated-dists/centos9s/bootstrap.sh
+++ b/bootstrap/generated-dists/centos9s/bootstrap.sh
@@ -73,6 +73,7 @@ dnf install -y \
     libunwind-devel \
     liburing-devel \
     libuuid-devel \
+    libxcrypt-devel \
     libxslt \
     lmdb \
     lmdb-devel \

diff --git a/bootstrap/generated-dists/centos9s/packages.yml b/bootstrap/generated-dists/centos9s/packages.yml
index 889198a282a753ab1e2593e62eaf6dcb64d0483c..5278a3840c2d6c7dd38ed96ec9a40a83879ccee0 100644 (file)
--- a/bootstrap/generated-dists/centos9s/packages.yml
+++ b/bootstrap/generated-dists/centos9s/packages.yml
@@ -54,6 +54,7 @@ packages:
   - libunwind-devel
   - liburing-devel
   - libuuid-devel
+  - libxcrypt-devel
   - libxslt
   - lmdb
   - lmdb-devel

diff --git a/bootstrap/generated-dists/debian11-32bit/bootstrap.sh b/bootstrap/generated-dists/debian11-32bit/bootstrap.sh
index 371291f33fbd65cdbacd2006dc5ad8dc5b55e48f..ef8bdae5fb441de9e0017aa6805e8a30373561b9 100755 (executable)
--- a/bootstrap/generated-dists/debian11-32bit/bootstrap.sh
+++ b/bootstrap/generated-dists/debian11-32bit/bootstrap.sh
@@ -51,6 +51,7 @@ apt-get -y install \
     libcap-dev \
     libcephfs-dev \
     libclang-dev \
+    libcrypt-dev \
     libcups2-dev \
     libdbus-1-dev \
     libevent-dev \
@@ -74,6 +75,7 @@ apt-get -y install \
     libsystemd-dev \
     libtasn1-bin \
     libtasn1-dev \
+    libtirpc-dev \
     libunwind-dev \
     liburing-dev \
     libutf8proc-dev \

diff --git a/bootstrap/generated-dists/debian11-32bit/packages.yml b/bootstrap/generated-dists/debian11-32bit/packages.yml
index 479b2940cf6653ec22b751c7b99b8e40b1ec3db5..33add53e02af10cb2110f3f938721f2baedf1254 100644 (file)
--- a/bootstrap/generated-dists/debian11-32bit/packages.yml
+++ b/bootstrap/generated-dists/debian11-32bit/packages.yml
@@ -40,6 +40,7 @@ packages:
   - libcap-dev
   - libcephfs-dev
   - libclang-dev
+  - libcrypt-dev
   - libcups2-dev
   - libdbus-1-dev
   - libevent-dev
@@ -63,6 +64,7 @@ packages:
   - libsystemd-dev
   - libtasn1-bin
   - libtasn1-dev
+  - libtirpc-dev
   - libunwind-dev
   - liburing-dev
   - libutf8proc-dev

diff --git a/bootstrap/generated-dists/debian11/bootstrap.sh b/bootstrap/generated-dists/debian11/bootstrap.sh
index 371291f33fbd65cdbacd2006dc5ad8dc5b55e48f..ef8bdae5fb441de9e0017aa6805e8a30373561b9 100755 (executable)
--- a/bootstrap/generated-dists/debian11/bootstrap.sh
+++ b/bootstrap/generated-dists/debian11/bootstrap.sh
@@ -51,6 +51,7 @@ apt-get -y install \
     libcap-dev \
     libcephfs-dev \
     libclang-dev \
+    libcrypt-dev \
     libcups2-dev \
     libdbus-1-dev \
     libevent-dev \
@@ -74,6 +75,7 @@ apt-get -y install \
     libsystemd-dev \
     libtasn1-bin \
     libtasn1-dev \
+    libtirpc-dev \
     libunwind-dev \
     liburing-dev \
     libutf8proc-dev \

diff --git a/bootstrap/generated-dists/debian11/packages.yml b/bootstrap/generated-dists/debian11/packages.yml
index 479b2940cf6653ec22b751c7b99b8e40b1ec3db5..33add53e02af10cb2110f3f938721f2baedf1254 100644 (file)
--- a/bootstrap/generated-dists/debian11/packages.yml
+++ b/bootstrap/generated-dists/debian11/packages.yml
@@ -40,6 +40,7 @@ packages:
   - libcap-dev
   - libcephfs-dev
   - libclang-dev
+  - libcrypt-dev
   - libcups2-dev
   - libdbus-1-dev
   - libevent-dev
@@ -63,6 +64,7 @@ packages:
   - libsystemd-dev
   - libtasn1-bin
   - libtasn1-dev
+  - libtirpc-dev
   - libunwind-dev
   - liburing-dev
   - libutf8proc-dev

diff --git a/bootstrap/generated-dists/debian12-32bit/bootstrap.sh b/bootstrap/generated-dists/debian12-32bit/bootstrap.sh
index 6d1d7f610882c292abeb5c37aa5ed4457a895b64..abda3e84938cc72aebb1b5c50b044d49ec0d4d65 100755 (executable)
--- a/bootstrap/generated-dists/debian12-32bit/bootstrap.sh
+++ b/bootstrap/generated-dists/debian12-32bit/bootstrap.sh
@@ -51,6 +51,7 @@ apt-get -y install \
     libcap-dev \
     libcephfs-dev \
     libclang-dev \
+    libcrypt-dev \
     libcups2-dev \
     libdbus-1-dev \
     libevent-dev \
@@ -74,6 +75,7 @@ apt-get -y install \
     libsystemd-dev \
     libtasn1-bin \
     libtasn1-dev \
+    libtirpc-dev \
     libunwind-dev \
     liburing-dev \
     libutf8proc-dev \

diff --git a/bootstrap/generated-dists/debian12-32bit/packages.yml b/bootstrap/generated-dists/debian12-32bit/packages.yml
index 56264828e9a46f70bf341ad4d9e6aa78cd82a4e8..f8569c4618f576e0eb1244bdb696d9ce5686ba9a 100644 (file)
--- a/bootstrap/generated-dists/debian12-32bit/packages.yml
+++ b/bootstrap/generated-dists/debian12-32bit/packages.yml
@@ -40,6 +40,7 @@ packages:
   - libcap-dev
   - libcephfs-dev
   - libclang-dev
+  - libcrypt-dev
   - libcups2-dev
   - libdbus-1-dev
   - libevent-dev
@@ -63,6 +64,7 @@ packages:
   - libsystemd-dev
   - libtasn1-bin
   - libtasn1-dev
+  - libtirpc-dev
   - libunwind-dev
   - liburing-dev
   - libutf8proc-dev

diff --git a/bootstrap/generated-dists/debian12/bootstrap.sh b/bootstrap/generated-dists/debian12/bootstrap.sh
index 6d1d7f610882c292abeb5c37aa5ed4457a895b64..abda3e84938cc72aebb1b5c50b044d49ec0d4d65 100755 (executable)
--- a/bootstrap/generated-dists/debian12/bootstrap.sh
+++ b/bootstrap/generated-dists/debian12/bootstrap.sh
@@ -51,6 +51,7 @@ apt-get -y install \
     libcap-dev \
     libcephfs-dev \
     libclang-dev \
+    libcrypt-dev \
     libcups2-dev \
     libdbus-1-dev \
     libevent-dev \
@@ -74,6 +75,7 @@ apt-get -y install \
     libsystemd-dev \
     libtasn1-bin \
     libtasn1-dev \
+    libtirpc-dev \
     libunwind-dev \
     liburing-dev \
     libutf8proc-dev \

diff --git a/bootstrap/generated-dists/debian12/packages.yml b/bootstrap/generated-dists/debian12/packages.yml
index 56264828e9a46f70bf341ad4d9e6aa78cd82a4e8..f8569c4618f576e0eb1244bdb696d9ce5686ba9a 100644 (file)
--- a/bootstrap/generated-dists/debian12/packages.yml
+++ b/bootstrap/generated-dists/debian12/packages.yml
@@ -40,6 +40,7 @@ packages:
   - libcap-dev
   - libcephfs-dev
   - libclang-dev
+  - libcrypt-dev
   - libcups2-dev
   - libdbus-1-dev
   - libevent-dev
@@ -63,6 +64,7 @@ packages:
   - libsystemd-dev
   - libtasn1-bin
   - libtasn1-dev
+  - libtirpc-dev
   - libunwind-dev
   - liburing-dev
   - libutf8proc-dev

diff --git a/bootstrap/generated-dists/fedora43/bootstrap.sh b/bootstrap/generated-dists/fedora43/bootstrap.sh
index 235658d054f29a7d0bea5eb460b634cc85ca342e..54b4519bc038ef665c22a246f4a6f791e3244414 100755 (executable)
--- a/bootstrap/generated-dists/fedora43/bootstrap.sh
+++ b/bootstrap/generated-dists/fedora43/bootstrap.sh
@@ -71,6 +71,7 @@ dnf install -y \
     liburing-devel \
     libuuid-devel \
     libvarlink-devel \
+    libxcrypt-devel \
     libxslt \
     lmdb \
     lmdb-devel \

diff --git a/bootstrap/generated-dists/fedora43/packages.yml b/bootstrap/generated-dists/fedora43/packages.yml
index d8162e34aba5742b0784b250a476c58a12fea450..d0f023e68ab348c72259d4a54a3e82cd222df0bd 100644 (file)
--- a/bootstrap/generated-dists/fedora43/packages.yml
+++ b/bootstrap/generated-dists/fedora43/packages.yml
@@ -60,6 +60,7 @@ packages:
   - liburing-devel
   - libuuid-devel
   - libvarlink-devel
+  - libxcrypt-devel
   - libxslt
   - lmdb
   - lmdb-devel

diff --git a/bootstrap/generated-dists/opensuse160/bootstrap.sh b/bootstrap/generated-dists/opensuse160/bootstrap.sh
index 06ed3096e95566c6d9156f74de1501b274462b6f..5340af53d10994aec0d71418352c33f90cf95f34 100755 (executable)
--- a/bootstrap/generated-dists/opensuse160/bootstrap.sh
+++ b/bootstrap/generated-dists/opensuse160/bootstrap.sh
@@ -68,6 +68,7 @@ zypper --non-interactive install \
     libunwind-devel \
     liburing-devel \
     libuuid-devel \
+    libxcrypt-devel \
     libxslt \
     lmdb \
     lmdb-devel \

diff --git a/bootstrap/generated-dists/opensuse160/packages.yml b/bootstrap/generated-dists/opensuse160/packages.yml
index b319da00bf57bccd65004537cbd6150c9cef4466..4a9e7ed1724c5cdcc51c60a58e1b77363dd30417 100644 (file)
--- a/bootstrap/generated-dists/opensuse160/packages.yml
+++ b/bootstrap/generated-dists/opensuse160/packages.yml
@@ -55,6 +55,7 @@ packages:
   - libunwind-devel
   - liburing-devel
   - libuuid-devel
+  - libxcrypt-devel
   - libxslt
   - lmdb
   - lmdb-devel

diff --git a/bootstrap/generated-dists/rocky8/bootstrap.sh b/bootstrap/generated-dists/rocky8/bootstrap.sh
index e5cdb92b3529f2e0058160a62bd1c33ebd295e1a..2722186fbbab57ae60c5b5570332c3ccf8687bc9 100755 (executable)
--- a/bootstrap/generated-dists/rocky8/bootstrap.sh
+++ b/bootstrap/generated-dists/rocky8/bootstrap.sh
@@ -79,6 +79,7 @@ yum install -y \
     libtirpc-devel \
     libunwind-devel \
     libuuid-devel \
+    libxcrypt-devel \
     libxslt \
     lmdb \
     lmdb-devel \

diff --git a/bootstrap/generated-dists/rocky8/packages.yml b/bootstrap/generated-dists/rocky8/packages.yml
index 759d629288a6c177af9748fe5b351e9f6705cecb..43d6a93ad004a00521f844ca8484774c806e5c21 100644 (file)
--- a/bootstrap/generated-dists/rocky8/packages.yml
+++ b/bootstrap/generated-dists/rocky8/packages.yml
@@ -55,6 +55,7 @@ packages:
   - libtirpc-devel
   - libunwind-devel
   - libuuid-devel
+  - libxcrypt-devel
   - libxslt
   - lmdb
   - lmdb-devel

diff --git a/bootstrap/generated-dists/ubuntu2204/bootstrap.sh b/bootstrap/generated-dists/ubuntu2204/bootstrap.sh
index 17831dfaefe84c6c7aed4add60834d284628b851..014307f7d770074beada163399eae847f9525ddb 100755 (executable)
--- a/bootstrap/generated-dists/ubuntu2204/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu2204/bootstrap.sh
@@ -54,6 +54,7 @@ apt-get -y install \
     libcap-dev \
     libcephfs-dev \
     libclang-dev \
+    libcrypt-dev \
     libcups2-dev \
     libdbus-1-dev \
     libevent-dev \

diff --git a/bootstrap/generated-dists/ubuntu2204/packages.yml b/bootstrap/generated-dists/ubuntu2204/packages.yml
index 8d5d400a2eafa66651fa0cc70d3d93f1c052c442..7874acb02de083fbeb140f6140a0804dccec4c8b 100644 (file)
--- a/bootstrap/generated-dists/ubuntu2204/packages.yml
+++ b/bootstrap/generated-dists/ubuntu2204/packages.yml
@@ -43,6 +43,7 @@ packages:
   - libcap-dev
   - libcephfs-dev
   - libclang-dev
+  - libcrypt-dev
   - libcups2-dev
   - libdbus-1-dev
   - libevent-dev

diff --git a/bootstrap/generated-dists/ubuntu2404/bootstrap.sh b/bootstrap/generated-dists/ubuntu2404/bootstrap.sh
index 17831dfaefe84c6c7aed4add60834d284628b851..cc18c086062d71d2f9b65c90b09b2a5a49c50f91 100755 (executable)
--- a/bootstrap/generated-dists/ubuntu2404/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu2404/bootstrap.sh
@@ -54,6 +54,7 @@ apt-get -y install \
     libcap-dev \
     libcephfs-dev \
     libclang-dev \
+    libcrypt-dev \
     libcups2-dev \
     libdbus-1-dev \
     libevent-dev \
@@ -77,6 +78,7 @@ apt-get -y install \
     libsystemd-dev \
     libtasn1-bin \
     libtasn1-dev \
+    libtirpc-dev \
     libunwind-dev \
     liburing-dev \
     libutf8proc-dev \

diff --git a/bootstrap/generated-dists/ubuntu2404/packages.yml b/bootstrap/generated-dists/ubuntu2404/packages.yml
index 8d5d400a2eafa66651fa0cc70d3d93f1c052c442..b004fe6d56c16c11a395a1ddd176f1126ebd0ef6 100644 (file)
--- a/bootstrap/generated-dists/ubuntu2404/packages.yml
+++ b/bootstrap/generated-dists/ubuntu2404/packages.yml
@@ -43,6 +43,7 @@ packages:
   - libcap-dev
   - libcephfs-dev
   - libclang-dev
+  - libcrypt-dev
   - libcups2-dev
   - libdbus-1-dev
   - libevent-dev
@@ -66,6 +67,7 @@ packages:
   - libsystemd-dev
   - libtasn1-bin
   - libtasn1-dev
+  - libtirpc-dev
   - libunwind-dev
   - liburing-dev
   - libutf8proc-dev

diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index 4604131f7b1f8da7acc91266682d9bf7f3acbfc7..053d2c22e092cb921cdd1b6406ccb4075e88e569 100644 (file)
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-c0e1131fbccc83ca191d64af7d29aab7ede1a129
+604d8f614b0e7eb59b995f4f7ff84a7cc2aa1f0d