[arch-commits] Commit in 389-ds-base/trunk (PKGBUILD openldap-2.5.patch)

[Evangelos Foutras]

    Date: Saturday, November 13, 2021 @ 21:05:54
  Author: foutrelis
Revision: 428379

Fix build with openldap 2.5+

Added:
  389-ds-base/trunk/openldap-2.5.patch
Modified:
  389-ds-base/trunk/PKGBUILD

--------------------+
 PKGBUILD           |    3 +++
 openldap-2.5.patch |   12 ++++++++++++
 2 files changed, 15 insertions(+)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-11-13 21:04:33 UTC (rev 428378)
+++ PKGBUILD	2021-11-13 21:05:54 UTC (rev 428379)
@@ -21,9 +21,11 @@
 makedepends=('cargo' 'rsync' 'doxygen' 'cmocka' 'python-setuptools' 'python-argparse-manpage'
              'npm' 'nodejs-lts-fermium' 'systemd')
 source=(https://github.com/389ds/389-ds-base/archive/389-ds-base-${pkgver}.tar.gz
+        openldap-2.5.patch
         389-ds-base.sysusers
         389-ds-base.tmpfiles)
 sha512sums=('e648c8de6032d9e8714030b2300f3af79fdb17004606cebee345903ef76fca5df4fef7eb80fd982b656b6937560f43350af90c3da08515a8ce2fb88e2a662f22'
+            '2e18a2ce12f245a188d9c7b1165f755e2eb3be4f5417ec94df0b87560d13a0d1350ef8774b276172f0df314a9ad82b0b0284ee3be040462afd6af4daac5c9c6a'
             '8689b60f13517e6541e1faa62e61781654a8e4678990d14a3fe0cfe4673697cdde1c46763fdc7ef6203e4026286fa004c73b2857fd7fecff69483e6d1e8e6d68'
             '69ed8b8f3bdbf9098088b0c92c41a238f16d14ba9f86ebc2b5debe5f001b4d8e235f7cff4731d72b30b5ac70486b0f4300b99646aa3926a3fa59515a64f16402')
 
@@ -30,6 +32,7 @@
 prepare() {
   cd "${pkgname}-${pkgname}-${pkgver}"
 
+  patch -Np1 -i ../openldap-2.5.patch
   autoreconf -fiv
 }
 

Added: openldap-2.5.patch
===================================================================
--- openldap-2.5.patch	                        (rev 0)
+++ openldap-2.5.patch	2021-11-13 21:05:54 UTC (rev 428379)
@@ -0,0 +1,12 @@
+diff -upr 389-ds-base-389-ds-base-2.0.10.orig/Makefile.am 389-ds-base-389-ds-base-2.0.10/Makefile.am
+--- 389-ds-base-389-ds-base-2.0.10.orig/Makefile.am	2021-09-20 16:12:55.000000000 +0300
++++ 389-ds-base-389-ds-base-2.0.10/Makefile.am	2021-11-13 23:02:18.801136472 +0200
+@@ -186,7 +186,7 @@ NSS_LINK = $(NSS_LIBS)
+ # with recent versions of openldap - if you link with both ldap_r and ldap, the
+ # shared lib _fini for one will stomp on the other, and the program will crash
+ LDAPSDK_LINK_NOTHR = @openldap_lib@ -lldap at ol_libver@ @ldap_lib_ldif@ -llber at ol_libver@
+-LDAPSDK_LINK = @openldap_lib@ -lldap_r at ol_libver@ @ldap_lib_ldif@ -llber at ol_libver@
++LDAPSDK_LINK = @openldap_lib@ -lldap at ol_libver@ @ldap_lib_ldif@ -llber at ol_libver@
+ ldaplib = @ldaplib@
+ ldaplib_defs = @ldaplib_defs@
+