- 1.74 - patch from Mathew Miller

- changed build policy

.cvsignore

@@ -1 +1,3 @@
-usermode-1.60.tar.gz
+usermode-1.72.tar.gz
+usermode-1.73.tar.bz2
+usermode-1.74.tar.bz2

sources

@@ -1 +1 @@
-0f05a2f9f9deb2a08b803dc204416046  usermode-1.60.tar.gz
+1c78136b3274e6d85f10343c075a8494  usermode-1.74.tar.bz2

usermode.spec

@@ -1,19 +1,26 @@
+%if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1}
+%define WITH_SELINUX 1
+%endif
+
 %define build6x 0
 Summary: Tools for certain user account management tasks.
 Name: usermode
-Version: 1.60
+Version: 1.74
 Release: 1
 License: GPL
 Group: Applications/System
-Source: usermode-%{version}.tar.gz
+Source: usermode-%{version}.tar.bz2
 %if %{build6x}
 Requires: util-linux, pam >= 0.66-5
 %else
-Requires: util-linux, pam >= 0.75-37, /etc/pam.d/system-auth
+Requires: util-linux, pam >= 0.75-37, /etc/pam.d/system-auth, passwd
 %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
@@ -38,9 +45,14 @@ graphical tools for certain account management tasks.
 
 %prep
 %setup -q
+./autogen.sh
 
 %build
-%configure
+%configure \
+%if %{WITH_SELINUX}
+	--with-selinux 
+%endif
+
 make
 
 %install
@@ -60,9 +72,7 @@ for wrappedapp in halt reboot poweroff ; do
 %endif
 done
 %if ! %{build6x}
-install -m644 pam_timestamp_init.console $RPM_BUILD_ROOT/etc/security/console.apps/pam_timestamp_init
-install -m644 pam_timestamp_init.pamd    $RPM_BUILD_ROOT/etc/pam.d/pam_timestamp_init
-ln -sf consolehelper $RPM_BUILD_ROOT/%{_bindir}/pam_timestamp_init
+rm -f $RPM_BUILD_ROOT/%{_bindir}/shutdown
 %endif
 
 %find_lang %{name}
@@ -104,9 +114,169 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/*
 %{_datadir}/applications/*
 
-# If you're updating translations, do me a favor and bump the RELEASE number,
-# and not the VERSION number.  Version numbers indicate CODE changes.
 %changelog
+* Wed Oct 20 2004 Jindrich Novy <jnovy@redhat.con> 1.74-1
+- add patch from Mathew Miller (mattdm@mattdm.org) to use
+  own user's password instead of root's in authentization
+  (the user must be a member of specific group to enable it)
+
+* Mon Oct 04 2004 Jindrich Novy <jnovy@redhat.com> 1.73-1
+- add support to configure.in for more languages
+- update translations from upstream
+- generate build scripts by autogen.sh
+
+* Tue Sep 28 2004 Rik van Riel <riel@redhat.com> 1.72-2
+- add dependency on passwd (bz #125010)
+- make sure the Release: isn't part of the path name and tarball name
+
+* 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)