From fade5d625ad67a33aadf28365ecb29a39b10325a562aa70e19d9828b229a0e91 Mon Sep 17 00:00:00 2001 From: James McDonough Date: Sun, 1 Oct 2017 11:54:28 +0000 Subject: [PATCH 1/3] Accepting request 529903 from network:samba:TESTING 1 OBS-URL: https://build.opensuse.org/request/show/529903 OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/ldb?expand=0&rev=112 --- ldb-1.1.29.tar.asc | 11 --------- ldb-1.1.29.tar.gz | 3 --- ldb-1.2.2.tar.asc | 11 +++++++++ ldb-1.2.2.tar.gz | 3 +++ ldb.changes | 59 ++++++++++++++++++++++++++++++++++++++++++++++ ldb.spec | 37 ++++++++++++++--------------- 6 files changed, 91 insertions(+), 33 deletions(-) delete mode 100644 ldb-1.1.29.tar.asc delete mode 100644 ldb-1.1.29.tar.gz create mode 100644 ldb-1.2.2.tar.asc create mode 100644 ldb-1.2.2.tar.gz diff --git a/ldb-1.1.29.tar.asc b/ldb-1.1.29.tar.asc deleted file mode 100644 index 242fd8b..0000000 --- a/ldb-1.1.29.tar.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQEcBAABAgAGBQJYQCJ2AAoJEEeTkWETCEAlPDEH/1tGd3yUGKc3MSlgZQcfckP0 -es2JJFAwW46Jyx03VeOQeRvQwIoOCOJkxFhpGESeAce3aTyCGKSiAYy5o9H5WsGI -ZPAQ+zlWKtFEiRBiEOV8IRMN40YjrtBeryZblYCKrCa+4iLgpMuEwiO3AIfZtbjz -rvt3YmCY8sSCW/0x0QqcjRuJDrHqkJTYqwLrGMRZpZIBPaAz4DPnm6ES0UftqlsR -qTudolOTwSPNcsSKoxV8p4HCec6vJ/kUPCXhPL6U5Jj2nnVRFTvG/y/Eq2Ux1hL2 -1sYpVZfLpm+GP7REXWsSpjhkmSRJetwkSweSjEcH9ZPyKMxmcOyqoRjQ89fcFZ8= -=PPwp ------END PGP SIGNATURE----- diff --git a/ldb-1.1.29.tar.gz b/ldb-1.1.29.tar.gz deleted file mode 100644 index acfc6cc..0000000 --- a/ldb-1.1.29.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:59d84f9a5b799f519ba7b2685bb46f5a26f1bbf05b7a144b2f5e017d01d80f97 -size 1277551 diff --git a/ldb-1.2.2.tar.asc b/ldb-1.2.2.tar.asc new file mode 100644 index 0000000..f68f763 --- /dev/null +++ b/ldb-1.2.2.tar.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQEcBAABAgAGBQJZsRnXAAoJEEeTkWETCEAlP3IH/R80hUhKyUSTsPNgSh7AwVId +L6dN8UbDsbIOvS8UF55TZu5CgB4tb4urpAm/oj//NAxfwe/6EriAyw9e8yWXwyUv +fCq9Kd8GiDvfAWj9IUuL57rzY8Sp++syuQA2AMywlvApnQejkAZS0Q9WATxkdzDr +Ha5WnwzrlR54RxmaLW3bwxCeGQzXRnE87oeGGgipkOLeZgy814QyBOumjekht7nN +NqTF0EjvMsNe39tx0QkR6/ntjBQf35jkZp+jW0RD65QXotQajCwKPz6/1bwtPS/m +/DVO9J9rGyiyAdMJ85m7U+a80VDezeaRv1DBrONkpYqFAAUwWNDe9kwUFj7CzzY= +=Rmaf +-----END PGP SIGNATURE----- diff --git a/ldb-1.2.2.tar.gz b/ldb-1.2.2.tar.gz new file mode 100644 index 0000000..85b7b09 --- /dev/null +++ b/ldb-1.2.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0cedeadb75de401c9735127f654dbc1a391c4327a2b83be54078be286fed1113 +size 1348041 diff --git a/ldb.changes b/ldb.changes index 996be61..6d4ab67 100644 --- a/ldb.changes +++ b/ldb.changes @@ -1,3 +1,62 @@ +------------------------------------------------------------------- +Mon Sep 18 12:17:31 UTC 2017 - scabrero@suse.com + +- Update to 1.2.2 + + Bug #13017: Add ldb_ldif_message_redacted_string() to allow debug + of redacted log messages, avoiding showing secret values + + + Bug #13015: Allow re-index of newer databases with binary GUID TDB keys + (this officially removes support for re-index of the original + pack format 0, rather than simply segfaulting). + + Avoid memory allocation and so make modify of records in ldb_tdb faster + +------------------------------------------------------------------- +Wed Jul 26 09:18:14 UTC 2017 - scabrero@suse.com + +- Update to 1.2.1 + + Bug #12882: Do not install _ldb_text.py if we have system libldb + + Use libraries from build dir for testsuite + + Bug #12900: Fix index out of bound in ldb_msg_find_common_values + +------------------------------------------------------------------- +Wed Jul 5 09:05:46 UTC 2017 - scabrero@suse.com + +- Update to 1.2.0 + + handle one more LDB_FLAG_INTERNAL_DISABLE_SINGLE_VALUE_CHECK + case in ldb_tdb + + fix ldb_tdb locking (performance) problems + + fix ldb_tdb search inconsistencies by adding + read_[un]lock() hooks to the module stack + (bug #12858) + + add cmocka based tests for the locking issues + + ldb_version.h provides LDB_VERSION_{MAJOR,MINOR,RELEASE} defines + + protect ldb_modules.h from being used by Samba < 4.7 + Note: that this release (as well as 1.1.30 and 1.1.31) + may cause problems for older applications, e.g. Samba + See https://bugzilla.samba.org/show_bug.cgi?id=12859 + +------------------------------------------------------------------- +Mon Jul 3 08:16:32 UTC 2017 - scabrero@suse.com + +- Update to 1.1.31 + + let ldbdump parse the -i option + + don't allow the reveal_internals control for ldbedit + + only allow --show-binary for ldbsearch + + don't let ldbsearch create non-existing files + + fix ldb_tdb search inconsistencies + + add cmocka based tests + + provide an interface for improved indexing for callers + like Samba, which will allow much better performance. + + Makes ldb access to tdb:// databases use a private event context + rather than the global event context passed in by the caller. + This is because running other operations while locks are held + or a search is being conducted is not safe. + + Add efficient function to find duplicate values in ldb messages + (this makes large multi-valued attributes in ldb_tdb more efficient) +- Add ldb-tests-do-not-override-lib-path.patch: Check if LD_LIBRARY_PATH + and LDB_MODULES_PATH environment variables are set before overriding + them. + ------------------------------------------------------------------- Tue Jan 24 17:44:38 UTC 2017 - ddiss@suse.com diff --git a/ldb.spec b/ldb.spec index 4551ff4..4c8d044 100644 --- a/ldb.spec +++ b/ldb.spec @@ -24,24 +24,28 @@ %define with_python3 0 %endif -%define talloc_version 2.1.8 -%define tdb_version 1.3.11 -%define tevent_version 0.9.29 +%define talloc_version 2.1.10 +%define tdb_version 1.3.15 +%define tevent_version 0.9.33 Name: ldb BuildRequires: docbook-xsl-stylesheets BuildRequires: doxygen +BuildRequires: libcmocka-devel >= 1.1.1 BuildRequires: libtalloc-devel >= %{talloc_version} BuildRequires: libtdb-devel >= %{tdb_version} BuildRequires: libtevent-devel >= %{tevent_version} BuildRequires: libxslt BuildRequires: popt-devel BuildRequires: python-devel -BuildRequires: python-talloc-devel >= %{talloc_version} 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} +%else +BuildRequires: python-talloc-devel >= %{talloc_version} %endif %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1140 %define build_make_smp_mflags %{?_smp_mflags} @@ -49,7 +53,7 @@ BuildRequires: python3-devel %define build_make_smp_mflags %{?jobs:-j%jobs} %endif Url: https://ldb.samba.org/ -Version: 1.1.29 +Version: 1.2.2 Release: 0 Summary: An LDAP-like embedded database License: GPL-3.0+ @@ -65,17 +69,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Ldb is an LDAP-like embedded database. -%if 0%{?suse_version} > 0 -%define libldb_name libldb1 -%else -%define libldb_name libldb -%endif -%package -n %{libldb_name} +%package -n libldb1 Summary: An LDAP-like embedded database Group: System/Libraries PreReq: /sbin/ldconfig -%description -n %{libldb_name} +%description -n libldb1 Ldb is an LDAP-like embedded database. This package includes the ldb1 library. @@ -84,7 +83,7 @@ This package includes the ldb1 library. %package -n libldb-devel Summary: Libraries and Header Files to Develop Programs with ldb1 Support Group: Development/Libraries/C and C++ -Requires: %{libldb_name} = %{version} +Requires: libldb1 = %{version} %if 0%{?suse_version} > 1020 Requires: pkg-config %else @@ -108,7 +107,7 @@ Tools to manipulate ldb files %package -n python-ldb Summary: Python bindings for the LDB library Group: Development/Libraries/Python -Requires: %{libldb_name} = %{version} +Requires: libldb1 = %{version} PreReq: /sbin/ldconfig Provides: pyldb = %{version} Obsoletes: pyldb < %{version} @@ -139,13 +138,12 @@ LDB library. %package -n python3-ldb Summary: Python3 bindings for the LDB library Group: Development/Libraries/Python -Requires: %{libldb_name} = %{version} +Requires: libldb1 = %{version} PreReq: /sbin/ldconfig %description -n python3-ldb This package contains the python3 bindings for the LDB library. - %package -n python3-ldb-devel Summary: Development files for the Python3 bindings for the LDB library Group: Development/Libraries/Python @@ -210,9 +208,9 @@ DESTDIR=${RPM_BUILD_ROOT} make install # Install API documentation cp -a apidocs/man/* $RPM_BUILD_ROOT/%{_mandir} -%post -n %{libldb_name} -p /sbin/ldconfig +%post -n libldb1 -p /sbin/ldconfig -%postun -n %{libldb_name} -p /sbin/ldconfig +%postun -n libldb1 -p /sbin/ldconfig %post -n python-ldb -p /sbin/ldconfig @@ -224,7 +222,7 @@ cp -a apidocs/man/* $RPM_BUILD_ROOT/%{_mandir} %postun -n python3-ldb -p /sbin/ldconfig %endif -%files -n %{libldb_name} +%files -n libldb1 %defattr(-,root,root) %{_libdir}/libldb.so.* %dir %{_libdir}/ldb @@ -296,6 +294,7 @@ cp -a apidocs/man/* $RPM_BUILD_ROOT/%{_mandir} %files -n python3-ldb-devel %defattr(-,root,root) %{_libdir}/libpyldb-util.%{py3_soflags}.so +%{_libdir}/pkgconfig/pyldb-util.%{py3_soflags}.pc %endif %changelog From 4ff2553fa68ce22721adc34e324dc68463ec57bcd517521ff2986d2c8e2ccb0f Mon Sep 17 00:00:00 2001 From: James McDonough Date: Fri, 6 Oct 2017 08:30:56 +0000 Subject: [PATCH 2/3] Accepting request 532083 from home:scabrero:branches:network:samba:STABLE OBS-URL: https://build.opensuse.org/request/show/532083 OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/ldb?expand=0&rev=113 --- ldb.spec | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/ldb.spec b/ldb.spec index 4c8d044..969c656 100644 --- a/ldb.spec +++ b/ldb.spec @@ -31,7 +31,11 @@ Name: ldb BuildRequires: docbook-xsl-stylesheets BuildRequires: doxygen +%if 0%{?suse_version} > 1320 +%ifnarch ppc BuildRequires: libcmocka-devel >= 1.1.1 +%endif +%endif BuildRequires: libtalloc-devel >= %{talloc_version} BuildRequires: libtdb-devel >= %{tdb_version} BuildRequires: libtevent-devel >= %{tevent_version} @@ -174,6 +178,14 @@ LDB library. %if 0%{?suse_version} > 1110 export SUSE_ASNEEDED=0 %endif + +%define bundled_libs cmocka +%if 0%{?suse_version} > 1320 +%ifnarch ppc + %define bundled_libs NONE +%endif +%endif + export CFLAGS="${RPM_OPT_FLAGS} -D_GNU_SOURCE ${OPTIMIZATION} -D_LARGEFILE64_SOURCE -DIDMAP_RID_SUPPORT_TRUSTED_DOMAINS" CONFIGURE_OPTIONS="\ --prefix=%{_prefix} \ @@ -182,7 +194,7 @@ CONFIGURE_OPTIONS="\ --disable-rpath-install \ --disable-silent-rules \ --with-modulesdir=%{_libdir} \ - --bundled-libraries=NONE \ + --bundled-libraries=%{bundled_libs} \ --builtin-libraries=replace \ %if %{with_python3} --extra-python=/usr/bin/python3 \ @@ -234,6 +246,12 @@ cp -a apidocs/man/* $RPM_BUILD_ROOT/%{_mandir} %{_libdir}/ldb/server_sort.so %{_libdir}/ldb/skel.so %{_libdir}/ldb/tdb.so +%if 0%{?suse_version} <= 1320 +%{_libdir}/ldb/libcmocka-ldb.so +%endif +%ifarch ppc +%{_libdir}/ldb/libcmocka-ldb.so +%endif %files -n libldb-devel %defattr(-,root,root) From 9c1c2e0c6838c669cf46654763f3fb6071d18c91235f788b8f22c5f6389e39c1 Mon Sep 17 00:00:00 2001 From: James McDonough Date: Fri, 6 Oct 2017 09:22:06 +0000 Subject: [PATCH 3/3] Accepting request 532142 from home:jengelh:branches:network:samba:STABLE rebase + sp4 compile test OBS-URL: https://build.opensuse.org/request/show/532142 OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/ldb?expand=0&rev=114 --- ldb.changes | 8 +++++++ ldb.spec | 63 ++++++++++++++--------------------------------------- 2 files changed, 24 insertions(+), 47 deletions(-) diff --git a/ldb.changes b/ldb.changes index 6d4ab67..4640b9d 100644 --- a/ldb.changes +++ b/ldb.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Oct 2 12:18:30 UTC 2017 - jengelh@inai.de + +- Remove %if guards for blocks that do not affect the build result. + Fix RPM groups and summaries. + Drop very old SUSE support. Replace old RPM macros by new + constructs. + ------------------------------------------------------------------- Mon Sep 18 12:17:31 UTC 2017 - scabrero@suse.com diff --git a/ldb.spec b/ldb.spec index 969c656..4d532fc 100644 --- a/ldb.spec +++ b/ldb.spec @@ -51,17 +51,12 @@ BuildRequires: python3-talloc-devel >= %{talloc_version} %else BuildRequires: python-talloc-devel >= %{talloc_version} %endif -%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1140 -%define build_make_smp_mflags %{?_smp_mflags} -%else -%define build_make_smp_mflags %{?jobs:-j%jobs} -%endif Url: https://ldb.samba.org/ Version: 1.2.2 Release: 0 Summary: An LDAP-like embedded database License: GPL-3.0+ -Group: System/Libraries +Group: Development/Libraries/C and C++ Source: https://download.samba.org/pub/ldb/ldb-%{version}.tar.gz Source1: https://download.samba.org/pub/ldb/ldb-%{version}.tar.asc Source2: ldb.keyring @@ -70,16 +65,15 @@ Patch0: ldb-python3.5-fix-soabi_name.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -Ldb is an LDAP-like embedded database. +LDB is an LDAP-like embedded database. %package -n libldb1 Summary: An LDAP-like embedded database Group: System/Libraries -PreReq: /sbin/ldconfig %description -n libldb1 -Ldb is an LDAP-like embedded database. +LDB is an LDAP-like embedded database. This package includes the ldb1 library. @@ -88,47 +82,38 @@ This package includes the ldb1 library. Summary: Libraries and Header Files to Develop Programs with ldb1 Support Group: Development/Libraries/C and C++ Requires: libldb1 = %{version} -%if 0%{?suse_version} > 1020 Requires: pkg-config -%else -Requires: pkgconfig -%endif %description -n libldb-devel -Ldb is an LDAP-like embedded database. +LDB is an LDAP-like embedded database. -Libraries and Header Files to Develop Programs with ldb1 Support +Libraries and Header Files to Develop Programs with ldb1 Support. %package -n ldb-tools -Summary: Tools to manipulate ldb files +Summary: Tools to manipulate LDB files Group: Development/Libraries/C and C++ %description -n ldb-tools -Tools to manipulate ldb files +Tools to manipulate LDB files. %package -n python-ldb Summary: Python bindings for the LDB library Group: Development/Libraries/Python Requires: libldb1 = %{version} -PreReq: /sbin/ldconfig Provides: pyldb = %{version} Obsoletes: pyldb < %{version} %description -n python-ldb -This package contains the python bindings for the LDB library. +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: python-ldb = %{version} -%if 0%{?suse_version} > 1020 Requires: pkg-config -%else -Requires: pkgconfig -%endif +Requires: python-ldb = %{version} Provides: pyldb-devel = %{version} Obsoletes: pyldb-devel < %{version} Conflicts: python3-ldb-devel @@ -137,13 +122,10 @@ Conflicts: python3-ldb-devel This package contains the development files for the Python bindings for the LDB library. - -%if %{with_python3} %package -n python3-ldb Summary: Python3 bindings for the LDB library Group: Development/Libraries/Python Requires: libldb1 = %{version} -PreReq: /sbin/ldconfig %description -n python3-ldb This package contains the python3 bindings for the LDB library. @@ -151,34 +133,23 @@ This package contains the python3 bindings for the LDB library. %package -n python3-ldb-devel Summary: Development files for the Python3 bindings for the LDB library Group: Development/Libraries/Python -Requires: python3-ldb = %{version} -%if 0%{?suse_version} > 1020 Requires: pkg-config -%else -Requires: pkgconfig -%endif +Requires: python3-ldb = %{version} Conflicts: python-ldb-devel %description -n python3-ldb-devel This package contains the development files for the Python bindings for the LDB library. -%endif %prep %setup -n ldb-%{version} -q %patch0 -p1 %build -%if 0%{?suse_version} && 0%{?suse_version} < 911 - OPTIMIZATION="-O" -%else - # use the default optimization - unset OPTIMIZATION -%endif %if 0%{?suse_version} > 1110 export SUSE_ASNEEDED=0 %endif - +export CFLAGS="%{optflags} -D_GNU_SOURCE -D_LARGEFILE64_SOURCE -DIDMAP_RID_SUPPORT_TRUSTED_DOMAINS" %define bundled_libs cmocka %if 0%{?suse_version} > 1320 %ifnarch ppc @@ -186,7 +157,7 @@ LDB library. %endif %endif -export CFLAGS="${RPM_OPT_FLAGS} -D_GNU_SOURCE ${OPTIMIZATION} -D_LARGEFILE64_SOURCE -DIDMAP_RID_SUPPORT_TRUSTED_DOMAINS" +export CFLAGS="%{optflags} -D_GNU_SOURCE -D_LARGEFILE64_SOURCE -DIDMAP_RID_SUPPORT_TRUSTED_DOMAINS" CONFIGURE_OPTIONS="\ --prefix=%{_prefix} \ --libdir=%{_libdir} \ @@ -201,7 +172,7 @@ CONFIGURE_OPTIONS="\ %endif " ./configure ${CONFIGURE_OPTIONS} -%{__make} %{build_make_smp_mflags} \ +make %{?_smp_mflags} \ all doxygen Doxyfile # remove man page with bogus full build dir in path @@ -211,14 +182,14 @@ rm -f apidocs/man/man3/_*_ldb-%{version}_include_.3 %ifnarch ppc64 s390x LD_LIBRARY_PATH="bin/shared:bin/shared/private" \ LDB_MODULES_PATH="bin/modules" \ -%{__make} test +make test %endif %install -DESTDIR=${RPM_BUILD_ROOT} make install +%make_install # Install API documentation -cp -a apidocs/man/* $RPM_BUILD_ROOT/%{_mandir} +cp -a apidocs/man/* %{buildroot}/%{_mandir} %post -n libldb1 -p /sbin/ldconfig @@ -228,11 +199,9 @@ cp -a apidocs/man/* $RPM_BUILD_ROOT/%{_mandir} %postun -n python-ldb -p /sbin/ldconfig -%if %{with_python3} %post -n python3-ldb -p /sbin/ldconfig %postun -n python3-ldb -p /sbin/ldconfig -%endif %files -n libldb1 %defattr(-,root,root)