!37 update to 3.4.4
From: @tmacbb Reviewed-by: @robertxw, @compile_success Signed-off-by: @compile_success
This commit is contained in:
commit
dc08e3674f
@ -1,42 +0,0 @@
|
|||||||
From d2d0d010570160b3daddd754d22f80bf5e435b6f Mon Sep 17 00:00:00 2001
|
|
||||||
From: root <root@localhost.localdomain>
|
|
||||||
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
|
|
||||||
|
|
||||||
@ -1,22 +0,0 @@
|
|||||||
From faa011b41f7141121546045925d809d54e70f5fd Mon Sep 17 00:00:00 2001
|
|
||||||
From: Kevin Backhouse <kevinbackhouse@github.com>
|
|
||||||
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
|
|
||||||
Binary file not shown.
BIN
python-ldap-3.4.4.tar.gz
Normal file
BIN
python-ldap-3.4.4.tar.gz
Normal file
Binary file not shown.
@ -1,14 +1,11 @@
|
|||||||
Name: python-ldap
|
Name: python-ldap
|
||||||
Version: 3.3.1
|
Version: 3.4.4
|
||||||
Release: 5
|
Release: 1
|
||||||
Summary: An object-oriented API to access LDAP directory servers
|
Summary: An object-oriented API to access LDAP directory servers
|
||||||
License: Python-2.0
|
License: Python-2.0
|
||||||
URL: http://python-ldap.org/
|
URL: http://python-ldap.org/
|
||||||
Source0: https://files.pythonhosted.org/packages/source/p/%{name}/%{name}-%{version}.tar.gz
|
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
|
|
||||||
|
|
||||||
BuildRequires: gcc openldap-devel
|
BuildRequires: gcc openldap-devel
|
||||||
BuildRequires: python3-devel python3-setuptools
|
BuildRequires: python3-devel python3-setuptools
|
||||||
|
|
||||||
@ -58,6 +55,12 @@ sed -i 's,-Werror,-Wignore,g' tox.ini
|
|||||||
%doc CHANGES README TODO Demo
|
%doc CHANGES README TODO Demo
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Feb 1 2024 liubo <liubo335@huawei.com> - 3.4.4-1
|
||||||
|
- Type: requirement
|
||||||
|
- ID: NA
|
||||||
|
- SUG: NA
|
||||||
|
- DESC: update to version 3.4.4
|
||||||
|
|
||||||
* Fri Aug 05 2022 zhouwenpei <zhouwenpei1@h-partners.com> - 3.3.1-5
|
* Fri Aug 05 2022 zhouwenpei <zhouwenpei1@h-partners.com> - 3.3.1-5
|
||||||
- Type:bugfix
|
- Type:bugfix
|
||||||
- Id:NA
|
- Id:NA
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user