- Remove Patch0 line

- fix `make distcheck'
- use proper value types for Terminal keys in desktop entries
- remove upstreamed mkfs patch

.cvsignore

@@ -1 +1,5 @@
-usermode-1.42.tar.bz2
+usermode-1.71-1.tar.gz
+usermode-1.71-2.tar.gz
+usermode-1.71-3.tar.gz
+usermode-1.71-4.tar.gz
+usermode-1.72-1.tar.gz

sources

@@ -1 +1 @@
-174eee12925e631cbe23842ad5469c78  usermode-1.42.tar.bz2
+a7f65656f662ceb7e115b68289e90e6d  usermode-1.72-1.tar.gz

usermode.spec

@@ -1,62 +1,79 @@
+%if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1}
+%define WITH_SELINUX 1
+%endif
+
 %define build6x 0
-Summary: Graphical tools for certain user account management tasks.
+Summary: Tools for certain user account management tasks.
 Name: usermode
-Version: 1.42
+Version: 1.72
 Release: 1
-Copyright: GPL
+License: GPL
 Group: Applications/System
-Source: usermode-%{version}.tar.bz2
+Source: usermode-%{version}-%{release}.tar.gz
 %if %{build6x}
 Requires: util-linux, pam >= 0.66-5
 %else
-Requires: util-linux, pam >= 0.66-5, /etc/pam.d/system-auth
+Requires: util-linux, pam >= 0.75-37, /etc/pam.d/system-auth
 %endif
 Conflicts: SysVinit < 2.74-14
+BuildPrereq: desktop-file-utils, glib2-devel, gtk2-devel
+BuildPrereq: libglade2-devel, libuser-devel, pam-devel, util-linux
+%if %{WITH_SELINUX}
+BuildPrereq: libselinux-devel >= 1.17.13-2
+%endif
 BuildRoot: %{_tmppath}/%{name}-root
 
+%package gtk
+Summary: Graphical tools for certain user account management tasks.
+Group: Applications/System
+Requires: %{name} = %{version}-%{release}
+
 %description
-The usermode package contains several graphical tools for users:
+The usermode package contains the userhelper program, which can be
+used to allow configured programs to be run with superuser privileges
+by ordinary users.
+
+%description gtk
+The usermode-gtk package contains several graphical tools for users:
 userinfo, usermount and userpasswd.  Userinfo allows users to change
 their finger information.  Usermount lets users mount, unmount, and
 format filesystems.  Userpasswd allows users to change their
 passwords.
 
-Install the usermode package if you would like to provide users with
+Install the usermode-gtk package if you would like to provide users with
 graphical tools for certain account management tasks.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}-%{release}
 
 %build
+%configure \
+%if %{WITH_SELINUX}
+	--with-selinux 
+%endif
+
 make
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make PREFIX=$RPM_BUILD_ROOT \
-	bindir=%{_bindir} \
-	mandir=%{_mandir} \
-	sbindir=%{_sbindir} \
-	datadir=%{_datadir} \
-	install install-man install-po
+make install DESTDIR=$RPM_BUILD_ROOT
 
-# Stuff from pam_console, for sysvinit. Here for lack of a better
-# place....
+# 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 wrapapp in halt reboot poweroff ; do
-  ln -sf consolehelper $RPM_BUILD_ROOT/usr/bin/$wrapapp
-  touch $RPM_BUILD_ROOT/etc/security/console.apps/$wrapapp
+for wrappedapp in halt reboot poweroff ; do
+	ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/${wrappedapp}
+	install -m644 $wrappedapp $RPM_BUILD_ROOT/etc/security/console.apps/${wrappedapp}
 %if %{build6x}
-  cp shutdown.pamd.6x $RPM_BUILD_ROOT/etc/pam.d/$wrapapp
+	cp shutdown.pamd.6x $RPM_BUILD_ROOT/etc/pam.d/${wrappedapp}
 %else
-  cp shutdown.pamd $RPM_BUILD_ROOT/etc/pam.d/$wrapapp
+	cp shutdown.pamd $RPM_BUILD_ROOT/etc/pam.d/${wrappedapp}
 %endif
 done
+%if ! %{build6x}
+rm -f $RPM_BUILD_ROOT/%{_bindir}/shutdown
+%endif
 
-install -m755 shutdown $RPM_BUILD_ROOT%{_bindir}/
-
-# Strip it!
-strip $RPM_BUILD_ROOT%{_bindir}/* $RPM_BUILD_ROOT%{_sbindir}/* || :
-      
 %find_lang %{name}
 
 %clean
@@ -64,17 +81,10 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%{_bindir}/usermount
-%{_mandir}/man1/usermount.1*
-%{_bindir}/userinfo
-%{_mandir}/man1/userinfo.1*
 %attr(4711,root,root) /usr/sbin/userhelper
-%{_mandir}/man8/userhelper.8*
-%{_bindir}/userpasswd
-%{_mandir}/man1/userpasswd.1*
 %{_bindir}/consolehelper
+%{_mandir}/man8/userhelper.8*
 %{_mandir}/man8/consolehelper.8*
-%config /etc/X11/applnk/System/*
 # PAM console wrappers
 %{_bindir}/halt
 %{_bindir}/reboot
@@ -82,15 +92,318 @@ rm -rf $RPM_BUILD_ROOT
 %if %{build6x}
 %{_bindir}/shutdown
 %endif
-%{_datadir}/pixmaps/*
 %config(noreplace) /etc/pam.d/halt
 %config(noreplace) /etc/pam.d/reboot
 %config(noreplace) /etc/pam.d/poweroff
-%config(missingok) /etc/security/console.apps/halt
-%config(missingok) /etc/security/console.apps/reboot
-%config(missingok) /etc/security/console.apps/poweroff
+%config /etc/security/console.apps/halt
+%config /etc/security/console.apps/reboot
+%config /etc/security/console.apps/poweroff
+
+%files gtk
+%defattr(-,root,root)
+%{_bindir}/usermount
+%{_mandir}/man1/usermount.1*
+%{_bindir}/userinfo
+%{_mandir}/man1/userinfo.1*
+%{_bindir}/userpasswd
+%{_mandir}/man1/userpasswd.1*
+%{_bindir}/consolehelper-gtk
+%{_bindir}/pam-panel-icon
+%{_datadir}/%{name}
+%{_datadir}/pixmaps/*
+%{_datadir}/applications/*
 
 %changelog
+* Mon Sep 27 2004 Ray Strode <rstrode@redhat.com> 1.72-1
+- remove X-Red-Hat-Base category from userinfo.desktop
+- fix `make distcheck'
+- use proper value types for Terminal keys in desktop entries
+- remove upstreamed mkfs patch
+
+* Fri Sep 24 2004 Jindrich Novy <jnovy@redhat.com> 1.71-4
+- updated dependencies to SELinux
+
+* Wed Sep 22 2004 Jindrich Novy <jnovy@redhat.com> 1.71-3
+- installation to Preferences/More Preferences as a request
+  of Ray Strode (rstrode@redhat.com) and #131605
+
+* Mon Sep 20 2004 Jindrich Novy <jnovy@redhat.com> 1.71-2
+- added "-I" option to mkfs in the .mkfs patch (#117793)
+
+* Thu Aug 26 2004 Alexander Larsson <alexl@redhat.com> - 1.71-1
+- consolehelper: work if root is readonly
+
+* Mon Jul 12 2004 Dan Walsh <dwalsh@redhat.com> 1.70-8
+- Additional diffs from NSA
+- Clean up comments
+
+* Thu Jul 8 2004 Dan Walsh <dwalsh@redhat.com> 1.70-7
+- More fixes for SELinux.  roll back to only use root for auth.
+- Add getenforce checks
+- Add root_passwd check
+
+* Tue Jul 1 2004 Dan Walsh <dwalsh@redhat.com> 1.70-6
+- More fixes to make targeted policy work correctly
+
+* Tue Jul 1 2004 Dan Walsh <dwalsh@redhat.com> 1.70-5
+- Fix to use root if user not defined
+
+* Tue May 25 2004 Dan Walsh <dwalsh@redhat.com> 1.70-4
+- Support new policy files
+
+* Thu May 20 2004 Dan Walsh <dwalsh@redhat.com> 1.70-3
+- Change user context to default name if username context not in passwd file
+
+* Thu Apr 1 2004 Dan Walsh <dwalsh@redhat.com> 1.70-1
+- Change user context to "root" if username context "user_t" not in passwd file
+
+* Wed Mar 31 2004 Nalin Dahyabhai <nalin@redhat.com> 1.70-1
+- fix accidental mixup of role and type setting up new selinux context
+- log the new selinux context if we're running an app in a new selinux context
+
+* Sat Feb 21 2004 Dan Walsh <dwalsh@redhat.com> 1.69-5
+- Change to fall back to root auth if selinux user does not exist
+
+* Tue Jan 27 2004 Dan Walsh <dwalsh@redhat.com> 1.69-4
+- fix call to is_selinux_enabled
+
+* Mon Dec  8 2003 Nalin Dahyabhai <nalin@redhat.com>
+- fix warning in userinfo which would cause random early exit (#111409)
+- clean up warnings
+
+* Tue Nov 25 2003 Dan Walsh <dwalsh@redhat.com> 1.69-3.sel
+- Fix handling of roles from console file
+
+* Fri Nov 14 2003 Nalin Dahyabhai <nalin@redhat.com>
+- don't disable use of deprecated GLib and GTK+ APIs, reported by the
+  mysterious Pierre-with-no-last-name
+
+* Thu Oct 30 2003 Dan Walsh <dwalsh@redhat.com> 1.69-2.sel
+- Turn on sleinux
+
+* Thu Oct 23 2003 Nalin Dahyabhai <nalin@redhat.com> 1.69-1
+- all around: cleanups
+- consolehelper: coalesce multiple messages from PAM again
+- usermount: handle user-not-allowed-to-control-mounts error correctly (#100457)
+- userhelper: trim off terminating commas when changing chfn info
+
+* Mon Oct 6 2003 Dan Walsh <dwalsh@redhat.com> 1.68-8
+
+* Wed Oct 1 2003 Dan Walsh <dwalsh@redhat.com> 1.68-7.sel
+- Fix to use /etc instead of /usr/etc
+
+* Thu Sep 25 2003 Dan Walsh <dwalsh@redhat.com> 1.68-6.sel
+- turn on selinux
+- add default userhelper context file
+
+* Thu Sep 25 2003 Nalin Dahyabhai <nalin@redhat.com> 1.68-6
+- make selinux a configure option to avoid screwing with makefiles
+
+* Thu Sep 25 2003 Nalin Dahyabhai <nalin@redhat.com> 1.68-5
+- rebuild
+
+* Mon Sep 8 2003 Dan Walsh <dwalsh@redhat.com> 1.68-4
+- turn off selinux
+
+* Fri Sep 5 2003 Dan Walsh <dwalsh@redhat.com> 1.68-3.sel
+- turn on selinux
+
+* Tue Jul 29 2003 Dan Walsh <dwalsh@redhat.com> 1.68-2
+- Add SELinux support
+
+* Wed Apr 16 2003 Nalin Dahyabhai <nalin@redhat.com> 1.68-1
+- update translations
+- suppress the error dialog from user cancel
+
+* Mon Feb 24 2003 Elliot Lee <sopwith@redhat.com>
+- rebuilt
+
+* Thu Feb 20 2003 Nalin Dahyabhai <nalin@redhat.com> 1.67-1
+- work around GTK+ clearing DESKTOP_STARTUP_ID at gtk_init() time, so that
+  startup notification actually works (#84684)
+
+* Wed Feb 19 2003 Nalin Dahyabhai <nalin@redhat.com> 1.66-1
+- consolehelper-gtk: complete startup notification at startup
+- userhelper: pass startup notification data to consolehelper-gtk
+- consolehelper-gtk: setup startup notification for children if userhelper
+  requests it
+
+* Mon Jan 27 2003 Nalin Dahyabhai <nalin@redhat.com> 1.65-2
+- rebuild
+
+* Mon Jan 20 2003 Nalin Dahyabhai <nalin@redhat.com> 1.65-1
+- pass-through DESKTOP_STARTUP_ID
+
+* Mon Jan  6 2003 Nalin Dahyabhai <nalin@redhat.com> 1.64-1
+- set the requesting user PAM item to the invoking user's name (#81255)
+
+* Mon Nov 11 2002 Nalin Dahyabhai <nalin@redhat.com> 1.63-2
+- remove directory names from PAM config files, allowing the same config
+  files to work for both arches on multilib boxes
+- translation updates
+
+* Wed Sep  4 2002 Nalin Dahyabhai <nalin@redhat.com> 1.63-1
+- userhelper: swallow the exec'd program's exit status, which would be
+  misinterpreted by consolehelper anyway
+
+* Tue Sep  3 2002 Nalin Dahyabhai <nalin@redhat.com> 1.62-1
+- consolehelper: suppress dialog on successful execution
+- userhelper: return 0 on success, not 1 (what was I *thinking*?)
+
+* Mon Sep  2 2002 Nalin Dahyabhai <nalin@redhat.com> 1.61-1
+- userinfo: exit properly on escape. handle site_info field properly. go
+  insensitive while running child process.
+- userpasswd: exit properly on cancel.
+- all of the above: reap the child instead of checking for pipe close -- this
+  way is more robust (#68578,72684).
+- usermount: run mount/umount synchronously. capture stderr and display in a
+  dialog. desensitize action buttons when no filesystems are selected.
+- consolehelper: display errors if we're attempting to run bogus programs
+  (#72127)
+- translation updates (#70278)
+
+* Wed Aug 14 2002 Nalin Dahyabhai <nalin@redhat.com> 1.60-1
+- reconnect the "cancel" and "ok" buttons in userinfo
+- heed the cancel button when prompting for passwords in userinfo (#68578)
+- translation update
+
+* Wed Aug 14 2002 Nalin Dahyabhai <nalin@redhat.com> 1.59-2
+- change "forget password" to "forget authorization", because we don't actually
+  remember the password (that would be scary, #71476)
+- translation update
+
+* Tue Aug 13 2002 Nalin Dahyabhai <nalin@redhat.com> 1.59-1
+- pam-panel-icon: overhaul, change the 'locked' icon to keyring-small, nix the
+  'unlocked' icon
+- consolehelper-gtk: properly set up the dialog buttons (should be 'cancel/ok'
+  when we're asking questions, was always 'close')
+- disappear pam_timestamp_init
+
+* Wed Aug  7 2002 Nalin Dahyabhai <nalin@redhat.com> 1.58-2
+- install the new 'unlocked' icon
+
+* Tue Aug  6 2002 Jonathan Blandford <jrb@redhat.com>
+- New version.
+
+* Mon Aug  5 2002 Nalin Dahyabhai <nalin@redhat.com> 1.57-1
+- add support for BANNER and BANNER_DOMAIN in the userhelper configuration
+
+* Mon Aug  5 2002 Nalin Dahyabhai <nalin@redhat.com> 1.56-4
+- mark strings in the .glade file as translatable (#70278)
+- translation updates
+
+* Wed Jul 31 2002 Nalin Dahyabhai <nalin@redhat.com> 1.56-3
+- add icons for userpasswd and usermount
+
+* Wed Jul 24 2002 Nalin Dahyabhai <nalin@redhat.com> 1.56-2
+- actually include the icons
+- translation updates
+
+* Tue Jul 23 2002 Nalin Dahyabhai <nalin@redhat.com> 1.56-1
+- userinfo: prevent users from selecting "nologin" as a shell (#68579)
+- don't strip binaries by default; leave that to the buildroot policy
+- use desktop-file-install
+
+* Wed Jun 19 2002 Havoc Pennington <hp@redhat.com>
+- put pam-panel-icon in file list
+
+* Mon May 20 2002 Nalin Dahyabhai <nalin@redhat.com> 1.55-2
+- don't strip binaries which have no special privileges
+
+* Wed May 15 2002 Nalin Dahyabhai <nalin@redhat.com> 1.55-1
+- remove the pixmap we don't use any more (we use stock pixmaps now)
+- update translations
+
+* Thu Apr 16 2002 Nalin Dahyabhai <nalin@redhat.com> 1.54-1
+- suppress even error messages from Xlib when consolehelper calls
+  gtk_init_check() to see if the display is available
+
+* Mon Apr 15 2002 Nalin Dahyabhai <nalin@redhat.com> 1.53-2
+- refresh translations
+
+* Thu Apr 11 2002 Nalin Dahyabhai <nalin@redhat.com> 1.53-1
+- refresh shell variable code from authconfig (#63175)
+
+* Tue Apr  9 2002 Nalin Dahyabhai <nalin@redhat.com> 1.52-2
+- refresh translations
+
+* Mon Apr  1 2002 Nalin Dahyabhai <nalin@redhat.com> 1.52-1
+- attempt to make prompts at the console more meaningful
+- when falling back, reset the entire environment to the user's
+
+* Thu Mar 28 2002 Nalin Dahyabhai <nalin@redhat.com>
+- stop giving the user chances to enter the right password if we get a
+  conversation error reading a response (appears to be masked by libpam)
+  (#62195)
+- always center consolehelper dialog windows
+
+* Wed Mar 27 2002 Nalin Dahyabhai <nalin@redhat.com> 1.51-1
+- patch to make gettext give us UTF-8 strings (which GTK needs) from ynakai
+
+* Fri Mar 22 2002 Nalin Dahyabhai <nalin@redhat.com> 1.50-6
+- update translations
+- actually include the glade files (#61665)
+
+* Mon Mar 11 2002 Nalin Dahyabhai <nalin@redhat.com> 1.50-5
+- update translations
+
+* Mon Feb 25 2002 Nalin Dahyabhai <nalin@redhat.com> 1.50-4
+- rebuild
+
+* Fri Feb 22 2002 Nalin Dahyabhai <nalin@redhat.com> 1.50-3
+- update translations
+
+* Thu Jan 31 2002 Nalin Dahyabhai <nalin@redhat.com> 1.50-2
+- rebuild to fix dependencies
+
+* Thu Jan 31 2002 Nalin Dahyabhai <nalin@redhat.com> 1.50-1
+- fix userpasswd dialog message being incorrect for password changes
+- use a dumb conversation function when text mode is invoked without a tty -- if
+  the service's configuration doesn't call for prompts, then it'll still work
+- port from pwdb to libuser
+- catch child-exit errors correctly again
+- fix keyboard-grabbing
+
+* Wed Jan 23 2002 Nalin Dahyabhai <nalin@redhat.com> 1.49-3
+- add default locations for certain binaries to configure.in
+
+* Thu Jan  3 2002 Nalin Dahyabhai <nalin@redhat.com> 1.49-2
+- munge glade file to use stock items for buttons where possible
+
+* Mon Dec 10 2001 Nalin Dahyabhai <nalin@redhat.com> 1.49-1
+- the console.apps configs shouldn't be missingok
+- fix buildprereqs for gtk2/libglade2
+
+* Tue Dec  4 2001 Nalin Dahyabhai <nalin@redhat.com>
+- more gtk2 changes
+- split off a -gtk subpackage with all of the gtk-specific functionality
+
+* Wed Nov 28 2001 Nalin Dahyabhai <nalin@redhat.com>
+- the grand libglade/gtk2 overhaul
+- allow disabling display of GUI windows by setting "GUI=false" in the
+  console.apps configuration file (default: TRUE)
+- allow disabling display of GUI windows by recognizing a magic option
+  on the command-line of the program being wrapped (NOXOPTION, no default)
+
+* Fri Nov  9 2001 Nalin Dahyabhai <nalin@redhat.com> 1.46-1
+- restore the previous XAUTHORITY setting before opening PAM sessions
+
+* Fri Nov  2 2001 Nalin Dahyabhai <nalin@redhat.com> 1.45-1
+- propagate environment variables from libpam to applications
+
+* Fri Oct  3 2001 Nalin Dahyabhai <nalin@redhat.com> 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
+
+* Tue Aug 28 2001 Trond Eivind Glomsrød <teg@redhat.com> 1.43-1
+- Update translations
+
+* Mon Aug  6 2001 Nalin Dahyabhai <nalin@redhat.com>
+- add build requirements on glib-devel, gtk+-devel, pam-devel (#49726)
+
+* Sun Jun 24 2001 Elliot Lee <sopwith@redhat.com>
+- Bump release + rebuild.
+
 * Wed Feb 14 2001 Preston Brown <pbrown@redhat.com>
 - final translation merge.