From 68a87d386e964a3884b6d0e8d4663838dd372b89 Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Wed, 27 Aug 2025 11:08:36 +0200 Subject: [PATCH 1/6] do not use console.apps as pam_console was dropped --- config-util | 2 -- usermode.spec | 11 ++++------- 2 files changed, 4 insertions(+), 9 deletions(-) delete mode 100644 config-util diff --git a/config-util b/config-util deleted file mode 100644 index a6b9096..0000000 --- a/config-util +++ /dev/null @@ -1,2 +0,0 @@ -USER=root -UGROUPS=wheel diff --git a/usermode.spec b/usermode.spec index a52aeda..7b4dbc0 100644 --- a/usermode.spec +++ b/usermode.spec @@ -9,11 +9,10 @@ Summary: Tools for certain user account management tasks Name: usermode Version: 1.114 -Release: 13%{?dist} +Release: 14%{?dist} License: GPL-2.0-or-later URL: https://pagure.io/%{name}/ Source: https://releases.pagure.org/%{name}/%{name}-%{version}.tar.xz -Source1: config-util Patch1: fix-sast.patch Requires: pam, passwd, util-linux # https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/IJFYI5Q2BYZKIGDFS2WLOBDUSEGWHIKV/ @@ -70,10 +69,6 @@ ln -sf usermount $RPM_BUILD_ROOT%{_bindir}/userformat ln -s usermount.1 $RPM_BUILD_ROOT%{_mandir}/man1/userformat.1 %endif -mkdir -p $RPM_BUILD_ROOT/etc/security/console.apps -install -p -m 644 %{SOURCE1} \ - $RPM_BUILD_ROOT/etc/security/console.apps/config-util - %if %{with gtk} for i in redhat-userinfo.desktop redhat-userpasswd.desktop \ redhat-usermount.desktop; do @@ -93,7 +88,6 @@ done %{_bindir}/consolehelper %{_mandir}/man8/userhelper.8* %{_mandir}/man8/consolehelper.8* -%config(noreplace) /etc/security/console.apps/config-util %if %{with gtk} %files gtk @@ -115,6 +109,9 @@ done %endif %changelog +* Wed Aug 27 2025 Michal Hlavinka - 1.114-14 +- do not use console.apps as pam_console was dropped + * Fri Jul 25 2025 Fedora Release Engineering - 1.114-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 1b190bb759042bc1a16eff03de932f2915cdefb4 Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Wed, 27 Aug 2025 11:53:47 +0200 Subject: [PATCH 2/6] revert previous commit, it is still needed even without pam_console instead take ownership of /etc/security/console.apps/ --- config-util | 2 ++ usermode.spec | 11 +++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 config-util diff --git a/config-util b/config-util new file mode 100644 index 0000000..a6b9096 --- /dev/null +++ b/config-util @@ -0,0 +1,2 @@ +USER=root +UGROUPS=wheel diff --git a/usermode.spec b/usermode.spec index 7b4dbc0..a52aeda 100644 --- a/usermode.spec +++ b/usermode.spec @@ -9,10 +9,11 @@ Summary: Tools for certain user account management tasks Name: usermode Version: 1.114 -Release: 14%{?dist} +Release: 13%{?dist} License: GPL-2.0-or-later URL: https://pagure.io/%{name}/ Source: https://releases.pagure.org/%{name}/%{name}-%{version}.tar.xz +Source1: config-util Patch1: fix-sast.patch Requires: pam, passwd, util-linux # https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/IJFYI5Q2BYZKIGDFS2WLOBDUSEGWHIKV/ @@ -69,6 +70,10 @@ ln -sf usermount $RPM_BUILD_ROOT%{_bindir}/userformat ln -s usermount.1 $RPM_BUILD_ROOT%{_mandir}/man1/userformat.1 %endif +mkdir -p $RPM_BUILD_ROOT/etc/security/console.apps +install -p -m 644 %{SOURCE1} \ + $RPM_BUILD_ROOT/etc/security/console.apps/config-util + %if %{with gtk} for i in redhat-userinfo.desktop redhat-userpasswd.desktop \ redhat-usermount.desktop; do @@ -88,6 +93,7 @@ done %{_bindir}/consolehelper %{_mandir}/man8/userhelper.8* %{_mandir}/man8/consolehelper.8* +%config(noreplace) /etc/security/console.apps/config-util %if %{with gtk} %files gtk @@ -109,9 +115,6 @@ done %endif %changelog -* Wed Aug 27 2025 Michal Hlavinka - 1.114-14 -- do not use console.apps as pam_console was dropped - * Fri Jul 25 2025 Fedora Release Engineering - 1.114-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From ab4bae546069108dfeb69c401e45dc4bcd85b675 Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Wed, 27 Aug 2025 12:09:41 +0200 Subject: [PATCH 3/6] add missing spec part --- usermode.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/usermode.spec b/usermode.spec index a52aeda..596d7ba 100644 --- a/usermode.spec +++ b/usermode.spec @@ -9,7 +9,7 @@ Summary: Tools for certain user account management tasks Name: usermode Version: 1.114 -Release: 13%{?dist} +Release: 15%{?dist} License: GPL-2.0-or-later URL: https://pagure.io/%{name}/ Source: https://releases.pagure.org/%{name}/%{name}-%{version}.tar.xz @@ -93,6 +93,7 @@ done %{_bindir}/consolehelper %{_mandir}/man8/userhelper.8* %{_mandir}/man8/consolehelper.8* +%dir /etc/security/console.apps %config(noreplace) /etc/security/console.apps/config-util %if %{with gtk} @@ -115,6 +116,13 @@ done %endif %changelog +* Wed Aug 27 2025 Michal Hlavinka - 1.114-15 +- revert back and take ownership of console.apps as usermode still needs it + +* Wed Aug 27 2025 Michal Hlavinka - 1.114-14 +- drop console.apps files as pam no longer uses those and pam_console + was dropped https://fedoraproject.org/wiki/Changes/RemovePamConsole + * Fri Jul 25 2025 Fedora Release Engineering - 1.114-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 1d182048fee65ebe64339016e87703854ee5feb9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 19:42:37 +0000 Subject: [PATCH 4/6] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- usermode.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usermode.spec b/usermode.spec index 596d7ba..719c356 100644 --- a/usermode.spec +++ b/usermode.spec @@ -9,7 +9,7 @@ Summary: Tools for certain user account management tasks Name: usermode Version: 1.114 -Release: 15%{?dist} +Release: 16%{?dist} License: GPL-2.0-or-later URL: https://pagure.io/%{name}/ Source: https://releases.pagure.org/%{name}/%{name}-%{version}.tar.xz @@ -116,6 +116,9 @@ done %endif %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 1.114-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Wed Aug 27 2025 Michal Hlavinka - 1.114-15 - revert back and take ownership of console.apps as usermode still needs it From 65a5302e0555d62d10b039626ce6fde1c2b9b7a9 Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Wed, 24 Jun 2026 09:54:06 +0200 Subject: [PATCH 5/6] remove unused buildrequires --- usermode.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/usermode.spec b/usermode.spec index 719c356..c55caa3 100644 --- a/usermode.spec +++ b/usermode.spec @@ -25,7 +25,6 @@ BuildRequires: desktop-file-utils, gtk2-devel, startup-notification-devel, libSM %endif BuildRequires: libblkid-devel, libselinux-devel, libuser-devel BuildRequires: pam-devel, perl-XML-Parser -BuildRequires: util-linux %if %{with gtk} %package gtk From 697f37050d1dfee1b79fb4a79dedc912fde8b894 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:17:14 +0000 Subject: [PATCH 6/6] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- usermode.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usermode.spec b/usermode.spec index c55caa3..048552f 100644 --- a/usermode.spec +++ b/usermode.spec @@ -9,7 +9,7 @@ Summary: Tools for certain user account management tasks Name: usermode Version: 1.114 -Release: 16%{?dist} +Release: 17%{?dist} License: GPL-2.0-or-later URL: https://pagure.io/%{name}/ Source: https://releases.pagure.org/%{name}/%{name}-%{version}.tar.xz @@ -115,6 +115,9 @@ done %endif %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 1.114-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Sat Jan 17 2026 Fedora Release Engineering - 1.114-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild