From 7dbd57586e279320695e96a2c3c80a744a9a9e88 Mon Sep 17 00:00:00 2001 From: Timo Aaltonen Date: Tue, 21 Feb 2023 21:39:44 +0200 Subject: [PATCH] fix-ldap-so-path.diff: Specify the path to ldap.so again, and use multiarch path. --- debian/changelog | 2 ++ debian/patches/fix-ldap-so-path.diff | 11 +++++++++++ debian/patches/series | 1 + 3 files changed, 14 insertions(+) create mode 100644 debian/patches/fix-ldap-so-path.diff diff --git a/debian/changelog b/debian/changelog index 822cb3647..ea821383c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ freeipa (4.10.1+dfsg1-1) UNRELEASED; urgency=medium * patches: Specify krb5_keytab in the named.conf template. * copyright, watch: Filter prebuilt html documentation from the tarball. + * fix-ldap-so-path.diff: Specify the path to ldap.so again, and use + multiarch path. -- Timo Aaltonen Tue, 21 Feb 2023 10:13:42 +0200 diff --git a/debian/patches/fix-ldap-so-path.diff b/debian/patches/fix-ldap-so-path.diff new file mode 100644 index 000000000..41c59cdb7 --- /dev/null +++ b/debian/patches/fix-ldap-so-path.diff @@ -0,0 +1,11 @@ +--- a/ipaplatform/debian/paths.py ++++ b/ipaplatform/debian/paths.py +@@ -79,7 +79,7 @@ class DebianPathNamespace(BasePathNamesp + UPDATE_CA_TRUST = "/usr/sbin/update-ca-certificates" + BIND_LDAP_DNS_IPA_WORKDIR = "/var/cache/bind/dyndb-ldap/ipa/" + BIND_LDAP_DNS_ZONE_WORKDIR = "/var/cache/bind/dyndb-ldap/ipa/master/" +- BIND_LDAP_SO = "ldap.so" ++ BIND_LDAP_SO = "/usr/lib/{0}/bind/ldap.so".format(MULTIARCH) + LIBARCH = "/{0}".format(MULTIARCH) + LIBSOFTHSM2_SO = "/usr/lib/{0}/softhsm/libsofthsm2.so".format(MULTIARCH) + PAM_KRB5_SO = "/usr/lib/{0}/security/pam_krb5.so".format(MULTIARCH) diff --git a/debian/patches/series b/debian/patches/series index f51771527..395c4507b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,3 +6,4 @@ dnssec-race-wa.diff fix-sssd-socket-activation.diff # send upstream +fix-ldap-so-path.diff