diff --git a/README.md b/README.md new file mode 100644 index 0000000000000000000000000000000000000000..2f69796d8c82f075528fe123327509766e5a17d7 --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +Merged into samba since March 2025. +- https://gitee.com/src-openeuler/samba/pulls/272 +- https://gitee.com/openeuler/release-management/pulls/2200 diff --git a/backport-Skip-ldb_lmdb_free_list_test-on-ppc64el-ppc64-and-sp.patch b/backport-Skip-ldb_lmdb_free_list_test-on-ppc64el-ppc64-and-sp.patch deleted file mode 100644 index cc566b9023df5b21df14e5056c261e03d3bf8ba8..0000000000000000000000000000000000000000 --- a/backport-Skip-ldb_lmdb_free_list_test-on-ppc64el-ppc64-and-sp.patch +++ /dev/null @@ -1,29 +0,0 @@ -From eb5409dd5e4dde482935421ce0eddf88a0d2d2f4 Mon Sep 17 00:00:00 2001 -From: Mathieu Parent -Date: Thu, 25 Jun 2020 15:15:40 +0200 -Subject: [PATCH] Skip ldb_lmdb_free_list_test on alpha, ia64, mips64el, ppc64el, ppc64 and sparc64 - -Workaround: https://bugzilla.samba.org/show_bug.cgi?id=14404 ---- - wscript | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/wscript b/wscript -index 9866901..17a9f14 100644 ---- a/wscript -+++ b/wscript -@@ -651,8 +651,9 @@ def test(ctx): - # we can fit > 4G of data into the DB), it would fill up - # the disk on many of our test instances - 'ldb_mdb_kv_ops_test', -- 'ldb_key_value_sub_txn_mdb_test', -- 'ldb_lmdb_free_list_test'] -+ 'ldb_key_value_sub_txn_mdb_test'] -+ if os.environ.get('DEB_HOST_ARCH', 'unknown') not in ['alpha', 'ia64', 'mips64el', 'ppc64el', 'ppc64', 'sparc64', 'unknown']: -+ test_exes += ['ldb_lmdb_free_list_test'] - else: - test_exes += ['ldb_no_lmdb_test'] - --- -2.27.0 - diff --git a/ldb-2.8.0.tar.asc b/ldb-2.8.0.tar.asc deleted file mode 100644 index 25d706fd987e91167cbc038913a10b6958de4256..0000000000000000000000000000000000000000 --- a/ldb-2.8.0.tar.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCgAdFiEEkUejOXGVGO6QEby1R5ORYRMIQCUFAmTDr+oACgkQR5ORYRMI -QCXfwgf/cAqWCgnnKIT3hvUdL2i2F9edDXTOkBDZ1vxQ8hLO+T8JtWO9F40hEZjH -F5R5B2pxBP6T2Nd9NHVbHUqlIpjqqesweTXtabuW60oz5PZ13owpGDWWQKortH5/ -j49v/ZKHD0NBjVN09AylRgoKQ4kRDtd0rMOAS951aRUcRTFRjK86hnaHPgvQeexy -SizGRtHlifnwM/lbgJlLkTDUDNA+7RwXRAv0pvLwYReGFoS8vyUbMOYt1lnoiNas -6cz+6yTKknGO7KSE6bjviDahv7Xg04Qy02eI/HYEZ8NG3aJqNsOqPchP4y/JgVv+ -90FZR2cdZNpTdlZ5TPfihL2/zldXKQ== -=H6+4 ------END PGP SIGNATURE----- diff --git a/ldb-2.8.0.tar.gz b/ldb-2.8.0.tar.gz deleted file mode 100644 index 0cb53fa8059dd0a45aa60b1c92faaa9f1d21ddb6..0000000000000000000000000000000000000000 Binary files a/ldb-2.8.0.tar.gz and /dev/null differ diff --git a/libldb.spec b/libldb.spec deleted file mode 100644 index 53fabaf54bba545b24d1a3d872023d121bda2084..0000000000000000000000000000000000000000 --- a/libldb.spec +++ /dev/null @@ -1,250 +0,0 @@ -%global with_lmdb 1 -%global with_python3 1 -%global talloc_version 2.4.1 -%global tdb_version 1.4.9 -%global tevent_version 0.15.0 - -Name: libldb -Version: 2.8.0 -Release: 1 -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: LGPL-3.0-or-later -URL: http://ldb.samba.org/ -Source0: http://samba.org/ftp/ldb/ldb-%{version}.tar.gz -Source1: http://samba.org/ftp/ldb/ldb-%{version}.tar.asc - -Patch0: backport-Skip-ldb_lmdb_free_list_test-on-ppc64el-ppc64-and-sp.patch - -BuildRequires: gcc libtalloc-devel >= %{talloc_version} libtdb-devel >= %{tdb_version} -BuildRequires: libtevent-devel >= %{tevent_version} lmdb-devel >= 0.9.16 popt-devel -BuildRequires: libxslt docbook-style-xsl python3-devel python3-tdb python3-talloc-devel -BuildRequires: python3-tevent doxygen openldap-devel libcmocka-devel gnupg2 -BuildRequires: chrpath - -Provides: bundled(libreplace) ldb-tools -Obsoletes: python2-ldb < 2.0.5-1 python2-ldb-devel < 2.0.5-1 pyldb < 1.1.26-2 ldb-tools - -%description -An extensible library that implements an LDAP like API to access remote LDAP -servers, or use local tdb databases. - -%package devel -Summary: Developer tools for the LDB library -Requires: libldb%{?_isa} = %{version}-%{release} libtdb-devel%{?_isa} >= %{tdb_version} -Requires: libtalloc-devel%{?_isa} >= %{talloc_version} libtevent-devel%{?_isa} >= %{tevent_version} - -%description devel -Header files needed to develop programs that link against the LDB library. - -%package -n python-ldb-devel-common -Summary: Common development files for the Python bindings for the LDB library - -Provides: pyldb-devel%{?_isa} = %{version}-%{release} -%{?python_provide:%python_provide python2-ldb-devel} - -%description -n python-ldb-devel-common -Development files for the Python bindings for the LDB library. -This package includes files that aren't specific to a Python version. - -%package -n python3-ldb -Summary: Python bindings for the LDB library -Requires: libldb%{?_isa} = %{version}-%{release} python3-tdb%{?_isa} >= %{tdb_version} - -%{?python_provide:%python_provide python3-ldb} - -%description -n python3-ldb -Python bindings for the LDB library - -%package -n python3-ldb-devel -Summary: Development files for the Python bindings for the LDB library -Requires: python3-ldb%{?_isa} = %{version}-%{release} -Requires: python-ldb-devel-common%{?_isa} = %{version}-%{release} - -%{?python_provide:%python_provide python3-ldb-devel} - -%description -n python3-ldb-devel -Development files for the Python bindings for the LDB library - -%package_help - -%prep -%autosetup -n ldb-%{version} -p1 - -%build - -export python_LDFLAGS="" - -%configure --disable-rpath \ - --disable-rpath-install \ - --bundled-libraries=NONE \ - --builtin-libraries=replace \ - --with-modulesdir=%{_libdir}/ldb/modules \ - %{?without_lmdb_flags} \ - --with-privatelibdir=%{_libdir}/ldb - -%make_build V=1 -doxygen Doxyfile - -%check -make %{?_smp_mflags} check - -%install -%make_install -cp -a apidocs/man/* $RPM_BUILD_ROOT/%{_mandir} -rm -f $RPM_BUILD_ROOT/%{_mandir}/man3/_* - -# remove rpath -chrpath -d %{buildroot}%{_bindir}/ldbrename -chrpath -d %{buildroot}%{_bindir}/ldbedit -chrpath -d %{buildroot}%{_bindir}/ldbmodify -chrpath -d %{buildroot}%{_bindir}/ldbadd -chrpath -d %{buildroot}%{_bindir}/ldbdel -chrpath -d %{buildroot}%{_bindir}/ldbsearch -chrpath -d %{buildroot}%{_libdir}/ldb/libldb-mdb-int.so -chrpath -d %{buildroot}%{_libdir}/ldb/libldb-tdb-int.so -chrpath -d %{buildroot}%{_libdir}/ldb/libldb-key-value.so -chrpath -d %{buildroot}%{_libdir}/ldb/modules/ldb/tdb.so -chrpath -d %{buildroot}%{_libdir}/ldb/modules/ldb/ldb.so -chrpath -d %{buildroot}%{_libdir}/ldb/modules/ldb/mdb.so - -mkdir -p %{buildroot}/etc/ld.so.conf.d -echo "%{_libdir}/ldb" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf - -%ldconfig_scriptlets - -%files -%{_bindir}/ldbadd -%{_bindir}/ldbdel -%{_bindir}/ldbedit -%{_bindir}/ldbmodify -%{_bindir}/ldbrename -%{_bindir}/ldbsearch -%config(noreplace) /etc/ld.so.conf.d/* -%dir %{_libdir}/ldb -%{_libdir}/libldb.so.* -%{_libdir}/ldb/libldb-key-value.so -%{_libdir}/ldb/libldb-tdb-err-map.so -%{_libdir}/ldb/libldb-tdb-int.so -%{_libdir}/ldb/libldb-mdb-int.so -%dir %{_libdir}/ldb/modules -%dir %{_libdir}/ldb/modules/ldb -%{_libdir}/ldb/modules/ldb/*.so -%{_libdir}/ldb/libldb-cmdline.so - -%files devel -%{_includedir}/ldb_module.h -%{_includedir}/ldb_handlers.h -%{_includedir}/ldb_errors.h -%{_includedir}/ldb_version.h -%{_includedir}/ldb.h -%{_libdir}/libldb.so -%{_libdir}/pkgconfig/ldb.pc - -%files -n python-ldb-devel-common -%{_includedir}/pyldb.h - -%files -n python3-ldb -%{python3_sitearch}/ldb.cpython-*.so -%{_libdir}/libpyldb-util.cpython-*.so.2* -%{python3_sitearch}/_ldb_text.py -%{python3_sitearch}/__pycache__/_ldb_text.cpython-*.py* - -%files -n python3-ldb-devel -%{_libdir}/libpyldb-util.cpython-*.so -%{_libdir}/pkgconfig/pyldb-util.cpython-*.pc - -%ldconfig_scriptlets -n python3-ldb - -%files help -%{_mandir}/man*/Py*.gz -%{_mandir}/man3/ldb*.gz -%{_mandir}/man3/ldif*.gz -%{_mandir}/man1/ldbadd.1.* -%{_mandir}/man1/ldbdel.1.* -%{_mandir}/man1/ldbedit.1.* -%{_mandir}/man1/ldbmodify.1.* -%{_mandir}/man1/ldbrename.1.* -%{_mandir}/man1/ldbsearch.1.* - -%changelog -* Thu Dec 28 2023 xinghe - 2.8.0-1 -- Type:requirement -- ID:NA -- SUG:NA -- DESC:update libldb version to 2.8.0 - -* Sat Jul 22 2023 yanglu - 2.7.2-1 -- Type:requirement -- ID:NA -- SUG:NA -- DESC:update libldb version to 2.7.2 - -* Sat Apr 01 2023 xinghe - 2.6.1-2 -- Type:CVE -- ID:CVE-2023-0614 -- SUG:NA -- DESC:fix CVE-2023-0614 - -* Fri Nov 04 2022 yanglu - 2.6.1-1 -- Type:requirement -- ID:NA -- SUG:NA -- DESC:update libldb version to 2.6.1 - -* Mon Aug 01 2022 gaihuiying - 2.4.1-2 -- Type:CVE -- ID:CVE-2022-32746 -- SUG:NA -- DESC:fix CVE-2022-32746 - -* Wed Dec 15 2021 yanglu - 2.4.1-1 -- Type:update -- ID:NA -- SUG:NA -- DESC:update to 2.4.1 - -* Tue Sep 07 2021 gaihuiying - 2.1.4-4 -- Type:requirement -- ID:NA -- SUG:NA -- DESC:remove rpath of libldb's binary files - -* Mon Jul 19 2021 lijingyuan - 2.1.4-3 -- Type:requirement -- ID:NA -- SUG:NA -- DESC:cancel gdb in buildrequires - -* Tue Mar 23 2021 gaihuiying - 2.1.4-2 -- Type:bugfix -- ID:NA -- SUG:NA -- DESC:fix tests failed when build with rpmbuild command - -* Fri Jul 24 2020 openEuler Buildteam - 2.1.4-1 -- Type:update -- ID:NA -- SUG:NA -- DESC:update to 2.1.4 - -* Fri Mar 20 2020 songnannan - 2.0.8-2 -- add gdb in buildrequires - -* Wed Feb 12 2020 openEuler Buildteam - 2.0.8-1 -- Type:update -- ID:NA -- SUG:NA -- DESC:update to 2.0.8 - -* Thu Dec 26 2019 openEuler Buildteam - 1.4.2-3 -- Type:enhancement -- ID:NA -- SUG:NA -- DESC:remove rpath and runpath of exec files and libraries - -* Wed Sep 11 2019 liyongqiang - 1.4.2-2 -- Package init - diff --git a/libldb.yaml b/libldb.yaml deleted file mode 100644 index 8f4b8589cf025e34ea7053f89eb44860dd353912..0000000000000000000000000000000000000000 --- a/libldb.yaml +++ /dev/null @@ -1,5 +0,0 @@ -version_control: NA -src_repo: NA -tag_prefix: NA -separator: NA -url: https://download.samba.org/pub/ldb