Compare commits

..

11 Commits

Author SHA1 Message Date
Fedora Release Engineering a546b622a9 Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-25 19:53:27 +00:00
Michal Hlavinka 7b3dc67018 fix static analysis issues and ftbfs 2025-01-30 11:31:03 +01:00
Fedora Release Engineering 3e24aa5f3a Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-19 13:58:09 +00:00
Fedora Release Engineering 695d624d0f Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-20 08:26:45 +00:00
Fedora Release Engineering ac22bb99e9 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-27 07:19:53 +00:00
Michal Hlavinka a6c93c2abc drop install variable, already defined in the macro 2023-10-25 08:52:25 +02:00
Fedora Release Engineering 0648cbbc61 Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-07-22 17:18:07 +00:00
Jiri Kucera 7b3885c985 Migrate to SPDX license identifier 2023-06-29 11:59:33 +02:00
Fedora Release Engineering d0c9ebd161 Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-01-21 05:59:49 +00:00
Tomas Popela 61be5014fe Don't build GTK 2 bits on ELN/RHEL 10
GTK 2 won't be part of RHEL 10, see the following announcements:

https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/KH2BKEOZTLV4G6WF5FUXU6RYDPC62UEX/
https://github.com/minimization/content-resolver-input/pull/724
https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html/9.1_release_notes/deprecated_functionality#deprecated-functionality_desktop
2023-01-06 16:00:55 +01:00
Fedora Release Engineering 8df24764b5 Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-07-23 11:34:22 +00:00
2 changed files with 74 additions and 4 deletions
+36
View 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;
}
+38 -4
View File
@@ -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: 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/
BuildRequires: make
@@ -48,6 +54,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 +62,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,7 +89,7 @@ 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*
@@ -108,6 +115,33 @@ done
%endif
%changelog
* 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
* Fri Jan 06 2023 Tomas Popela <tpopela@redhat.com> - 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 <releng@fedoraproject.org> - 1.114-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.114-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild