Attachment 603139 Details for Bug 804088 – Proposed patch

[patch] Proposed patch

0001-Drop-halt-poweroff-reboot-helpers.patch (text/plain), 2.78 KB, created by Lennart Poettering on 2012-08-09 00:32:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lennart Poettering

Created: 2012-08-09 00:32:35 UTC

Size: 2.78 KB

patch

obsolete

>From 8715d6e86a7a6f9bca5a0bb059601852d4ca90a4 Mon Sep 17 00:00:00 2001
>From: Lennart Poettering <lennart@poettering.net>
>Date: Thu, 9 Aug 2012 02:30:28 +0200
>Subject: [PATCH] Drop halt/poweroff/reboot helpers
>
>---
> usermode.spec | 31 +++++++++++++------------------
> 1 file changed, 13 insertions(+), 18 deletions(-)
>
>diff --git a/usermode.spec b/usermode.spec
>index 630b7f8..83a5570 100644
>--- a/usermode.spec
>+++ b/usermode.spec
>@@ -1,7 +1,7 @@
> Summary: Tools for certain user account management tasks
> Name: usermode
> Version: 1.109
>-Release: 2%{?dist}
>+Release: 3%{?dist}
> License: GPLv2+
> Group: Applications/System
> URL: https://fedorahosted.org/usermode/
>@@ -48,15 +48,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
> install -p -m 644 %{SOURCE1} \
> 	$RPM_BUILD_ROOT/etc/security/console.apps/config-util
> 
>@@ -81,17 +73,11 @@ rm -rf $RPM_BUILD_ROOT
> %{_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
>+%exclude /etc/security/console.apps/halt
>+%exclude /etc/security/console.apps/reboot
>+%exclude /etc/security/console.apps/poweroff
> 
> %files gtk
> %defattr(-,root,root,-)
>@@ -112,6 +98,15 @@ rm -rf $RPM_BUILD_ROOT
> %{_datadir}/applications/*
> 
> %changelog
>+* Thu Aug  9 2012 Lennart Poettering <lpoetter@redhat.com> - 1.109-3
>+- Drop halt/poweroff/reboot helpers
>+- These helpers should live in the packages that actually include the
>+  tools in question, not in this package. Also the respective
>+  implementations of systemd already include PolicyKit support, so
>+  that usermode support is entirely redundant. Hence let's drop them
>+  for good.
>+- https://bugzilla.redhat.com/show_bug.cgi?id=804088
>+
> * 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
> 
>-- 
>1.7.11.2
>

Actions: View | Diff

Attachments on bug 804088: 603139