From 5ebd2b55e6b846f57044a71313b666d6f693cebb Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 9 Jan 2021 00:30:44 +0000 Subject: [PATCH 01/25] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- usermode.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/usermode.spec b/usermode.spec index e6c6490..d1493e3 100644 --- a/usermode.spec +++ b/usermode.spec @@ -17,6 +17,7 @@ Patch1: fsfaddr.patch Patch2: selinux_deprecated.patch Requires: pam, passwd, util-linux # https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/IJFYI5Q2BYZKIGDFS2WLOBDUSEGWHIKV/ +BuildRequires: make BuildRequires: gcc BuildRequires: desktop-file-utils, gettext, glib2-devel, gtk2-devel, intltool BuildRequires: libblkid-devel, libSM-devel, libselinux-devel, libuser-devel From 6984a6cdaac9b07e704ba19b9f969058e9b467b4 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Wed, 13 Jan 2021 03:07:56 +0000 Subject: [PATCH 02/25] Spec file cleanup --- usermode.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/usermode.spec b/usermode.spec index d1493e3..0db978d 100644 --- a/usermode.spec +++ b/usermode.spec @@ -54,10 +54,10 @@ graphical tools for certain account management tasks. %build %configure --with-selinux -make %{?_smp_mflags} +%make_build %install -make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' +%make_install INSTALL='install -p' # make userformat symlink to usermount ln -sf usermount $RPM_BUILD_ROOT%{_bindir}/userformat @@ -78,7 +78,8 @@ done %find_lang %{name} %files -f %{name}.lang -%doc COPYING ChangeLog NEWS README +%license COPYING +%doc ChangeLog NEWS README %attr(4711,root,root) /usr/sbin/userhelper %{_bindir}/consolehelper %{_mandir}/man8/userhelper.8* From da1e16cdeec56cde6d65e5f6abeab4a6bfba5a15 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 22:49:00 +0000 Subject: [PATCH 03/25] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- usermode.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usermode.spec b/usermode.spec index 0db978d..83fde68 100644 --- a/usermode.spec +++ b/usermode.spec @@ -1,7 +1,7 @@ Summary: Tools for certain user account management tasks Name: usermode Version: 1.112 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv2+ URL: https://pagure.io/usermode/ Source: https://releases.pagure.org/usermode/usermode-%{version}.autotoolized.tar.xz @@ -104,6 +104,9 @@ done %{_datadir}/applications/* %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 1.112-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Sep 09 2020 Jiri Kucera - 1.112-9 - Do not use deprecated selinux headers Resolves #1865598 From aa53392b50c1460b380ab5b32990774e9bee67c6 Mon Sep 17 00:00:00 2001 From: Jiri Kucera Date: Mon, 3 May 2021 16:08:37 +0200 Subject: [PATCH 04/25] Update to usermode-1.113 --- .gitignore | 1 + fsfaddr.patch | 396 ------------------------------------------------ sources | 2 +- sysmacros.patch | 12 -- usermode.spec | 21 +-- 5 files changed, 10 insertions(+), 422 deletions(-) delete mode 100644 fsfaddr.patch delete mode 100644 sysmacros.patch diff --git a/.gitignore b/.gitignore index 928fd93..936ca2d 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ usermode-1.105.tar.xz /usermode-1.111.tar.xz /usermode-1.112.tar.xz /usermode-1.112.autotoolized.tar.xz +/usermode-1.113.tar.xz diff --git a/fsfaddr.patch b/fsfaddr.patch deleted file mode 100644 index 769e4b0..0000000 --- a/fsfaddr.patch +++ /dev/null @@ -1,396 +0,0 @@ -diff --git a/consolehelper-gtk.8 b/consolehelper-gtk.8 -index d964ffa..a0937cf 100644 ---- a/consolehelper-gtk.8 -+++ b/consolehelper-gtk.8 -@@ -12,7 +12,8 @@ - .\" - .\" You should have received a copy of the GNU General Public License - .\" along with this program; if not, write to the Free Software --.\" Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+.\" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -+.\" MA 02110-1301, USA. - .\" - .TH CONSOLEHELPER-GTK 8 "2009-10-05" "Red Hat" - .SH NAME -diff --git a/consolehelper.8.in b/consolehelper.8.in -index d771da7..e6ad431 100644 ---- a/consolehelper.8.in -+++ b/consolehelper.8.in -@@ -12,7 +12,8 @@ - .\" - .\" You should have received a copy of the GNU General Public License - .\" along with this program; if not, write to the Free Software --.\" Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+.\" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -+.\" MA 02110-1301, USA. - .\" - .TH CONSOLEHELPER 8 "18 March 1999" "Red Hat Software" - .SH NAME -diff --git a/consolehelper.c b/consolehelper.c -index d4ee6f9..064ccb3 100644 ---- a/consolehelper.c -+++ b/consolehelper.c -@@ -13,7 +13,8 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -+ * MA 02110-1301, USA. - */ - - #include "config.h" -diff --git a/dummy.h b/dummy.h -index 24f8277..b6d38d3 100644 ---- a/dummy.h -+++ b/dummy.h -@@ -13,7 +13,8 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -+ * MA 02110-1301, USA. - */ - - /* Just a dummy file for gettext, containing messages emmitted by various -diff --git a/gsmclient.c b/gsmclient.c -index 85a3dea..6d67e91 100644 ---- a/gsmclient.c -+++ b/gsmclient.c -@@ -17,8 +17,8 @@ - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the -- * Free Software Foundation, Inc., 59 Temple Place - Suite 330, -- * Boston, MA 02111-1307, USA. -+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. - */ - - #include -diff --git a/gsmclient.h b/gsmclient.h -index a4e94b0..66d97c7 100644 ---- a/gsmclient.h -+++ b/gsmclient.h -@@ -17,8 +17,8 @@ - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the -- * Free Software Foundation, Inc., 59 Temple Place - Suite 330, -- * Boston, MA 02111-1307, USA. -+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. - */ - - #ifndef GSM_CLIENT_H -diff --git a/pam-panel-icon.1 b/pam-panel-icon.1 -index f92f57a..5f891dc 100644 ---- a/pam-panel-icon.1 -+++ b/pam-panel-icon.1 -@@ -12,7 +12,8 @@ - .\" - .\" You should have received a copy of the GNU General Public License - .\" along with this program; if not, write to the Free Software --.\" Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+.\" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -+.\" MA 02110-1301, USA. - .\" - .\" Red Hat author: Miloslav Trmač - .TH PAM-PANEL-ICON 1 "2009-10-05" "Red Hat" -diff --git a/pam-panel-icon.c b/pam-panel-icon.c -index d2e93fa..c4e038c 100644 ---- a/pam-panel-icon.c -+++ b/pam-panel-icon.c -@@ -13,7 +13,8 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -+ * MA 02110-1301, USA. - */ - - #include "config.h" -diff --git a/props.c b/props.c -index 04eaeb6..3f37fd5 100644 ---- a/props.c -+++ b/props.c -@@ -15,8 +15,8 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -- * 02111-1307, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -+ * MA 02110-1301, USA. - */ - - #include "props.h" -diff --git a/props.h b/props.h -index c309450..aaa491c 100644 ---- a/props.h -+++ b/props.h -@@ -15,8 +15,8 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -- * 02111-1307, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -+ * MA 02110-1301, USA. - */ - - #ifndef MSM_PROPS_H -diff --git a/shvar.c b/shvar.c -index 114b7fc..7dd3651 100644 ---- a/shvar.c -+++ b/shvar.c -@@ -24,7 +24,8 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -+ * MA 02110-1301, USA. - * - */ - -diff --git a/shvar.h b/shvar.h -index debc1ee..81cff6f 100644 ---- a/shvar.h -+++ b/shvar.h -@@ -24,7 +24,8 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -+ * MA 02110-1301, USA. - * - */ - #ifndef _SHVAR_H -diff --git a/test-userdialog.c b/test-userdialog.c -index 4ace42e..d3dd34f 100644 ---- a/test-userdialog.c -+++ b/test-userdialog.c -@@ -14,7 +14,8 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -+ * MA 02110-1301, USA. - */ - - #include "config.h" -diff --git a/userdialogs.c b/userdialogs.c -index af44607..04f450a 100644 ---- a/userdialogs.c -+++ b/userdialogs.c -@@ -13,7 +13,8 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -+ * MA 02110-1301, USA. - * - */ - -diff --git a/userdialogs.h b/userdialogs.h -index 44b464a..3ea2f01 100644 ---- a/userdialogs.h -+++ b/userdialogs.h -@@ -13,7 +13,8 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -+ * MA 02110-1301, USA. - */ - - #ifndef __USERDIALOGS_H__ -diff --git a/userhelper-messages.c b/userhelper-messages.c -index 5c73cc0..7b8e37c 100644 ---- a/userhelper-messages.c -+++ b/userhelper-messages.c -@@ -13,7 +13,8 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -+ * MA 02110-1301, USA. - */ - - #include "config.h" -diff --git a/userhelper-messages.h b/userhelper-messages.h -index 69825f5..ec507d3 100644 ---- a/userhelper-messages.h -+++ b/userhelper-messages.h -@@ -13,7 +13,8 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -+ * MA 02110-1301, USA. - */ - - #ifndef USERHELPER_MESSAGES_H__ -diff --git a/userhelper-wrap.c b/userhelper-wrap.c -index cd35cd6..1e631f7 100644 ---- a/userhelper-wrap.c -+++ b/userhelper-wrap.c -@@ -13,7 +13,8 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -+ * MA 02110-1301, USA. - */ - - #include "config.h" -diff --git a/userhelper-wrap.h b/userhelper-wrap.h -index 2fb77c0..e4fea41 100644 ---- a/userhelper-wrap.h -+++ b/userhelper-wrap.h -@@ -13,7 +13,8 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -+ * MA 02110-1301, USA. - */ - - #ifndef __USERHELPER_WRAP_H__ -diff --git a/userhelper.8.in b/userhelper.8.in -index 4e7aff1..ce90528 100644 ---- a/userhelper.8.in -+++ b/userhelper.8.in -@@ -12,7 +12,8 @@ - .\" - .\" You should have received a copy of the GNU General Public License - .\" along with this program; if not, write to the Free Software --.\" Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+.\" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -+.\" MA 02110-1301, USA. - .\" - .TH USERHELPER 8 "January 8 2008" "Red Hat, Inc." - .SH NAME -diff --git a/userhelper.c b/userhelper.c -index 287aa4d..fa5395d 100644 ---- a/userhelper.c -+++ b/userhelper.c -@@ -13,7 +13,8 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -+ * MA 02110-1301, USA. - */ - - #include "config.h" -diff --git a/userhelper.h b/userhelper.h -index 50e6ed9..32c29d6 100644 ---- a/userhelper.h -+++ b/userhelper.h -@@ -13,7 +13,8 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -+ * MA 02110-1301, USA. - */ - - #ifndef __USERHELPER_H__ -diff --git a/userinfo.1 b/userinfo.1 -index 8701bda..292aa4b 100644 ---- a/userinfo.1 -+++ b/userinfo.1 -@@ -12,7 +12,8 @@ - .\" - .\" You should have received a copy of the GNU General Public License - .\" along with this program; if not, write to the Free Software --.\" Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+.\" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -+.\" MA 02110-1301, USA. - .\" - .TH USERINFO 1 "6 October 1997" "Red Hat Software" - .SH NAME -diff --git a/userinfo.c b/userinfo.c -index 5139b13..4c0ea9b 100644 ---- a/userinfo.c -+++ b/userinfo.c -@@ -14,7 +14,8 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -+ * MA 02110-1301, USA. - */ - - /* Things to remember... -diff --git a/usermount.1 b/usermount.1 -index eb864c8..1af6122 100644 ---- a/usermount.1 -+++ b/usermount.1 -@@ -12,7 +12,8 @@ - .\" - .\" You should have received a copy of the GNU General Public License - .\" along with this program; if not, write to the Free Software --.\" Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+.\" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -+.\" MA 02110-1301, USA. - .\" - .TH USERMOUNT 1 "March 13 2007" "Red Hat" - .SH NAME -diff --git a/usermount.c b/usermount.c -index 5875c09..1fc627b 100644 ---- a/usermount.c -+++ b/usermount.c -@@ -14,7 +14,8 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -+ * MA 02110-1301, USA. - */ - - /* TODO notes. -diff --git a/userpasswd.1 b/userpasswd.1 -index 3f11f7a..6e2ab14 100644 ---- a/userpasswd.1 -+++ b/userpasswd.1 -@@ -12,7 +12,8 @@ - .\" - .\" You should have received a copy of the GNU General Public License - .\" along with this program; if not, write to the Free Software --.\" Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+.\" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -+.\" MA 02110-1301, USA. - .\" - .TH USERPASSWD 1 "17 October 1997" "Red Hat Software" - .SH NAME -diff --git a/userpasswd.c b/userpasswd.c -index 42c6705..fad128f 100644 ---- a/userpasswd.c -+++ b/userpasswd.c -@@ -14,7 +14,8 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -+ * MA 02110-1301, USA. - */ - - #include "config.h" diff --git a/sources b/sources index 8e2e9ef..ee6f411 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (usermode-1.112.autotoolized.tar.xz) = b1e6fc846b074d99409eb57347eabc2816bbba075af10bc14f396e09d0b0f89bde7b80546a647ed6e30e958a449138ec04708896c9406359504750bcd05ed819 +SHA512 (usermode-1.113.tar.xz) = 0653da8cff94b86bd67ca1bed50bb77a929f5da1c047e6c627273fc319cc3bf6df7c5af1b5be160b2068632199d194bd00bcf43f702927a34b884149800c7f21 diff --git a/sysmacros.patch b/sysmacros.patch deleted file mode 100644 index 4ba8859..0000000 --- a/sysmacros.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/usermount.c b/usermount.c -index 3aafadd..5875c09 100644 ---- a/usermount.c -+++ b/usermount.c -@@ -40,6 +40,7 @@ - #include - #include - #include -+#include - #include - #include - #include diff --git a/usermode.spec b/usermode.spec index 83fde68..39433d7 100644 --- a/usermode.spec +++ b/usermode.spec @@ -1,20 +1,14 @@ Summary: Tools for certain user account management tasks Name: usermode -Version: 1.112 -Release: 10%{?dist} +Version: 1.113 +Release: 1%{?dist} License: GPLv2+ -URL: https://pagure.io/usermode/ -Source: https://releases.pagure.org/usermode/usermode-%{version}.autotoolized.tar.xz +URL: https://pagure.io/%{name}/ +Source: https://releases.pagure.org/%{name}/%{name}-%{version}.tar.xz Source1: config-util -# Backport of c5a0bfd174e4a88fcd49fe7a130b37b6779c1a18 -# - inclusion of from is now deprecated -Patch0: sysmacros.patch -# Backport of da01d6325a1a9eb8154abb6a4590c610e8db8ec4 -# - bad FSF address fix -Patch1: fsfaddr.patch # Backport of 48c4085004caad1ec928fa103b7f3e3fe684c826 # - and are now deprecated -Patch2: selinux_deprecated.patch +Patch0: selinux_deprecated.patch Requires: pam, passwd, util-linux # https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/IJFYI5Q2BYZKIGDFS2WLOBDUSEGWHIKV/ BuildRequires: make @@ -48,8 +42,6 @@ graphical tools for certain account management tasks. %prep %setup -q %patch0 -p1 -%patch1 -p1 -%patch2 -p1 %build %configure --with-selinux @@ -104,6 +96,9 @@ done %{_datadir}/applications/* %changelog +* Mon May 03 2021 Jiri Kucera - 1.113-1 +- Update to usermode-1.113 + * Wed Jan 27 2021 Fedora Release Engineering - 1.112-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 76346b911b21d8b2f2a9a19a6a2071d73a1936f1 Mon Sep 17 00:00:00 2001 From: Jiri Kucera Date: Wed, 5 May 2021 02:04:28 +0200 Subject: [PATCH 05/25] Update to usermode-1.114 --- .gitignore | 1 + selinux_deprecated.patch | 49 ---------------------------------------- sources | 2 +- usermode.spec | 34 ++++++++++++++++++++-------- 4 files changed, 27 insertions(+), 59 deletions(-) delete mode 100644 selinux_deprecated.patch diff --git a/.gitignore b/.gitignore index 936ca2d..0e2dc37 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ usermode-1.105.tar.xz /usermode-1.112.tar.xz /usermode-1.112.autotoolized.tar.xz /usermode-1.113.tar.xz +/usermode-1.114.tar.xz diff --git a/selinux_deprecated.patch b/selinux_deprecated.patch deleted file mode 100644 index fbce502..0000000 --- a/selinux_deprecated.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff --git a/userhelper.c b/userhelper.c -index 4177c89..f2afde7 100644 ---- a/userhelper.c -+++ b/userhelper.c -@@ -48,8 +48,6 @@ - - #ifdef WITH_SELINUX - #include --#include --#include - #endif - - #include "shvar.h" -@@ -111,7 +109,7 @@ static int checkAccess(unsigned int selaccess) { - struct av_decision avd; - int retval = security_compute_av(user_context, - user_context, -- SECCLASS_PASSWD, -+ string_to_security_class("passwd"), - selaccess, - &avd); - -@@ -2267,7 +2265,8 @@ main(int argc, char **argv) - const char *new_home_phone; - const char *new_shell; - #ifdef WITH_SELINUX -- unsigned perm; -+ security_class_t class; -+ access_vector_t perm; - #endif - - /* State variable we pass around. */ -@@ -2426,12 +2425,13 @@ main(int argc, char **argv) - user_name = g_strdup(argv[optind]); - - #ifdef WITH_SELINUX -+ class = string_to_security_class("passwd"); - if (c_flag) -- perm = PASSWD__PASSWD; -+ perm = string_to_av_perm(class, "passwd"); - else if (s_flag) -- perm = PASSWD__CHSH; -+ perm = string_to_av_perm(class, "chsh"); - else -- perm = PASSWD__CHFN; -+ perm = string_to_av_perm(class, "chfn"); - - if (is_selinux_enabled() > 0 && - checkAccess(perm)!= 0) { diff --git a/sources b/sources index ee6f411..5065b51 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (usermode-1.113.tar.xz) = 0653da8cff94b86bd67ca1bed50bb77a929f5da1c047e6c627273fc319cc3bf6df7c5af1b5be160b2068632199d194bd00bcf43f702927a34b884149800c7f21 +SHA512 (usermode-1.114.tar.xz) = 703eb218704c7a11cdce25a71f4fc91bf4f042a8b185f79f3954699081c0db8a6234ad6f11738d8b2fe6a492a03d029cbe01762a47869edc473e4fbaa6e0ee32 diff --git a/usermode.spec b/usermode.spec index 39433d7..5e07f58 100644 --- a/usermode.spec +++ b/usermode.spec @@ -1,26 +1,31 @@ +# Add `--without gtk' option (enable gtk by default): +%bcond_without gtk + Summary: Tools for certain user account management tasks Name: usermode -Version: 1.113 +Version: 1.114 Release: 1%{?dist} License: GPLv2+ URL: https://pagure.io/%{name}/ Source: https://releases.pagure.org/%{name}/%{name}-%{version}.tar.xz Source1: config-util -# Backport of 48c4085004caad1ec928fa103b7f3e3fe684c826 -# - and are now deprecated -Patch0: selinux_deprecated.patch Requires: pam, passwd, util-linux # https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/IJFYI5Q2BYZKIGDFS2WLOBDUSEGWHIKV/ BuildRequires: make BuildRequires: gcc -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 +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 Requires: %{name} = %{version}-%{release} +%endif %global _hardened_build 1 @@ -29,6 +34,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 @@ -38,27 +44,30 @@ 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 %build -%configure --with-selinux +%configure --with-selinux %{!?with_gtk:--without-gtk} %make_build %install %make_install INSTALL='install -p' +%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 @@ -66,6 +75,7 @@ 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} @@ -78,6 +88,7 @@ done %{_mandir}/man8/consolehelper.8* %config(noreplace) /etc/security/console.apps/config-util +%if %{with gtk} %files gtk %{_bindir}/usermount %{_mandir}/man1/usermount.1* @@ -94,8 +105,13 @@ done %{_datadir}/%{name} %{_datadir}/pixmaps/* %{_datadir}/applications/* +%endif %changelog +* Tue May 04 2021 Jiri Kucera - 1.114-1 +- Update to usermode-1.114 +- Allow to optionally disable GTK + * Mon May 03 2021 Jiri Kucera - 1.113-1 - Update to usermode-1.113 From fc3e4de1fbb7d454aba36c3db38869b73209c568 Mon Sep 17 00:00:00 2001 From: Jiri Kucera Date: Wed, 16 Jun 2021 21:09:51 +0200 Subject: [PATCH 06/25] 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: [options]" instead of "Usage: [options]". Resolves: #1969918 --- usermode.spec | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/usermode.spec b/usermode.spec index 5e07f58..94cd0ad 100644 --- a/usermode.spec +++ b/usermode.spec @@ -4,7 +4,7 @@ Summary: Tools for certain user account management tasks Name: usermode Version: 1.114 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: https://pagure.io/%{name}/ Source: https://releases.pagure.org/%{name}/%{name}-%{version}.tar.xz @@ -50,7 +50,7 @@ graphical tools for certain account management tasks. %setup -q %build -%configure --with-selinux %{!?with_gtk:--without-gtk} +%configure --with-selinux --without-fexecve %{!?with_gtk:--without-gtk} %make_build @@ -108,6 +108,14 @@ done %endif %changelog +* Wed Jun 16 2021 Jiri Kucera - 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: [options]" + instead of "Usage: [options]". + Resolves: #1969918 + * Tue May 04 2021 Jiri Kucera - 1.114-1 - Update to usermode-1.114 - Allow to optionally disable GTK From 85a0972cac9679621a77bbe5f61a8ef37f878a78 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 20:12:12 +0000 Subject: [PATCH 07/25] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- usermode.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usermode.spec b/usermode.spec index 94cd0ad..7c5231e 100644 --- a/usermode.spec +++ b/usermode.spec @@ -4,7 +4,7 @@ Summary: Tools for certain user account management tasks Name: usermode Version: 1.114 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ URL: https://pagure.io/%{name}/ Source: https://releases.pagure.org/%{name}/%{name}-%{version}.tar.xz @@ -108,6 +108,9 @@ done %endif %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 1.114-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed Jun 16 2021 Jiri Kucera - 1.114-2 - Do not use fexecve Script executed via fexecve has a file descriptor number in From 871e94164714ca8c2d5623ae2e7b7619301292b1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 03:41:21 +0000 Subject: [PATCH 08/25] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- usermode.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usermode.spec b/usermode.spec index 7c5231e..c650e7d 100644 --- a/usermode.spec +++ b/usermode.spec @@ -4,7 +4,7 @@ Summary: Tools for certain user account management tasks Name: usermode Version: 1.114 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ URL: https://pagure.io/%{name}/ Source: https://releases.pagure.org/%{name}/%{name}-%{version}.tar.xz @@ -108,6 +108,9 @@ done %endif %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 1.114-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 1.114-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 8df24764b5b6193583169db26ba83fad69cfa7b0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 11:34:22 +0000 Subject: [PATCH 09/25] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- usermode.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usermode.spec b/usermode.spec index c650e7d..3483dc5 100644 --- a/usermode.spec +++ b/usermode.spec @@ -4,7 +4,7 @@ Summary: Tools for certain user account management tasks Name: usermode Version: 1.114 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ URL: https://pagure.io/%{name}/ Source: https://releases.pagure.org/%{name}/%{name}-%{version}.tar.xz @@ -108,6 +108,9 @@ done %endif %changelog +* 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 From 61be5014fe4f0cd0d974b90b7568940a933028fd Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Fri, 6 Jan 2023 15:56:54 +0100 Subject: [PATCH 10/25] 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 --- usermode.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/usermode.spec b/usermode.spec index 3483dc5..abf47e0 100644 --- a/usermode.spec +++ b/usermode.spec @@ -1,10 +1,15 @@ # 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: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ URL: https://pagure.io/%{name}/ Source: https://releases.pagure.org/%{name}/%{name}-%{version}.tar.xz @@ -108,6 +113,9 @@ done %endif %changelog +* 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 From d0c9ebd161383c63dbfa960570789937d99b610e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 05:59:49 +0000 Subject: [PATCH 11/25] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- usermode.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usermode.spec b/usermode.spec index abf47e0..faa9e6b 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: 6%{?dist} +Release: 7%{?dist} License: GPLv2+ URL: https://pagure.io/%{name}/ Source: https://releases.pagure.org/%{name}/%{name}-%{version}.tar.xz @@ -113,6 +113,9 @@ done %endif %changelog +* 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 From 7b3885c9859761c8e7c3a9de0313c15e6bed5c06 Mon Sep 17 00:00:00 2001 From: Jiri Kucera Date: Thu, 29 Jun 2023 11:59:33 +0200 Subject: [PATCH 12/25] Migrate to SPDX license identifier --- usermode.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usermode.spec b/usermode.spec index faa9e6b..e5ddba7 100644 --- a/usermode.spec +++ b/usermode.spec @@ -10,7 +10,7 @@ Summary: Tools for certain user account management tasks Name: usermode Version: 1.114 Release: 7%{?dist} -License: GPLv2+ +License: GPL-2.0-or-later URL: https://pagure.io/%{name}/ Source: https://releases.pagure.org/%{name}/%{name}-%{version}.tar.xz Source1: config-util From 0648cbbc618e5e6facc0d0407855f5b95940fcd7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 17:18:07 +0000 Subject: [PATCH 13/25] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- usermode.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usermode.spec b/usermode.spec index e5ddba7..4e538f5 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: 7%{?dist} +Release: 8%{?dist} License: GPL-2.0-or-later URL: https://pagure.io/%{name}/ Source: https://releases.pagure.org/%{name}/%{name}-%{version}.tar.xz @@ -113,6 +113,9 @@ done %endif %changelog +* 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 From a6c93c2abc7df5bed9e8d4c38e4e549035ac4e2d Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Wed, 25 Oct 2023 08:52:25 +0200 Subject: [PATCH 14/25] drop install variable, already defined in the macro --- usermode.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usermode.spec b/usermode.spec index 4e538f5..94f8aa1 100644 --- a/usermode.spec +++ b/usermode.spec @@ -60,7 +60,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 From ac22bb99e91811b4f195cbfb3992c6d6da533ec9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 07:19:53 +0000 Subject: [PATCH 15/25] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- usermode.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usermode.spec b/usermode.spec index 94f8aa1..414c06b 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: 8%{?dist} +Release: 9%{?dist} License: GPL-2.0-or-later URL: https://pagure.io/%{name}/ Source: https://releases.pagure.org/%{name}/%{name}-%{version}.tar.xz @@ -113,6 +113,9 @@ done %endif %changelog +* 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 From 695d624d0f26eb5199bd0526c20798d2a01f48d6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 08:26:45 +0000 Subject: [PATCH 16/25] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- usermode.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usermode.spec b/usermode.spec index 414c06b..7290183 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: 9%{?dist} +Release: 10%{?dist} License: GPL-2.0-or-later URL: https://pagure.io/%{name}/ Source: https://releases.pagure.org/%{name}/%{name}-%{version}.tar.xz @@ -113,6 +113,9 @@ done %endif %changelog +* 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 From 3e24aa5f3a3d15ff479733e3a0410756e672a54b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 13:58:09 +0000 Subject: [PATCH 17/25] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- usermode.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usermode.spec b/usermode.spec index 7290183..062ee3a 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: 10%{?dist} +Release: 11%{?dist} License: GPL-2.0-or-later URL: https://pagure.io/%{name}/ Source: https://releases.pagure.org/%{name}/%{name}-%{version}.tar.xz @@ -113,6 +113,9 @@ done %endif %changelog +* 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 From 7b3dc67018583c4c29df36de64d6e9a52b6c7daa Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Thu, 30 Jan 2025 11:29:44 +0100 Subject: [PATCH 18/25] fix static analysis issues and ftbfs --- fix-sast.patch | 36 ++++++++++++++++++++++++++++++++++++ usermode.spec | 9 +++++++-- 2 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 fix-sast.patch 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 062ee3a..5e55dfe 100644 --- a/usermode.spec +++ b/usermode.spec @@ -9,11 +9,12 @@ Summary: Tools for certain user account management tasks Name: usermode Version: 1.114 -Release: 11%{?dist} +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 +Patch1: fix-sast.patch Requires: pam, passwd, util-linux # https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/IJFYI5Q2BYZKIGDFS2WLOBDUSEGWHIKV/ BuildRequires: make @@ -53,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} @@ -87,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* @@ -113,6 +115,9 @@ done %endif %changelog +* 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 From a546b622a9794d8129d6004e9a266a0f1706e9e3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 19:53:27 +0000 Subject: [PATCH 19/25] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- usermode.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usermode.spec b/usermode.spec index 5e55dfe..a52aeda 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: 12%{?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 @@ -115,6 +115,9 @@ done %endif %changelog +* 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 From 68a87d386e964a3884b6d0e8d4663838dd372b89 Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Wed, 27 Aug 2025 11:08:36 +0200 Subject: [PATCH 20/25] 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 21/25] 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 22/25] 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 23/25] 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 24/25] 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 25/25] 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