Enable hardened build

.gitignore

@@ -3,3 +3,6 @@ usermode-1.105.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

sources

@@ -1 +1 @@
-bef795b757defb9fd27cfbd48ef79861  usermode-1.108.tar.xz
+28ba510fbd8da9f4e86e57d6c31cff29  usermode-1.111.tar.xz

usermode.spec

@@ -1,7 +1,7 @@
 Summary: Tools for certain user account management tasks
 Name: usermode
-Version: 1.108
-Release: 1%{?dist}
+Version: 1.111
+Release: 3%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: https://fedorahosted.org/usermode/
@@ -18,6 +18,8 @@ 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
@@ -48,15 +50,7 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
 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
+mkdir -p $RPM_BUILD_ROOT/etc/security/console.apps
 install -p -m 644 %{SOURCE1} \
 	$RPM_BUILD_ROOT/etc/security/console.apps/config-util
 
@@ -70,31 +64,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
@@ -112,6 +90,35 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/*
 
 %changelog
+* 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