Compare commits

...

32 Commits

Author SHA1 Message Date
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
Fedora Release Engineering 871e941647 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-01-22 03:41:21 +00:00
Fedora Release Engineering 85a0972cac - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-07-23 20:12:12 +00:00
Jiri Kucera fc3e4de1fb Do not use fexecve
Script executed via fexecve has a file descriptor number in
argv[0]. This results in unexpected output: when displaying
the script help, a user see "Usage: <number> [options]"
instead of "Usage: <scriptname> [options]".

Resolves: #1969918
2021-06-16 21:09:51 +02:00
Jiri Kucera 76346b911b Update to usermode-1.114 2021-05-05 02:04:28 +02:00
Jiri Kucera aa53392b50 Update to usermode-1.113 2021-05-03 16:08:37 +02:00
Fedora Release Engineering da1e16cdee - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-01-27 22:49:00 +00:00
Robert Scheck 6984a6cdaa Spec file cleanup 2021-01-13 03:07:56 +00:00
Tom Stellard 5ebd2b55e6 Add BuildRequires: make
https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
2021-01-09 00:30:44 +00:00
Jiri Kucera a17faee8fd Do not use deprecated selinux headers
Resolves: #1865598
2020-09-09 13:37:35 +02:00
Fedora Release Engineering e4aaf906a8 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-08-01 09:33:55 +00:00
Fedora Release Engineering 81f0589322 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-07-29 13:27:05 +00:00
Fedora Release Engineering 529d783670 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-01-31 02:48:33 +00:00
Fedora Release Engineering c211b79f76 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-07-27 02:40:47 +00:00
Fedora Release Engineering 596b834c77 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-02-03 10:58:34 +00:00
Igor Gnatenko 96a21d11bb Remove obsolete Group tag
References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag
2019-01-28 20:24:53 +01:00
Jiri Kucera 6569117db5 <sys/sysmacros.h> must be now included manually
- resolves #1606624
- inclusion of <sys/sysmacros.h> from <sys/types.h> is
  now deprecated
- also dropped autotools invocation from spec
- also fix bad FSF address
2018-08-07 20:57:34 +02:00
Fedora Release Engineering 4e359c182a - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-07-14 08:20:46 +00:00
Jiri Kucera 665eabf8bd Update to usermode-1.112
- resolve #1269643
2018-02-23 19:25:49 +01:00
Jiri Kucera aa41e53d15 Added missing gcc dependency
See https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/IJFYI5Q2BYZKIGDFS2WLOBDUSEGWHIKV/
2018-02-21 22:03:19 +01:00
Fedora Release Engineering f3b5f64435 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-02-09 20:11:59 +00:00
Fedora Release Engineering 137e051740 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild 2017-08-03 09:54:39 +00:00
Fedora Release Engineering 9e1759cf00 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild 2017-07-27 21:06:04 +00:00
5 changed files with 174 additions and 41 deletions
+4
View File
@@ -6,3 +6,7 @@ usermode-1.105.tar.xz
/usermode-1.109.tar.xz
/usermode-1.110.tar.xz
/usermode-1.111.tar.xz
/usermode-1.112.tar.xz
/usermode-1.112.autotoolized.tar.xz
/usermode-1.113.tar.xz
/usermode-1.114.tar.xz
+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;
}
+1 -1
View File
@@ -1 +1 @@
28ba510fbd8da9f4e86e57d6c31cff29 usermode-1.111.tar.xz
SHA512 (usermode-1.114.tar.xz) = 703eb218704c7a11cdce25a71f4fc91bf4f042a8b185f79f3954699081c0db8a6234ad6f11738d8b2fe6a492a03d029cbe01762a47869edc473e4fbaa6e0ee32
-21
View File
@@ -1,21 +0,0 @@
commit b562472980ecd903d13e69279a31fcf77fac57bc
Author: Miloslav Trmač <mitr@redhat.com>
Date: Mon Apr 24 21:58:56 2017 +0200
Don't unnecessarily use g_strdup_printf()
This avoids a build failure with Werror=format-security.
diff --git a/userhelper.c b/userhelper.c
index 15d2c5e..287aa4d 100644
--- a/userhelper.c
+++ b/userhelper.c
@@ -583,7 +583,7 @@ converse_console(int num_msg, const struct pam_message **msg,
if (banner == 0) {
if ((data->banner != NULL) && (data->domain != NULL)) {
- text = g_strdup_printf(dgettext(data->domain, data->banner));
+ text = g_strdup (dgettext(data->domain, data->banner));
} else {
if ((service != NULL) && (strlen(service) > 0)) {
if (data->fallback_allowed) {
+133 -19
View File
@@ -1,24 +1,37 @@
# 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.111
Release: 10%{?dist}
License: GPLv2+
Group: Applications/System
URL: https://pagure.io/usermode/
Source: https://releases.pagure.org/usermode/usermode-%{version}.tar.xz
Version: 1.114
Release: 12%{?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
# Upstream commit b562472980ecd903d13e69279a31fcf77fac57bc
Patch0: usermode-1.111-format-security.patch
Patch1: fix-sast.patch
Requires: pam, passwd, util-linux
BuildRequires: desktop-file-utils, gettext, glib2-devel, gtk2-devel, intltool
BuildRequires: libblkid-devel, libSM-devel, libselinux-devel, libuser-devel
BuildRequires: pam-devel, perl-XML-Parser, startup-notification-devel
# https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/IJFYI5Q2BYZKIGDFS2WLOBDUSEGWHIKV/
BuildRequires: make
BuildRequires: gcc
BuildRequires: gettext, glib2-devel, intltool
%if %{with gtk}
BuildRequires: desktop-file-utils, gtk2-devel, startup-notification-devel, libSM-devel
%endif
BuildRequires: libblkid-devel, libselinux-devel, libuser-devel
BuildRequires: pam-devel, perl-XML-Parser
BuildRequires: util-linux
%if %{with gtk}
%package gtk
Summary: Graphical tools for certain user account management tasks
Group: Applications/System
Requires: %{name} = %{version}-%{release}
%endif
%global _hardened_build 1
@@ -27,6 +40,7 @@ The usermode package contains the userhelper program, which can be
used to allow configured programs to be run with superuser privileges
by ordinary users.
%if %{with gtk}
%description gtk
The usermode-gtk package contains several graphical tools for users:
userinfo, usermount and userpasswd. Userinfo allows users to change
@@ -36,28 +50,31 @@ passwords.
Install the usermode-gtk package if you would like to provide users with
graphical tools for certain account management tasks.
%endif
%prep
%setup -q
%patch0 -p1 -b .format-security
%patch -P 1 -p 1
%build
%configure --with-selinux
%configure --with-selinux --without-fexecve %{!?with_gtk:--without-gtk}
make %{?_smp_mflags}
%make_build
%install
make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
%make_install
%if %{with gtk}
# make userformat symlink to usermount
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
echo 'NotShowIn=GNOME;KDE;' >>$RPM_BUILD_ROOT%{_datadir}/applications/$i
@@ -65,17 +82,20 @@ for i in redhat-userinfo.desktop redhat-userpasswd.desktop \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
$RPM_BUILD_ROOT%{_datadir}/applications/$i
done
%endif
%find_lang %{name}
%files -f %{name}.lang
%doc COPYING ChangeLog NEWS README
%attr(4711,root,root) /usr/sbin/userhelper
%license COPYING
%doc ChangeLog NEWS README
%attr(4711,root,root) /%{_sbindir}/userhelper
%{_bindir}/consolehelper
%{_mandir}/man8/userhelper.8*
%{_mandir}/man8/consolehelper.8*
%config(noreplace) /etc/security/console.apps/config-util
%if %{with gtk}
%files gtk
%{_bindir}/usermount
%{_mandir}/man1/usermount.1*
@@ -92,8 +112,102 @@ done
%{_datadir}/%{name}
%{_datadir}/pixmaps/*
%{_datadir}/applications/*
%endif
%changelog
* 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
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.114-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Wed Jun 16 2021 Jiri Kucera <jkucera@redhat.com> - 1.114-2
- Do not use fexecve
Script executed via fexecve has a file descriptor number in
argv[0]. This results in unexpected output: when displaying
the script help, a user see "Usage: <number> [options]"
instead of "Usage: <scriptname> [options]".
Resolves: #1969918
* Tue May 04 2021 Jiri Kucera <jkucera@redhat.com> - 1.114-1
- Update to usermode-1.114
- Allow to optionally disable GTK
* Mon May 03 2021 Jiri Kucera <jkucera@redhat.com> - 1.113-1
- Update to usermode-1.113
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.112-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Wed Sep 09 2020 Jiri Kucera <jkucera@redhat.com> - 1.112-9
- Do not use deprecated selinux headers
Resolves #1865598
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.112-8
- Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.112-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.112-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.112-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.112-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Tue Aug 07 2018 Jiri Kucera <jkucera@redhat.com> - 1.112-3
- Dropped need to run autotools
- <sys/sysmacros.h> must be now included manually
Resolves #1606624
- Fixed bad FSF address
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.112-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Thu Feb 22 2018 Jiri Kucera <jkucera@redhat.com> - 1.112-1
- Update to usermode-1.112
Resolves #1269643
* Wed Feb 21 2018 Jiri Kucera <jkucera@redhat.com> - 1.111-14
- Added missing gcc dependency
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.111-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.111-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.111-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Mon Apr 24 2017 Miloslav Trmač <mitr@redhat.com> - 1.111-10
- Fix a FBFS with -Werror=format-security
Resolves #1444750