Sync changes to SLFO-1.2 branch

0001-Use-reentrant-libldap.patch

@@ -0,0 +1,25 @@
+From de85e6b833fc43f273f688680d7a95e9a8330704 Mon Sep 17 00:00:00 2001
+From: William Brown <william@blackhats.net.au>
+Date: Tue, 5 Aug 2025 15:24:49 +1000
+Subject: [PATCH] Use reentrant libldap
+
+---
+ Build/setup.cfg.suse-linux | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Build/setup.cfg.suse-linux b/Build/setup.cfg.suse-linux
+index 0a48ef2..d715737 100644
+--- a/Build/setup.cfg.suse-linux
++++ b/Build/setup.cfg.suse-linux
+@@ -15,7 +15,7 @@ extra_objects =
+ # Support for StartTLS/LDAPS, SASL bind and reentrant libldap_r.
+ # This needs recent OpenLDAP 2.0.26+ or 2.1.3+ built with
+ # ./configure --with-cyrus-sasl --with-tls
+-libs = ldap_r lber sasl2 ssl crypto
++libs = ldap lber sasl2 ssl crypto
+ 
+ [install]
+ # Installation options
+-- 
+2.39.5 (Apple Git-154)
+

python-ldap.changes

@@ -1,10 +1,8 @@
 -------------------------------------------------------------------
-Mon Jun 30 09:36:40 UTC 2025 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
+Tue Aug  5 05:27:36 UTC 2025 - William Brown <william.brown@suse.com>
 
-- Switch build system from setuptools to pyproject.toml
+- Allow building against OpenLDAP 2.5
-  * Add python-pip and python-wheel to BuildRequires
+  * 0001-Use-reentrant-libldap.patch
-  * Replace %python_build with %pyproject_wheel
-  * Replace %python_install with %pyproject_install
 
 -------------------------------------------------------------------
 Thu Aug 29 07:22:28 UTC 2024 - Markéta Machová <mmachova@suse.com>

python-ldap.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package python-ldap
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -25,12 +25,11 @@ License:        Python-2.0
 Group:          Development/Libraries/Python
 URL:            https://www.python-ldap.org/
 Source0:        https://files.pythonhosted.org/packages/source/p/python-ldap/python-ldap-%{version}.tar.gz
+Patch0:         0001-Use-reentrant-libldap.patch
 BuildRequires:  %{python_module devel}
-BuildRequires:  %{python_module pip}
 BuildRequires:  %{python_module pyasn1 >= 0.3.7}
 BuildRequires:  %{python_module pyasn1-modules >= 0.1.5}
 BuildRequires:  %{python_module setuptools}
-BuildRequires:  %{python_module wheel}
 BuildRequires:  cyrus-sasl-devel >= 2.1
 BuildRequires:  fdupes
 BuildRequires:  krb5-devel
@@ -52,14 +51,14 @@ for that purpose.  Additionally the package contains modules for other
 LDAP-related stuff (e.g. processing LDIF, LDAPURLs, LDAPv3 schema, etc.).
 
 %prep
-%setup -q
+%autosetup -p1
 cp Build/setup.cfg.suse-linux setup.cfg
 
 %build
-CFLAGS="%{optflags}" %pyproject_wheel
+CFLAGS="%{optflags}" %python_build
 
 %install
-%pyproject_install
+%python_install
 %python_expand %fdupes %{buildroot}%{$python_sitearch}
 
 %check