From: Todd C. Miller <Todd.Miller@courtesan.com>
Date: Tue, 7 Feb 2012 18:26:27 +0000 (-0500)
Subject: Re-sync with upstream; no longer need a local patch.
X-Git-Tag: SUDO_1_8_4~12^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=12eba56fdc3b6fb850780e759cea499300f6ae8a;p=sudo

Re-sync with upstream; no longer need a local patch.
---

diff --git a/pp b/pp
index 00942c2dc..c8b20797b 100755
--- a/pp
+++ b/pp
@@ -6576,7 +6576,7 @@ pp_backend_macos_init () {
     pp_macos_prog_packagemaker=/Developer/usr/bin/packagemaker
     pp_macos_pkg_domain=anywhere
     pp_macos_pkg_extra_flags=
-    pp_macos_sudo=
+    pp_macos_sudo=sudo
     # OS X puts the library version *before* the .dylib extension
     pp_shlib_suffix='*.dylib'
 }
@@ -6775,6 +6775,7 @@ pp_macos_mkbom () {
     pp_warn "mkbom workaround: copying source files to staging area"
 
     bomstage=$pp_wrkdir/bom_stage
+    $pp_macos_sudo /bin/mkdir "$bomstage"
     while IFS='	' read path mode ugid size cksumi linkpath; do
 	if test -h "$pp_destdir/$path"; then
 	    $pp_macos_sudo /bin/ln -s "$linkpath" "$bomstage/$path"
@@ -6961,7 +6962,7 @@ CompressedSize 0
     cat $pp_wrkdir/%files.* | awk '{ print "." $6 }' | sed '/\/$/d' | sort | /bin/pax -w -f - | gzip -9 -c > $Contents/Archive.pax.gz
     )
 
-	$pp_macos_sudo rm -rf $pp_wrkdir/bom_stage
+    test -d $pp_wrkdir/bom_stage && $pp_macos_sudo rm -rf $pp_wrkdir/bom_stage
 
     rm -f ${name}-${version}.dmg
     hdiutil create -fs HFS+ -srcfolder $pkgdir -volname $name ${name}-${version}.dmg