Attachment 598933 Details for Bug 841070 – proposed and tested patch

[patch] proposed and tested patch

sudo.spec.patch (text/plain), 2.38 KB, created by Daniel Kopeček on 2012-07-18 16:32:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Kopeček

Created: 2012-07-18 16:32:09 UTC

Size: 2.38 KB

patch

obsolete

>diff --git a/sudo.spec b/sudo.spec
>index b27de0e..7ad0e2f 100644
>--- a/sudo.spec
>+++ b/sudo.spec
>@@ -1,12 +1,12 @@
> %define nsswitch_path    "/etc/nsswitch.conf"
>-%define nsswitch_line    "sudoers: files ldap"
>-%define nsswitch_regex   "^sudoers: files ldap$"
>+%define nsswitch_line    "sudoers:  files ldap"
>+%define nsswitch_regex   "^sudoers:  files ldap$"
> %define nsswitch_tmppath "%{_tmppath}/nsswitch.conf.bak"
> 
> Summary: Allows restricted root access for specified users.
> Name: sudo
> Version: 1.7.2p1
>-Release: 15%{?dist}
>+Release: 16%{?dist}
> License: BSD
> Group: Applications/System
> URL: http://www.courtesan.com/sudo/
>@@ -205,22 +205,40 @@ rm -rf $RPM_BUILD_ROOT
> %post
> /bin/chmod 0440 /etc/sudoers || :
> 
>-if ! grep -q '^[[:space:]]*sudoers:' "%{nsswitch_path}"; then
>+#
>+# 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
>+   rm -f %{nsswitch_tmppath} && \
>+   touch %{nsswitch_tmppath} && \
>+   grep -v '^sudoers: files ldap$' %{nsswitch_path} > %{nsswitch_tmppath} && \
>+   mv -f %{nsswitch_tmppath} %{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 %{nsswitch_line} >> %{nsswitch_path}
>+   restorecon %{nsswitch_path}
> fi
> 
> %postun
> # Remove the "sudoers:" line from nsswitch.conf if it's not modified
>-if grep -q %{nsswitch_regex} "%{nsswitch_path}"; then
>-   rm -f "%{nsswitch_tmppath}" && \
>-   touch "%{nsswitch_tmppath}" && \
>-   grep -v %{nsswitch_regex} "%{nsswitch_path}" > "%{nsswitch_tmppath}" && \
>-   mv -f "%{nsswitch_tmppath}" "%{nsswitch_path}"
>-   restorecon "%{nsswitch_path}"
>+# and only when we are erasing (not upgrading) the package!
>+if [ $1 = 0 ] && grep -q %{nsswitch_regex} %{nsswitch_path}; then
>+   rm -f %{nsswitch_tmppath} && \
>+   touch %{nsswitch_tmppath} && \
>+   grep -v %{nsswitch_regex} %{nsswitch_path} > %{nsswitch_tmppath} && \
>+   mv -f %{nsswitch_tmppath} %{nsswitch_path}
>+   restorecon %{nsswitch_path}
> fi
> 
> %changelog
>+* Wed Jul 18 2012 Daniel Kopecek <dkopecek@redhat.com> - 1.7.2p1-15
>+- corrected postun script
>+  Resolves: rhbz#841070
>+
> * Mon Jul  2 2012 Daniel Kopecek <dkopecek@redhat.com> - 1.7.2p1-15
> - corrected release number
>

Actions: View | Diff

Attachments on bug 841070: 598915 | 598933