dist-git conversion

#2781)

.gitignore

@@ -1,10 +1 @@
-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
-/usermode-1.112.tar.xz
-/usermode-1.112.autotoolized.tar.xz
+usermode-1.104.tar.bz2

config-util

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

fsfaddr.patch

@@ -1,396 +0,0 @@
-diff --git a/consolehelper-gtk.8 b/consolehelper-gtk.8
-index d964ffa..a0937cf 100644
---- a/consolehelper-gtk.8
-+++ b/consolehelper-gtk.8
-@@ -12,7 +12,8 @@
- .\"
- .\" You should have received a copy of the GNU General Public License
- .\" along with this program; if not, write to the Free Software
--.\" Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+.\" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-+.\" MA  02110-1301, USA.
- .\"
- .TH CONSOLEHELPER-GTK 8 "2009-10-05" "Red Hat"
- .SH NAME
-diff --git a/consolehelper.8.in b/consolehelper.8.in
-index d771da7..e6ad431 100644
---- a/consolehelper.8.in
-+++ b/consolehelper.8.in
-@@ -12,7 +12,8 @@
- .\"
- .\" You should have received a copy of the GNU General Public License
- .\" along with this program; if not, write to the Free Software
--.\" Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+.\" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-+.\" MA  02110-1301, USA.
- .\"
- .TH CONSOLEHELPER 8 "18 March 1999" "Red Hat Software"
- .SH NAME
-diff --git a/consolehelper.c b/consolehelper.c
-index d4ee6f9..064ccb3 100644
---- a/consolehelper.c
-+++ b/consolehelper.c
-@@ -13,7 +13,8 @@
-  *
-  * You should have received a copy of the GNU General Public License
-  * along with this program; if not, write to the Free Software
-- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-+ * MA  02110-1301, USA.
-  */
- 
- #include "config.h"
-diff --git a/dummy.h b/dummy.h
-index 24f8277..b6d38d3 100644
---- a/dummy.h
-+++ b/dummy.h
-@@ -13,7 +13,8 @@
-  *
-  * You should have received a copy of the GNU General Public License
-  * along with this program; if not, write to the Free Software
-- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-+ * MA  02110-1301, USA.
-  */
- 
- /* Just a dummy file for gettext, containing messages emmitted by various
-diff --git a/gsmclient.c b/gsmclient.c
-index 85a3dea..6d67e91 100644
---- a/gsmclient.c
-+++ b/gsmclient.c
-@@ -17,8 +17,8 @@
-  *
-  * You should have received a copy of the GNU Library General Public
-  * License along with this library; if not, write to the
-- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-- * Boston, MA 02111-1307, USA.
-+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-+ * Boston, MA  02110-1301, USA.
-  */
- 
- #include <config.h>
-diff --git a/gsmclient.h b/gsmclient.h
-index a4e94b0..66d97c7 100644
---- a/gsmclient.h
-+++ b/gsmclient.h
-@@ -17,8 +17,8 @@
-  *
-  * You should have received a copy of the GNU Library General Public
-  * License along with this library; if not, write to the
-- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-- * Boston, MA 02111-1307, USA.
-+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-+ * Boston, MA  02110-1301, USA.
-  */
- 
- #ifndef GSM_CLIENT_H
-diff --git a/pam-panel-icon.1 b/pam-panel-icon.1
-index f92f57a..5f891dc 100644
---- a/pam-panel-icon.1
-+++ b/pam-panel-icon.1
-@@ -12,7 +12,8 @@
- .\"
- .\" You should have received a copy of the GNU General Public License
- .\" along with this program; if not, write to the Free Software
--.\" Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+.\" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-+.\" MA  02110-1301, USA.
- .\"
- .\" Red Hat author: Miloslav Trmač <mitr@redhat.com>
- .TH PAM-PANEL-ICON 1 "2009-10-05" "Red Hat"
-diff --git a/pam-panel-icon.c b/pam-panel-icon.c
-index d2e93fa..c4e038c 100644
---- a/pam-panel-icon.c
-+++ b/pam-panel-icon.c
-@@ -13,7 +13,8 @@
-  *
-  * You should have received a copy of the GNU General Public License
-  * along with this program; if not, write to the Free Software
-- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-+ * MA  02110-1301, USA.
-  */
- 
- #include "config.h"
-diff --git a/props.c b/props.c
-index 04eaeb6..3f37fd5 100644
---- a/props.c
-+++ b/props.c
-@@ -15,8 +15,8 @@
-  * 
-  * You should have received a copy of the GNU General Public License
-  * along with this program; if not, write to the Free Software
-- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-- * 02111-1307, USA.
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-+ * MA  02110-1301, USA.
-  */
- 
- #include "props.h"
-diff --git a/props.h b/props.h
-index c309450..aaa491c 100644
---- a/props.h
-+++ b/props.h
-@@ -15,8 +15,8 @@
-  * 
-  * You should have received a copy of the GNU General Public License
-  * along with this program; if not, write to the Free Software
-- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-- * 02111-1307, USA.
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-+ * MA  02110-1301, USA.
-  */
- 
- #ifndef MSM_PROPS_H
-diff --git a/shvar.c b/shvar.c
-index 114b7fc..7dd3651 100644
---- a/shvar.c
-+++ b/shvar.c
-@@ -24,7 +24,8 @@
-  *
-  * You should have received a copy of the GNU General Public License
-  * along with this program; if not, write to the Free Software
-- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-+ * MA  02110-1301, USA.
-  *
-  */
- 
-diff --git a/shvar.h b/shvar.h
-index debc1ee..81cff6f 100644
---- a/shvar.h
-+++ b/shvar.h
-@@ -24,7 +24,8 @@
-  *
-  * You should have received a copy of the GNU General Public License
-  * along with this program; if not, write to the Free Software
-- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-+ * MA  02110-1301, USA.
-  *
-  */
- #ifndef _SHVAR_H
-diff --git a/test-userdialog.c b/test-userdialog.c
-index 4ace42e..d3dd34f 100644
---- a/test-userdialog.c
-+++ b/test-userdialog.c
-@@ -14,7 +14,8 @@
-  *
-  * You should have received a copy of the GNU General Public License
-  * along with this program; if not, write to the Free Software
-- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-+ * MA  02110-1301, USA.
-  */
- 
- #include "config.h"
-diff --git a/userdialogs.c b/userdialogs.c
-index af44607..04f450a 100644
---- a/userdialogs.c
-+++ b/userdialogs.c
-@@ -13,7 +13,8 @@
-  *
-  * You should have received a copy of the GNU General Public License
-  * along with this program; if not, write to the Free Software
-- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-+ * MA  02110-1301, USA.
-  *
-  */
- 
-diff --git a/userdialogs.h b/userdialogs.h
-index 44b464a..3ea2f01 100644
---- a/userdialogs.h
-+++ b/userdialogs.h
-@@ -13,7 +13,8 @@
-  *
-  * You should have received a copy of the GNU General Public License
-  * along with this program; if not, write to the Free Software
-- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-+ * MA  02110-1301, USA.
-  */
- 
- #ifndef __USERDIALOGS_H__
-diff --git a/userhelper-messages.c b/userhelper-messages.c
-index 5c73cc0..7b8e37c 100644
---- a/userhelper-messages.c
-+++ b/userhelper-messages.c
-@@ -13,7 +13,8 @@
-  *
-  * You should have received a copy of the GNU General Public License
-  * along with this program; if not, write to the Free Software
-- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-+ * MA  02110-1301, USA.
-  */
- 
- #include "config.h"
-diff --git a/userhelper-messages.h b/userhelper-messages.h
-index 69825f5..ec507d3 100644
---- a/userhelper-messages.h
-+++ b/userhelper-messages.h
-@@ -13,7 +13,8 @@
-  *
-  * You should have received a copy of the GNU General Public License
-  * along with this program; if not, write to the Free Software
-- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-+ * MA  02110-1301, USA.
-  */
- 
- #ifndef USERHELPER_MESSAGES_H__
-diff --git a/userhelper-wrap.c b/userhelper-wrap.c
-index cd35cd6..1e631f7 100644
---- a/userhelper-wrap.c
-+++ b/userhelper-wrap.c
-@@ -13,7 +13,8 @@
-  *
-  * You should have received a copy of the GNU General Public License
-  * along with this program; if not, write to the Free Software
-- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-+ * MA  02110-1301, USA.
-  */
- 
- #include "config.h"
-diff --git a/userhelper-wrap.h b/userhelper-wrap.h
-index 2fb77c0..e4fea41 100644
---- a/userhelper-wrap.h
-+++ b/userhelper-wrap.h
-@@ -13,7 +13,8 @@
-  *
-  * You should have received a copy of the GNU General Public License
-  * along with this program; if not, write to the Free Software
-- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-+ * MA  02110-1301, USA.
-  */
- 
- #ifndef __USERHELPER_WRAP_H__
-diff --git a/userhelper.8.in b/userhelper.8.in
-index 4e7aff1..ce90528 100644
---- a/userhelper.8.in
-+++ b/userhelper.8.in
-@@ -12,7 +12,8 @@
- .\"
- .\" You should have received a copy of the GNU General Public License
- .\" along with this program; if not, write to the Free Software
--.\" Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+.\" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-+.\" MA  02110-1301, USA.
- .\"
- .TH USERHELPER 8 "January 8 2008" "Red Hat, Inc."
- .SH NAME
-diff --git a/userhelper.c b/userhelper.c
-index 287aa4d..fa5395d 100644
---- a/userhelper.c
-+++ b/userhelper.c
-@@ -13,7 +13,8 @@
-  *
-  * You should have received a copy of the GNU General Public License
-  * along with this program; if not, write to the Free Software
-- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-+ * MA  02110-1301, USA.
-  */
- 
- #include "config.h"
-diff --git a/userhelper.h b/userhelper.h
-index 50e6ed9..32c29d6 100644
---- a/userhelper.h
-+++ b/userhelper.h
-@@ -13,7 +13,8 @@
-  *
-  * You should have received a copy of the GNU General Public License
-  * along with this program; if not, write to the Free Software
-- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-+ * MA  02110-1301, USA.
-  */
- 
- #ifndef __USERHELPER_H__
-diff --git a/userinfo.1 b/userinfo.1
-index 8701bda..292aa4b 100644
---- a/userinfo.1
-+++ b/userinfo.1
-@@ -12,7 +12,8 @@
- .\"
- .\" You should have received a copy of the GNU General Public License
- .\" along with this program; if not, write to the Free Software
--.\" Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+.\" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-+.\" MA  02110-1301, USA.
- .\"
- .TH USERINFO 1 "6 October 1997" "Red Hat Software"
- .SH NAME
-diff --git a/userinfo.c b/userinfo.c
-index 5139b13..4c0ea9b 100644
---- a/userinfo.c
-+++ b/userinfo.c
-@@ -14,7 +14,8 @@
-  *
-  * You should have received a copy of the GNU General Public License
-  * along with this program; if not, write to the Free Software
-- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-+ * MA  02110-1301, USA.
-  */
- 
- /* Things to remember...
-diff --git a/usermount.1 b/usermount.1
-index eb864c8..1af6122 100644
---- a/usermount.1
-+++ b/usermount.1
-@@ -12,7 +12,8 @@
- .\"
- .\" You should have received a copy of the GNU General Public License
- .\" along with this program; if not, write to the Free Software
--.\" Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+.\" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-+.\" MA  02110-1301, USA.
- .\"
- .TH USERMOUNT 1 "March 13 2007" "Red Hat"
- .SH NAME
-diff --git a/usermount.c b/usermount.c
-index 5875c09..1fc627b 100644
---- a/usermount.c
-+++ b/usermount.c
-@@ -14,7 +14,8 @@
-  *
-  * You should have received a copy of the GNU General Public License
-  * along with this program; if not, write to the Free Software
-- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-+ * MA  02110-1301, USA.
-  */
- 
- /* TODO notes.
-diff --git a/userpasswd.1 b/userpasswd.1
-index 3f11f7a..6e2ab14 100644
---- a/userpasswd.1
-+++ b/userpasswd.1
-@@ -12,7 +12,8 @@
- .\"
- .\" You should have received a copy of the GNU General Public License
- .\" along with this program; if not, write to the Free Software
--.\" Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+.\" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-+.\" MA  02110-1301, USA.
- .\"
- .TH USERPASSWD 1 "17 October 1997" "Red Hat Software"
- .SH NAME
-diff --git a/userpasswd.c b/userpasswd.c
-index 42c6705..fad128f 100644
---- a/userpasswd.c
-+++ b/userpasswd.c
-@@ -14,7 +14,8 @@
-  *
-  * You should have received a copy of the GNU General Public License
-  * along with this program; if not, write to the Free Software
-- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-+ * MA  02110-1301, USA.
-  */
- 
- #include "config.h"

selinux_deprecated.patch

@@ -1,49 +0,0 @@
-diff --git a/userhelper.c b/userhelper.c
-index 4177c89..f2afde7 100644
---- a/userhelper.c
-+++ b/userhelper.c
-@@ -48,8 +48,6 @@
- 
- #ifdef WITH_SELINUX
- #include <selinux/selinux.h>
--#include <selinux/flask.h>
--#include <selinux/av_permissions.h>
- #endif
- 
- #include "shvar.h"
-@@ -111,7 +109,7 @@ static int checkAccess(unsigned int selaccess) {
-     struct av_decision avd;
-     int retval = security_compute_av(user_context,
- 				     user_context,
--				     SECCLASS_PASSWD,
-+				     string_to_security_class("passwd"),
- 				     selaccess,
- 				     &avd);
- 	  
-@@ -2267,7 +2265,8 @@ main(int argc, char **argv)
- 	const char *new_home_phone;
- 	const char *new_shell;
- #ifdef WITH_SELINUX
--	unsigned perm;
-+	security_class_t class;
-+	access_vector_t perm;
- #endif
- 
- 	/* State variable we pass around. */
-@@ -2426,12 +2425,13 @@ main(int argc, char **argv)
- 			user_name = g_strdup(argv[optind]);
- 
- #ifdef WITH_SELINUX
-+			class = string_to_security_class("passwd");
- 			if (c_flag) 
--			  perm = PASSWD__PASSWD;
-+			  perm = string_to_av_perm(class, "passwd");
- 			else if (s_flag)
--			  perm = PASSWD__CHSH;
-+			  perm = string_to_av_perm(class, "chsh");
- 			else
--			  perm = PASSWD__CHFN;
-+			  perm = string_to_av_perm(class, "chfn");
- 
- 			if (is_selinux_enabled() > 0 &&
- 			    checkAccess(perm)!= 0) {

sources

@@ -1 +1 @@
-SHA512 (usermode-1.112.autotoolized.tar.xz) = b1e6fc846b074d99409eb57347eabc2816bbba075af10bc14f396e09d0b0f89bde7b80546a647ed6e30e958a449138ec04708896c9406359504750bcd05ed819
+64f6ba4490ef50977b1fe9c0525f9265  usermode-1.104.tar.bz2

sysmacros.patch

@@ -1,12 +0,0 @@
-diff --git a/usermount.c b/usermount.c
-index 3aafadd..5875c09 100644
---- a/usermount.c
-+++ b/usermount.c
-@@ -40,6 +40,7 @@
- #include <sys/stat.h>
- #include <sys/time.h>
- #include <sys/types.h>
-+#include <sys/sysmacros.h>
- #include <errno.h>
- #include <glob.h>
- #include <libintl.h>

usermode.spec

@@ -1,34 +1,23 @@
 Summary: Tools for certain user account management tasks
 Name: usermode
-Version: 1.112
-Release: 9%{?dist}
+Version: 1.104
+Release: 1%{?dist}
 License: GPLv2+
-URL: https://pagure.io/usermode/
-Source: https://releases.pagure.org/usermode/usermode-%{version}.autotoolized.tar.xz
-Source1: config-util
-# Backport of c5a0bfd174e4a88fcd49fe7a130b37b6779c1a18
-# - inclusion of <sys/sysmacros.h> from <sys/types.h> is now deprecated
-Patch0: sysmacros.patch
-# Backport of da01d6325a1a9eb8154abb6a4590c610e8db8ec4
-# - bad FSF address fix
-Patch1: fsfaddr.patch
-# Backport of 48c4085004caad1ec928fa103b7f3e3fe684c826
-# - <selinux/flask.h> and <selinux/av_permissions.h> are now deprecated
-Patch2: selinux_deprecated.patch
+Group: Applications/System
+URL: https://fedorahosted.org/usermode/
+Source: https://fedorahosted.org/releases/u/s/usermode/usermode-%{version}.tar.bz2
 Requires: pam, passwd, util-linux
-# https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/IJFYI5Q2BYZKIGDFS2WLOBDUSEGWHIKV/
-BuildRequires: gcc
 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
+Group: Applications/System
 Requires: %{name} = %{version}-%{release}
 
-%global _hardened_build 1
-
 %description
 The usermode package contains the userhelper program, which can be
 used to allow configured programs to be run with superuser privileges
@@ -46,9 +35,6 @@ graphical tools for certain account management tasks.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
 %configure --with-selinux
@@ -56,15 +42,23 @@ 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
 
-mkdir -p $RPM_BUILD_ROOT/etc/security/console.apps
-install -p -m 644 %{SOURCE1} \
-	$RPM_BUILD_ROOT/etc/security/console.apps/config-util
+# 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
 
 for i in redhat-userinfo.desktop redhat-userpasswd.desktop \
 	redhat-usermount.desktop; do
@@ -76,15 +70,31 @@ 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
@@ -102,140 +112,8 @@ done
 %{_datadir}/applications/*
 
 %changelog
-* Wed Sep 09 2020 Jiri Kucera <jkucera@redhat.com> - 1.112-9
-- Do not use deprecated selinux headers
-  Resolves #1865598
-
-* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.112-8
-- Second attempt - Rebuilt for
-  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.112-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.112-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.112-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.112-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Tue Aug 07 2018 Jiri Kucera <jkucera@redhat.com> - 1.112-3
-- Dropped need to run autotools
-- <sys/sysmacros.h> must be now included manually
-  Resolves #1606624
-- Fixed bad FSF address
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.112-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Thu Feb 22 2018 Jiri Kucera <jkucera@redhat.com> - 1.112-1
-- Update to usermode-1.112
-  Resolves #1269643
-
-* Wed Feb 21 2018 Jiri Kucera <jkucera@redhat.com> - 1.111-14
-- Added missing gcc dependency
-
-* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.111-13
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.111-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.111-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Mon Apr 24 2017 Miloslav Trmač <mitr@redhat.com> - 1.111-10
-- Fix a FBFS with  -Werror=format-security
-  Resolves #1444750
-- Fix inconsistent dates in %%changelog
-
-* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.111-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.111-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.111-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.111-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.111-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.111-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Tue May 21 2013 Miloslav Trmač <mitr@redhat.com> - 1.111-3
-- Enable hardened build
-  Resolves: #965471
-
-* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.111-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* 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
@@ -533,10 +411,10 @@ done
 - Add getenforce checks
 - Add root_passwd check
 
-* Thu Jul 1 2004 Dan Walsh <dwalsh@redhat.com> 1.70-6
+* Tue Jul 1 2004 Dan Walsh <dwalsh@redhat.com> 1.70-6
 - More fixes to make targeted policy work correctly
 
-* Thu Jul 1 2004 Dan Walsh <dwalsh@redhat.com> 1.70-5
+* 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
@@ -705,7 +583,7 @@ done
 - remove the pixmap we don't use any more (we use stock pixmaps now)
 - update translations
 
-* Tue Apr 16 2002 Nalin Dahyabhai <nalin@redhat.com> 1.54-1
+* 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
 
@@ -782,7 +660,7 @@ done
 * Fri Nov  2 2001 Nalin Dahyabhai <nalin@redhat.com> 1.45-1
 - propagate environment variables from libpam to applications
 
-* Wed Oct  3 2001 Nalin Dahyabhai <nalin@redhat.com> 1.44-1
+* 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
 
@@ -922,7 +800,7 @@ done
 * Tue Mar 07 2000 Nalin Dahyabhai <nalin@redhat.com>
 - queue notice messages until we get prompts in userhelper to fix bug #8745
 
-* Thu Feb 03 2000 Nalin Dahyabhai <nalin@redhat.com>
+* Fri Feb 03 2000 Nalin Dahyabhai <nalin@redhat.com>
 - free trip through the build system
 
 * Tue Jan 11 2000 Nalin Dahyabhai <nalin@redhat.com>