[arch-commits] Commit in python-ldap/trunk (PKGBUILD openldap-2.5.patch)

[Evangelos Foutras]

    Date: Saturday, November 13, 2021 @ 19:25:52
  Author: foutrelis
Revision: 1045924

Fix build with openldap 2.5+ (thanks @grawity)

Added:
  python-ldap/trunk/openldap-2.5.patch
Modified:
  python-ldap/trunk/PKGBUILD

--------------------+
 PKGBUILD           |   17 +++++++++++++++--
 openldap-2.5.patch |   12 ++++++++++++
 2 files changed, 27 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-11-13 19:24:30 UTC (rev 1045923)
+++ PKGBUILD	2021-11-13 19:25:52 UTC (rev 1045924)
@@ -11,9 +11,22 @@
 depends=('python-pyasn1' 'python-pyasn1-modules' 'libldap')
 makedepends=('python-setuptools' 'python-coverage')
 checkdepends=('openldap' 'python-pyasn1' 'python-pyasn1-modules')
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/python-ldap/python-ldap/archive/${pkgname}-${pkgver}.tar.gz")
-sha256sums=('014681ee155a61fde50cf3f19a2f85c5c094439da695968f7fcdf75e95db84f9')
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/python-ldap/python-ldap/archive/${pkgname}-${pkgver}.tar.gz"
+        openldap-2.5.patch)
+sha256sums=('014681ee155a61fde50cf3f19a2f85c5c094439da695968f7fcdf75e95db84f9'
+            'a309bacc490ad11ec48693c72330d4530fd687d7808d8bed90470fbb5e68eac1')
 
+prepare() {
+  cd "$pkgbase-$pkgbase-$pkgver"
+  # https://github.com/python-ldap/python-ldap/issues/432
+  patch -Np1 -i ../openldap-2.5.patch
+
+  # slapd fails to start because -F points to a non-empty directory.
+  # Simply don't pass both -f and -F to slapd, it is only done when
+  # converting slapd.conf to LDIF and pointless here.
+  sed -i "/'-F', self.testrundir,/d" Lib/slapdtest/_slapdtest.py
+}
+
 build(){
   cd "$pkgbase-$pkgbase-$pkgver"
   python setup.py build

Added: openldap-2.5.patch
===================================================================
--- openldap-2.5.patch	                        (rev 0)
+++ openldap-2.5.patch	2021-11-13 19:25:52 UTC (rev 1045924)
@@ -0,0 +1,12 @@
+diff -upr python-ldap-python-ldap-3.3.1.orig/setup.cfg python-ldap-python-ldap-3.3.1/setup.cfg
+--- python-ldap-python-ldap-3.3.1.orig/setup.cfg	2020-06-29 17:43:42.000000000 +0300
++++ python-ldap-python-ldap-3.3.1/setup.cfg	2021-11-13 20:13:55.037043241 +0200
+@@ -23,7 +23,7 @@ extra_objects =
+ 
+ # Example for full-featured build:
+ # Support for StartTLS/LDAPS, SASL bind and reentrant libldap_r.
+-libs = ldap_r lber
++libs = ldap lber
+ 
+ # Installation options
+ [install]