diff --git a/.files b/.files
index e36d680..2b3c66d 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index 1a1a881..074b31b 100644
--- a/.rev
+++ b/.rev
@@ -414,4 +414,12 @@
868235
+
+ f961aac7ad532555b5ee5b239bf21b46
+ 2.0.4~git0.7f6ba5a37
+
+ RBrownSUSE
+
+ 883928
+
diff --git a/.servicemark b/.servicemark
index 2ae088d..7a960b0 100644
--- a/.servicemark
+++ b/.servicemark
@@ -1 +1 @@
-9da564584217471149a2a9225ed92fa1
+691a16d520b7b49c81374fde01a17377
diff --git a/389-ds-base-2.0.2~git0.6d17ca7df.tar.bz2 b/389-ds-base-2.0.2~git0.6d17ca7df.tar.bz2
deleted file mode 120000
index 63d5214..0000000
--- a/389-ds-base-2.0.2~git0.6d17ca7df.tar.bz2
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafybeicmykbi2lkqrvd56f4mxefquw7kgr7m6j3jv2ztyfx67utdyw4fjm
\ No newline at end of file
diff --git a/389-ds-base-2.0.4~git0.7f6ba5a37.tar.xz b/389-ds-base-2.0.4~git0.7f6ba5a37.tar.xz
new file mode 120000
index 0000000..dc22839
--- /dev/null
+++ b/389-ds-base-2.0.4~git0.7f6ba5a37.tar.xz
@@ -0,0 +1 @@
+/ipfs/bafybeif3ui2in47qucoleqyq5pcqertmnp6e5r2rm6x53uqyasd6usdsxu
\ No newline at end of file
diff --git a/389-ds-base.obsinfo b/389-ds-base.obsinfo
index 52c93d5..4975c31 100644
--- a/389-ds-base.obsinfo
+++ b/389-ds-base.obsinfo
@@ -1,5 +1,5 @@
name: 389-ds-base
-version: 2.0.2~git0.6d17ca7df
-mtime: 1610648180
-commit: 6d17ca7df0fdd58175ff03ded410412400780065
+version: 2.0.4~git0.7f6ba5a37
+mtime: 1617781588
+commit: 7f6ba5a3785df4b4b974acfa534414cff53d6fc5
diff --git a/389-ds.changes b/389-ds.changes
index ee449f6..bc86b4a 100644
--- a/389-ds.changes
+++ b/389-ds.changes
@@ -1,4 +1,94 @@
-------------------------------------------------------------------
+Thu Apr 08 00:22:28 UTC 2021 - wbrown@suse.de
+
+- Update to version 389-ds-base-2.0.4~git0.7f6ba5a37:
+ * Bump version to 2.0.4
+ * Issue 4680 - 389ds coredump (@389ds/389-ds-base-nightly) in replica install with CA (#4715)
+ * Issue 3965 - RFE - Implement the Password Policy attribute "pwdReset" (#4713)
+ * Issue 4700 - Regression in winsync replication agreement (#4712)
+ * Issue 3965 - RFE - Implement the Password Policy attribute "pwdReset" (#4710)
+ * Issue 4169 - UI - migrate monitor tables to PF4
+ * issue 4585 - backend redesign phase 3c - dbregion test removal (#4665)
+ * Issue 2736 - remove remaining perl references
+ * Issue 2736 - https://github.com/389ds/389-ds-base/issues/2736
+ * Issue 4706 - negative wtime in access log for CMP operations
+ * Issue 3585 - LDAP server returning controltype in different sequence
+ * Issue 4127 - With Accounts/Account module delete fuction is not working (#4697)
+ * Issue 4666 - BUG - cb_ping_farm can fail with anonymous binds disabled (#4669)
+ * Issue 4671 - UI - Fix browser crashes
+ * Issue 4169 - UI - Add PF4 charts for server stats
+ * Issue 4648 - Fix some issues and improvement around CI tests (#4651)
+ * Issue 4654 Updates to tickets/ticket48234_test.py (#4654)
+ * Issue 4229 - Fix Rust linking
+ * Issue 4673 - Update Rust crates
+ * Issue 4658 - monitor - connection start date is incorrect
+ * Issue 4169 - UI - migrate modals to PF4
+ * Issue 4656 - remove problematic language from ds-replcheck
+ * Issue 4459 - lib389 - Default paths should use dse.ldif if the server is down
+ * Issue 4656 - Remove problematic language from UI/CLI/lib389
+ * Issue 4661 - RFE - allow importing openldap schemas (#4662)
+ * Issue 4659 - restart after openldap migration to enable plugins (#4660)
+ * Merge pull request #4664 from mreynolds389/issue4663
+ * issue 4552 - Backup Redesign phase 3b - use dbimpl in replicatin plugin (#4622)
+ * Issue 4643 - Add a tool that generates Rust dependencies for a specfile (#4645)
+ * Issue 4646 - CLI/UI - revise DNA plugin management
+ * Issue 4644 - Large updates can reset the CLcache to the beginning of the changelog (#4647)
+ * Issue 4649 - crash in sync_repl when a MODRDN create a cenotaph (#4652)
+ * Issue 4169 - UI - Migrate alerts to PF4
+ * Issue 4169 - UI - Migrate Accordians to PF4 ExpandableSection
+ * Issue 4595 - Paged search lookthroughlimit bug (#4602)
+ * Issue 4169 - UI - port charts to PF4
+ * Issue 2820 - Fix CI test suite issues
+ * Issue 4513 - CI - make acl ip address tests more robust
+ * Bump version to 2.0.3
+ * Issue 4619 - remove pytest requirement from lib389
+ * Issue 4615 - log message when psearch first exceeds max threads per conn
+ * Issue 4469 - Backend redesing phase 3a - implement dbimpl API and use it in back-ldbm (#4618)
+ * Issue 4324 - Some architectures the cache line size file does not exist
+ * Issue 4593 - RFE - Print help when nsSSLPersonalitySSL is not found (#4614)
+ * Issue 4469 - Backend redesign phase 3a - bdb dependency removal from back-ldbm
+ * Update dscontainer (#4564)
+ * Issue 4149 - UI - port TreeView and opther components to PF4
+ * Issue 4577 - Add GitHub actions
+ * Issue 4591 - RFE - improve openldap_to_ds help and features (#4607)
+ * issue 4612 - Fix pytest fourwaymmr_test for non root user (#4613)
+ * Issue 4609 - CVE - info disclosure when authenticating
+ * Issue 4348 - Add tests for dsidm
+ * Issue 4571 - Stale libdb-utils dependency
+ * Issue 4600 - performance modify rate: reduce lock contention on the object extension factory (#4601)
+ * Issue 4577 - Add GitHub actions
+ * Issue 4588 - BUG - unable to compile without xcrypt (#4589)
+ * Issue 4579 - libasan detects heap-use-after-free in URP test (#4584)
+ * Issue 4581 - A failed re-indexing leaves the database in broken state (#4582)
+ * Issue 4348 - Add tests for dsidm
+ * Issue 4577 - Add GitHub actions
+ * Issue 4563 - Failure on s390x: 'Fails to split RDN "o=pki-tomcat-CA" into components' (#4573)
+ * Issue 4093 - fix compiler warnings and update doxygen
+ * Issue 4575 - Update test docstrings metadata
+ * Issue 4526 - sync_repl: when completing an operation in the pending list, it can select the wrong operation (#4553)
+ * Issue 4324 - Performance search rate: change entry cache monitor to recursive pthread mutex (#4569)
+ * Issue 4513 - Add DS version check to SSL version test (#4570)
+ * Issue 5442 - Search results are different between RHDS10 and RHDS11
+ * Issue 4396 - Minor memory leak in backend (#4558)
+ * Revert "Update metadata for customerscenario in test docstring"
+ * Update metadata for customerscenario in test docstring
+ * Issue 4513 - Fix replication CI test failures (#4557)
+ * Issue 4513 - Fix replication CI test failures (#4557)
+ * Issue 4153 - Added a CI test (#4556)
+ * Issue 4506 - BUG - fix oob alloc for fds (#4555)
+ * Issue 4548 - CLI - dsconf needs better root DN access control plugin validation
+ * Issue 4506 - Temporary fix for io issues (#4516)
+ * Issue 4535 - lib389 - Fix log function in backends.py
+ * Issue 4534 - libasan read buffer overflow in filtercmp (#4541)
+ * Issue 4544 - Compiler warnings on krb5 functions (#4545)
+ * Update rpm.mk for RUST tarballs
+
+-------------------------------------------------------------------
+Wed Apr 7 16:07:34 UTC 2021 - Dirk Müller
+
+- small spec cleanup
+
+-------------------------------------------------------------------
Fri Jan 29 19:06:53 UTC 2021 - Dominique Leuenberger
- As there is no python-* package, the direct use of singlespec
diff --git a/389-ds.spec b/389-ds.spec
index 36bb633..f0610e9 100644
--- a/389-ds.spec
+++ b/389-ds.spec
@@ -37,13 +37,13 @@
%define svrcorelib libsvrcore0
Name: 389-ds
-Version: 2.0.2~git0.6d17ca7df
+Version: 2.0.4~git0.7f6ba5a37
Release: 0
Summary: 389 Directory Server
License: GPL-3.0-or-later AND MPL-2.0
Group: Productivity/Networking/LDAP/Servers
URL: https://pagure.io/389-ds-base
-Source: 389-ds-base-%{version}.tar.bz2
+Source: 389-ds-base-%{version}.tar.xz
Source1: extra-schema.tgz
Source2: LICENSE.openldap
Source3: vendor.tar.xz
@@ -52,7 +52,6 @@ Source9: %{name}-rpmlintrc
Source10: %{user_group}-user.conf
# 389-ds does not support i686
ExcludeArch: %ix86
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: cracklib-devel
@@ -123,7 +122,7 @@ Recommends: cyrus-sasl-digestmd5
Requires(post): fillup
Requires(pre): shadow
-PreReq: permissions
+Requires(post): permissions
Obsoletes: 389-ds-base < %{version}-%{release}
Provides: 389-ds-base = %{version}-%{release}
%{?systemd_ordering}
@@ -161,7 +160,7 @@ features.
This package contains the development files for 389DS.
-%package snmp
+%package snmp
Summary: SNMP Agent for 389 Directory Server
License: GPL-3.0-or-later AND MPL-2.0
Group: System/Daemons
@@ -169,7 +168,7 @@ Requires: %{name} = %{version}
Obsoletes: %{name} <= 1.3.6.2
-%description snmp
+%description snmp
SNMP Agent for the 389 Directory Server base package.
%package -n lib389
@@ -333,7 +332,6 @@ exit 0
%postun -n %{svrcorelib} -p /sbin/ldconfig
%files
-%defattr(-,root,root)
%doc README*
%license LICENSE LICENSE.openldap
%{_sysusersdir}/%{user_group}-user.conf
@@ -374,7 +372,6 @@ exit 0
%{_datadir}/gdb/auto-load/usr/sbin/ns-slapd-gdb.py
%files devel
-%defattr(-,root,root)
%doc README*
%doc src/svrcore/README.svrcore
%license LICENSE
@@ -390,12 +387,10 @@ exit 0
%{_libdir}/pkgconfig/svrcore.pc
%files -n %{svrcorelib}
-%defattr(-,root,root,-)
%license src/svrcore/LICENSE*
%{_libdir}/libsvrcore.so.*
%files snmp
-%defattr(-,root,root,-)
%license LICENSE LICENSE.GPLv3+ LICENSE.openssl
# TODO: README.devel
%config(noreplace)%{_sysconfdir}/%{pkgname}/config/ldap-agent.conf
@@ -404,7 +399,6 @@ exit 0
%{_unitdir}/%{pkgname}-snmp.service
%files -n lib389
-%defattr(-,root,root,-)
%license src/lib389/LICENSE
%doc src/lib389/README*
%{_sbindir}/dsconf
diff --git a/_service b/_service
index de11315..d17873b 100644
--- a/_service
+++ b/_service
@@ -3,9 +3,9 @@
https://github.com/389ds/389-ds-base.git
@PARENT_TAG@~git@TAG_OFFSET@.%h
git
- 389-ds-base-2.0.2
- 389-ds-base-2.0.2
- 389dsbase(.*)
+ 389-ds-base-2.0.4
+ 389-ds-base-2.0.4
+ 389-ds-base-(.*)
\1
enable
wbrown@suse.de
@@ -13,7 +13,7 @@
*.tar
- bz2
+ xz
diff --git a/_servicedata b/_servicedata
index 3dcfa74..8a213b9 100644
--- a/_servicedata
+++ b/_servicedata
@@ -5,4 +5,4 @@
https://pagure.io/forks/firstyear/389-ds-base.git
52fa3f10591fc102b1e08def13e1e2bf48ecfd2e
https://github.com/389ds/389-ds-base.git
- 6d17ca7df0fdd58175ff03ded410412400780065
\ No newline at end of file
+ 7f6ba5a3785df4b4b974acfa534414cff53d6fc5
\ No newline at end of file
diff --git a/vendor.tar.xz b/vendor.tar.xz
index 895f361..c5434a6 120000
--- a/vendor.tar.xz
+++ b/vendor.tar.xz
@@ -1 +1 @@
-/ipfs/bafybeietuuj73x4n3ag3wofl5uaiezx5ifrvehpbdevesyttatw7wu7pdq
\ No newline at end of file
+/ipfs/bafybeiatzvt273niklfhe52y3uti3qhrfxoe6x3bmffoegdtofm3kebg6u
\ No newline at end of file