- Update to usermode-1.103

- Use the four-parameter version of %%defattr
- Be more paranoid about dropping privileges
- Set PAM_TTY

.cvsignore

@@ -1 +1 @@
-usermode-1.91.1.tar.bz2
+usermode-1.103.tar.bz2

Makefile

@@ -1,6 +1,21 @@
 # Makefile for source rpm: usermode
-# $Id$
+# $Id: Makefile,v 1.2 2007/10/15 19:29:38 notting Exp $
 NAME := usermode
 SPECFILE = $(firstword $(wildcard *.spec))
 
-include ../common/Makefile.common
+define find-makefile-common
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+endef
+
+MAKEFILE_COMMON := $(shell $(find-makefile-common))
+
+ifeq ($(MAKEFILE_COMMON),)
+# attempt a checkout
+define checkout-makefile-common
+test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
+endef
+
+MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
+endif
+
+include $(MAKEFILE_COMMON)

sources

@@ -1 +1 @@
-d036105f567bf0649bbec0c5866a0f81  usermode-1.91.1.tar.bz2
+f3650586d3199b5ccefd6ab0b35c844c  usermode-1.103.tar.bz2

usermode.spec

@@ -1,23 +1,17 @@
-%if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1}
-%define WITH_SELINUX 1
-%endif
-
 Summary: Tools for certain user account management tasks
 Name: usermode
-Version: 1.91.1
+Version: 1.103
-Release: 1
+Release: 1%{?dist}
-License: GPL
+License: GPLv2+
 Group: Applications/System
-Source: usermode-%{version}.tar.bz2
+URL: https://fedorahosted.org/usermode/
-Requires: util-linux, pam >= 0.75-37, /etc/pam.d/system-auth, passwd
+Source: https://fedorahosted.org/releases/u/s/usermode/usermode-%{version}.tar.bz2
-Conflicts: SysVinit < 2.74-14
+Requires: pam, passwd, util-linux
-BuildRequires: desktop-file-utils, e2fsprogs-devel, glib2-devel, gtk2-devel
+BuildRequires: desktop-file-utils, gettext, glib2-devel, gtk2-devel, intltool
-BuildRequires: libglade2-devel, libuser-devel, pam-devel, util-linux
+BuildRequires: libblkid-devel, libSM-devel, libselinux-devel, libuser-devel
-BuildRequires: perl-XML-Parser, libattr-devel, libSM-devel, gettext
+BuildRequires: pam-devel, perl-XML-Parser, startup-notification-devel
-%if %{WITH_SELINUX}
+BuildRequires: util-linux
-BuildRequires: libselinux-devel >= 1.17.13-2
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-%endif
-BuildRoot: %{_tmppath}/%{name}-root
 
 %package gtk
 Summary: Graphical tools for certain user account management tasks
@@ -43,52 +37,45 @@ graphical tools for certain account management tasks.
 %setup -q
 
 %build
-%configure \
+%configure --with-selinux
-%if %{WITH_SELINUX}
-	--with-selinux
-%endif
 
-make
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
 
 # make userformat symlink to usermount
 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 -m644 $wrappedapp $RPM_BUILD_ROOT/etc/security/console.apps/${wrappedapp}
+	install -p -m644 $wrappedapp \
-	cp shutdown.pamd $RPM_BUILD_ROOT/etc/pam.d/${wrappedapp}
+		$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
 
-for i in redhat-userinfo.desktop redhat-userpasswd.desktop; do
+for i in redhat-userinfo.desktop redhat-userpasswd.desktop \
-  cat >>$RPM_BUILD_ROOT%{_datadir}/applications/$i <<EOF
+	redhat-usermount.desktop; do
-NoDisplay=true
+	echo 'NotShowIn=GNOME;KDE;' >>$RPM_BUILD_ROOT%{_datadir}/applications/$i
-EOF
 	desktop-file-install --vendor redhat --delete-original \
 		--dir $RPM_BUILD_ROOT%{_datadir}/applications \
-    --remove-category Application			    \
-    --add-category X-GNOME-PersonalSettings		    \
 		$RPM_BUILD_ROOT%{_datadir}/applications/$i
 done
 
-desktop-file-install --vendor redhat --delete-original       \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications              \
-  --remove-category Application				     \
-  $RPM_BUILD_ROOT%{_datadir}/applications/redhat-usermount.desktop
-
 %find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
-%defattr(-,root,root)
+%defattr(-,root,root,-)
+%doc COPYING ChangeLog NEWS README
 %attr(4711,root,root) /usr/sbin/userhelper
 %{_bindir}/consolehelper
 %{_mandir}/man8/userhelper.8*
@@ -101,26 +88,141 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) /etc/pam.d/halt
 %config(noreplace) /etc/pam.d/reboot
 %config(noreplace) /etc/pam.d/poweroff
-%config /etc/security/console.apps/halt
+%config(noreplace) /etc/security/console.apps/config-util
-%config /etc/security/console.apps/reboot
+%config(noreplace) /etc/security/console.apps/halt
-%config /etc/security/console.apps/poweroff
+%config(noreplace) /etc/security/console.apps/reboot
+%config(noreplace) /etc/security/console.apps/poweroff
 
 %files gtk
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_bindir}/usermount
-%{_bindir}/userformat
 %{_mandir}/man1/usermount.1*
+%{_bindir}/userformat
+%{_mandir}/man1/userformat.1*
 %{_bindir}/userinfo
 %{_mandir}/man1/userinfo.1*
 %{_bindir}/userpasswd
 %{_mandir}/man1/userpasswd.1*
 %{_bindir}/consolehelper-gtk
+%{_mandir}/man8/consolehelper-gtk.8*
 %{_bindir}/pam-panel-icon
+%{_mandir}/man1/pam-panel-icon.1*
 %{_datadir}/%{name}
 %{_datadir}/pixmaps/*
 %{_datadir}/applications/*
 
 %changelog
+* Tue Feb 16 2010 Miloslav Trmač <mitr@redhat.com> - 1.103-1
+- Update to usermode-1.103
+
+* Fri Feb  5 2010 Miloslav Trmač <mitr@redhat.com> - 1.102-2
+- Use %%{?_smp_mflags}
+- Use the four-parameter version of %%defattr
+- Be more paranoid about dropping privileges
+  Resolves: #562194
+- Set PAM_TTY
+  Resolves: #562195
+
+* Mon Oct  5 2009 Miloslav Trmač <mitr@redhat.com> - 1.102-1
+- Update to usermode-1.102
+
+* Tue Sep 15 2009 Miloslav Trmač <mitr@redhat.com> - 1.101-1
+- Update to usermode-1.101
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.100-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Jun 29 2009 Miloslav Trmač <mitr@redhat.com> - 1.100-3
+- Require libblkid-devel instead of e2fsprogs-devel
+
+* Tue Apr 14 2009 Miloslav Trmač <mitr@redhat.com> - 1.100-2
+- Add BuildRequires: intltool
+
+* Tue Apr 14 2009 Miloslav Trmač <mitr@redhat.com> - 1.100-1
+- Update to usermode-1.100
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.99-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Wed Jan 14 2009 Miloslav Trmač <mitr@redhat.com> - 1.99-2
+- Fix problems pointed out in merge review:
+  - Drop Conflicts: SysVinit < very-old
+  - Remove very old version requirements from Requires and BuildRequires
+  - Make /etc/security/console.apps/* %%config(noreplace)
+  - Update BuildRoot
+
+* Tue Nov 11 2008 Miloslav Trmač <mitr@redhat.com> - 1.99-1
+- Update to usermode-1.99
+  Resolves: #470834
+
+* Thu Nov  6 2008 Miloslav Trmač <mitr@redhat.com> - 1.98.1-2
+- Hide usermount from GNOME and KDE menus
+  Resolves: #440029
+- Only hide userinfo and userpasswd in GNOME and KDE
+
+* Tue Oct 28 2008 Miloslav Trmač <mitr@redhat.com> - 1.98.1-1
+- Update to usermode-1.98.1-1
+
+* Sun Aug  3 2008 Miloslav Trmač <mitr@redhat.com> - 1.98-1
+- Support dialogs with no text entries
+- Preserve timestamps of some installed files
+  Resolves: #456749
+- Remove /usr/X11R6/bin from the default path.
+  Resolves: #446849
+- Left-justify messages
+- Preserve file timestamps where possible.
+
+* Thu May  1 2008 Miloslav Trmač <mitr@redhat.com> - 1.97-1
+- Fix display of '_' in prompts
+  Resolves: #444545
+
+* Thu Apr 10 2008 Miloslav Trmač <mitr@redhat.com> - 1.96.1-1
+- New release with updated translations
+
+* Fri Feb 29 2008 Miloslav Trmač <mitr@redhat.com> - 1.96-1
+- Remove code that overrides SELinux contexts of processes started by
+  userhelper.
+  Related: #247967
+- Delete the WITH_SELINUX variable.
+
+* Mon Feb 25 2008 Miloslav Trmač <mitr@redhat.com> - 1.95-1
+- New home page at https://fedorahosted.org/usermode/
+- Correctly preserve exit code when SESSION=yes
+- Fix minor errors in the .desktop files
+- Ship documentation
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 1.94-2
+- Autorebuild for GCC 4.3
+
+* Thu Jan 10 2008 Miloslav Trmač <mitr@redhat.com> - 1.94-1
+- Add support for including files from wrapper configuration files.  Original
+  patch by Carlo de Wolf.
+  Resolves: #426095
+- Add /etc/security/console.apps/config-util for use by system-config-*
+- Rename sr@Latn.po to sr@latin.po
+  Resolves: #425842
+
+* Tue Oct 16 2007 Miloslav Trmač <mitr@redhat.com> - 1.93.1-1
+- New release with updated translations
+  Resolves: #332441
+- Build with startup notification
+  Resolves: #294591
+
+* Wed Sep  5 2007 Miloslav Trmač <mitr@redhat.com> - 1.93-1
+- Fix handling of PAM conversations with no questions
+  Resolves: #267361
+- Update License:
+
+* Mon Jun 11 2007 Miloslav Trmač <mitr@redhat.com> - 1.92-1
+- Fix userhelper hangs in non-UTF8 locales
+  Resolves: #242420
+- Clean up menu categories in desktop files
+
+* Sat Jun  9 2007 Miloslav Trmač <mitr@redhat.com> - 1.91.2-1
+- Show the user we're authenticating as in an i18n-safe way.
+  Resolves: #233210
+- Remove BuildRequires: libattr-devel
+
 * Thu Apr 19 2007 Miloslav Trmac <mitr@redhat.com> - 1.91.1-1
 - New release with updated translations