SPECS/oddjob.spec

@@ -22,14 +22,15 @@
 
 Name: oddjob
 Version: 0.34.7
-Release: 7%{?dist}
+Release: 3%{?dist}
 Source0: https://releases.pagure.org/oddjob/oddjob-%{version}.tar.gz
 Source1: https://releases.pagure.org/oddjob/oddjob-%{version}.tar.gz.asc
 Patch0: oddjob-cve-2020-10737-reversal-option.patch
 Patch1: oddjob-override-mask-fix.patch
+
 Summary: A D-Bus service which runs odd jobs on behalf of client applications
 License: BSD
-BuildRequires: make
+Group: System Environment/Daemons
 BuildRequires:  gcc
 BuildRequires: dbus-devel >= 0.22, dbus-x11, libselinux-devel, libxml2-devel
 BuildRequires: pam-devel, pkgconfig
@@ -72,6 +73,7 @@ oddjob is a D-Bus service which performs particular tasks for clients which
 connect to it and issue requests using the system-wide message bus.
 
 %package mkhomedir
+Group: System Environment/Daemons
 Summary: An oddjob helper which creates and populates home directories
 Requires: %{name} = %{version}-%{release}
 Requires(post): %{dbus_send}, grep, sed, psmisc
@@ -82,6 +84,7 @@ pam_oddjob_mkhomedir module to create a home directory for a user
 at login-time.
 
 %package sample
+Group: System Environment/Daemons
 Summary: A sample oddjob service.
 Requires: %{name} = %{version}-%{release}
 
@@ -190,7 +193,7 @@ touch -r src/oddjob-mkhomedir.conf.in	$RPM_BUILD_ROOT/%{_sysconfdir}/dbus-1/syst
 
 %post
 if test $1 -eq 1 ; then
-	killall -HUP dbus-daemon  >/dev/null 2>&1
+	killall -HUP dbus-daemon 2>&1 > /dev/null
 fi
 %if %{systemd}
 %systemd_post oddjobd.service
@@ -205,7 +208,7 @@ fi
 %endif
 %if %{sysvinit}
 if [ $1 -gt 0 ] ; then
-	/sbin/service oddjobd condrestart >/dev/null 2>&1 || :
+	/sbin/service oddjobd condrestart 2>&1 > /dev/null || :
 fi
 %endif
 exit 0
@@ -216,7 +219,7 @@ exit 0
 %endif
 %if %{sysvinit}
 if [ $1 -eq 0 ] ; then
-	/sbin/service oddjobd stop >/dev/null 2>&1
+	/sbin/service oddjobd stop > /dev/null 2>&1
 	/sbin/chkconfig --del oddjobd
 fi
 %endif
@@ -243,7 +246,7 @@ if grep -q %{_libdir}/%{name}/mkhomedir $cfg ; then
 	sed -i 's^%{_libdir}/%{name}/mkhomedir^%{_libexecdir}/%{name}/mkhomedir^g' $cfg
 fi
 if test $1 -eq 1 ; then
-	killall -HUP dbus-daemon >/dev/null 2>&1
+	killall -HUP dbus-daemon 2>&1 > /dev/null
 fi
 if [ -f /var/lock/subsys/oddjobd ] ; then
 	%{dbus_send} --system --dest=com.redhat.oddjob /com/redhat/oddjob com.redhat.oddjob.reload
@@ -251,51 +254,37 @@ fi
 exit 0
 
 %changelog
-* Fri Dec 09 2022 Alexander Bokovoy <abokovoy@redhat.com> - 0.34.7-7
+* Fri Dec 09 2022 Alexander Bokovoy <abokovoy@redhat.com> - 0.34.7-3
 - Always set the home directory permissions according to HOME_MODE
-- Resolves: rhbz#2149988
+- Resolves: rhbz#2135793
 
-* Thu Aug 18 2022 Alexander Bokovoy <abokovoy@redhat.com> - 0.34.7-6
+* Wed Aug 17 2022 Alexander Bokovoy <abokovoy@redhat.com> - 0.34.7-2
 - Add a non-default option to revert behavior for CVE-2020-10737 fix
-- Resolved: rhbz#2119265
+- Resolved: rhbz#2050079
 
-* Mon Feb 07 2022 Alexander Bokovoy <abokovoy@redhat.com> - 0.34.7-5
-- Fix stdin redirection in RPM scripts
-  Resolves: rhbz#2041585
+* Mon Dec 14 18:38:43 EET 2020 Alexander Bokovoy <abokovoy@redhat.com> - 0.34.7-1
+- Upstream release 0.34.7
+- Force LC_ALL=C.UTF-8 in oddjobd systemd service environment
+- Resolves: rhbz#1907481 - oddjob locale issue
+- Resolves: rhbz#1907541 - rebase oddjob to 0.34.7
 
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 0.34.7-4
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
+* Thu Oct 08 2020 Alexander Bokovoy <abokovoy@redhat.com> - 0.34.5-4
+- Rebuild against RHEL 8.4.0
+  Resolves: rhbz#1886433
 
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0.34.7-3
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+* Thu Oct 08 2020 Alexander Bokovoy <abokovoy@redhat.com> - 0.34.5-3
+- Support HOME_MODE from /etc/login.defs
+  Resolves: rhbz#1886433
 
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.34.7-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+* Fri May 08 2020 Alexander Bokovoy <abokovoy@redhat.com> - 0.34.5-2
+- Add gating tests using idm:DL1 module stream and upstream tests
+  Resolves: rhbz#1682457
 
-* Mon Dec 14 22:09:29 EET 2020 Alexander Bokovoy <abokovoy@redhat.com> - 0.34.7-1
-- upstream release 0.34.7
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.34.6-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Thu May  7 2020 Nalin Dahyabhai <nalin@redhat.com> - 0.34.6-1
-- update license on src/buffer.h
-- change /var/run -> /run in systemd service file (Orion Poplawski)
-
-* Thu May  7 2020 Nalin Dahyabhai <nalin@redhat.com> - 0.34.5-1
-- apply patch from Matthias Gerstner of the SUSE security team to fix a
-  possible race condition in the mkhomedir helper (CVE-2020-10737)
-- only process SELinux contexts if SELinux is not disabled (Alexander Bokovoy)
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.34.4-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.34.4-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.34.4-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+* Fri May 08 2020 Alexander Bokovoy <abokovoy@redhat.com> - 0.34.5-1
+- Upstream release 0.34.5
+- Resolves: rhbz#1833289 - Rebase oddjob to 0.34.5
+- Resolves: rhbz#1833052 - CVE-2020-10737 
+  oddjob: race condition in oddjob_selinux_mkdir function in mkhomedir.c can lead to symlink attack
 
 * Tue Dec  4 2018 Nalin Dahyabhai <nalin@redhat.com> - 0.34.4-7
 - Drop Python 2 build-time dependency, which hasn't been used since we turned