From 67d5731b1129913b9d0fcaa97c1fc34e9a200e24 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 29 Sep 2010 15:25:29 -0700 Subject: [PATCH 01/62] - Rebuilt for gcc bug 634757 --- usermode.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usermode.spec b/usermode.spec index baa6cc1..f3fcce2 100644 --- a/usermode.spec +++ b/usermode.spec @@ -1,7 +1,7 @@ Summary: Tools for certain user account management tasks Name: usermode Version: 1.106.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/System URL: https://fedorahosted.org/usermode/ @@ -110,6 +110,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/applications/* %changelog +* Wed Sep 29 2010 jkeating - 1.106.1-2 +- Rebuilt for gcc bug 634757 + * Tue Sep 14 2010 Miloslav Trmač - 1.106.1-1 - Update to usermode-1.106.1 From 133aae569e6bdc36da17f932b057869495769fed Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 18:43:30 -0600 Subject: [PATCH 02/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- usermode.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usermode.spec b/usermode.spec index f3fcce2..5d957a4 100644 --- a/usermode.spec +++ b/usermode.spec @@ -1,7 +1,7 @@ Summary: Tools for certain user account management tasks Name: usermode Version: 1.106.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: Applications/System URL: https://fedorahosted.org/usermode/ @@ -110,6 +110,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/applications/* %changelog +* Mon Feb 07 2011 Fedora Release Engineering - 1.106.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Wed Sep 29 2010 jkeating - 1.106.1-2 - Rebuilt for gcc bug 634757 From 2d24fa9874c2d387b780e268643aca98adf8de1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miloslav=20Trma=C4=8D?= Date: Thu, 31 Mar 2011 22:36:45 +0200 Subject: [PATCH 03/62] Update to usermode-1.107 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Thu Mar 31 2011 Miloslav Trmač - 1.107-1 - Update to usermode-1.107 Resolves: #668731 --- .gitignore | 1 + sources | 2 +- usermode.spec | 8 ++++++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 707474a..cf05f91 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ usermode-1.105.tar.xz /usermode-1.106.tar.xz /usermode-1.106.1.tar.xz +/usermode-1.107.tar.xz diff --git a/sources b/sources index df9d075..6ef84ec 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e687f847bc050b669c9dc76915349853 usermode-1.106.1.tar.xz +00a53086a5716106585fe0234f1030d3 usermode-1.107.tar.xz diff --git a/usermode.spec b/usermode.spec index 5d957a4..db4daae 100644 --- a/usermode.spec +++ b/usermode.spec @@ -1,7 +1,7 @@ Summary: Tools for certain user account management tasks Name: usermode -Version: 1.106.1 -Release: 3%{?dist} +Version: 1.107 +Release: 1%{?dist} License: GPLv2+ Group: Applications/System URL: https://fedorahosted.org/usermode/ @@ -110,6 +110,10 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/applications/* %changelog +* Thu Mar 31 2011 Miloslav Trmač - 1.107-1 +- Update to usermode-1.107 + Resolves: #668731 + * Mon Feb 07 2011 Fedora Release Engineering - 1.106.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 459a7682f7fae71eaf54c867c142cf0a150e107a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miloslav=20Trma=C4=8D?= Date: Thu, 31 Mar 2011 22:57:53 +0200 Subject: [PATCH 04/62] Add UGROUPS=wheel to config-util - Add UGROUPS=wheel to config-util Resolves: #688690 --- config-util | 2 ++ usermode.spec | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) 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 db4daae..415ae3b 100644 --- a/usermode.spec +++ b/usermode.spec @@ -6,6 +6,7 @@ License: GPLv2+ Group: Applications/System URL: https://fedorahosted.org/usermode/ Source: https://fedorahosted.org/releases/u/s/usermode/usermode-%{version}.tar.xz +Source1: config-util Requires: pam, passwd, util-linux BuildRequires: desktop-file-utils, gettext, glib2-devel, gtk2-devel, intltool BuildRequires: libblkid-devel, libSM-devel, libselinux-devel, libuser-devel @@ -56,7 +57,8 @@ for wrappedapp in halt reboot poweroff ; do $RPM_BUILD_ROOT/etc/security/console.apps/${wrappedapp} install -p -m644 shutdown.pamd $RPM_BUILD_ROOT/etc/pam.d/${wrappedapp} done -echo 'USER=root' > $RPM_BUILD_ROOT/etc/security/console.apps/config-util +install -p -m 644 %{SOURCE1} \ + $RPM_BUILD_ROOT/etc/security/console.apps/config-util for i in redhat-userinfo.desktop redhat-userpasswd.desktop \ redhat-usermount.desktop; do @@ -113,6 +115,8 @@ rm -rf $RPM_BUILD_ROOT * Thu Mar 31 2011 Miloslav Trmač - 1.107-1 - Update to usermode-1.107 Resolves: #668731 +- Add UGROUPS=wheel to config-util + Resolves: #688690 * Mon Feb 07 2011 Fedora Release Engineering - 1.106.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 3a83623291614b0f85b2f8c646e006321d83a48d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miloslav=20Trma=C4=8D?= Date: Mon, 3 Oct 2011 17:59:40 +0200 Subject: [PATCH 05/62] Update to usermode-1.108 --- .gitignore | 1 + sources | 2 +- usermode.spec | 6 +++++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index cf05f91..0128a98 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ usermode-1.105.tar.xz /usermode-1.106.tar.xz /usermode-1.106.1.tar.xz /usermode-1.107.tar.xz +/usermode-1.108.tar.xz diff --git a/sources b/sources index 6ef84ec..e672840 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -00a53086a5716106585fe0234f1030d3 usermode-1.107.tar.xz +bef795b757defb9fd27cfbd48ef79861 usermode-1.108.tar.xz diff --git a/usermode.spec b/usermode.spec index 415ae3b..db99dbc 100644 --- a/usermode.spec +++ b/usermode.spec @@ -1,6 +1,6 @@ Summary: Tools for certain user account management tasks Name: usermode -Version: 1.107 +Version: 1.108 Release: 1%{?dist} License: GPLv2+ Group: Applications/System @@ -112,6 +112,10 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/applications/* %changelog +* Mon Oct 3 2011 Miloslav Trmač - 1.108-1 +- Update to usermode-1.108 + Resolves: #622813, #716524 + * Thu Mar 31 2011 Miloslav Trmač - 1.107-1 - Update to usermode-1.107 Resolves: #668731 From d1cafe9d706289b34c0f151cd238634c9e05e22a Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 14 Jan 2012 01:40:32 -0600 Subject: [PATCH 06/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- usermode.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usermode.spec b/usermode.spec index db99dbc..f04cb42 100644 --- a/usermode.spec +++ b/usermode.spec @@ -1,7 +1,7 @@ Summary: Tools for certain user account management tasks Name: usermode Version: 1.108 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/System URL: https://fedorahosted.org/usermode/ @@ -112,6 +112,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/applications/* %changelog +* Sat Jan 14 2012 Fedora Release Engineering - 1.108-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Mon Oct 3 2011 Miloslav Trmač - 1.108-1 - Update to usermode-1.108 Resolves: #622813, #716524 From 92c27282c7bdaa7cd65dd027103c77285a7ebd29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miloslav=20Trma=C4=8D?= Date: Sat, 3 Mar 2012 07:12:45 +0100 Subject: [PATCH 07/62] Update to usermode-1.109 --- .gitignore | 1 + sources | 2 +- usermode.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 0128a98..2b1239a 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ usermode-1.105.tar.xz /usermode-1.106.1.tar.xz /usermode-1.107.tar.xz /usermode-1.108.tar.xz +/usermode-1.109.tar.xz diff --git a/sources b/sources index e672840..164309a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bef795b757defb9fd27cfbd48ef79861 usermode-1.108.tar.xz +d7c292b24cd9804887bc856523cffeb2 usermode-1.109.tar.xz diff --git a/usermode.spec b/usermode.spec index f04cb42..e98715b 100644 --- a/usermode.spec +++ b/usermode.spec @@ -1,7 +1,7 @@ Summary: Tools for certain user account management tasks Name: usermode -Version: 1.108 -Release: 2%{?dist} +Version: 1.109 +Release: 1%{?dist} License: GPLv2+ Group: Applications/System URL: https://fedorahosted.org/usermode/ @@ -112,6 +112,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/applications/* %changelog +* Sat Mar 3 2012 Miloslav Trmač - 1.109-1 +- Update to usermode-1.109 + * Sat Jan 14 2012 Fedora Release Engineering - 1.108-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 2615a2b372a5397b4ec496933b6e54ad6c420db8 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 21 Jul 2012 21:12:14 -0500 Subject: [PATCH 08/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- usermode.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usermode.spec b/usermode.spec index e98715b..630b7f8 100644 --- a/usermode.spec +++ b/usermode.spec @@ -1,7 +1,7 @@ Summary: Tools for certain user account management tasks Name: usermode Version: 1.109 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/System URL: https://fedorahosted.org/usermode/ @@ -112,6 +112,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/applications/* %changelog +* Sun Jul 22 2012 Fedora Release Engineering - 1.109-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Sat Mar 3 2012 Miloslav Trmač - 1.109-1 - Update to usermode-1.109 From d0cbd31537f1d534f70b8fc1719983302afd1c9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miloslav=20Trma=C4=8D?= Date: Tue, 21 Aug 2012 01:54:21 +0200 Subject: [PATCH 09/62] Update to usermode-1.110 --- .gitignore | 1 + sources | 2 +- usermode.spec | 32 ++++++++++---------------------- 3 files changed, 12 insertions(+), 23 deletions(-) diff --git a/.gitignore b/.gitignore index 2b1239a..ed4f6a7 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ usermode-1.105.tar.xz /usermode-1.107.tar.xz /usermode-1.108.tar.xz /usermode-1.109.tar.xz +/usermode-1.110.tar.xz diff --git a/sources b/sources index 164309a..403f2ed 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d7c292b24cd9804887bc856523cffeb2 usermode-1.109.tar.xz +af38f6dfbae23777be77c081868bcdad usermode-1.110.tar.xz diff --git a/usermode.spec b/usermode.spec index 630b7f8..d3e016a 100644 --- a/usermode.spec +++ b/usermode.spec @@ -1,7 +1,7 @@ Summary: Tools for certain user account management tasks Name: usermode -Version: 1.109 -Release: 2%{?dist} +Version: 1.110 +Release: 1%{?dist} License: GPLv2+ Group: Applications/System URL: https://fedorahosted.org/usermode/ @@ -48,15 +48,7 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' ln -sf usermount $RPM_BUILD_ROOT%{_bindir}/userformat ln -s usermount.1 $RPM_BUILD_ROOT%{_mandir}/man1/userformat.1 -# We set up the shutdown programs to be wrapped in this package. Other -# packages are on their own.... -mkdir -p $RPM_BUILD_ROOT/etc/pam.d $RPM_BUILD_ROOT/etc/security/console.apps -for wrappedapp in halt reboot poweroff ; do - ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/${wrappedapp} - install -p -m644 $wrappedapp \ - $RPM_BUILD_ROOT/etc/security/console.apps/${wrappedapp} - install -p -m644 shutdown.pamd $RPM_BUILD_ROOT/etc/pam.d/${wrappedapp} -done +mkdir -p $RPM_BUILD_ROOT/etc/security/console.apps install -p -m 644 %{SOURCE1} \ $RPM_BUILD_ROOT/etc/security/console.apps/config-util @@ -80,18 +72,7 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/consolehelper %{_mandir}/man8/userhelper.8* %{_mandir}/man8/consolehelper.8* -# PAM console wrappers -%{_bindir}/halt -%{_bindir}/reboot -%{_bindir}/poweroff -%exclude %{_bindir}/shutdown -%config(noreplace) /etc/pam.d/halt -%config(noreplace) /etc/pam.d/reboot -%config(noreplace) /etc/pam.d/poweroff %config(noreplace) /etc/security/console.apps/config-util -%config(noreplace) /etc/security/console.apps/halt -%config(noreplace) /etc/security/console.apps/reboot -%config(noreplace) /etc/security/console.apps/poweroff %files gtk %defattr(-,root,root,-) @@ -112,6 +93,13 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/applications/* %changelog +* Mon Aug 20 2012 Miloslav Trmač - 1.101-1 +- Update to usermode-1.110. + Note that this drops halt/poweroff/reboot helpers, the respective + implementations in systemd now include PolicyKit support. Spec file change + based on a patch by Lennart Poettering . + Resolves: #804088, #849208 + * Sun Jul 22 2012 Fedora Release Engineering - 1.109-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From e6decb8183a5c7980640a5bd949f453969b75bd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miloslav=20Trma=C4=8D?= Date: Tue, 21 Aug 2012 02:04:56 +0200 Subject: [PATCH 10/62] Fix changelog version --- usermode.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usermode.spec b/usermode.spec index d3e016a..2efecc1 100644 --- a/usermode.spec +++ b/usermode.spec @@ -93,7 +93,7 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/applications/* %changelog -* Mon Aug 20 2012 Miloslav Trmač - 1.101-1 +* Mon Aug 20 2012 Miloslav Trmač - 1.110-1 - Update to usermode-1.110. Note that this drops halt/poweroff/reboot helpers, the respective implementations in systemd now include PolicyKit support. Spec file change From 494acd5807428b232ca3364f0dca35fc0b8bf0a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miloslav=20Trma=C4=8D?= Date: Tue, 21 Aug 2012 20:25:31 +0200 Subject: [PATCH 11/62] Drop no longer necessary %clean and %defattr commands --- usermode.spec | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/usermode.spec b/usermode.spec index 2efecc1..882146a 100644 --- a/usermode.spec +++ b/usermode.spec @@ -62,11 +62,7 @@ done %find_lang %{name} -%clean -rm -rf $RPM_BUILD_ROOT - %files -f %{name}.lang -%defattr(-,root,root,-) %doc COPYING ChangeLog NEWS README %attr(4711,root,root) /usr/sbin/userhelper %{_bindir}/consolehelper @@ -75,7 +71,6 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) /etc/security/console.apps/config-util %files gtk -%defattr(-,root,root,-) %{_bindir}/usermount %{_mandir}/man1/usermount.1* %{_bindir}/userformat @@ -93,6 +88,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/applications/* %changelog +* Tue Aug 21 2012 Miloslav Trmač - 1.110-2 +- Drop no longer necessary %%clean and %%defattr commands. + * Mon Aug 20 2012 Miloslav Trmač - 1.110-1 - Update to usermode-1.110. Note that this drops halt/poweroff/reboot helpers, the respective From 047ba0f48a52536df34f0878c70d2ede38afe70c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miloslav=20Trma=C4=8D?= Date: Sat, 22 Sep 2012 20:51:19 +0200 Subject: [PATCH 12/62] Update to usermode-1.111 --- .gitignore | 1 + sources | 2 +- usermode.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index ed4f6a7..938f499 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ usermode-1.105.tar.xz /usermode-1.108.tar.xz /usermode-1.109.tar.xz /usermode-1.110.tar.xz +/usermode-1.111.tar.xz diff --git a/sources b/sources index 403f2ed..7fc5776 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -af38f6dfbae23777be77c081868bcdad usermode-1.110.tar.xz +28ba510fbd8da9f4e86e57d6c31cff29 usermode-1.111.tar.xz diff --git a/usermode.spec b/usermode.spec index 882146a..d8f909c 100644 --- a/usermode.spec +++ b/usermode.spec @@ -1,6 +1,6 @@ Summary: Tools for certain user account management tasks Name: usermode -Version: 1.110 +Version: 1.111 Release: 1%{?dist} License: GPLv2+ Group: Applications/System @@ -88,6 +88,9 @@ done %{_datadir}/applications/* %changelog +* Sat Sep 22 2012 Miloslav Trmač - 1.111-1 +- Update to usermode-1.111 + * Tue Aug 21 2012 Miloslav Trmač - 1.110-2 - Drop no longer necessary %%clean and %%defattr commands. From e4db17f5fa10dd67f6ab0ebe23576b116bc412db Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 14 Feb 2013 20:34:38 -0600 Subject: [PATCH 13/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- usermode.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usermode.spec b/usermode.spec index d8f909c..f535a32 100644 --- a/usermode.spec +++ b/usermode.spec @@ -1,7 +1,7 @@ Summary: Tools for certain user account management tasks Name: usermode Version: 1.111 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/System URL: https://fedorahosted.org/usermode/ @@ -88,6 +88,9 @@ done %{_datadir}/applications/* %changelog +* Fri Feb 15 2013 Fedora Release Engineering - 1.111-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Sat Sep 22 2012 Miloslav Trmač - 1.111-1 - Update to usermode-1.111 From 3d898fb33b5519124ad703ba33a1bd7179aa3068 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miloslav=20Trma=C4=8D?= Date: Tue, 21 May 2013 17:08:34 +0200 Subject: [PATCH 14/62] Enable hardened build --- usermode.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/usermode.spec b/usermode.spec index f535a32..4ce1901 100644 --- a/usermode.spec +++ b/usermode.spec @@ -1,7 +1,7 @@ Summary: Tools for certain user account management tasks Name: usermode Version: 1.111 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: Applications/System URL: https://fedorahosted.org/usermode/ @@ -18,6 +18,8 @@ Summary: Graphical tools for certain user account management tasks Group: Applications/System Requires: %{name} = %{version}-%{release} +%global _hardened_build 1 + %description The usermode package contains the userhelper program, which can be used to allow configured programs to be run with superuser privileges @@ -88,6 +90,10 @@ done %{_datadir}/applications/* %changelog +* Tue May 21 2013 Miloslav Trmač - 1.111-3 +- Enable hardened build + Resolves: #965471 + * Fri Feb 15 2013 Fedora Release Engineering - 1.111-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 621260e65e7c8834eb59bfa7d71b9822155d0be8 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 00:49:13 -0500 Subject: [PATCH 15/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- usermode.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usermode.spec b/usermode.spec index 4ce1901..ef41a80 100644 --- a/usermode.spec +++ b/usermode.spec @@ -1,7 +1,7 @@ Summary: Tools for certain user account management tasks Name: usermode Version: 1.111 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Group: Applications/System URL: https://fedorahosted.org/usermode/ @@ -90,6 +90,9 @@ done %{_datadir}/applications/* %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 1.111-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Tue May 21 2013 Miloslav Trmač - 1.111-3 - Enable hardened build Resolves: #965471 From 45adcfa66ee9aa4ee801f1ae2afda68b11cd7f9a Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 22:06:03 -0500 Subject: [PATCH 16/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- usermode.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usermode.spec b/usermode.spec index ef41a80..9a95ab3 100644 --- a/usermode.spec +++ b/usermode.spec @@ -1,7 +1,7 @@ Summary: Tools for certain user account management tasks Name: usermode Version: 1.111 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ Group: Applications/System URL: https://fedorahosted.org/usermode/ @@ -90,6 +90,9 @@ done %{_datadir}/applications/* %changelog +* Sun Jun 08 2014 Fedora Release Engineering - 1.111-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Sun Aug 04 2013 Fedora Release Engineering - 1.111-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From 87980c4de1bc1a1e2ca184b67ac06302355e5909 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 18 Aug 2014 07:17:05 +0000 Subject: [PATCH 17/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- usermode.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usermode.spec b/usermode.spec index 9a95ab3..5cd2cbd 100644 --- a/usermode.spec +++ b/usermode.spec @@ -1,7 +1,7 @@ Summary: Tools for certain user account management tasks Name: usermode Version: 1.111 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ Group: Applications/System URL: https://fedorahosted.org/usermode/ @@ -90,6 +90,9 @@ done %{_datadir}/applications/* %changelog +* Mon Aug 18 2014 Fedora Release Engineering - 1.111-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sun Jun 08 2014 Fedora Release Engineering - 1.111-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 8e3b8943e939ead41c54d322fe603d1da61da93e Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 01:42:54 +0000 Subject: [PATCH 18/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- usermode.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usermode.spec b/usermode.spec index 5cd2cbd..28d99b6 100644 --- a/usermode.spec +++ b/usermode.spec @@ -1,7 +1,7 @@ Summary: Tools for certain user account management tasks Name: usermode Version: 1.111 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2+ Group: Applications/System URL: https://fedorahosted.org/usermode/ @@ -90,6 +90,9 @@ done %{_datadir}/applications/* %changelog +* Fri Jun 19 2015 Fedora Release Engineering - 1.111-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Mon Aug 18 2014 Fedora Release Engineering - 1.111-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From fbc8fe6c32da523775b01481b6e2d726f78ef32c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 02:28:13 +0000 Subject: [PATCH 19/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- usermode.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usermode.spec b/usermode.spec index 28d99b6..67b31af 100644 --- a/usermode.spec +++ b/usermode.spec @@ -1,7 +1,7 @@ Summary: Tools for certain user account management tasks Name: usermode Version: 1.111 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2+ Group: Applications/System URL: https://fedorahosted.org/usermode/ @@ -90,6 +90,9 @@ done %{_datadir}/applications/* %changelog +* Fri Feb 05 2016 Fedora Release Engineering - 1.111-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Fri Jun 19 2015 Fedora Release Engineering - 1.111-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From bd4ba70e00b0ef0068ca57e0fafaa869252ae446 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 16:50:58 +0000 Subject: [PATCH 20/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- usermode.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usermode.spec b/usermode.spec index 67b31af..4dd811b 100644 --- a/usermode.spec +++ b/usermode.spec @@ -1,7 +1,7 @@ Summary: Tools for certain user account management tasks Name: usermode Version: 1.111 -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv2+ Group: Applications/System URL: https://fedorahosted.org/usermode/ @@ -90,6 +90,9 @@ done %{_datadir}/applications/* %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 1.111-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Fri Feb 05 2016 Fedora Release Engineering - 1.111-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From b77212f16ccec520909169010fe8c463477e1901 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miloslav=20Trma=C4=8D?= Date: Mon, 24 Apr 2017 22:13:58 +0200 Subject: [PATCH 21/62] Fix a build failure with -Werror=format-security --- usermode-1.111-format-security.patch | 21 +++++++++++++++++++++ usermode.spec | 10 +++++++++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 usermode-1.111-format-security.patch diff --git a/usermode-1.111-format-security.patch b/usermode-1.111-format-security.patch new file mode 100644 index 0000000..efd1c49 --- /dev/null +++ b/usermode-1.111-format-security.patch @@ -0,0 +1,21 @@ +commit b562472980ecd903d13e69279a31fcf77fac57bc +Author: Miloslav Trmač +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) { diff --git a/usermode.spec b/usermode.spec index 4dd811b..a376893 100644 --- a/usermode.spec +++ b/usermode.spec @@ -1,12 +1,14 @@ Summary: Tools for certain user account management tasks Name: usermode Version: 1.111 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv2+ Group: Applications/System URL: https://fedorahosted.org/usermode/ Source: https://fedorahosted.org/releases/u/s/usermode/usermode-%{version}.tar.xz Source1: config-util +# Upstream commit b562472980ecd903d13e69279a31fcf77fac57bc +Patch0: usermode-1.111-format-security.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 @@ -38,6 +40,8 @@ graphical tools for certain account management tasks. %prep %setup -q +%patch0 -p1 -b .format-security + %build %configure --with-selinux @@ -90,6 +94,10 @@ done %{_datadir}/applications/* %changelog +* Mon Apr 24 2017 Miloslav Trmač - 1.111-10 +- Fix a FBFS with -Werror=format-security + Resolves #1444750 + * Sat Feb 11 2017 Fedora Release Engineering - 1.111-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From c04cf117e971f5709466354c77adc40a23bcf5e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miloslav=20Trma=C4=8D?= Date: Mon, 24 Apr 2017 22:18:41 +0200 Subject: [PATCH 22/62] Fix inconsistent dates in %%changelog Because such an old history is no longer available, assume that the dates are correct and the days of week are incorrect. --- usermode.spec | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/usermode.spec b/usermode.spec index a376893..9041fc1 100644 --- a/usermode.spec +++ b/usermode.spec @@ -97,6 +97,7 @@ done * Mon Apr 24 2017 Miloslav Trmač - 1.111-10 - Fix a FBFS with -Werror=format-security Resolves #1444750 +- Fix inconsistent dates in %%changelog * Sat Feb 11 2017 Fedora Release Engineering - 1.111-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild @@ -479,10 +480,10 @@ done - Add getenforce checks - Add root_passwd check -* Tue Jul 1 2004 Dan Walsh 1.70-6 +* Thu Jul 1 2004 Dan Walsh 1.70-6 - More fixes to make targeted policy work correctly -* Tue Jul 1 2004 Dan Walsh 1.70-5 +* Thu Jul 1 2004 Dan Walsh 1.70-5 - Fix to use root if user not defined * Tue May 25 2004 Dan Walsh 1.70-4 @@ -651,7 +652,7 @@ done - remove the pixmap we don't use any more (we use stock pixmaps now) - update translations -* Thu Apr 16 2002 Nalin Dahyabhai 1.54-1 +* Tue Apr 16 2002 Nalin Dahyabhai 1.54-1 - suppress even error messages from Xlib when consolehelper calls gtk_init_check() to see if the display is available @@ -728,7 +729,7 @@ done * Fri Nov 2 2001 Nalin Dahyabhai 1.45-1 - propagate environment variables from libpam to applications -* Fri Oct 3 2001 Nalin Dahyabhai 1.44-1 +* Wed Oct 3 2001 Nalin Dahyabhai 1.44-1 - only try to call gtk_main_quit() if we've got a loop to get out of (#54109) - obey RPM_OPT_FLAGS, obey @@ -868,7 +869,7 @@ done * Tue Mar 07 2000 Nalin Dahyabhai - queue notice messages until we get prompts in userhelper to fix bug #8745 -* Fri Feb 03 2000 Nalin Dahyabhai +* Thu Feb 03 2000 Nalin Dahyabhai - free trip through the build system * Tue Jan 11 2000 Nalin Dahyabhai From 124aec2cb3cc9910f5abbb1560d49157488136af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miloslav=20Trma=C4=8D?= Date: Mon, 24 Apr 2017 22:22:57 +0200 Subject: [PATCH 23/62] Update home page and release URLs to point to pagure.io --- usermode.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usermode.spec b/usermode.spec index 9041fc1..2762ab1 100644 --- a/usermode.spec +++ b/usermode.spec @@ -4,8 +4,8 @@ Version: 1.111 Release: 10%{?dist} License: GPLv2+ Group: Applications/System -URL: https://fedorahosted.org/usermode/ -Source: https://fedorahosted.org/releases/u/s/usermode/usermode-%{version}.tar.xz +URL: https://pagure.io/usermode/ +Source: https://releases.pagure.org/usermode/usermode-%{version}.tar.xz Source1: config-util # Upstream commit b562472980ecd903d13e69279a31fcf77fac57bc Patch0: usermode-1.111-format-security.patch From 9e1759cf002d279f5dbc340e94ff3738fbef78aa Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 21:06:04 +0000 Subject: [PATCH 24/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- usermode.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usermode.spec b/usermode.spec index 2762ab1..a581058 100644 --- a/usermode.spec +++ b/usermode.spec @@ -1,7 +1,7 @@ Summary: Tools for certain user account management tasks Name: usermode Version: 1.111 -Release: 10%{?dist} +Release: 11%{?dist} License: GPLv2+ Group: Applications/System URL: https://pagure.io/usermode/ @@ -94,6 +94,9 @@ done %{_datadir}/applications/* %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 1.111-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Mon Apr 24 2017 Miloslav Trmač - 1.111-10 - Fix a FBFS with -Werror=format-security Resolves #1444750 From 137e0517402e18f4618183bef5c8f9edb934f6d1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 09:54:39 +0000 Subject: [PATCH 25/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- usermode.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usermode.spec b/usermode.spec index a581058..e3950c4 100644 --- a/usermode.spec +++ b/usermode.spec @@ -1,7 +1,7 @@ Summary: Tools for certain user account management tasks Name: usermode Version: 1.111 -Release: 11%{?dist} +Release: 12%{?dist} License: GPLv2+ Group: Applications/System URL: https://pagure.io/usermode/ @@ -94,6 +94,9 @@ done %{_datadir}/applications/* %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 1.111-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 1.111-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From f3b5f644353c01a18b518a7f504478de82297376 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 20:11:59 +0000 Subject: [PATCH 26/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_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 e3950c4..111ff08 100644 --- a/usermode.spec +++ b/usermode.spec @@ -1,7 +1,7 @@ Summary: Tools for certain user account management tasks Name: usermode Version: 1.111 -Release: 12%{?dist} +Release: 13%{?dist} License: GPLv2+ Group: Applications/System URL: https://pagure.io/usermode/ @@ -94,6 +94,9 @@ done %{_datadir}/applications/* %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 1.111-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Aug 03 2017 Fedora Release Engineering - 1.111-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From aa41e53d153847f7a0205f6d5ebabf70b4b78976 Mon Sep 17 00:00:00 2001 From: Jiri Kucera Date: Wed, 21 Feb 2018 22:03:19 +0100 Subject: [PATCH 27/62] Added missing gcc dependency See https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/IJFYI5Q2BYZKIGDFS2WLOBDUSEGWHIKV/ --- usermode.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/usermode.spec b/usermode.spec index 111ff08..062228d 100644 --- a/usermode.spec +++ b/usermode.spec @@ -1,7 +1,7 @@ Summary: Tools for certain user account management tasks Name: usermode Version: 1.111 -Release: 13%{?dist} +Release: 14%{?dist} License: GPLv2+ Group: Applications/System URL: https://pagure.io/usermode/ @@ -10,6 +10,8 @@ Source1: config-util # Upstream commit b562472980ecd903d13e69279a31fcf77fac57bc Patch0: usermode-1.111-format-security.patch Requires: pam, passwd, util-linux +# https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/IJFYI5Q2BYZKIGDFS2WLOBDUSEGWHIKV/ +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 @@ -94,6 +96,9 @@ done %{_datadir}/applications/* %changelog +* Wed Feb 21 2018 Jiri Kucera - 1.111-14 +- Added missing gcc dependency + * Fri Feb 09 2018 Fedora Release Engineering - 1.111-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 665eabf8bd53409a33c3c2148734064b070210ee Mon Sep 17 00:00:00 2001 From: Jiri Kucera Date: Fri, 23 Feb 2018 19:25:49 +0100 Subject: [PATCH 28/62] Update to usermode-1.112 - resolve #1269643 --- .gitignore | 1 + sources | 2 +- translations.patch | 14 ++++++++++++++ usermode-1.111-format-security.patch | 21 --------------------- usermode.spec | 16 ++++++++++------ 5 files changed, 26 insertions(+), 28 deletions(-) create mode 100644 translations.patch delete mode 100644 usermode-1.111-format-security.patch diff --git a/.gitignore b/.gitignore index 938f499..0070639 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ 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 diff --git a/sources b/sources index 7fc5776..dd92272 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -28ba510fbd8da9f4e86e57d6c31cff29 usermode-1.111.tar.xz +SHA512 (usermode-1.112.tar.xz) = 2c975eea65c74b0b05d9f2faf767862e55ace042b3c6bf072a8cabb724841c3c1e7f55be8afcff459ba599b2077d96c44e11dac4d3cc051cd39ab1e9e3b6451d diff --git a/translations.patch b/translations.patch new file mode 100644 index 0000000..b5365bf --- /dev/null +++ b/translations.patch @@ -0,0 +1,14 @@ +diff --git a/po/tr.po b/po/tr.po +index 84e5021..a28e947 100644 +--- a/po/tr.po ++++ b/po/tr.po +@@ -408,7 +408,7 @@ msgstr "Grafik pencere açılamadı ve uçbirim denetimi bulunamadı.\n" + #: ../../po/../userpasswd.c:37 + #, c-format + msgid "Unexpected command-line arguments\n" +-msgstr "Beklenmeyen komut satırı argümanları" ++msgstr "Beklenmeyen komut satırı argümanları\n" + + #: ../../po/../userinfo.c:411 + #, c-format + diff --git a/usermode-1.111-format-security.patch b/usermode-1.111-format-security.patch deleted file mode 100644 index efd1c49..0000000 --- a/usermode-1.111-format-security.patch +++ /dev/null @@ -1,21 +0,0 @@ -commit b562472980ecd903d13e69279a31fcf77fac57bc -Author: Miloslav Trmač -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) { diff --git a/usermode.spec b/usermode.spec index 062228d..c79e802 100644 --- a/usermode.spec +++ b/usermode.spec @@ -1,14 +1,14 @@ Summary: Tools for certain user account management tasks Name: usermode -Version: 1.111 -Release: 14%{?dist} +Version: 1.112 +Release: 1%{?dist} License: GPLv2+ Group: Applications/System URL: https://pagure.io/usermode/ Source: https://releases.pagure.org/usermode/usermode-%{version}.tar.xz Source1: config-util -# Upstream commit b562472980ecd903d13e69279a31fcf77fac57bc -Patch0: usermode-1.111-format-security.patch +# Corrects missing `\n' in `po/tr.po' +Patch0: translations.patch Requires: pam, passwd, util-linux # https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/IJFYI5Q2BYZKIGDFS2WLOBDUSEGWHIKV/ BuildRequires: gcc @@ -41,8 +41,8 @@ graphical tools for certain account management tasks. %prep %setup -q - -%patch0 -p1 -b .format-security +%patch0 -p1 +./autogen.sh %build %configure --with-selinux @@ -96,6 +96,10 @@ done %{_datadir}/applications/* %changelog +* Thu Feb 22 2018 Jiri Kucera - 1.112-1 +- Update to usermode-1.112 + Resolves #1269643 + * Wed Feb 21 2018 Jiri Kucera - 1.111-14 - Added missing gcc dependency From 4e359c182a2191197f520e94e6bcbcc8827c5899 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 08:20:46 +0000 Subject: [PATCH 29/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_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 c79e802..a94cf53 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: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/System URL: https://pagure.io/usermode/ @@ -96,6 +96,9 @@ done %{_datadir}/applications/* %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 1.112-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Thu Feb 22 2018 Jiri Kucera - 1.112-1 - Update to usermode-1.112 Resolves #1269643 From 6569117db50fe0b1adef017563b2e0217c04110a Mon Sep 17 00:00:00 2001 From: Jiri Kucera Date: Tue, 7 Aug 2018 16:24:20 +0200 Subject: [PATCH 30/62] must be now included manually - resolves #1606624 - inclusion of from is now deprecated - also dropped autotools invocation from spec - also fix bad FSF address --- .gitignore | 1 + fsfaddr.patch | 396 +++++++++++++++++++++++++++++++++++++++++++++ sources | 2 +- sysmacros.patch | 12 ++ translations.patch | 14 -- usermode.spec | 20 ++- 6 files changed, 425 insertions(+), 20 deletions(-) create mode 100644 fsfaddr.patch create mode 100644 sysmacros.patch delete mode 100644 translations.patch diff --git a/.gitignore b/.gitignore index 0070639..928fd93 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ usermode-1.105.tar.xz /usermode-1.110.tar.xz /usermode-1.111.tar.xz /usermode-1.112.tar.xz +/usermode-1.112.autotoolized.tar.xz diff --git a/fsfaddr.patch b/fsfaddr.patch new file mode 100644 index 0000000..769e4b0 --- /dev/null +++ b/fsfaddr.patch @@ -0,0 +1,396 @@ +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 dd92272..8e2e9ef 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (usermode-1.112.tar.xz) = 2c975eea65c74b0b05d9f2faf767862e55ace042b3c6bf072a8cabb724841c3c1e7f55be8afcff459ba599b2077d96c44e11dac4d3cc051cd39ab1e9e3b6451d +SHA512 (usermode-1.112.autotoolized.tar.xz) = b1e6fc846b074d99409eb57347eabc2816bbba075af10bc14f396e09d0b0f89bde7b80546a647ed6e30e958a449138ec04708896c9406359504750bcd05ed819 diff --git a/sysmacros.patch b/sysmacros.patch new file mode 100644 index 0000000..4ba8859 --- /dev/null +++ b/sysmacros.patch @@ -0,0 +1,12 @@ +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/translations.patch b/translations.patch deleted file mode 100644 index b5365bf..0000000 --- a/translations.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/po/tr.po b/po/tr.po -index 84e5021..a28e947 100644 ---- a/po/tr.po -+++ b/po/tr.po -@@ -408,7 +408,7 @@ msgstr "Grafik pencere açılamadı ve uçbirim denetimi bulunamadı.\n" - #: ../../po/../userpasswd.c:37 - #, c-format - msgid "Unexpected command-line arguments\n" --msgstr "Beklenmeyen komut satırı argümanları" -+msgstr "Beklenmeyen komut satırı argümanları\n" - - #: ../../po/../userinfo.c:411 - #, c-format - diff --git a/usermode.spec b/usermode.spec index a94cf53..7a69c11 100644 --- a/usermode.spec +++ b/usermode.spec @@ -1,14 +1,18 @@ Summary: Tools for certain user account management tasks Name: usermode Version: 1.112 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: Applications/System URL: https://pagure.io/usermode/ -Source: https://releases.pagure.org/usermode/usermode-%{version}.tar.xz +Source: https://releases.pagure.org/usermode/usermode-%{version}.autotoolized.tar.xz Source1: config-util -# Corrects missing `\n' in `po/tr.po' -Patch0: translations.patch +# Backport of c5a0bfd174e4a88fcd49fe7a130b37b6779c1a18 +# - inclusion of from is now deprecated +Patch0: sysmacros.patch +# Backport of da01d6325a1a9eb8154abb6a4590c610e8db8ec4 +# - bad FSF address fix +Patch1: fsfaddr.patch Requires: pam, passwd, util-linux # https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/IJFYI5Q2BYZKIGDFS2WLOBDUSEGWHIKV/ BuildRequires: gcc @@ -42,7 +46,7 @@ graphical tools for certain account management tasks. %prep %setup -q %patch0 -p1 -./autogen.sh +%patch1 -p1 %build %configure --with-selinux @@ -96,6 +100,12 @@ done %{_datadir}/applications/* %changelog +* Tue Aug 07 2018 Jiri Kucera - 1.112-3 +- Dropped need to run autotools +- must be now included manually + Resolves #1606624 +- Fixed bad FSF address + * Sat Jul 14 2018 Fedora Release Engineering - 1.112-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 96a21d11bb7d71b3bdde4194982fd00bf170624c Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:29 +0100 Subject: [PATCH 31/62] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- usermode.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/usermode.spec b/usermode.spec index 7a69c11..6b059e5 100644 --- a/usermode.spec +++ b/usermode.spec @@ -3,7 +3,6 @@ Name: usermode Version: 1.112 Release: 3%{?dist} License: GPLv2+ -Group: Applications/System URL: https://pagure.io/usermode/ Source: https://releases.pagure.org/usermode/usermode-%{version}.autotoolized.tar.xz Source1: config-util @@ -23,7 +22,6 @@ BuildRequires: util-linux %package gtk Summary: Graphical tools for certain user account management tasks -Group: Applications/System Requires: %{name} = %{version}-%{release} %global _hardened_build 1 From 596b834c7749ed3d174de9af3c44e544dd5e4fe2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 10:58:34 +0000 Subject: [PATCH 32/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_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 6b059e5..9864028 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: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ URL: https://pagure.io/usermode/ Source: https://releases.pagure.org/usermode/usermode-%{version}.autotoolized.tar.xz @@ -98,6 +98,9 @@ done %{_datadir}/applications/* %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 1.112-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Tue Aug 07 2018 Jiri Kucera - 1.112-3 - Dropped need to run autotools - must be now included manually From c211b79f7663e04baa93eaefd3a41536d4103d99 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 02:40:47 +0000 Subject: [PATCH 33/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_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 9864028..4dd27b3 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: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ URL: https://pagure.io/usermode/ Source: https://releases.pagure.org/usermode/usermode-%{version}.autotoolized.tar.xz @@ -98,6 +98,9 @@ done %{_datadir}/applications/* %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 1.112-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Feb 03 2019 Fedora Release Engineering - 1.112-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 529d7836706a2c14f2feb3f9693e34383adcaaa3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 02:48:33 +0000 Subject: [PATCH 34/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_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 4dd27b3..3d24816 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: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ URL: https://pagure.io/usermode/ Source: https://releases.pagure.org/usermode/usermode-%{version}.autotoolized.tar.xz @@ -98,6 +98,9 @@ done %{_datadir}/applications/* %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 1.112-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sat Jul 27 2019 Fedora Release Engineering - 1.112-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 81f05893225b801ab026061ab0ebb70a186d3e1a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 13:27:05 +0000 Subject: [PATCH 35/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_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 3d24816..79a0d81 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: 6%{?dist} +Release: 7%{?dist} License: GPLv2+ URL: https://pagure.io/usermode/ Source: https://releases.pagure.org/usermode/usermode-%{version}.autotoolized.tar.xz @@ -98,6 +98,9 @@ done %{_datadir}/applications/* %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 1.112-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jan 31 2020 Fedora Release Engineering - 1.112-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From e4aaf906a8a583d4996c5b46811b1b927e74ed1f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 09:33:55 +0000 Subject: [PATCH 36/62] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- usermode.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/usermode.spec b/usermode.spec index 79a0d81..bc74a70 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: 7%{?dist} +Release: 8%{?dist} License: GPLv2+ URL: https://pagure.io/usermode/ Source: https://releases.pagure.org/usermode/usermode-%{version}.autotoolized.tar.xz @@ -98,6 +98,10 @@ done %{_datadir}/applications/* %changelog +* Sat Aug 01 2020 Fedora Release Engineering - 1.112-8 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 1.112-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From a17faee8fd739d6966a3a248578801e1827e275b Mon Sep 17 00:00:00 2001 From: Jiri Kucera Date: Wed, 9 Sep 2020 13:37:35 +0200 Subject: [PATCH 37/62] Do not use deprecated selinux headers Resolves: #1865598 --- selinux_deprecated.patch | 49 ++++++++++++++++++++++++++++++++++++++++ usermode.spec | 10 +++++++- 2 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 selinux_deprecated.patch diff --git a/selinux_deprecated.patch b/selinux_deprecated.patch new file mode 100644 index 0000000..fbce502 --- /dev/null +++ b/selinux_deprecated.patch @@ -0,0 +1,49 @@ +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/usermode.spec b/usermode.spec index bc74a70..e6c6490 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: 8%{?dist} +Release: 9%{?dist} License: GPLv2+ URL: https://pagure.io/usermode/ Source: https://releases.pagure.org/usermode/usermode-%{version}.autotoolized.tar.xz @@ -12,6 +12,9 @@ Patch0: sysmacros.patch # Backport of da01d6325a1a9eb8154abb6a4590c610e8db8ec4 # - bad FSF address fix Patch1: fsfaddr.patch +# Backport of 48c4085004caad1ec928fa103b7f3e3fe684c826 +# - and are now deprecated +Patch2: selinux_deprecated.patch Requires: pam, passwd, util-linux # https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/IJFYI5Q2BYZKIGDFS2WLOBDUSEGWHIKV/ BuildRequires: gcc @@ -45,6 +48,7 @@ graphical tools for certain account management tasks. %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build %configure --with-selinux @@ -98,6 +102,10 @@ done %{_datadir}/applications/* %changelog +* Wed Sep 09 2020 Jiri Kucera - 1.112-9 +- Do not use deprecated selinux headers + Resolves #1865598 + * Sat Aug 01 2020 Fedora Release Engineering - 1.112-8 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 5ebd2b55e6b846f57044a71313b666d6f693cebb Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 9 Jan 2021 00:30:44 +0000 Subject: [PATCH 38/62] 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 39/62] 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 40/62] - 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 41/62] 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 42/62] 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 43/62] 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 44/62] - 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 45/62] - 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 46/62] 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 47/62] 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 48/62] 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 49/62] 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 50/62] 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 51/62] 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 52/62] 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 53/62] 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 54/62] 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 55/62] 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 56/62] 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 57/62] 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 58/62] 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 59/62] 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 60/62] 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 61/62] 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 62/62] 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