Attachment 603251 Details for Bug 818585 – Patch for sudo.spec to address issue from comment #37

[patch] Patch for sudo.spec to address issue from comment #37

sudo.patch (text/plain), 1.47 KB, created by Robert Scheck on 2012-08-09 12:28:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Robert Scheck

Created: 2012-08-09 12:28:25 UTC

Size: 1.47 KB

patch

obsolete

>--- sudo.spec		2012-08-01 14:10:19.000000000 +0200
>+++ sudo.spec.rsc	2012-08-09 14:26:30.000000000 +0200
>@@ -5,7 +5,7 @@
> Summary: Allows restricted root access for specified users.
> Name: sudo
> Version: 1.7.2p1
>-Release: 14%{?dist}.2
>+Release: 14%{?dist}.3
> License: BSD
> Group: Applications/System
> URL: http://www.courtesan.com/sudo/
>@@ -214,13 +214,13 @@
>    NSSWITCH_TMPFILE=$(mktemp)
>    grep -v '^sudoers: files ldap$' %{nsswitch_path} > "$NSSWITCH_TMPFILE" && \
>    mv -f "$NSSWITCH_TMPFILE" %{nsswitch_path}
>-   restorecon %{nsswitch_path}
>+   [ -x /sbin/restorecon ] && /sbin/restorecon %{nsswitch_path}
> fi
> 
> if ! grep -q '^[[:space:]]*sudoers:' %{nsswitch_path}; then
>    # No "sudoers:" line in nsswitch.conf, add a default one
>    echo %{nsswitch_line} >> %{nsswitch_path}
>-   restorecon %{nsswitch_path}
>+   [ -x /sbin/restorecon ] && /sbin/restorecon %{nsswitch_path}
> fi
> 
> %postun
>@@ -230,10 +230,13 @@
>    NSSWITCH_TMPFILE=$(mktemp)
>    grep -v %{nsswitch_regex} %{nsswitch_path} > "$NSSWITCH_TMPFILE" && \
>    mv -f "$NSSWITCH_TMPFILE" %{nsswitch_path}
>-   restorecon %{nsswitch_path}
>+   [ -x /sbin/restorecon ] && /sbin/restorecon %{nsswitch_path}
> fi
> 
> %changelog
>+* Thu Aug 09 2012 Robert Scheck <robert@fedoraproject.org> - 1.7.2p1-14.3
>+- only execute restorecon if it is really installed (#818585 #c37)
>+
> * Wed Aug  1 2012 Daniel Kopecek <dkopecek@redhat.com> - 1.7.2p1-14.2
> - added a workaround for a race condition in handling child processes 
>   Resolves: rhbz#844978

Actions: View | Diff

Attachments on bug 818585: 603251