From: David Mulder <dmulder@samba.org>
Date: Thu, 8 Aug 2024 20:48:59 +0000 (-0600)
Subject: utf8proc-devel is missing from CentOS 8 Stream
X-Git-Tag: tdb-1.4.13~901
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2824ed2605b1d8b4103d8a4bc5e482a5ffd1aef9;p=thirdparty%2Fsamba.git

utf8proc-devel is missing from CentOS 8 Stream

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 b6caae6ae60..ed9c83fb037 100644
--- 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: edd9967901b27be5820a342e98b483dfde156c43
+  SAMBA_CI_CONTAINER_TAG: e8921f91497f528c3f07d31e67e48b79dcba3705
   #
   # 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 b37ca5ee43a..d0e826208a6 100644
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -524,6 +524,7 @@ RPM_DISTS = {
             'ShellCheck': '',
             'shfmt': '',
             'codespell': '',
+            'utf8proc-devel': '',
         }
     },
     'centos9s': {
diff --git a/bootstrap/generated-dists/rocky8/bootstrap.sh b/bootstrap/generated-dists/rocky8/bootstrap.sh
index ae45151eab2..94219d81091 100755
--- a/bootstrap/generated-dists/rocky8/bootstrap.sh
+++ b/bootstrap/generated-dists/rocky8/bootstrap.sh
@@ -118,7 +118,6 @@ yum install -y \
     tar \
     tracker-devel \
     tree \
-    utf8proc-devel \
     wget \
     which \
     xfsprogs-devel \
diff --git a/bootstrap/generated-dists/rocky8/packages.yml b/bootstrap/generated-dists/rocky8/packages.yml
index cd91a67f11a..eba6d0df51c 100644
--- a/bootstrap/generated-dists/rocky8/packages.yml
+++ b/bootstrap/generated-dists/rocky8/packages.yml
@@ -100,7 +100,6 @@ packages:
   - tar
   - tracker-devel
   - tree
-  - utf8proc-devel
   - wget
   - which
   - xfsprogs-devel
diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index eaa3163d89d..14c14eed45a 100644
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-edd9967901b27be5820a342e98b483dfde156c43
+e8921f91497f528c3f07d31e67e48b79dcba3705