From 73bf342805bdd9793b601505d0167bdcae22d567 Mon Sep 17 00:00:00 2001
From: Bernhard M. Wiedemann <bwiedemann+opensusegit@suse.de>
Date: Mar 14 2020 09:06:17 +0000
Subject: Update 389-ds to rev 30 via SR 784733


https://build.opensuse.org/request/show/784733
by user firstyear + dimstar_suse

---

diff --git a/.files b/.files
index 1e1f92a..fda334e 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index fbdb8cf..a3a0914 100644
--- a/.rev
+++ b/.rev
@@ -312,4 +312,12 @@
     <comment></comment>
     <requestid>778632</requestid>
   </revision>
+  <revision rev="30" vrev="2">
+    <srcmd5>d52276f09c7702173c01acc4f53e8fc7</srcmd5>
+    <version>1.4.3.3~git0.776c6edf5</version>
+    <time>1584176203</time>
+    <user>dimstar_suse</user>
+    <comment></comment>
+    <requestid>784733</requestid>
+  </revision>
 </revisionlist>
diff --git a/.servicemark b/.servicemark
index 2759574..c564f0a 100644
--- a/.servicemark
+++ b/.servicemark
@@ -1 +1 @@
-6709a0d39403dbd14f91593c8d9c2e0e
+84e22c1fa7729c18387849ef25d56579
diff --git a/389-ds.changes b/389-ds.changes
index 9bc1966..333580f 100644
--- a/389-ds.changes
+++ b/389-ds.changes
@@ -1,4 +1,12 @@
 -------------------------------------------------------------------
+Mon Mar  9 03:48:34 UTC 2020 - William Brown <william.brown@suse.com>
+
+- Change systemd_requires to systemd_ordering based on packaging
+  advice.
+- Change 389-ds to use sysusers.d for user/group addition of dirsrv
+  instead of manual calls to useradd/groupadd.
+
+-------------------------------------------------------------------
 Mon Feb 17 03:45:13 UTC 2020 - 389-ds-maintainer@suse.de
 
 - Add requirement on openssl for rust-openssl as part of ldaptokens
diff --git a/389-ds.spec b/389-ds.spec
index c4a5b67..1912540 100644
--- a/389-ds.spec
+++ b/389-ds.spec
@@ -64,6 +64,7 @@ Source2:        LICENSE.openldap
 Source3:        vendor.tar.gz
 %endif
 Source9:        %{name}-rpmlintrc
+Source10:       %{user_group}-user.conf
 %if %{with rust}
 Patch1:         0001-fix-cargo-build.patch
 %endif
@@ -84,6 +85,7 @@ BuildRequires:  libevent-devel
 BuildRequires:  libtalloc-devel
 BuildRequires:  libtevent-devel
 BuildRequires:  libtool
+BuildRequires:  sysuser-tools
 # net-snmp-devel is needed to build the snmp ldap-agent
 BuildRequires:  net-snmp-devel >= 5.1.2
 BuildRequires:  openldap2-devel
@@ -141,6 +143,7 @@ Requires:       perl(Socket6)
 %endif
 # Needed for creating the ccache and some GSSAPI steps in sasl
 Requires:       krb5
+%sysusers_requires
 # 389-ds does not directly require gssapi, but it is needed for
 # ldap gssapi auth, so we recommend it.
 # This used to be a requirement, but it's actually optional.
@@ -155,7 +158,7 @@ Requires(pre):  shadow
 PreReq:         permissions
 Obsoletes:      389-ds-base < %{version}-%{release}
 Provides:       389-ds-base = %{version}-%{release}
-%{?systemd_requires}
+%{?systemd_ordering}
 
 %description
 389 Directory Server is a full-featured LDAPv3 compliant server. In
@@ -257,6 +260,7 @@ uses the facilities provided by NSS.
 %patch1 -p1
 
 %build
+%sysusers_generate_pre %{SOURCE10} %{user_group}
 # Make sure python3 is used in shebangs
 # FIX ME!!  This should be fixed in the source code !!!
 sed -r -i '1s|^#!\s*%{_bindir}.*python.*|#!%{_bindir}/%{use_python}|' ldap/admin/src/scripts/{*.py,ds-replcheck} src/lib389/cli/ds*
@@ -322,6 +326,7 @@ install -D -d -m 0750 %{buildroot}%{homedir}
 mkdir -p %{buildroot}%{logdir}
 mkdir -p %{buildroot}%{homedir}
 mkdir -p %{buildroot}%{lockdir}
+mkdir -p %{buildroot}%{_sysusersdir}
 
 #remove libtool archives and static libs
 find %{buildroot} -type f -name "*.la" -delete -print
@@ -341,14 +346,9 @@ rm -rv %{buildroot}/usr/share/cockpit/
 rm -rv %{buildroot}/usr/share/metainfo/389-console/
 mv src/svrcore/README{,.svrcore}
 mv src/svrcore/LICENSE{,.svrcore}
+install -m 0644 %{SOURCE10} %{buildroot}%{_sysusersdir}/
 
-%pre
-if ! getent group %{user_group} >/dev/null; then
-  %{_sbindir}/groupadd -f -r %{user_group}
-fi
-if ! getent passwd %{user_group} >/dev/null; then
-  %{_sbindir}/useradd  -r -g %{user_group} -s /sbin/nologin -r -d %{homedir} -c "User for 389 directory server" %{user_group}
-fi
+%pre -f %{user_group}.pre
 
 %post
 %fillup_only -n dirsrv
@@ -389,6 +389,7 @@ exit 0
 %defattr(-,root,root)
 %doc README*
 %license LICENSE LICENSE.openldap
+%{_sysusersdir}/%{user_group}-user.conf
 %dir %attr(-,%{user_group},%{user_group}) %{homedir}
 %dir %attr(-,%{user_group},%{user_group}) %{logdir}
 %config(noreplace) %{_sysconfdir}/dirsrv/config/*
diff --git a/dirsrv-user.conf b/dirsrv-user.conf
new file mode 100644
index 0000000..be6c242
--- /dev/null
+++ b/dirsrv-user.conf
@@ -0,0 +1,3 @@
+#Type Name       ID  GECOS                            Home directory  Shell
+g     dirsrv     -   -
+u     dirsrv     -   "User for 389 directory server"  /var/lib/dirsrv /sbin/nologin