Update to usermode-1.111

- Add UGROUPS=wheel to config-util
  Resolves: #688690

.cvsignore

@@ -1 +0,0 @@
-usermode-1.102.tar.bz2

.gitignore

@@ -0,0 +1,8 @@
+usermode-1.105.tar.xz
+/usermode-1.106.tar.xz
+/usermode-1.106.1.tar.xz
+/usermode-1.107.tar.xz
+/usermode-1.108.tar.xz
+/usermode-1.109.tar.xz
+/usermode-1.110.tar.xz
+/usermode-1.111.tar.xz

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: usermode
-# $Id: Makefile,v 1.2 2007/10/15 19:29:38 notting Exp $
-NAME := usermode
-SPECFILE = $(firstword $(wildcard *.spec))
-
-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)

config-util

@@ -0,0 +1,2 @@
+USER=root
+UGROUPS=wheel

sources

@@ -1 +1 @@
-0a8437ef146b8eabbd733959c5cac851  usermode-1.102.tar.bz2
+28ba510fbd8da9f4e86e57d6c31cff29  usermode-1.111.tar.xz

usermode-1.102-PAM_TTY.patch

@@ -1,100 +0,0 @@
-# HG changeset patch
-# User Miloslav Trmač <mitr@redhat.com>
-# Date 1265372688 -3600
-# Node ID 9a7b1e69d0a8213092caf45beb52c07a8d334ea3
-# Parent  8a897830e2d8745a72eb4236f02a981cfdc95528
-Set PAM_TTY if known.
-
-2010-02-05  Miloslav Trmač  <mitr@redhat.com>
-
-	* userhelper.c (set_pam_items): New function.
-	(passwd, chfn, wrap): Use pam_set_items.
-
-diff -r 8a897830e2d8 -r 9a7b1e69d0a8 ChangeLog
---- a/ChangeLog	Thu Feb 04 23:00:17 2010 +0100
-+++ b/ChangeLog	Fri Feb 05 13:24:48 2010 +0100
-@@ -1,3 +1,8 @@
-+2010-02-05  Miloslav Trmač  <mitr@redhat.com>
-+
-+	* userhelper.c (set_pam_items): New function.
-+	(passwd, chfn, wrap): Use pam_set_items.
-+
- 2010-02-04  Miloslav Trmač  <mitr@redhat.com>
- 
- 	* userhelper.c (become_super): Check for failures of the system
-diff -r 8a897830e2d8 -r 9a7b1e69d0a8 userhelper.c
---- a/userhelper.c	Thu Feb 04 23:00:17 2010 +0100
-+++ b/userhelper.c	Fri Feb 05 13:24:48 2010 +0100
-@@ -1102,6 +1102,31 @@
- 	return NULL;
- }
- 
-+/* Set various attributes of DATA, including the requesting user USER. */
-+static void
-+set_pam_items(struct app_data *data, const char *user)
-+{
-+	int retval;
-+	char *tty;
-+
-+	retval = pam_set_item(data->pamh, PAM_RUSER, user);
-+	if (retval != PAM_SUCCESS) {
-+		debug_msg("userhelper: pam_set_item(PAM_RUSER) failed\n");
-+		fail_exit(data, retval);
-+	}
-+
-+	tty = ttyname(STDIN_FILENO);
-+	if (tty != NULL) {
-+		if (strncmp(tty, "/dev/", 5) == 0)
-+			tty += 5;
-+		retval = pam_set_item(data->pamh, PAM_TTY, tty);
-+		if (retval != PAM_SUCCESS) {
-+			debug_msg("userhelper: pam_set_item(PAM_TTY) failed\n");
-+			fail_exit(data, retval);
-+		}
-+	}
-+}
-+
- /* Change the user's password using the indicated conversation function and
-  * application data (which includes the ability to cancel if the user requests
-  * it.  For this task, we don't retry on failure. */
-@@ -1118,11 +1143,7 @@
- 		fail_exit(conv->appdata_ptr, retval);
- 	}
- 
--	retval = pam_set_item(data->pamh, PAM_RUSER, user);
--	if (retval != PAM_SUCCESS) {
--		debug_msg("userhelper: pam_set_item(PAM_RUSER) failed\n");
--		fail_exit(conv->appdata_ptr, retval);
--	}
-+	set_pam_items(data, user);
- 
- 	debug_msg("userhelper: changing password for \"%s\"\n", user);
- 	retval = pam_chauthtok(data->pamh, 0);
-@@ -1195,12 +1216,7 @@
- 		fail_exit(conv->appdata_ptr, retval);
- 	}
- 
--	/* Set the requesting user. */
--	retval = pam_set_item(data->pamh, PAM_RUSER, user);
--	if (retval != PAM_SUCCESS) {
--		debug_msg("userhelper: pam_set_item(PAM_RUSER) failed\n");
--		fail_exit(conv->appdata_ptr, retval);
--	}
-+	set_pam_items(data, user);
- 
- 	/* Try to authenticate the user. */
- 	do {
-@@ -1742,12 +1758,7 @@
- 		fail_exit(conv->appdata_ptr, retval);
- 	}
- 
--	/* Set the requesting user. */
--	retval = pam_set_item(data->pamh, PAM_RUSER, user);
--	if (retval != PAM_SUCCESS) {
--		debug_msg("userhelper: pam_set_item(PAM_RUSER) failed\n");
--		fail_exit(conv->appdata_ptr, retval);
--	}
-+	set_pam_items(data, user);
- 
- 	/* Try to authenticate the user. */
- 	do {

usermode-1.102-paranoia.patch

@@ -1,94 +0,0 @@
-# HG changeset patch
-# User Miloslav Trmač <mitr@redhat.com>
-# Date 1265320817 -3600
-# Node ID 8a897830e2d8745a72eb4236f02a981cfdc95528
-# Parent  0dcd3edc6d56d65d8f02b31a9c807b1c152232c5
-Be more paranoid about manipulating user/group IDs.
-
-2010-02-04  Miloslav Trmač  <mitr@redhat.com>
-
-	* userhelper.c (become_super): Check for failures of the system
-	calls in addition to verifying the expected results.
-	(become_normal): Check for failures of the system
-	calls in addition to verifying the expected results.  Call setregid()
-	as well.  Verify the real gid/uid values.
-
-diff -r 0dcd3edc6d56 -r 8a897830e2d8 ChangeLog
---- a/ChangeLog	Sun Dec 06 17:02:50 2009 +0000
-+++ b/ChangeLog	Thu Feb 04 23:00:17 2010 +0100
-@@ -1,3 +1,11 @@
-+2010-02-04  Miloslav Trmač  <mitr@redhat.com>
-+
-+	* userhelper.c (become_super): Check for failures of the system
-+	calls in addition to verifying the expected results.
-+	(become_normal): Check for failures of the system
-+	calls in addition to verifying the expected results.  Call setregid()
-+	as well.  Verify the real gid/uid values.
-+
- 2009-10-05  Miloslav Trmač  <mitr@redhat.com>
- 
- 	* configure.ac: Release 1.102.
-diff -r 0dcd3edc6d56 -r 8a897830e2d8 userhelper.c
---- a/userhelper.c	Sun Dec 06 17:02:50 2009 +0000
-+++ b/userhelper.c	Thu Feb 04 23:00:17 2010 +0100
-@@ -985,17 +985,20 @@
- static void
- become_super(void)
- {
--	/* Become the superuser. */
--	setgroups(0, NULL);
--	setregid(0, 0);
--	setreuid(0, 0);
--	/* Yes, setuid() and friends can fail, even for superusers. */
-+	/* Become the superuser.
-+	   Yes, setuid() and friends can fail, even for superusers. */
-+	if (setgroups(0, NULL) != 0 ||
-+	    setregid(0, 0) != 0 ||
-+	    setreuid(0, 0) != 0) {
-+		debug_msg("userhelper: set*id() failure: %s\n",
-+			  strerror(errno));
-+		exit(ERR_EXEC_FAILED);
-+	}
- 	if ((geteuid() != 0) ||
- 	    (getuid() != 0) ||
- 	    (getegid() != 0) ||
- 	    (getgid() != 0)) {
--		debug_msg("userhelper: set*id() failure: %s\n",
--			  strerror(errno));
-+		debug_msg("userhelper: set*id() didn't work\n");
- 		exit(ERR_EXEC_FAILED);
- 	}
- }
-@@ -1003,17 +1006,26 @@
- static void
- become_normal(const char *user)
- {
--	/* Join the groups of the user who invoked us. */
--	initgroups(user, getgid());
-+	gid_t gid;
-+	uid_t uid;
-+
-+	gid = getgid();
-+	uid = getuid();
-+	/* Become the user who invoked us. */
-+	if (initgroups(user, gid) != 0 ||
-+	    setregid(gid, gid) != 0 ||
-+	    setreuid(uid, uid) != 0) {
-+		debug_msg("userhelper: set*id() failure: %s\n",
-+			  strerror(errno));
-+		exit(ERR_EXEC_FAILED);
-+	}
- 	/* Verify that we're back to normal. */
--	if (getegid() != getgid()) {
-+	if (getegid() != gid || getgid() != gid) {
- 		debug_msg("userhelper: still setgid()\n");
- 		exit(ERR_EXEC_FAILED);
- 	}
--	/* Become the user who invoked us. */
--	setreuid(getuid(), getuid());
- 	/* Yes, setuid() can fail. */
--	if (geteuid() != getuid()) {
-+	if (geteuid() != uid || getuid() != uid) {
- 		debug_msg("userhelper: still setuid()\n");
- 		exit(ERR_EXEC_FAILED);
- 	}

usermode.spec

@@ -1,21 +1,17 @@
 Summary: Tools for certain user account management tasks
 Name: usermode
-Version: 1.102
-Release: 2%{?dist}
+Version: 1.111
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: https://fedorahosted.org/usermode/
-Source: https://fedorahosted.org/releases/u/s/usermode/usermode-%{version}.tar.bz2
-# Committed upstream
-Patch0: usermode-1.102-paranoia.patch
-# Committed upstream
-Patch1: usermode-1.102-PAM_TTY.patch
+Source: https://fedorahosted.org/releases/u/s/usermode/usermode-%{version}.tar.xz
+Source1: config-util
 Requires: pam, passwd, util-linux
 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
-BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 %package gtk
 Summary: Graphical tools for certain user account management tasks
@@ -31,7 +27,7 @@ by ordinary users.
 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
+format file systems.  Userpasswd allows users to change their
 passwords.
 
 Install the usermode-gtk package if you would like to provide users with
@@ -39,8 +35,6 @@ graphical tools for certain account management tasks.
 
 %prep
 %setup -q
-%patch0 -p1 -b .paranoia
-%patch1 -p1 -b .PAM_TTY
 
 %build
 %configure --with-selinux
@@ -48,23 +42,15 @@ graphical tools for certain account management tasks.
 make %{?_smp_mflags}
 
 %install
-rm -rf $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 -p -m644 $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
+mkdir -p $RPM_BUILD_ROOT/etc/security/console.apps
+install -p -m 644 %{SOURCE1} \
+	$RPM_BUILD_ROOT/etc/security/console.apps/config-util
 
 for i in redhat-userinfo.desktop redhat-userpasswd.desktop \
 	redhat-usermount.desktop; do
@@ -76,31 +62,15 @@ done
 
 %find_lang %{name}
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files -f %{name}.lang
-%defattr(-,root,root,-)
 %doc COPYING ChangeLog NEWS README
 %attr(4711,root,root) /usr/sbin/userhelper
 %{_bindir}/consolehelper
 %{_mandir}/man8/userhelper.8*
 %{_mandir}/man8/consolehelper.8*
-# PAM console wrappers
-%{_bindir}/halt
-%{_bindir}/reboot
-%{_bindir}/poweroff
-%exclude %{_bindir}/shutdown
-%config(noreplace) /etc/pam.d/halt
-%config(noreplace) /etc/pam.d/reboot
-%config(noreplace) /etc/pam.d/poweroff
 %config(noreplace) /etc/security/console.apps/config-util
-%config(noreplace) /etc/security/console.apps/halt
-%config(noreplace) /etc/security/console.apps/reboot
-%config(noreplace) /etc/security/console.apps/poweroff
 
 %files gtk
-%defattr(-,root,root,-)
 %{_bindir}/usermount
 %{_mandir}/man1/usermount.1*
 %{_bindir}/userformat
@@ -118,11 +88,76 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/*
 
 %changelog
+* Sat Sep 22 2012 Miloslav Trmač <mitr@redhat.com> - 1.111-1
+- Update to usermode-1.111
+
+* Tue Aug 21 2012 Miloslav Trmač <mitr@redhat.com> - 1.110-2
+- Drop no longer necessary %%clean and %%defattr commands.
+
+* Mon Aug 20 2012 Miloslav Trmač <mitr@redhat.com> - 1.110-1
+- Update to usermode-1.110.
+  Note that this drops halt/poweroff/reboot helpers, the respective
+  implementations in systemd now include PolicyKit support.  Spec file change
+  based on a patch by Lennart Poettering <lpoetter@redhat.com>.
+  Resolves: #804088, #849208
+
+* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.109-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Sat Mar  3 2012 Miloslav Trmač <mitr@redhat.com> - 1.109-1
+- Update to usermode-1.109
+
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.108-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Mon Oct  3 2011 Miloslav Trmač <mitr@redhat.com> - 1.108-1
+- Update to usermode-1.108
+  Resolves: #622813, #716524
+
+* Thu Mar 31 2011 Miloslav Trmač <mitr@redhat.com> - 1.107-1
+- Update to usermode-1.107
+  Resolves: #668731
+- Add UGROUPS=wheel to config-util
+  Resolves: #688690
+
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.106.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Wed Sep 29 2010 jkeating - 1.106.1-2
+- Rebuilt for gcc bug 634757
+
+* Tue Sep 14 2010 Miloslav Trmač <mitr@redhat.com> - 1.106.1-1
+- Update to usermode-1.106.1
+
+* Thu Aug 26 2010 Miloslav Trmač <mitr@redhat.com> - 1.106-1
+- Update to usermode-1.106
+
+* Thu Apr  8 2010 Miloslav Trmač <mitr@redhat.com> - 1.105-1
+- Update to usermode-1.105
+  Resolves: #578124
+  Resolves: #580481
+
+* Fri Mar 26 2010 Miloslav Trmač <mitr@redhat.com> - 1.104.2-1
+- Update to usermode-1.104.2
+
+* Thu Mar  4 2010 Miloslav Trmač <mitr@redhat.com> - 1.104.1-1
+- Update to usermode-1.104.1
+- Drop no longer necessary references to BuildRoot:
+
+* Thu Feb 25 2010 Miloslav Trmač <mitr@redhat.com> - 1.104-1
+- Update to usermode-1.104
+  Resolves: #567117
+
+* 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