diff --git a/Handle-unknown-LDAP-result-code.patch b/Handle-unknown-LDAP-result-code.patch deleted file mode 100644 index 474053fddc9d302709bfbfdfc2b761af53033d7c..0000000000000000000000000000000000000000 --- a/Handle-unknown-LDAP-result-code.patch +++ /dev/null @@ -1,42 +0,0 @@ -From d2d0d010570160b3daddd754d22f80bf5e435b6f Mon Sep 17 00:00:00 2001 -From: root -Date: Thu, 5 May 2022 10:38:57 +0800 -Subject: [PATCH] fix a system error and optimize the checking of LDAP results - ---- - Modules/constants.c | 10 +++++++--- - 1 file changed, 7 insertions(+), 3 deletions(-) - -diff --git a/Modules/constants.c b/Modules/constants.c -index 8b902e0..07d6065 100644 ---- a/Modules/constants.c -+++ b/Modules/constants.c -@@ -31,7 +31,8 @@ static PyObject *errobjects[LDAP_ERROR_MAX - LDAP_ERROR_MIN + 1]; - PyObject * - LDAPerr(int errnum) - { -- if (errnum >= LDAP_ERROR_MIN && errnum <= LDAP_ERROR_MAX) { -+ if (errnum >= LDAP_ERROR_MIN && errnum <= LDAP_ERROR_MAX && -+ errobjects[errnum + LDAP_ERROR_OFFSET] != NULL) { - PyErr_SetNone(errobjects[errnum + LDAP_ERROR_OFFSET]); - } - else { -@@ -88,10 +89,13 @@ LDAPraise_for_message(LDAP *l, LDAPMessage *m) - ldap_get_option(l, LDAP_OPT_ERROR_STRING, &error); - } - -- if (errnum >= LDAP_ERROR_MIN && errnum <= LDAP_ERROR_MAX) -+ if (errnum >= LDAP_ERROR_MIN && errnum <= LDAP_ERROR_MAX && -+ errobjects[errnum + LDAP_ERROR_OFFSET] != NULL) { - errobj = errobjects[errnum + LDAP_ERROR_OFFSET]; -- else -+ } -+ else { - errobj = LDAPexception_class; -+ } - - info = PyDict_New(); - if (info == NULL) { --- -2.23.0 - diff --git a/backport-CVE-2021-46823.patch b/backport-CVE-2021-46823.patch deleted file mode 100644 index 6aa5ea28532c778a661eee832fba1f5449f69157..0000000000000000000000000000000000000000 --- a/backport-CVE-2021-46823.patch +++ /dev/null @@ -1,22 +0,0 @@ -From faa011b41f7141121546045925d809d54e70f5fd Mon Sep 17 00:00:00 2001 -From: Kevin Backhouse -Date: Fri, 15 Oct 2021 15:21:37 +0100 -Subject: [PATCH] Fix ReDoS in regex. - ---- - Lib/ldap/schema/tokenizer.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Lib/ldap/schema/tokenizer.py b/Lib/ldap/schema/tokenizer.py -index 69823f2b..623b86d5 100644 ---- a/Lib/ldap/schema/tokenizer.py -+++ b/Lib/ldap/schema/tokenizer.py -@@ -13,7 +13,7 @@ - r"|" # or - r"([^'$()\s]+)" # string of length >= 1 without '$() or whitespace - r"|" # or -- r"('(?:[^'\\]|\\\\|\\.)*?'(?!\w))" -+ r"('(?:[^'\\]|\\.)*'(?!\w))" - # any string or empty string surrounded by unescaped - # single quotes except if right quote is succeeded by - # alphanumeric char diff --git a/python-ldap-3.3.1.tar.gz b/python-ldap-3.3.1.tar.gz deleted file mode 100644 index 8ab0ba71aaadda0d800b56c89ef2ed5eacd53f2c..0000000000000000000000000000000000000000 Binary files a/python-ldap-3.3.1.tar.gz and /dev/null differ diff --git a/python-ldap-3.4.3.tar.gz b/python-ldap-3.4.3.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..65caa022d21b70434dff6e03147b5170ef0b188c Binary files /dev/null and b/python-ldap-3.4.3.tar.gz differ diff --git a/python-ldap.spec b/python-ldap.spec index b00b33f5c3cabbd32d4d88a16b72347047b1ed5d..ff4a3a69b3d124a0dbbd922c9c43801ce2383fed 100644 --- a/python-ldap.spec +++ b/python-ldap.spec @@ -1,13 +1,10 @@ Name: python-ldap -Version: 3.3.1 -Release: 5 +Version: 3.4.3 +Release: 1 Summary: An object-oriented API to access LDAP directory servers License: Python-2.0 URL: http://python-ldap.org/ -Source0: https://files.pythonhosted.org/packages/source/p/%{name}/%{name}-%{version}.tar.gz - -Patch0: Handle-unknown-LDAP-result-code.patch -Patch1: backport-CVE-2021-46823.patch +Source0: https://files.pythonhosted.org/packages/3a/7d/de9ae3e5843de77eae3a60c1e70ef5cad9960db50521e8459f7d567a1d1d/python-ldap-3.4.3.tar.gz BuildRequires: gcc openldap-devel BuildRequires: python3-devel python3-setuptools @@ -58,6 +55,9 @@ sed -i 's,-Werror,-Wignore,g' tox.ini %doc CHANGES README TODO Demo %changelog +* Thu Apr 11 2024 OpenStack_SIG - 3.4.3-1 +- Upgrade package to version 3.4.3 + * Fri Aug 05 2022 zhouwenpei - 3.3.1-5 - Type:bugfix - Id:NA