Hello community, here is the log from the commit of package 389-ds for openSUSE:Factory checked in at 2020-02-24 15:54:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/389-ds (Old) and /work/SRC/openSUSE:Factory/.389-ds.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "389-ds" Mon Feb 24 15:54:13 2020 rev:29 rq:778632 version:1.4.3.3~git0.776c6edf5 Changes: -------- --- /work/SRC/openSUSE:Factory/389-ds/389-ds.changes 2020-01-29 13:22:48.138305473 +0100 +++ /work/SRC/openSUSE:Factory/.389-ds.new.26092/389-ds.changes 2020-02-24 15:56:08.479964583 +0100 @@ -1,0 +2,54 @@ +Mon Feb 17 03:45:13 UTC 2020 - [email protected] + +- Add requirement on openssl for rust-openssl as part of ldaptokens +- Add rust vendored libs +- Add 0001-fix-cargo-build.patch to fix minor rust build issues +- Update to version 1.4.3.3~git0.776c6edf5: + * Bump version to 1.4.3.3 + * Issue 50855 - remove unused file from UI + * Issue 50855 - UI: Port Server Tab to React + * Issue 49845 - README does not contain complete information on building + * Issue: 50686 - Port fractional replication test cases from TET to python3 part 1 + * Ticket - 49623-cont cenotaph errors on modrdn operations + * Issue 50882 - Fix healthcheck errors for instances that do not have TLS enabled + * Issue 50886 - Typo in the replication debug message + * Issue 50873 - Fix healthcheck and virtual attr check + * Issue 50873 - Fix issues with healthcheck tool + * Issue 50028 - Add a new CI test case + * Issue 49946 - Add a new CI test case + * Issue 50117 - Add a new CI test case + * Ticket 50787 - fix implementation of attr unique + * Ticket 50859 - support running only with ldaps socket + * Issue 50823 - dsctl doesn't work with 'slapd-' in the instance name + * Ticket 49624 cont - DB Deadlock on modrdn appears to corrupt database and entry cache + * Issue 50867 - Fix minor buildsys issues + * Issue 50737 - Allow building with rust online without vendoring + * Ticket 50831 add cargo.lock to allow offline builds + * Ticket 50694 - import PEM certs on startup + * Ticket 50857 - Memory leak in ACI using IP subject + * Issue 49761 - Fix CI test suite issues + * Issue 50853 - Fix NULL pointer deref in config setting + * Issue 50850 - Fix dsctl healthcheck for python36 + * Issue 49990 - Need to enforce a hard maximum limit for file descriptors + * Ticket 48707 - ldapssotoken for authentication + * Bump version to 1.4.3.2 + * Issue 49254 - Fix compiler failures and warnings + * Ticket 50741-cont bdb_start - Detected Disorderly Shutdown + * Issue 50836 - Port Schema UI tab to React + * Issue 50842 - Decrease 389-console Cockpit component size + * Ticket 50790 - Add result text when filter is invalid + * Issue 50627 - Add ASAN logs to HTML report + * Issue 50834 - Incorrectly setting the NSS default SSL version max + * Issue 50829 - Disk monitoring rotated log cleanup causes heap-use-after-free + * Ticket 50709 - (cont) Several memory leaks reported by Valgrind for 389-ds 1.3.9.1-10 + * Ticket 50784 - performance testing scripts + * Issue 50599 - Fix memory leak when removing db region files + * Issue 49395 - Set the default TLS version min to TLS1.2 + * Issue 50818 - dsconf pwdpolicy get error + * Issue 50824 - dsctl remove fails with "name 'ensure_str' is not defined" + * Issue 50599 - Remove db region files prior to db recovery + * Issue 50812 - dscontainer executable should be placed under /usr/libexec/dirsrv/ + * Issue 50816 - dsconf allows the root password to be set to nothing + * Issue 50798 - incorrect bytes in format string(fix import issue) + +------------------------------------------------------------------- Old: ---- 389-ds-base-1.4.3.1~git0.a08202a5b.tar.bz2 New: ---- 0001-fix-cargo-build.patch 389-ds-base-1.4.3.3~git0.776c6edf5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ 389-ds.spec ++++++ --- /var/tmp/diff_new_pack.e2vXTU/_old 2020-02-24 15:56:09.439966569 +0100 +++ /var/tmp/diff_new_pack.e2vXTU/_new 2020-02-24 15:56:09.439966569 +0100 @@ -18,11 +18,15 @@ # bcond is confusingly backwards to what you expect - without means # to ENABLE the option, with means to DISABLE it. -%if (0%{is_opensuse} > 0) || (0%{?sle_version} > 150100) +%if (0%{?sle_version} > 150099) || (0%{?suse_version} > 1549) %bcond_without lib389 -%bcond_with rust %else %bcond_with lib389 +%endif + +%if (0%{?sle_version} > 150299) || (0%{?suse_version} > 1549) +%bcond_without rust +%else %bcond_with rust %endif @@ -47,7 +51,7 @@ %define svrcorelib libsvrcore0 Name: 389-ds -Version: 1.4.3.1~git0.a08202a5b +Version: 1.4.3.3~git0.776c6edf5 Release: 0 Summary: 389 Directory Server License: GPL-3.0-or-later AND MPL-2.0 @@ -56,8 +60,13 @@ Source: 389-ds-base-%{version}.tar.bz2 Source1: extra-schema.tgz Source2: LICENSE.openldap +%if %{with rust} Source3: vendor.tar.gz +%endif Source9: %{name}-rpmlintrc +%if %{with rust} +Patch1: 0001-fix-cargo-build.patch +%endif # 389-ds does not support i686 ExcludeArch: %ix86 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -96,7 +105,9 @@ BuildRequires: pkgconfig(icu-i18n) BuildRequires: pkgconfig(icu-uc) BuildRequires: pkgconfig(libcap) +BuildRequires: pkgconfig(libcrypto) BuildRequires: pkgconfig(libpcre) +BuildRequires: pkgconfig(libssl) BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(nspr) BuildRequires: pkgconfig(nss) @@ -235,18 +246,15 @@ uses the facilities provided by NSS. %prep +# Extract the 389-ds sources. %setup -q -a 1 -n %{name}-base-%{version} -%setup -q -n %{name}-base-%{version} -D -T -a 3 -rm -rf .cargo -mkdir .cargo -cat >.cargo/config <<EOF -[source.crates-io] -registry = 'https://github.com/rust-lang/crates.io-index' -replace-with = 'vendored-sources' -[source.vendored-sources] -directory = './vendor' -EOF +# Extract the vendor.tar.gz. The -D -T here prevents removal of the sources +# from the previous setup step. +%if %{with rust} +%setup -q -n %{name}-base-%{version} -D -T -a 3 +%endif +%patch1 -p1 %build # Make sure python3 is used in shebangs @@ -303,6 +311,8 @@ %if %{with lib389} pushd src/lib389 %python_install +mv %{buildroot}/usr/libexec/dirsrv/dscontainer %{buildroot}%{_prefix}/lib/dirsrv/ +rmdir %{buildroot}/usr/libexec/dirsrv/ popd %endif @@ -495,7 +505,7 @@ %{_unitdir}/[email protected] %{_unitdir}/dirsrv.target %exclude %{_unitdir}/[email protected]/custom.conf -%{_prefix}/lib/dirsrv/ +%{_prefix}/lib/dirsrv/ds_systemd_ask_password_acl # This has to be hardcoded to /lib - $libdir changes between lib/lib64, but # sysctl.d is always in /lib. %{_prefix}/lib/sysctl.d/* @@ -543,9 +553,8 @@ %{_sbindir}/dscreate %{_sbindir}/dsctl %{_sbindir}/dsidm -%{_sbindir}/dscontainer -# %dir %{_prefix}/libexec/dirsrv -# %{_prefix}/libexec/dirsrv/dscontainer +%dir %{_prefix}/lib/dirsrv/ +%{_prefix}/lib/dirsrv/dscontainer %{_mandir}/man8/dsconf.8.gz %{_mandir}/man8/dscreate.8.gz %{_mandir}/man8/dsctl.8.gz ++++++ 0001-fix-cargo-build.patch ++++++ >From ee740a74baf6454b149ffe6061f8419f727bb16d Mon Sep 17 00:00:00 2001 From: William Brown <[email protected]> Date: Mon, 17 Feb 2020 13:59:27 +1000 Subject: [PATCH] fix cargo build --- Makefile.am | 2 +- configure.ac | 15 +++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/Makefile.am b/Makefile.am index df986bfee..9180d170c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2180,7 +2180,7 @@ ns_slapd_LDADD = libslapd.la libldaputil.la libsvrcore.la $(LDAPSDK_LINK) $(NSS_ $(NSPR_LINK) $(SASL_LINK) $(LIBNSL) $(LIBSOCKET) $(THREADLIB) $(SYSTEMD_LIBS) $(EVENT_LINK) if RUST_ENABLE ns_slapd_LDADD += $(RNSSLAPD_LIB) -ns_slapd_CPPFLAGS = -lssl -lcrypto +ns_slapd_CPPFLAGS += -lssl -lcrypto endif ns_slapd_DEPENDENCIES = libslapd.la libldaputil.la # We need to link ns-slapd with the C++ compiler on HP-UX since we load diff --git a/configure.ac b/configure.ac index 78803cc9b..895b11a04 100644 --- a/configure.ac +++ b/configure.ac @@ -104,18 +104,15 @@ if test "$enable_rust" = yes -o "$enable_rust_offline" = yes; then AS_IF([test "$CARGO" != "yes" -o "$RUSTC" != "yes"], [ AC_MSG_FAILURE("Rust based plugins cannot be built cargo=$CARGO rustc=$RUSTC") ]) - - if test "$enable_rust_offline" = yes; then - rust_vendor_sources = "replace-with = \"vendored-sources\"" - else - rust_vendor_sources = "" - fi - AC_SUBST([rust_vendor_sources]) - AC_CONFIG_FILES([.cargo/config]) fi AC_SUBST([enable_rust]) AM_CONDITIONAL([RUST_ENABLE],[test "$enable_rust" = yes -o "$enable_rust_offline" = yes]) +AS_IF([test "$enable_rust_offline" = yes], + [rust_vendor_sources="replace-with = \"vendored-sources\""], + [rust_vendor_sources=""]) +AC_SUBST([rust_vendor_sources]) + AC_MSG_CHECKING(for --enable-debug) AC_ARG_ENABLE(debug, AS_HELP_STRING([--enable-debug], [Enable debug features (default: no)]), @@ -925,5 +922,7 @@ AC_CONFIG_FILES([src/pkgconfig/dirsrv.pc src/pkgconfig/libsds.pc src/pkgconfig/s AC_CONFIG_FILES([Makefile rpm/389-ds-base.spec ]) +AC_CONFIG_FILES([.cargo/config]) + AC_OUTPUT -- 2.21.1 (Apple Git-122.3) ++++++ 389-ds-base-1.4.3.1~git0.a08202a5b.tar.bz2 -> 389-ds-base-1.4.3.3~git0.776c6edf5.tar.bz2 ++++++ ++++ 27918 lines of diff (skipped) ++++++ 389-ds-base.obsinfo ++++++ --- /var/tmp/diff_new_pack.e2vXTU/_old 2020-02-24 15:56:13.767975520 +0100 +++ /var/tmp/diff_new_pack.e2vXTU/_new 2020-02-24 15:56:13.771975528 +0100 @@ -1,5 +1,5 @@ name: 389-ds-base -version: 1.4.3.1~git0.a08202a5b -mtime: 1578945985 -commit: a08202a5b755d61ae145716d02d78ba3d3a71b96 +version: 1.4.3.3~git0.776c6edf5 +mtime: 1581623924 +commit: 776c6edf5dbaabccd6d2e12a4ebd6b39598dc142 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.e2vXTU/_old 2020-02-24 15:56:13.807975603 +0100 +++ /var/tmp/diff_new_pack.e2vXTU/_new 2020-02-24 15:56:13.807975603 +0100 @@ -6,9 +6,9 @@ <param name="versionformat">@PARENT_TAG@~git@TAG_OFFSET@.%h</param> <param name="scm">git</param> <!-- use 1.4 branch --> - <param name="revision">389-ds-base-1.4.3.1</param> + <param name="revision">389-ds-base-1.4.3.3</param> <!-- use 1.4.0.20 tag as base --> - <param name="match-tag">389-ds-base-1.4.3.1</param> + <param name="match-tag">389-ds-base-1.4.3.3</param> <!-- remove the extra prefix from the tag again it looks so funny because the service removed "-" from the string before--> <param name="versionrewrite-pattern">389dsbase(.*)</param> <param name="versionrewrite-replacement">\1</param> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.e2vXTU/_old 2020-02-24 15:56:13.819975627 +0100 +++ /var/tmp/diff_new_pack.e2vXTU/_new 2020-02-24 15:56:13.823975635 +0100 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://pagure.io/389-ds-base.git</param> - <param name="changesrevision">a08202a5b755d61ae145716d02d78ba3d3a71b96</param></service><service name="tar_scm"> + <param name="changesrevision">776c6edf5dbaabccd6d2e12a4ebd6b39598dc142</param></service><service name="tar_scm"> <param name="url">https://pagure.io/forks/firstyear/389-ds-base.git</param> <param name="changesrevision">52fa3f10591fc102b1e08def13e1e2bf48ecfd2e</param></service></servicedata> \ No newline at end of file
