Compare commits
14 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
697f37050d | ||
|
|
65a5302e05 | ||
|
|
1d182048fe | ||
|
|
ab4bae5460 | ||
|
|
1b190bb759 | ||
|
|
68a87d386e | ||
|
|
a546b622a9 | ||
|
|
7b3dc67018 | ||
|
|
3e24aa5f3a | ||
|
|
695d624d0f | ||
|
|
ac22bb99e9 | ||
|
|
a6c93c2abc | ||
|
|
0648cbbc61 | ||
|
|
7b3885c985 |
2 changed files with 74 additions and 5 deletions
36
fix-sast.patch
Normal file
36
fix-sast.patch
Normal file
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
@ -9,11 +9,12 @@
|
|||
Summary: Tools for certain user account management tasks
|
||||
Name: usermode
|
||||
Version: 1.114
|
||||
Release: 7%{?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
|
||||
|
|
@ -24,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
|
||||
|
|
@ -53,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}
|
||||
|
|
@ -60,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
|
||||
|
|
@ -87,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}
|
||||
|
|
@ -113,6 +115,37 @@ done
|
|||
%endif
|
||||
|
||||
%changelog
|
||||
* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.114-17
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
|
||||
|
||||
* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.114-16
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
|
||||
|
||||
* Wed Aug 27 2025 Michal Hlavinka <mhlavink@redhat.com> - 1.114-15
|
||||
- revert back and take ownership of console.apps as usermode still needs it
|
||||
|
||||
* Wed Aug 27 2025 Michal Hlavinka <mhlavink@redhat.com> - 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 <releng@fedoraproject.org> - 1.114-13
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
|
||||
|
||||
* Thu Jan 30 2025 Michal Hlavinka <mhlavink@redhat.com> - 1.114-12
|
||||
- fix static analysis issues and ftbfs
|
||||
|
||||
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.114-11
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
|
||||
|
||||
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.114-10
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
||||
|
||||
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.114-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.114-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.114-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue