From ad0fc1a01fa83c267498eeb73360e68346a44ed7 Mon Sep 17 00:00:00 2001
From: Bruce Becker <brucellino@protonmail.com>
Date: Thu, 16 May 2024 15:39:11 +0200
Subject: [PATCH 1/2] build: openldap issue has been resolved upstream (#52)

# Summary

The workaround for openldap-server in alma8 is no longer necessary

Signed-off-by: Bruce Becker <bruce.becker@egi.eu>
---
 .github/workflows/build.yml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 44fcd21..de0a631 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -87,11 +87,6 @@ jobs:
           yum localinstall -y bdii-*.el7.noarch.rpm
 
   # XXX Dependency from EPEL: glue-schema
-  # FIXME: openldap-servers is in CentOS 8 Stream Powertools, but not in AlmaLinux PowerTools
-  # See https://bugs.almalinux.org/view.php?id=222
-  # Currently instaling using the package from devel repository
-  # See https://bugs.almalinux.org/view.php?id=100
-  # https://repo.almalinux.org/almalinux/8/devel/x86_64/os/Packages/
   install-almalinux8:
     name: Install AlmaLinux 8 RPMs
     needs: build-almalinux8
@@ -104,7 +99,7 @@ jobs:
       - name: Install generated RPMs
         run: |
           yum install -y epel-release
-          yum install -y https://repo.almalinux.org/almalinux/8/devel/x86_64/os/Packages/openldap-servers-2.4.46-18.el8.x86_64.rpm
+          dnf config-manager --set-enabled powertools
           yum localinstall -y bdii-*.el8.noarch.rpm
 
   # XXX Dependencies from EPEL: glue-schema, openldap-servers

From 5287f46e60027b87240646afd328050e13b6c9c1 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Thu, 16 May 2024 15:41:43 +0200
Subject: [PATCH 2/2] Update bdii-slapd-start for IPv6 support (#51)

# Summary

I would like to propose an alternative solution to #50. I find this
solution less confusing since it does not use bash arrays.

**Related issue :** #50

Closed #50

Co-authored-by: Bruce Becker <brucellino@protonmail.com>
---
 etc/systemd/bdii-slapd-start | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/etc/systemd/bdii-slapd-start b/etc/systemd/bdii-slapd-start
index ba1d0b7..fed911d 100644
--- a/etc/systemd/bdii-slapd-start
+++ b/etc/systemd/bdii-slapd-start
@@ -18,7 +18,7 @@ DELAYED_DELETE=${DELAYED_DELETE:-${BDII_VAR_DIR}/delayed_delete.pkl}
 BDII_RAM_SIZE=${BDII_RAM_SIZE:-1500M}
 
 if [ "${BDII_IPV6_SUPPORT}" == "yes" ]; then
-    SLAPD_HOST_STRING="'ldap://${SLAPD_HOST}:${SLAPD_PORT} ldap://[${SLAPD_HOST6}]:${SLAPD_PORT}'"
+    SLAPD_HOST_STRING="ldap://${SLAPD_HOST}:${SLAPD_PORT} ldap://[${SLAPD_HOST6}]:${SLAPD_PORT}"
 else
     SLAPD_HOST_STRING="ldap://${SLAPD_HOST}:${SLAPD_PORT}"
 fi
@@ -75,6 +75,5 @@ else
     fi
 fi
 
-COMMAND="${SLAPD} -f ${SLAPD_CONF} -h ${SLAPD_HOST_STRING} -u ${BDII_USER}"
-exec ${COMMAND}
-
+COMMAND="${SLAPD} -f ${SLAPD_CONF} -h \"${SLAPD_HOST_STRING}\" -u ${BDII_USER}"
+exec sh -c "${COMMAND}"