SOURCES/munge.sysusers

@@ -1 +0,0 @@
-u munge - "Runs Uid 'N' Gid Emporium" /run/munge /sbin/nologin

SPECS/munge.spec

@@ -1,6 +1,6 @@
 Name:           munge
 Version:        0.5.13
-Release:        13%{?dist}
+Release:        2%{?dist}
 Summary:        Enables uid & gid authentication across a host cluster
 
 # The libs and devel package is GPLv3+ and LGPLv3+ where as the main package is GPLv3 only.
@@ -9,7 +9,6 @@ URL:            https://dun.github.io/munge/
 Source0:        https://github.com/dun/munge/releases/download/munge-%{version}/munge-%{version}.tar.xz
 Source1:        create-munge-key
 Source2:        munge.logrotate
-Source3:        munge.sysusers
 
 BuildRequires:  gcc
 BuildRequires:  systemd-rpm-macros
@@ -19,8 +18,9 @@ Requires:       logrotate
 
 Requires(pre):    shadow-utils
 
-%{?systemd_requires}
-%{?sysusers_requires_compat}
+Requires(post):   systemd
+Requires(preun):  systemd
+Requires(postun): systemd
 
 %description
 MUNGE (MUNGE Uid 'N' Gid Emporium) is an authentication service for creating 
@@ -58,7 +58,7 @@ echo "d /run/munge 0755 munge munge -" > src/etc/munge.tmpfiles.conf.in
 # Get rid of some rpaths for /usr/sbin
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-%make_build
+make %{?_smp_mflags} 
 
 
 %install
@@ -68,11 +68,11 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 install -p -m 755 create-munge-key %{buildroot}/%{_sbindir}/create-munge-key
 install -p -D -m 644 munge.logrotate %{buildroot}/%{_sysconfdir}/logrotate.d/munge
 
-install -p -D -m 0644 %{SOURCE3} %{buildroot}%{_sysusersdir}/munge.conf
-
 # rm unneeded files.
 rm %{buildroot}/%{_sysconfdir}/sysconfig/munge
-rm %{buildroot}/%{_sysconfdir}/init.d/munge
+# 
+rm %{buildroot}/%{_initddir}/munge
+
 # Exclude .la files 
 rm %{buildroot}/%{_libdir}/libmunge.la
 
@@ -87,12 +87,17 @@ chmod 700 %{buildroot}%{_sysconfdir}/munge
 touch %{buildroot}%{_var}/run/munge/munged.pid
 mv %{buildroot}%{_var}/run %{buildroot}
 
-%pre
-%sysusers_create_compat %{SOURCE3}
-
 %preun
 %systemd_preun munge.service
 
+%pre
+getent group munge >/dev/null || groupadd -r munge
+getent passwd munge >/dev/null || \
+useradd -r -g munge -d %{_var}/run/munge -s /sbin/nologin \
+  -c "Runs Uid 'N' Gid Emporium" munge
+exit 0
+
+
 %post
 %systemd_post munge.service
 
@@ -120,8 +125,7 @@ mv %{buildroot}%{_var}/run %{buildroot}
 %attr(0755,munge,munge) %dir   /run/munge/
 %attr(0644,munge,munge) %ghost /run/munge/munged.pid
 
-%{_tmpfilesdir}/munge.conf
-%{_sysusersdir}/munge.conf
+%config(noreplace) %{_tmpfilesdir}/munge.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/munge
 
 %license COPYING COPYING.LESSER
@@ -155,49 +159,12 @@ mv %{buildroot}%{_var}/run %{buildroot}
 
 
 %changelog
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 0.5.13-13
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Wed Jun 16 2021 Mohan Boddu <mboddu@redhat.com> - 0.5.13-12
-- Rebuilt for RHEL 9 BETA for openssl 3.0
-  Related: rhbz#1971065
-
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0.5.13-11
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Tue Sep 29 2020 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.5.13-10
-- Fix spec + build
+* Fri Apr 24 2020 Honggang Li <honli@redhat.com> - 0.5.13-2
+- Don't create temporary files in legacy directory
+- Resolves: bz1805956
 
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.13-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Mon Feb 10 2020 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 0.5.13-8
-- Provide a sysusers.d file to get user() and group() provides
-  (see https://fedoraproject.org/wiki/Changes/Adopting_sysusers.d_format).
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.13-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Nov 28 2019 Gerd Pokorra <gp@zimt.uni-siegen.de> - 0.5.13-6
-- updating line in /usr/lib/tmpfiles.d/munge.conf: /var/run/munge → /run/munge
-- add license tag
-- add requires logrotate
-
-* Wed Nov 27 2019 Gerd Pokorra <gp@zimt.uni-siegen.de> - 0.5.13-5
-- built with OpenSSL (not libgcrypt)
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.13-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.13-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.13-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Thu May 17 2018 Steve Traylen <steve.traylen@cern.ch> - 0.5.13-1
-- Escape macros in %%changelog
+* Thu Jul 19 2018 Jarod Wilson <jarod@redhat.com> - 0.5.13-1
+- Update to upstream 0.5.13 release
 
 * Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.5.12-9
 - Escape macros in %%changelog