diff --git a/fix-sast.patch b/fix-sast.patch new file mode 100644 index 0000000..755ff3e --- /dev/null +++ b/fix-sast.patch @@ -0,0 +1,36 @@ +diff --git a/gsmclient.c b/gsmclient.c +index fb93a5c..93e9a64 100644 +--- a/gsmclient.c ++++ b/gsmclient.c +@@ -182,6 +182,7 @@ gsm_client_init (GsmClient *client, gpointer data) + char pid_str[64]; + int empty_vector_len = 0; + char *empty_vector[] = { NULL }; ++ gchar *curdir; + + (void)data; + client->priv = g_new (GsmClientPrivate, 1); +@@ -197,8 +198,10 @@ gsm_client_init (GsmClient *client, gpointer data) + /* Default property values (this code assumes we start + * with an empty proplist) + */ ++ curdir = g_get_current_dir (); + push_prop (client, smprop_new_string (GSM_CLIENT_PROPERTY_CURRENT_DIRECTORY, +- g_get_current_dir (), -1)); ++ curdir, -1)); ++ g_free(curdir); + + g_snprintf (pid_str, sizeof (pid_str), "%d", (int) getpid ()); + push_prop (client, smprop_new_string (GSM_CLIENT_PROPERTY_PROCESS_ID, +diff --git a/shvar.c b/shvar.c +index 0e199c6..62723db 100644 +--- a/shvar.c ++++ b/shvar.c +@@ -348,6 +348,7 @@ svSetValue(shvarFile *s, const char *key, const char *value) + s->modified = 1; + goto bail; /* do not need keyValue */ + } ++ else goto bail; + goto end; + } + diff --git a/usermode.spec b/usermode.spec index c650e7d..048552f 100644 --- a/usermode.spec +++ b/usermode.spec @@ -1,14 +1,20 @@ # Add `--without gtk' option (enable gtk by default): +# No GTK 2 in RHEL 10 +%if 0%{?rhel} > 9 +%bcond_with gtk +%else %bcond_without gtk +%endif Summary: Tools for certain user account management tasks Name: usermode Version: 1.114 -Release: 4%{?dist} -License: GPLv2+ +Release: 17%{?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/ BuildRequires: make @@ -19,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 @@ -48,6 +53,7 @@ graphical tools for certain account management tasks. %prep %setup -q +%patch -P 1 -p 1 %build %configure --with-selinux --without-fexecve %{!?with_gtk:--without-gtk} @@ -55,7 +61,7 @@ graphical tools for certain account management tasks. %make_build %install -%make_install INSTALL='install -p' +%make_install %if %{with gtk} # make userformat symlink to usermount @@ -82,10 +88,11 @@ done %files -f %{name}.lang %license COPYING %doc ChangeLog NEWS README -%attr(4711,root,root) /usr/sbin/userhelper +%attr(4711,root,root) /%{_sbindir}/userhelper %{_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} @@ -108,6 +115,46 @@ 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 + +* 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 + +* Thu Jan 30 2025 Michal Hlavinka - 1.114-12 +- fix static analysis issues and ftbfs + +* Sun Jan 19 2025 Fedora Release Engineering - 1.114-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Sat Jul 20 2024 Fedora Release Engineering - 1.114-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Sat Jan 27 2024 Fedora Release Engineering - 1.114-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jul 22 2023 Fedora Release Engineering - 1.114-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sat Jan 21 2023 Fedora Release Engineering - 1.114-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Fri Jan 06 2023 Tomas Popela - 1.114-6 +- Don't build GTK 2 bits on RHEL 10 as GTK 2 won't be available there + +* Sat Jul 23 2022 Fedora Release Engineering - 1.114-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Jan 22 2022 Fedora Release Engineering - 1.114-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild