Add clang and openssl deps

Ensure CI images are generated with the necessary
clang and openssl packages for building.

Signed-off-by: David Mulder <dmulder@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>

diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml
index 263d160a08d2bc6f8122b23fd86cc38320096943..b6caae6ae60de38140cc37b72dfc924ad051f6af 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: 2a20df752f162f9d1f617af785e463fa39944c6e
+  SAMBA_CI_CONTAINER_TAG: edd9967901b27be5820a342e98b483dfde156c43
   #
   # 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 d862ef407d2f0e2bb11aff2a4bf99d3c732a4e2c..b37ca5ee43a2533f371be6f0efabbe0be8616f1a 100644 (file)
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -85,6 +85,8 @@ PKGS = [
     ('libacl1-dev', 'libacl-devel'),
     ('libattr1-dev', 'libattr-devel'),
     ('libutf8proc-dev', 'utf8proc-devel'),
+    ('libssl-dev', 'openssl-devel'),
+    ('libclang-dev', 'clang-devel'),
 
     # libNAME1-dev, NAME2-devel
     ('libpopt-dev', 'popt-devel'),

diff --git a/bootstrap/generated-dists/centos9s/bootstrap.sh b/bootstrap/generated-dists/centos9s/bootstrap.sh
index 926a76f5d504701601abd521fa52a79f636431f9..e3ad1344985ea438d7f265660d7ba195d8165b43 100755 (executable)
--- a/bootstrap/generated-dists/centos9s/bootstrap.sh
+++ b/bootstrap/generated-dists/centos9s/bootstrap.sh
@@ -30,6 +30,7 @@ dnf install -y \
     cargo \
     ccache \
     chrpath \
+    clang-devel \
     crypto-policies-scripts \
     cups-devel \
     dbus-devel \
@@ -79,6 +80,7 @@ dnf install -y \
     mingw64-gcc \
     ncurses-devel \
     openldap-devel \
+    openssl-devel \
     pam-devel \
     patch \
     perl \

diff --git a/bootstrap/generated-dists/centos9s/packages.yml b/bootstrap/generated-dists/centos9s/packages.yml
index c218584e723dcaa9fb978242ed9b999c1e64a90c..4a4f99b8564a2688a4649b752238e7bab30c6c89 100644 (file)
--- a/bootstrap/generated-dists/centos9s/packages.yml
+++ b/bootstrap/generated-dists/centos9s/packages.yml
@@ -11,6 +11,7 @@ packages:
   - cargo
   - ccache
   - chrpath
+  - clang-devel
   - crypto-policies-scripts
   - cups-devel
   - dbus-devel
@@ -60,6 +61,7 @@ packages:
   - mingw64-gcc
   - ncurses-devel
   - openldap-devel
+  - openssl-devel
   - pam-devel
   - patch
   - perl

diff --git a/bootstrap/generated-dists/debian11-32bit/bootstrap.sh b/bootstrap/generated-dists/debian11-32bit/bootstrap.sh
index 4a4ee8cd706e7b4f1e08dea12c8f1038fffc3778..fa731aac17468fb9c5579326a0fcc48d8a4a7fcf 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 \
     libbsd-dev \
     libcap-dev \
     libcephfs-dev \
+    libclang-dev \
     libcups2-dev \
     libdbus-1-dev \
     libglib2.0-dev \
@@ -69,6 +70,7 @@ apt-get -y install \
     libpcap-dev \
     libpopt-dev \
     libreadline-dev \
+    libssl-dev \
     libsystemd-dev \
     libtasn1-bin \
     libtasn1-dev \

diff --git a/bootstrap/generated-dists/debian11-32bit/packages.yml b/bootstrap/generated-dists/debian11-32bit/packages.yml
index ef6b863e35e5fe460db111d50e94d15ca19f571f..63d5f41e06451d2d9f4826e8e3d1ca284e326959 100644 (file)
--- a/bootstrap/generated-dists/debian11-32bit/packages.yml
+++ b/bootstrap/generated-dists/debian11-32bit/packages.yml
@@ -40,6 +40,7 @@ packages:
   - libbsd-dev
   - libcap-dev
   - libcephfs-dev
+  - libclang-dev
   - libcups2-dev
   - libdbus-1-dev
   - libglib2.0-dev
@@ -58,6 +59,7 @@ packages:
   - libpcap-dev
   - libpopt-dev
   - libreadline-dev
+  - libssl-dev
   - libsystemd-dev
   - libtasn1-bin
   - libtasn1-dev

diff --git a/bootstrap/generated-dists/debian11/bootstrap.sh b/bootstrap/generated-dists/debian11/bootstrap.sh
index 4a4ee8cd706e7b4f1e08dea12c8f1038fffc3778..fa731aac17468fb9c5579326a0fcc48d8a4a7fcf 100755 (executable)
--- a/bootstrap/generated-dists/debian11/bootstrap.sh
+++ b/bootstrap/generated-dists/debian11/bootstrap.sh
@@ -51,6 +51,7 @@ apt-get -y install \
     libbsd-dev \
     libcap-dev \
     libcephfs-dev \
+    libclang-dev \
     libcups2-dev \
     libdbus-1-dev \
     libglib2.0-dev \
@@ -69,6 +70,7 @@ apt-get -y install \
     libpcap-dev \
     libpopt-dev \
     libreadline-dev \
+    libssl-dev \
     libsystemd-dev \
     libtasn1-bin \
     libtasn1-dev \

diff --git a/bootstrap/generated-dists/debian11/packages.yml b/bootstrap/generated-dists/debian11/packages.yml
index ef6b863e35e5fe460db111d50e94d15ca19f571f..63d5f41e06451d2d9f4826e8e3d1ca284e326959 100644 (file)
--- a/bootstrap/generated-dists/debian11/packages.yml
+++ b/bootstrap/generated-dists/debian11/packages.yml
@@ -40,6 +40,7 @@ packages:
   - libbsd-dev
   - libcap-dev
   - libcephfs-dev
+  - libclang-dev
   - libcups2-dev
   - libdbus-1-dev
   - libglib2.0-dev
@@ -58,6 +59,7 @@ packages:
   - libpcap-dev
   - libpopt-dev
   - libreadline-dev
+  - libssl-dev
   - libsystemd-dev
   - libtasn1-bin
   - libtasn1-dev

diff --git a/bootstrap/generated-dists/debian12-32bit/bootstrap.sh b/bootstrap/generated-dists/debian12-32bit/bootstrap.sh
index 38b3c4777affb92f28bf65471c2486e0f6249997..eea84b95ba63e6a66cd15e3d07aec6525736a7bf 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 \
     libbsd-dev \
     libcap-dev \
     libcephfs-dev \
+    libclang-dev \
     libcups2-dev \
     libdbus-1-dev \
     libglib2.0-dev \
@@ -69,6 +70,7 @@ apt-get -y install \
     libpcap-dev \
     libpopt-dev \
     libreadline-dev \
+    libssl-dev \
     libsystemd-dev \
     libtasn1-bin \
     libtasn1-dev \

diff --git a/bootstrap/generated-dists/debian12-32bit/packages.yml b/bootstrap/generated-dists/debian12-32bit/packages.yml
index bbc9d814fc741484862ba5acf46122bbf174c648..6191eb9c2aa451b6f7153dac23786e553bda0848 100644 (file)
--- a/bootstrap/generated-dists/debian12-32bit/packages.yml
+++ b/bootstrap/generated-dists/debian12-32bit/packages.yml
@@ -40,6 +40,7 @@ packages:
   - libbsd-dev
   - libcap-dev
   - libcephfs-dev
+  - libclang-dev
   - libcups2-dev
   - libdbus-1-dev
   - libglib2.0-dev
@@ -58,6 +59,7 @@ packages:
   - libpcap-dev
   - libpopt-dev
   - libreadline-dev
+  - libssl-dev
   - libsystemd-dev
   - libtasn1-bin
   - libtasn1-dev

diff --git a/bootstrap/generated-dists/debian12/bootstrap.sh b/bootstrap/generated-dists/debian12/bootstrap.sh
index 38b3c4777affb92f28bf65471c2486e0f6249997..eea84b95ba63e6a66cd15e3d07aec6525736a7bf 100755 (executable)
--- a/bootstrap/generated-dists/debian12/bootstrap.sh
+++ b/bootstrap/generated-dists/debian12/bootstrap.sh
@@ -51,6 +51,7 @@ apt-get -y install \
     libbsd-dev \
     libcap-dev \
     libcephfs-dev \
+    libclang-dev \
     libcups2-dev \
     libdbus-1-dev \
     libglib2.0-dev \
@@ -69,6 +70,7 @@ apt-get -y install \
     libpcap-dev \
     libpopt-dev \
     libreadline-dev \
+    libssl-dev \
     libsystemd-dev \
     libtasn1-bin \
     libtasn1-dev \

diff --git a/bootstrap/generated-dists/debian12/packages.yml b/bootstrap/generated-dists/debian12/packages.yml
index bbc9d814fc741484862ba5acf46122bbf174c648..6191eb9c2aa451b6f7153dac23786e553bda0848 100644 (file)
--- a/bootstrap/generated-dists/debian12/packages.yml
+++ b/bootstrap/generated-dists/debian12/packages.yml
@@ -40,6 +40,7 @@ packages:
   - libbsd-dev
   - libcap-dev
   - libcephfs-dev
+  - libclang-dev
   - libcups2-dev
   - libdbus-1-dev
   - libglib2.0-dev
@@ -58,6 +59,7 @@ packages:
   - libpcap-dev
   - libpopt-dev
   - libreadline-dev
+  - libssl-dev
   - libsystemd-dev
   - libtasn1-bin
   - libtasn1-dev

diff --git a/bootstrap/generated-dists/fedora40/bootstrap.sh b/bootstrap/generated-dists/fedora40/bootstrap.sh
index d794591986b61558f9950e5f54c28565350a142b..22d2fa8974509072eb28550ae4273dc1cd64cfb4 100755 (executable)
--- a/bootstrap/generated-dists/fedora40/bootstrap.sh
+++ b/bootstrap/generated-dists/fedora40/bootstrap.sh
@@ -23,6 +23,7 @@ dnf install -y \
     cargo \
     ccache \
     chrpath \
+    clang-devel \
     codespell \
     crypto-policies-scripts \
     cups-devel \
@@ -76,6 +77,7 @@ dnf install -y \
     mold \
     ncurses-devel \
     openldap-devel \
+    openssl-devel \
     pam-devel \
     patch \
     perl \

diff --git a/bootstrap/generated-dists/fedora40/packages.yml b/bootstrap/generated-dists/fedora40/packages.yml
index 2596611c5f3bcf3c8bebcb5bdba51c258d71d9a4..532ac877fddbb649175fff8af27c762609a9106f 100644 (file)
--- a/bootstrap/generated-dists/fedora40/packages.yml
+++ b/bootstrap/generated-dists/fedora40/packages.yml
@@ -12,6 +12,7 @@ packages:
   - cargo
   - ccache
   - chrpath
+  - clang-devel
   - codespell
   - crypto-policies-scripts
   - cups-devel
@@ -65,6 +66,7 @@ packages:
   - mold
   - ncurses-devel
   - openldap-devel
+  - openssl-devel
   - pam-devel
   - patch
   - perl

diff --git a/bootstrap/generated-dists/opensuse155/bootstrap.sh b/bootstrap/generated-dists/opensuse155/bootstrap.sh
index adfa86155002e356bb83f30e6196cb50307abcf1..e81cc18ccfbb7e28902ca401668b48edd7cb3942 100755 (executable)
--- a/bootstrap/generated-dists/opensuse155/bootstrap.sh
+++ b/bootstrap/generated-dists/opensuse155/bootstrap.sh
@@ -23,6 +23,7 @@ zypper --non-interactive install \
     cargo \
     ccache \
     chrpath \
+    clang-devel \
     codespell \
     crypto-policies-scripts \
     cups-devel \
@@ -73,6 +74,7 @@ zypper --non-interactive install \
     mingw64-gcc \
     ncurses-devel \
     openldap2-devel \
+    openssl-devel \
     pam-devel \
     patch \
     perl \

diff --git a/bootstrap/generated-dists/opensuse155/packages.yml b/bootstrap/generated-dists/opensuse155/packages.yml
index 05ebdf739d8fb8366ea3e905b5d3d06467d6a82b..b709cc45e23227ea64f6c901cc5f4701b1482053 100644 (file)
--- a/bootstrap/generated-dists/opensuse155/packages.yml
+++ b/bootstrap/generated-dists/opensuse155/packages.yml
@@ -11,6 +11,7 @@ packages:
   - cargo
   - ccache
   - chrpath
+  - clang-devel
   - codespell
   - crypto-policies-scripts
   - cups-devel
@@ -61,6 +62,7 @@ packages:
   - mingw64-gcc
   - ncurses-devel
   - openldap2-devel
+  - openssl-devel
   - pam-devel
   - patch
   - perl

diff --git a/bootstrap/generated-dists/rocky8/bootstrap.sh b/bootstrap/generated-dists/rocky8/bootstrap.sh
index 39dca1599790f90059773b62bb339771866d881c..ae45151eab2ea0591a09bb54a2e4ea436f16aa69 100755 (executable)
--- a/bootstrap/generated-dists/rocky8/bootstrap.sh
+++ b/bootstrap/generated-dists/rocky8/bootstrap.sh
@@ -29,6 +29,7 @@ yum install -y \
     cargo \
     ccache \
     chrpath \
+    clang-devel \
     crypto-policies-scripts \
     cups-devel \
     curl \
@@ -78,6 +79,7 @@ yum install -y \
     mingw64-gcc \
     ncurses-devel \
     openldap-devel \
+    openssl-devel \
     pam-devel \
     patch \
     perl \

diff --git a/bootstrap/generated-dists/rocky8/packages.yml b/bootstrap/generated-dists/rocky8/packages.yml
index 4be310344423c4113c650e6eb6067511debb7773..cd91a67f11a4dfe43261684b77a1f48172bb2eea 100644 (file)
--- a/bootstrap/generated-dists/rocky8/packages.yml
+++ b/bootstrap/generated-dists/rocky8/packages.yml
@@ -11,6 +11,7 @@ packages:
   - cargo
   - ccache
   - chrpath
+  - clang-devel
   - crypto-policies-scripts
   - cups-devel
   - curl
@@ -60,6 +61,7 @@ packages:
   - mingw64-gcc
   - ncurses-devel
   - openldap-devel
+  - openssl-devel
   - pam-devel
   - patch
   - perl

diff --git a/bootstrap/generated-dists/ubuntu1804-32bit/bootstrap.sh b/bootstrap/generated-dists/ubuntu1804-32bit/bootstrap.sh
index 607da6b4eaec263ba5cf2f01d2056357c3bf6313..2cb5e686209cd88ee352ec5dfee01175b086377e 100755 (executable)
--- a/bootstrap/generated-dists/ubuntu1804-32bit/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu1804-32bit/bootstrap.sh
@@ -52,6 +52,7 @@ apt-get -y install \
     libbsd-dev \
     libcap-dev \
     libcephfs-dev \
+    libclang-dev \
     libcups2-dev \
     libdbus-1-dev \
     libglib2.0-dev \
@@ -70,6 +71,7 @@ apt-get -y install \
     libpcap-dev \
     libpopt-dev \
     libreadline-dev \
+    libssl-dev \
     libsystemd-dev \
     libtasn1-bin \
     libtasn1-dev \

diff --git a/bootstrap/generated-dists/ubuntu1804-32bit/packages.yml b/bootstrap/generated-dists/ubuntu1804-32bit/packages.yml
index 80dd35cc204f59e35ae14bad329f3a108077db29..857ab0f6cfa754d236c52ab72f304ab49d607cf3 100644 (file)
--- a/bootstrap/generated-dists/ubuntu1804-32bit/packages.yml
+++ b/bootstrap/generated-dists/ubuntu1804-32bit/packages.yml
@@ -41,6 +41,7 @@ packages:
   - libbsd-dev
   - libcap-dev
   - libcephfs-dev
+  - libclang-dev
   - libcups2-dev
   - libdbus-1-dev
   - libglib2.0-dev
@@ -59,6 +60,7 @@ packages:
   - libpcap-dev
   - libpopt-dev
   - libreadline-dev
+  - libssl-dev
   - libsystemd-dev
   - libtasn1-bin
   - libtasn1-dev

diff --git a/bootstrap/generated-dists/ubuntu1804/bootstrap.sh b/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
index 607da6b4eaec263ba5cf2f01d2056357c3bf6313..2cb5e686209cd88ee352ec5dfee01175b086377e 100755 (executable)
--- a/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
@@ -52,6 +52,7 @@ apt-get -y install \
     libbsd-dev \
     libcap-dev \
     libcephfs-dev \
+    libclang-dev \
     libcups2-dev \
     libdbus-1-dev \
     libglib2.0-dev \
@@ -70,6 +71,7 @@ apt-get -y install \
     libpcap-dev \
     libpopt-dev \
     libreadline-dev \
+    libssl-dev \
     libsystemd-dev \
     libtasn1-bin \
     libtasn1-dev \

diff --git a/bootstrap/generated-dists/ubuntu1804/packages.yml b/bootstrap/generated-dists/ubuntu1804/packages.yml
index 80dd35cc204f59e35ae14bad329f3a108077db29..857ab0f6cfa754d236c52ab72f304ab49d607cf3 100644 (file)
--- a/bootstrap/generated-dists/ubuntu1804/packages.yml
+++ b/bootstrap/generated-dists/ubuntu1804/packages.yml
@@ -41,6 +41,7 @@ packages:
   - libbsd-dev
   - libcap-dev
   - libcephfs-dev
+  - libclang-dev
   - libcups2-dev
   - libdbus-1-dev
   - libglib2.0-dev
@@ -59,6 +60,7 @@ packages:
   - libpcap-dev
   - libpopt-dev
   - libreadline-dev
+  - libssl-dev
   - libsystemd-dev
   - libtasn1-bin
   - libtasn1-dev

diff --git a/bootstrap/generated-dists/ubuntu2004/bootstrap.sh b/bootstrap/generated-dists/ubuntu2004/bootstrap.sh
index 607da6b4eaec263ba5cf2f01d2056357c3bf6313..2cb5e686209cd88ee352ec5dfee01175b086377e 100755 (executable)
--- a/bootstrap/generated-dists/ubuntu2004/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu2004/bootstrap.sh
@@ -52,6 +52,7 @@ apt-get -y install \
     libbsd-dev \
     libcap-dev \
     libcephfs-dev \
+    libclang-dev \
     libcups2-dev \
     libdbus-1-dev \
     libglib2.0-dev \
@@ -70,6 +71,7 @@ apt-get -y install \
     libpcap-dev \
     libpopt-dev \
     libreadline-dev \
+    libssl-dev \
     libsystemd-dev \
     libtasn1-bin \
     libtasn1-dev \

diff --git a/bootstrap/generated-dists/ubuntu2004/packages.yml b/bootstrap/generated-dists/ubuntu2004/packages.yml
index 80dd35cc204f59e35ae14bad329f3a108077db29..857ab0f6cfa754d236c52ab72f304ab49d607cf3 100644 (file)
--- a/bootstrap/generated-dists/ubuntu2004/packages.yml
+++ b/bootstrap/generated-dists/ubuntu2004/packages.yml
@@ -41,6 +41,7 @@ packages:
   - libbsd-dev
   - libcap-dev
   - libcephfs-dev
+  - libclang-dev
   - libcups2-dev
   - libdbus-1-dev
   - libglib2.0-dev
@@ -59,6 +60,7 @@ packages:
   - libpcap-dev
   - libpopt-dev
   - libreadline-dev
+  - libssl-dev
   - libsystemd-dev
   - libtasn1-bin
   - libtasn1-dev

diff --git a/bootstrap/generated-dists/ubuntu2204/bootstrap.sh b/bootstrap/generated-dists/ubuntu2204/bootstrap.sh
index fab68e8d7b62e424c0e31ddc274342c5ed29fdb5..b1039708194e7d973536f1f142ffef0e6620d85b 100755 (executable)
--- a/bootstrap/generated-dists/ubuntu2204/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu2204/bootstrap.sh
@@ -52,6 +52,7 @@ apt-get -y install \
     libbsd-dev \
     libcap-dev \
     libcephfs-dev \
+    libclang-dev \
     libcups2-dev \
     libdbus-1-dev \
     libglib2.0-dev \
@@ -70,6 +71,7 @@ apt-get -y install \
     libpcap-dev \
     libpopt-dev \
     libreadline-dev \
+    libssl-dev \
     libsystemd-dev \
     libtasn1-bin \
     libtasn1-dev \

diff --git a/bootstrap/generated-dists/ubuntu2204/packages.yml b/bootstrap/generated-dists/ubuntu2204/packages.yml
index bd8052bbf44ec184e7c1661983641d83f9caae5f..8ab93b80b2de4c2ddeb235c378f4fa40f5702271 100644 (file)
--- a/bootstrap/generated-dists/ubuntu2204/packages.yml
+++ b/bootstrap/generated-dists/ubuntu2204/packages.yml
@@ -41,6 +41,7 @@ packages:
   - libbsd-dev
   - libcap-dev
   - libcephfs-dev
+  - libclang-dev
   - libcups2-dev
   - libdbus-1-dev
   - libglib2.0-dev
@@ -59,6 +60,7 @@ packages:
   - libpcap-dev
   - libpopt-dev
   - libreadline-dev
+  - libssl-dev
   - libsystemd-dev
   - libtasn1-bin
   - libtasn1-dev

diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index cc706332405fcb1a14dd5c293af1754d99e5456c..eaa3163d89dfe1d2fa75de7fe2b7efecb05fb639 100644 (file)
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-2a20df752f162f9d1f617af785e463fa39944c6e
+edd9967901b27be5820a342e98b483dfde156c43