diff --git a/.files b/.files index fda334e..eb51d6d 100644 Binary files a/.files and b/.files differ diff --git a/.rev b/.rev index a3a0914..4664fbb 100644 --- a/.rev +++ b/.rev @@ -320,4 +320,12 @@ 784733 + + e179091aa9719369a531cf9002323998 + 1.4.3.4~git0.3422d6574 + + dimstar_suse + Automatic submission by obs-autosubmit + 787619 + diff --git a/.servicemark b/.servicemark index c564f0a..33480ec 100644 --- a/.servicemark +++ b/.servicemark @@ -1 +1 @@ -84e22c1fa7729c18387849ef25d56579 +f9690474fd2dc5ccdef7a9d2cc5935d2 diff --git a/0001-fix-cargo-build.patch b/0001-fix-cargo-build.patch deleted file mode 100644 index afe79cd..0000000 --- a/0001-fix-cargo-build.patch +++ /dev/null @@ -1,62 +0,0 @@ -From ee740a74baf6454b149ffe6061f8419f727bb16d Mon Sep 17 00:00:00 2001 -From: William Brown -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) - diff --git a/389-ds-base-1.4.3.3~git0.776c6edf5.tar.bz2 b/389-ds-base-1.4.3.3~git0.776c6edf5.tar.bz2 deleted file mode 120000 index 81f9fd8..0000000 --- a/389-ds-base-1.4.3.3~git0.776c6edf5.tar.bz2 +++ /dev/null @@ -1 +0,0 @@ -/ipfs/bafybeielcdptsjbuz2evmzarawd2hy7k2pk5l4b4ouy374pdz744j7zimq \ No newline at end of file diff --git a/389-ds-base-1.4.3.4~git0.3422d6574.tar.bz2 b/389-ds-base-1.4.3.4~git0.3422d6574.tar.bz2 new file mode 120000 index 0000000..458b636 --- /dev/null +++ b/389-ds-base-1.4.3.4~git0.3422d6574.tar.bz2 @@ -0,0 +1 @@ +/ipfs/bafybeiechaepdvmxeo7dccfnchrtrnuznm6imy7h32iqerm4hq5ndzudui \ No newline at end of file diff --git a/389-ds-base.obsinfo b/389-ds-base.obsinfo index 3c8940b..1cb4e10 100644 --- a/389-ds-base.obsinfo +++ b/389-ds-base.obsinfo @@ -1,5 +1,5 @@ name: 389-ds-base -version: 1.4.3.3~git0.776c6edf5 -mtime: 1581623924 -commit: 776c6edf5dbaabccd6d2e12a4ebd6b39598dc142 +version: 1.4.3.4~git0.3422d6574 +mtime: 1584369590 +commit: 3422d6574166e9e63d5ee0c21e61128bcb7113da diff --git a/389-ds.changes b/389-ds.changes index 333580f..843fa9a 100644 --- a/389-ds.changes +++ b/389-ds.changes @@ -1,4 +1,46 @@ ------------------------------------------------------------------- +Tue Mar 17 00:42:30 UTC 2020 - 389-ds-maintainer@suse.de + +- Remove 0001-fix-cargo-build.patch as it has been included upstream +- Update to version 1.4.3.4~git0.3422d6574: + * Bump version to 1.4.3.4 + * Issue 50954 - Port buildnum.pl to python(part 2) + * Issue 50955 - Fix memory leaks in chaining plugin + * Issue 50954 - Port buildnum.pl to python + * Ticket 50947 - change 00core.ldif objectClasses for openldap migration + * Ticket: 50755 - setting nsslapd-db-home-directory is overriding db_directory + * Issue 50937 - Update CLI for new backend split configuration + * Issue: 50860 - Port Password Policy test cases from TET to python3 pwp.sh + * Ticket 50945 - givenname alias of gn from openldap + * Ticket 50935 - systemd override in lib389 for dscontainer + * Issue 50499 - Fix npm audit issues + * Issue 49761 - Fix CI test suite issues + * Ticket 50618 - clean compiler warning and log level + * Ticket 50889 - fix compiler issues + * Issue 50884 - Health check tool DSEldif check fails + * Issue 50926 - Remove dual spinner and other UI fixes + * Issue 50928 - Unable to create a suffix with countryName + * Issue 50758 - Only Recommend bash-completion, not Require + * Issue 50923 - Fix a test regression + * Issue 50904 - Connect All React Components And Refactor the Main Navigation Tab Code + * Issue 50920 - cl-dump exit code is 0 even if command fails with invalid arguments + * Issue 50923 - Add test - dsctl fails to remove instances with dashes in the name + * Issue 50919 - Backend delete fails using dsconf + * Issue 50872 - dsconf can't create GSSAPI replication agreements + * Issue 50912 - RFE - add password policy attribute pwdReset + * Ticket 50914 - No error returned when adding an entry matching filters for a non existing automember group + * Ticket 50889 - Extract pem files into a private namespace + * Issue 50909 - nsDS5ReplicaId cant be set to the old value it had before + * Issue: 50686 - Port fractional replication test cases from TET to python3 final + * Issue 49845 - Remove pkgconfig check for libasan + * Issue:50860 - Port Password Policy test cases from TET to python3 bug624080 + * Issue:50860 - Port Password Policy test cases from TET to python3 series of bugs + * Ticket 50786 - connection table freelist + * Ticket 50618 - support cgroupv2 + * Ticket 50900 - Fix cargo offline build + * Ticket 50898 - ldclt core dumped when run with -e genldif option + +------------------------------------------------------------------- Mon Mar 9 03:48:34 UTC 2020 - William Brown - Change systemd_requires to systemd_ordering based on packaging diff --git a/389-ds.spec b/389-ds.spec index 1912540..249a292 100644 --- a/389-ds.spec +++ b/389-ds.spec @@ -51,7 +51,7 @@ %define svrcorelib libsvrcore0 Name: 389-ds -Version: 1.4.3.3~git0.776c6edf5 +Version: 1.4.3.4~git0.3422d6574 Release: 0 Summary: 389 Directory Server License: GPL-3.0-or-later AND MPL-2.0 @@ -65,9 +65,6 @@ Source3: vendor.tar.gz %endif Source9: %{name}-rpmlintrc Source10: %{user_group}-user.conf -%if %{with rust} -Patch1: 0001-fix-cargo-build.patch -%endif # 389-ds does not support i686 ExcludeArch: %ix86 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -257,7 +254,6 @@ uses the facilities provided by NSS. %if %{with rust} %setup -q -n %{name}-base-%{version} -D -T -a 3 %endif -%patch1 -p1 %build %sysusers_generate_pre %{SOURCE10} %{user_group} diff --git a/_service b/_service index b62c497..e5a7d92 100644 --- a/_service +++ b/_service @@ -6,9 +6,9 @@ @PARENT_TAG@~git@TAG_OFFSET@.%h git - 389-ds-base-1.4.3.3 + 389-ds-base-1.4.3.4 - 389-ds-base-1.4.3.3 + 389-ds-base-1.4.3.4 389dsbase(.*) \1 diff --git a/_servicedata b/_servicedata index 7dbe5b5..0e5d261 100644 --- a/_servicedata +++ b/_servicedata @@ -1,6 +1,6 @@ https://pagure.io/389-ds-base.git - 776c6edf5dbaabccd6d2e12a4ebd6b39598dc142 + 3422d6574166e9e63d5ee0c21e61128bcb7113da https://pagure.io/forks/firstyear/389-ds-base.git 52fa3f10591fc102b1e08def13e1e2bf48ecfd2e \ No newline at end of file