From: Todd C. Miller <Todd.Miller@courtesan.com>
Date: Fri, 11 Jul 2014 16:27:23 +0000 (-0600)
Subject: For rpm, do not specify a mode in %attr for symbolic links.  Avoids
X-Git-Tag: SUDO_1_8_11^2~136
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=16b9aed751879ef201b12cd2898bd42c5f8fb58a;p=sudo

For rpm, do not specify a mode in %attr for symbolic links.  Avoids
the warning "Explicit %attr() mode not applicaple to symlink"
---

diff --git a/pp b/pp
index 8ffa55487..247dd2daf 100755
--- a/pp
+++ b/pp
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Copyright 2014 Quest Software, Inc. ALL RIGHTS RESERVED
-pp_revision="20140620"
+pp_revision="20140711"
  # Copyright 2012 Quest Software, Inc.  ALL RIGHTS RESERVED.
  #
  # Redistribution and use in source and binary forms, with or without
@@ -5517,7 +5517,10 @@ pp_rpm_writefiles () {
     while read t m o g f p st; do
         _l="$p"
 	test $t = d && _l="%dir ${_l%/}/"
-        if test x"$m" = x"-"; then
+	if test $t = s; then
+	    # rpm warns if %attr contains a mode for symlinks
+	    m=-
+        elif test x"$m" = x"-"; then
             case "$t" in
                 d) m=755;;
                 f) m=644;;