<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-base.

</pre>
<p><a href="https://github.com/macports/macports-base/commit/425611d8db5d7627b4acd68dd51952a9990bb3ac">https://github.com/macports/macports-base/commit/425611d8db5d7627b4acd68dd51952a9990bb3ac</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new 425611d8d Use shellescape on packagemaker path
</span>425611d8d is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 425611d8db5d7627b4acd68dd51952a9990bb3ac
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sat Sep 16 08:05:15 2023 +1000

<span style='display:block; white-space:pre;color:#404040;'>    Use shellescape on packagemaker path
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Fixes: https://trac.macports.org/ticket/39405
</span>---
 src/package1.0/portpkg.tcl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/package1.0/portpkg.tcl b/src/package1.0/portpkg.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index f5150f411..a7b67a7cb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/package1.0/portpkg.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/package1.0/portpkg.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -163,7 +163,7 @@ proc portpkg::package_pkg {portname portepoch portversion portrevision} {
</span>             if {$using_pkgbuild} {
                 set cmdline "$pkgbuild --root [shellescape ${destpath}] ${pkgresources} --info [shellescape $infofile] --install-location / --identifier org.macports.$portname"
             } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                set cmdline "PMResourceLocale=${language} $packagemaker --root [shellescape ${destpath}] --out [shellescape ${pkgpath}] ${pkgresources} --info [shellescape $infofile] --target $pkgtarget --domain system --id org.macports.$portname"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                set cmdline "PMResourceLocale=${language} [shellescape $packagemaker] --root [shellescape ${destpath}] --out [shellescape ${pkgpath}] ${pkgresources} --info [shellescape $infofile] --target $pkgtarget --domain system --id org.macports.$portname"
</span>             }
             if {${os.major} >= 10} {
                 set v [mp_version_to_apple_version $portepoch $portversion $portrevision]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -193,7 +193,7 @@ proc portpkg::package_pkg {portname portepoch portversion portrevision} {
</span>         } else {
             write_info_plist ${workpath}/Info.plist $portname $portversion $portrevision
             write_description_plist ${workpath}/Description.plist $portname $portversion $description
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            system "$packagemaker -build -f [shellescape ${destpath}] -p [shellescape ${pkgpath}] -r [shellescape ${package.resources}] -i [shellescape ${workpath}/Info.plist] -d [shellescape ${workpath}/Description.plist]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            system "[shellescape $packagemaker] -build -f [shellescape ${destpath}] -p [shellescape ${pkgpath}] -r [shellescape ${package.resources}] -i [shellescape ${workpath}/Info.plist] -d [shellescape ${workpath}/Description.plist]"
</span>         }
 
         file delete ${workpath}/Info.plist \
</pre><pre style='margin:0'>

</pre>