Accepting request 696793 from network:samba:STABLE

OBS-URL: https://build.opensuse.org/request/show/696793
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ldb?expand=0&rev=42

baselibs.conf

@@ -1,4 +1,2 @@
 libldb1
-python-ldb
-  obsoletes "pyldb-<targettype> < <version>"
 python3-ldb

ldb-1.4.3.tar.asc

@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQFJBAABCgAzFiEEkUejOXGVGO6QEby1R5ORYRMIQCUFAlvj7v0VHHNhbWJhLWJ1
-Z3NAc2FtYmEub3JnAAoJEEeTkWETCEAlqZYH/2ldcV6Ck3R2GKorzut9Vnr2Mzn5
-z21+L6BABHSSRX74wYR5AJA/J8If82A4YQ2MnLOQKxaUKxkCpg8FEl6dYj5I4stl
-in7TYmO6ETj0uvyKFJkSNrcIVAF9aLHs1AcbNVe4nFKTq+TQQ5ZLcAMMRZO2UGcc
-Qf4PMxUWZ44uFCYncbp1QnCafIxk0oBTpKzmeLrvCtsTQTCHKCQZTd9/huES3Hxd
-0SHQbiAH2TUbWgwJHwPcRv/lrCNcv7mvapVHMytFVjZ32wBU5Rh4R95/IxRd8HBW
-Ee29wwzY7hX2esW2DGtrP+3dn54W4kETus55G0aIEvKUtFttm43ncVKdN80=
-=vRfY
------END PGP SIGNATURE-----

ldb-1.4.3.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:aca09389eff859bfb4d10defa5f02ddfb99b45d67626eac3e8c2079232676a1f
-size 1428730

ldb-1.5.4.tar.asc

@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQFJBAABCgAzFiEEkUejOXGVGO6QEby1R5ORYRMIQCUFAlx1V4cVHHNhbWJhLWJ1
+Z3NAc2FtYmEub3JnAAoJEEeTkWETCEAl6Z8IALTANTPIAS3O53sp5U8g8lb8evNe
+o5HQ5qwXyPbuHVIbg22GhiZTcrb3k+8Dpp1T7ZYvESE9sUdEN3e9/eDqVQgd7CL9
+VrbEg9d2Lsl+pWOddMoXuskVT8yUk7pEU7K1OHnmKybFUwM5mNg+Q0Jf+eOEVeAg
+pJtrMHFWhXhy6n9R5y7oUUVe6OFTd7lVQ9gfufjHWZAdWgq/WY7cX8l7Ku1DEFIV
+WbSEVyS0DcVx3XrILevcA751Ix4r1NT+EowxQlOpQWu5jOlDW35hsCoPAeh8lqD6
+9Z8p0yoGUP0PiHp4jZV24PqxGGucykpC0Vzom6jalIMBxMbhRBAubVwi70Y=
+=wVZk
+-----END PGP SIGNATURE-----

ldb-1.5.4.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:db5beea64e305ef002a28fc6b6ca8e42b5fbee268bd713ff41e76c56a0a071d3
+size 1629123

ldb.changes

@@ -1,3 +1,26 @@
+-------------------------------------------------------------------
+Tue Mar  5 16:30:16 UTC 2019 - David Mulder <dmulder@suse.com>
+
+- Update to 1.5.4
+  + Fix standalone build of ldb.
+  + C99 build fixes.
+  + CVE-2019-3824 out of bounds read in wildcard compare (bug#13773)
+- Update to 1.5.3
+  + Avoid inefficient one-level searches (bug#13762)
+  + The test api.py should not rely on order of entries in dict (bug#13772)
+
+-------------------------------------------------------------------
+Wed Feb  6 17:40:31 UTC 2019 - David Mulder <dmulder@suse.com>
+
+- Update to 1.5.2
+  + dirsync: Allow arbitrary length cookies (bug #13686)
+  + The build uses python3 by default: --extra-python would take
+    python2 now
+  + To build with python2 only use:
+    PYTHON=python2 ./configure
+    PYTHON=python2 make
+    PYTHON=python2 make install
+
 -------------------------------------------------------------------
 Mon Nov 12 17:33:03 UTC 2018 - Samuel Cabrero <scabrero@suse.de>
 

ldb.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package ldb
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,14 +16,8 @@
 #
 
 
-%{!?python_sitearch:  %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 %{!?py3_soflags:  %global py3_soflags cpython-%{python3_version_nodots}m}
 %{!?py3_soflags_dash:   %global py3_soflags_dash %(echo %{py3_soflags} | sed "s/_/-/g")}
-%if 0%{?suse_version} > 1310 || 0%{?fedora_version} > 20
-%define with_python3 1
-%else
-%define with_python3 0
-%endif
 
 %global with_lmdb 0
 %if 0%{?suse_version} > 1320
@@ -33,16 +27,16 @@
 %endif
 
 %define lmdb_version 0.9.16
-%define talloc_version 2.1.14
+%define talloc_version 2.1.15
-%define tdb_version 1.3.15
+%define tdb_version 1.3.17
-%define tevent_version 0.9.36
+%define tevent_version 0.9.38
 
 Name:           ldb
 BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  doxygen
-%if 0%{?suse_version} > 1320
+%if 0%{?suse_version} > 1500
 %ifnarch ppc
-BuildRequires:  libcmocka-devel >= 1.1.1
+BuildRequires:  libcmocka-devel >= 1.1.3
 %endif
 %endif
 BuildRequires:  libtalloc-devel >= %{talloc_version}
@@ -50,23 +44,20 @@ BuildRequires:  libtdb-devel >= %{tdb_version}
 BuildRequires:  libtevent-devel >= %{tevent_version}
 BuildRequires:  libxslt
 BuildRequires:  popt-devel
-BuildRequires:  python-devel
-BuildRequires:  python-tdb >= %{tdb_version}
-BuildRequires:  python-tevent >= %{tevent_version}
-%if %{with_python3}
 BuildRequires:  python3-devel
 BuildRequires:  python3-talloc >= %{talloc_version}
 BuildRequires:  python3-talloc-devel >= %{talloc_version}
-%endif
+BuildRequires:  python3-tdb >= %{tdb_version}
-BuildRequires:  python-talloc-devel >= %{talloc_version}
+BuildRequires:  python3-tevent >= %{tevent_version}
 %if 0%{?suse_version} >= 1330
 BuildRequires:  libtirpc-devel
 %endif
 %if %{with_lmdb}
 BuildRequires:  lmdb-devel >= %{lmdb_version}
 %endif
+
 Url:            https://ldb.samba.org/
-Version:        1.4.3
+Version:        1.5.4
 Release:        0
 Summary:        An LDAP-like embedded database
 License:        LGPL-3.0-or-later
@@ -112,33 +103,11 @@ Group:          Development/Libraries/C and C++
 Tools to manipulate LDB files.
 
 
-%package -n python-ldb
-Summary:        Python bindings for the LDB library
-Group:          Development/Libraries/Python
-Requires:       libldb1 = %{version}
-Provides:       pyldb = %{version}
-Obsoletes:      pyldb < %{version}
-
-%description -n python-ldb
-This package contains the Python bindings for the LDB library.
-
-
-%package -n python-ldb-devel
-Summary:        Development files for the Python bindings for the LDB library
-Group:          Development/Libraries/Python
-Requires:       pkg-config
-Requires:       python-ldb = %{version}
-Provides:       pyldb-devel = %{version}
-Obsoletes:      pyldb-devel < %{version}
-
-%description -n python-ldb-devel
-This package contains the development files for the Python bindings for the
-LDB library.
-
 %package -n python3-ldb
 Summary:        Python3 bindings for the LDB library
 Group:          Development/Libraries/Python
 Requires:       libldb1 = %{version}
+Obsoletes:      python-ldb
 
 %description -n python3-ldb
 This package contains the python3 bindings for the LDB library.
@@ -148,6 +117,7 @@ Summary:        Development files for the Python3 bindings for the LDB library
 Group:          Development/Libraries/Python
 Requires:       pkg-config
 Requires:       python3-ldb = %{version}
+Obsoletes:      python-ldb-devel
 
 %description -n python3-ldb-devel
 This package contains the development files for the Python bindings for the
@@ -163,7 +133,7 @@ LDB library.
 %endif
 export CFLAGS="%{optflags} -D_GNU_SOURCE -D_LARGEFILE64_SOURCE -DIDMAP_RID_SUPPORT_TRUSTED_DOMAINS"
 %define bundled_libs cmocka
-%if 0%{?suse_version} > 1320
+%if 0%{?suse_version} > 1500
 %ifnarch ppc
 	%define bundled_libs NONE
 %endif
@@ -179,9 +149,6 @@ CONFIGURE_OPTIONS="\
 	--with-modulesdir=%{_libdir} \
 	--bundled-libraries=%{bundled_libs} \
 	--builtin-libraries=replace \
-%if %{with_python3}
-	--extra-python=/usr/bin/python3 \
-%endif
 %if !%{with_lmdb}
 	--without-ldb-lmdb \
 %endif
@@ -206,18 +173,12 @@ make test
 # Install API documentation
 cp -a apidocs/man/* %{buildroot}/%{_mandir}
 
-%if %{with_python3}
 sed -i 's;-lpyldb-util.%{py3_soflags_dash};-lpyldb-util.%{py3_soflags};g' %{buildroot}/%{_libdir}/pkgconfig/pyldb-util.%{py3_soflags}.pc
-%endif
 
 %post -n libldb1 -p /sbin/ldconfig
 
 %postun -n libldb1 -p /sbin/ldconfig
 
-%post -n python-ldb -p /sbin/ldconfig
-
-%postun -n python-ldb -p /sbin/ldconfig
-
 %post -n python3-ldb -p /sbin/ldconfig
 
 %postun -n python3-ldb -p /sbin/ldconfig
@@ -227,14 +188,13 @@ sed -i 's;-lpyldb-util.%{py3_soflags_dash};-lpyldb-util.%{py3_soflags};g' %{buil
 %{_libdir}/libldb.so.*
 %dir %{_libdir}/ldb
 %{_libdir}/ldb/asq.so
-%{_libdir}/ldb/paged_results.so
 %{_libdir}/ldb/paged_searches.so
 %{_libdir}/ldb/rdn_name.so
 %{_libdir}/ldb/sample.so
 %{_libdir}/ldb/server_sort.so
 %{_libdir}/ldb/skel.so
 %{_libdir}/ldb/tdb.so
-%if 0%{?suse_version} <= 1320
+%if 0%{?suse_version} <= 1500
 %{_libdir}/ldb/libcmocka-ldb.so
 %endif
 %ifarch ppc
@@ -246,6 +206,8 @@ sed -i 's;-lpyldb-util.%{py3_soflags_dash};-lpyldb-util.%{py3_soflags};g' %{buil
 %{_libdir}/ldb/libldb-mdb-int.so
 %{_libdir}/ldb/mdb.so
 %endif
+%{_libdir}/ldb/libldb-tdb-err-map.so
+%{_libdir}/ldb/libldb-tdb-int.so
 
 %files -n libldb-devel
 %defattr(-,root,root)
@@ -278,22 +240,6 @@ sed -i 's;-lpyldb-util.%{py3_soflags_dash};-lpyldb-util.%{py3_soflags};g' %{buil
 %{_mandir}/man1/ldbrename.1.*
 %{_mandir}/man1/ldbsearch.1.*
 
-%files -n python-ldb
-%defattr(-,root,root)
-%{python_sitearch}/ldb.so
-%{python_sitearch}/_ldb_text.py*
-%{_libdir}/libpyldb-util.so.*
-
-%files -n python-ldb-devel
-%defattr(-,root,root)
-%{_includedir}/pyldb.h
-%{_libdir}/libpyldb-util.so
-%{_libdir}/pkgconfig/pyldb-util.pc
-%if 0%{?suse_version} != 1110 || %{_arch} != i386
-%{_mandir}/man3/PyLdb*.3.*
-%endif
-
-%if %{with_python3}
 %files -n python3-ldb
 %defattr(-,root,root)
 %{_libdir}/libpyldb-util.%{py3_soflags}.so.*
@@ -305,8 +251,11 @@ sed -i 's;-lpyldb-util.%{py3_soflags_dash};-lpyldb-util.%{py3_soflags};g' %{buil
 
 %files -n python3-ldb-devel
 %defattr(-,root,root)
+%{_includedir}/pyldb.h
 %{_libdir}/libpyldb-util.%{py3_soflags}.so
 %{_libdir}/pkgconfig/pyldb-util.%{py3_soflags}.pc
+%if 0%{?suse_version} != 1110 || %{_arch} != i386
+%{_mandir}/man3/PyLdb*.3.*
 %endif
 
 %changelog