diff --git a/.gitignore b/.gitignore index 0e2dc37..928fd93 100644 --- a/.gitignore +++ b/.gitignore @@ -8,5 +8,3 @@ 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 -/usermode-1.114.tar.xz diff --git a/fix-sast.patch b/fix-sast.patch deleted file mode 100644 index 755ff3e..0000000 --- a/fix-sast.patch +++ /dev/null @@ -1,36 +0,0 @@ -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/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/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/sources b/sources index 5065b51..8e2e9ef 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (usermode-1.114.tar.xz) = 703eb218704c7a11cdce25a71f4fc91bf4f042a8b185f79f3954699081c0db8a6234ad6f11738d8b2fe6a492a03d029cbe01762a47869edc473e4fbaa6e0ee32 +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/usermode.spec b/usermode.spec index 048552f..e6c6490 100644 --- a/usermode.spec +++ b/usermode.spec @@ -1,36 +1,31 @@ -# 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: 17%{?dist} -License: GPL-2.0-or-later -URL: https://pagure.io/%{name}/ -Source: https://releases.pagure.org/%{name}/%{name}-%{version}.tar.xz +Version: 1.112 +Release: 9%{?dist} +License: GPLv2+ +URL: https://pagure.io/usermode/ +Source: https://releases.pagure.org/usermode/usermode-%{version}.autotoolized.tar.xz Source1: config-util -Patch1: fix-sast.patch +# 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 Requires: pam, passwd, util-linux # https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/IJFYI5Q2BYZKIGDFS2WLOBDUSEGWHIKV/ -BuildRequires: make BuildRequires: gcc -BuildRequires: gettext, glib2-devel, intltool -%if %{with gtk} -BuildRequires: desktop-file-utils, gtk2-devel, startup-notification-devel, libSM-devel -%endif -BuildRequires: libblkid-devel, libselinux-devel, libuser-devel -BuildRequires: pam-devel, perl-XML-Parser +BuildRequires: 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: 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 @@ -39,7 +34,6 @@ 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 @@ -49,31 +43,29 @@ 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 -%patch -P 1 -p 1 +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 %build -%configure --with-selinux --without-fexecve %{!?with_gtk:--without-gtk} +%configure --with-selinux -%make_build +make %{?_smp_mflags} %install -%make_install +make install DESTDIR=$RPM_BUILD_ROOT 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 @@ -81,21 +73,17 @@ for i in redhat-userinfo.desktop redhat-userpasswd.desktop \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ $RPM_BUILD_ROOT%{_datadir}/applications/$i done -%endif %find_lang %{name} %files -f %{name}.lang -%license COPYING -%doc ChangeLog NEWS README -%attr(4711,root,root) /%{_sbindir}/userhelper +%doc COPYING ChangeLog NEWS README +%attr(4711,root,root) /usr/sbin/userhelper %{_bindir}/consolehelper %{_mandir}/man8/userhelper.8* %{_mandir}/man8/consolehelper.8* -%dir /etc/security/console.apps %config(noreplace) /etc/security/console.apps/config-util -%if %{with gtk} %files gtk %{_bindir}/usermount %{_mandir}/man1/usermount.1* @@ -112,73 +100,8 @@ done %{_datadir}/%{name} %{_datadir}/pixmaps/* %{_datadir}/applications/* -%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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - * Wed Sep 09 2020 Jiri Kucera - 1.112-9 - Do not use deprecated selinux headers Resolves #1865598