- 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.69-1.tar.gz
+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 @@
-ce40aa888460625184e432b67e3591e4  usermode-1.69-1.tar.gz
+a7f65656f662ceb7e115b68289e90e6d  usermode-1.72-1.tar.gz

usermode.spec

@@ -1,11 +1,11 @@
 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1}
-%define WITH_SELINUX 0
+%define WITH_SELINUX 1
 %endif
 
 %define build6x 0
 Summary: Tools for certain user account management tasks.
 Name: usermode
-Version: 1.69
+Version: 1.72
 Release: 1
 License: GPL
 Group: Applications/System
@@ -18,6 +18,9 @@ Requires: util-linux, pam >= 0.75-37, /etc/pam.d/system-auth
 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
@@ -67,9 +70,6 @@ for wrappedapp in halt reboot poweroff ; do
 	cp shutdown.pamd $RPM_BUILD_ROOT/etc/pam.d/${wrappedapp}
 %endif
 done
-%if %{WITH_SELINUX}
-install -m644 userhelper_context $RPM_BUILD_ROOT/etc/security
-%endif
 %if ! %{build6x}
 rm -f $RPM_BUILD_ROOT/%{_bindir}/shutdown
 %endif
@@ -98,9 +98,6 @@ rm -rf $RPM_BUILD_ROOT
 %config /etc/security/console.apps/halt
 %config /etc/security/console.apps/reboot
 %config /etc/security/console.apps/poweroff
-%if %{WITH_SELINUX}
-%config /etc/security/userhelper_context
-%endif
 
 %files gtk
 %defattr(-,root,root)
@@ -117,6 +114,73 @@ rm -rf $RPM_BUILD_ROOT
 %{_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
@@ -179,7 +243,7 @@ rm -rf $RPM_BUILD_ROOT
 - translation updates
 
 * Wed Sep  4 2002 Nalin Dahyabhai <nalin@redhat.com> 1.63-1
-- userhelper: swallow the exec'd program's exit stauts, which would be
+- 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