Attachment 603230 Details for Bug 846631 – proposed sudo.spec changes

[patch] proposed sudo.spec changes

sudo.spec.diff (text/plain), 2.27 KB, created by Daniel Kopeček on 2012-08-09 10:30:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Kopeček

Created: 2012-08-09 10:30:34 UTC

Size: 2.27 KB

patch

obsolete

>diff --git a/sudo.spec b/sudo.spec
>index 0efef1b..9cfa456 100644
>--- a/sudo.spec
>+++ b/sudo.spec
>@@ -1,11 +1,9 @@
> %define nsswitch_path    "/etc/nsswitch.conf"
>-%define nsswitch_line    "sudoers:  files ldap"
>-%define nsswitch_regex   "^sudoers:  files ldap$"
> 
> Summary: Allows restricted root access for specified users.
> Name: sudo
> Version: 1.7.2p1
>-Release: 17%{?dist}
>+Release: 18%{?dist}
> License: BSD
> Group: Applications/System
> URL: http://www.courtesan.com/sudo/
>@@ -208,33 +206,42 @@ rm -rf $RPM_BUILD_ROOT
> /bin/chmod 0440 /etc/sudoers || :
> 
> #
>+# rhbz#846631: fix permissions on nsswitch.conf
>+#
>+if [ "$(stat -c '%a' %{nsswitch_path})" = "600" ]; then
>+	chmod 0644 %{nsswitch_path} || :
>+fi
>+
>+#
> # rhbz#841070: remove the old line, the new one won't be matched
> #              by the old regexp and won't be deleted on upgrade
> #
> if grep -q '^sudoers: files ldap$' %{nsswitch_path}; then
>-   NSSWITCH_TMPFILE=$(mktemp)
>-   grep -v '^sudoers: files ldap$' %{nsswitch_path} > "$NSSWITCH_TMPFILE" && \
>-   mv -f "$NSSWITCH_TMPFILE" %{nsswitch_path}
>+   sed -i '/^sudoers: files ldap/ d' %{nsswitch_path}
>    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}
>+   echo 'sudoers:  files ldap' >> %{nsswitch_path}
>    restorecon %{nsswitch_path}
> fi
> 
> %postun
> # Remove the "sudoers:" line from nsswitch.conf if it's not modified
> # and only when we are erasing (not upgrading) the package!
>-if [ $1 = 0 ] && grep -q %{nsswitch_regex} %{nsswitch_path}; then
>-   NSSWITCH_TMPFILE=$(mktemp)
>-   grep -v %{nsswitch_regex} %{nsswitch_path} > "$NSSWITCH_TMPFILE" && \
>-   mv -f "$NSSWITCH_TMPFILE" %{nsswitch_path}
>+if [ $1 = 0 ] && grep -q '^sudoers:  files ldap$' %{nsswitch_path}; then
>+   sed -i '/^sudoers:  files ldap$/ d' %{nsswitch_path}
>    restorecon %{nsswitch_path}
> fi
> 
>+
> %changelog
>+* Thu Aug  9 2012 Daniel Kopecek <dkopecek@redhat.com> - 1.7.2p1-18
>+- don't use a temporary file when modifying nsswitch.conf
>+- fix permissions on nsswitch.conf, if needed
>+  Resolves: rhbz#846631
>+
> * Wed Aug  1 2012 Daniel Kopecek <dkopecek@redhat.com> - 1.7.2p1-17
> - added a workaround for a race condition in handling child processes
>   Resolves: rhbz#829263

Actions: View | Diff

Attachments on bug 846631: 603230