From 752d953a34ffa220eb7d986007789b8450ebd003a16352b0840c5818ca88ea82 Mon Sep 17 00:00:00 2001
From: Matej Cepl <mcepl@suse.com>
Date: Fri, 10 Dec 2021 19:21:11 +0000
Subject: [PATCH] Accepting request 939167 from home:stroeder:iam

- skip Python 2 builds
- set PATH when running tests
- update to upstream release 3.4.0
  * Security fixes:
    - Fix inefficient regular expression which allows denial-of-service attacks
    - when parsing specially-crafted LDAP schema.
    - (GHSL-2021-117)
  * Changes:
    - On MacOS, remove option to make LDAP connections from a file descriptor
    - when built with the system libldap (which lacks the underlying function,
    - ldap_init_fd)
    - Attribute values of the post read control are now bytes
    - instead of ISO8859-1 decoded str
    - LDAPUrl now treats urlscheme as case-insensitive
    - Several OpenLDAP options are now supported:
        - OPT_X_TLS_REQUIRE_SAN
        - OPT_X_SASL_SSF_EXTERNAL
        - OPT_X_TLS_PEERCERT
  * Fixes:
    - The copy() method of cidict was added back. It was unintentionally
    - removed in 3.3.0
    - Fixed getting/setting SASL options on big endian platforms
    - Unknown LDAP result code are now converted to LDAPexception,
    - rather than raising a SystemError.
  * slapdtest:
    - Show stderr of slapd -Ttest
    - SlapdObject uses directory-based configuration of slapd
    - SlapdObject startup is now faster

OBS-URL: https://build.opensuse.org/request/show/939167
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-ldap?expand=0&rev=126
---
 python-ldap-3.3.1.tar.gz |  3 ---
 python-ldap-3.4.0.tar.gz |  3 +++
 python-ldap.changes      | 32 ++++++++++++++++++++++++++++++++
 python-ldap.spec         |  7 +++++--
 4 files changed, 40 insertions(+), 5 deletions(-)
 delete mode 100644 python-ldap-3.3.1.tar.gz
 create mode 100644 python-ldap-3.4.0.tar.gz

diff --git a/python-ldap-3.3.1.tar.gz b/python-ldap-3.3.1.tar.gz
deleted file mode 100644
index c17e71a..0000000
--- a/python-ldap-3.3.1.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4711cacf013e298754abd70058ccc995758177fb425f1c2d30e71adfc1d00aa5
-size 379810
diff --git a/python-ldap-3.4.0.tar.gz b/python-ldap-3.4.0.tar.gz
new file mode 100644
index 0000000..7549bb1
--- /dev/null
+++ b/python-ldap-3.4.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:60464c8fc25e71e0fd40449a24eae482dcd0fb7fcf823e7de627a6525b3e0d12
+size 376169
diff --git a/python-ldap.changes b/python-ldap.changes
index 92e0dee..dffb7e4 100644
--- a/python-ldap.changes
+++ b/python-ldap.changes
@@ -1,3 +1,35 @@
+-------------------------------------------------------------------
+Fri Dec 10 14:13:43 UTC 2021 - Michael Ströder <michael@stroeder.com>
+
+- skip Python 2 builds
+- set PATH when running tests
+- update to upstream release 3.4.0
+  * Security fixes:
+    - Fix inefficient regular expression which allows denial-of-service attacks
+    - when parsing specially-crafted LDAP schema.
+    - (GHSL-2021-117)
+  * Changes:
+    - On MacOS, remove option to make LDAP connections from a file descriptor
+    - when built with the system libldap (which lacks the underlying function,
+    - ldap_init_fd)
+    - Attribute values of the post read control are now bytes
+    - instead of ISO8859-1 decoded str
+    - LDAPUrl now treats urlscheme as case-insensitive
+    - Several OpenLDAP options are now supported:
+        - OPT_X_TLS_REQUIRE_SAN
+        - OPT_X_SASL_SSF_EXTERNAL
+        - OPT_X_TLS_PEERCERT
+  * Fixes:
+    - The copy() method of cidict was added back. It was unintentionally
+    - removed in 3.3.0
+    - Fixed getting/setting SASL options on big endian platforms
+    - Unknown LDAP result code are now converted to LDAPexception,
+    - rather than raising a SystemError.
+  * slapdtest:
+    - Show stderr of slapd -Ttest
+    - SlapdObject uses directory-based configuration of slapd
+    - SlapdObject startup is now faster
+
 -------------------------------------------------------------------
 Tue Sep 14 12:35:59 UTC 2021 - pgajdos@suse.com
 
diff --git a/python-ldap.spec b/python-ldap.spec
index 15443b3..0b2b4bb 100644
--- a/python-ldap.spec
+++ b/python-ldap.spec
@@ -17,8 +17,11 @@
 
 
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
+
+%define skip_python2 1
+
 Name:           python-ldap
-Version:        3.3.1
+Version:        3.4.0
 Release:        0
 Summary:        Python LDAP interface
 License:        Python-2.0
@@ -61,7 +64,7 @@ CFLAGS="%{optflags}" %python_build
 %python_expand %fdupes %{buildroot}%{$python_sitearch}
 
 %check
-%pyunittest_arch discover -v -s Tests -p 't_*'
+PATH=/sbin:/usr/sbin:/usr/local/bin:/usr/bin:/bin %pyunittest_arch discover -v -s Tests -p 't_*'
 
 %files %{python_files}
 %license LICENCE