Fix libldb build failure by upgrading to build with Python 3.12 in 3.0 (#10054)
This commit is contained in:
Родитель
f94a924668
Коммит
efe8917742
|
@ -131,19 +131,6 @@ index ef632ba903369e4211991f17a3b204bcd96c3a2f..63e50567860ff890b00b0ce6c7607c91
|
|||
if not m:
|
||||
conf.end_msg('not found', color='YELLOW')
|
||||
return
|
||||
diff --git a/buildtools/wafsamba/samba_cross.py b/buildtools/wafsamba/samba_cross.py
|
||||
index 8863c2c53e7d7dd9317c9233f0085ffd0eea6b2f..34793902fba884cf2d8358bf4315dc98027266b6 100644
|
||||
--- a/buildtools/wafsamba/samba_cross.py
|
||||
+++ b/buildtools/wafsamba/samba_cross.py
|
||||
@@ -77,7 +77,7 @@ def cross_answer(ca_file, msg):
|
||||
f.close()
|
||||
return (0, ans.strip("'"))
|
||||
else:
|
||||
- m = re.match('\(\s*(-?\d+)\s*,\s*\"(.*)\"\s*\)', ans)
|
||||
+ m = re.match(r'\(\s*(-?\d+)\s*,\s*\"(.*)\"\s*\)', ans)
|
||||
if m:
|
||||
f.close()
|
||||
return (int(m.group(1)), m.group(2))
|
||||
diff --git a/buildtools/wafsamba/samba_headers.py b/buildtools/wafsamba/samba_headers.py
|
||||
index a268c011c5d8e406e0d763554c55668cfb5388bc..c8bee19010978a04460b0637fcc8fd484a699ea8 100644
|
||||
--- a/buildtools/wafsamba/samba_headers.py
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
{
|
||||
"Signatures": {
|
||||
"ldb-2.1.4.tar.asc": "e3e6c5b00295584e11216eeae1546711138772ab819bf26f3ab4ea0c76c76041",
|
||||
"ldb-2.1.4.tar.gz": "9e0b12ee10cbd31f920f3ce1dcd7617c558411a438faaef44c596d77b4d0bf4e",
|
||||
"ldb-2.7.2.tar.asc": "b5d4d98f3aef9fd7c22a6962af775269d819643cbf1c9fd3a8c2885a2e61f464",
|
||||
"ldb-2.7.2.tar.gz": "26ee72d647854e662d99643eb2b2d341655abf31f4990838d6650fb5cf9209c8",
|
||||
"ldb.keyring": "9c5722acdd291bcc20a6b6d314b32d9cef30dcaeef59ef0d39635575e20167f1",
|
||||
"libldb-LICENSE.txt": "e3a994d82e644b03a792a930f574002658412f62407f5fee083f2555c5f23118"
|
||||
}
|
||||
}
|
||||
}
|
|
@ -3,18 +3,18 @@
|
|||
|
||||
%global with_python3 1
|
||||
|
||||
%global talloc_version 2.3.1
|
||||
%global tdb_version 1.4.3
|
||||
%global tevent_version 0.10.2
|
||||
%global talloc_version 2.4.0
|
||||
%global tdb_version 1.4.8
|
||||
%global tevent_version 0.14.1
|
||||
|
||||
Name: libldb
|
||||
Version: 2.1.4
|
||||
Release: 2%{?dist}
|
||||
Version: 2.7.2
|
||||
Release: 1%{?dist}
|
||||
Summary: A schema-less, ldap like, API and database
|
||||
Requires: libtalloc%{?_isa} >= %{talloc_version}
|
||||
Requires: libtdb%{?_isa} >= %{tdb_version}
|
||||
Requires: libtevent%{?_isa} >= %{tevent_version}
|
||||
License: LGPLv3+
|
||||
License: LGPL-3.0-or-later
|
||||
Vendor: Microsoft Corporation
|
||||
Distribution: Azure Linux
|
||||
URL: http://ldb.samba.org/
|
||||
|
@ -221,6 +221,10 @@ rm -f $RPM_BUILD_ROOT/%{_mandir}/man3/_*
|
|||
%endif
|
||||
|
||||
%changelog
|
||||
* Wed Aug 07 2024 Sindhu Karri <lakarri@microsoft.com> - 2.7.2-1
|
||||
- Upgrade to 2.7.2 to build with Python 3.12 for 3.0
|
||||
- License verified. Using SPDX format
|
||||
|
||||
* Tue Mar 02 2021 Henry Li <lihl@microsoft.com> - 2.1.4-2
|
||||
- Initial CBL-Mariner import from Fedora 32 (license: MIT).
|
||||
- Remove distro condition check
|
||||
|
|
|
@ -9841,8 +9841,8 @@
|
|||
"type": "other",
|
||||
"other": {
|
||||
"name": "libldb",
|
||||
"version": "2.1.4",
|
||||
"downloadUrl": "https://www.samba.org/ftp/ldb/ldb-2.1.4.tar.gz"
|
||||
"version": "2.7.2",
|
||||
"downloadUrl": "https://www.samba.org/ftp/ldb/ldb-2.7.2.tar.gz"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
Загрузка…
Ссылка в новой задаче