<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6c5276d315e64e99f0a7e57b6cf9940b83e9eab6">https://github.com/macports/macports-ports/commit/6c5276d315e64e99f0a7e57b6cf9940b83e9eab6</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 6c5276d315e Don't use shellescape in MacPorts < 2.6.99
</span>6c5276d315e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 6c5276d315e64e99f0a7e57b6cf9940b83e9eab6
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Sat Jun 27 23:45:10 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> Don't use shellescape in MacPorts < 2.6.99
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> It's not available yet.
</span>---
databases/oracle-instantclient/Portfile | 4 ++++
games/alienarena/Portfile | 4 ++++
games/mystonline-cider/Portfile | 11 ++++++++++-
net/curl/Portfile | 4 ++++
pure/pure-reduce/Portfile | 4 ++++
5 files changed, 26 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/oracle-instantclient/Portfile b/databases/oracle-instantclient/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 245ed8f67d1..f24625e2cf8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/oracle-instantclient/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/oracle-instantclient/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -133,7 +133,11 @@ extract {
</span> xinstall -d ${my_build_dir}
foreach my_arch ${configure.universal_archs} {
foreach my_distfile_type {basic sdk} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.6.99] >= 0} {
</span> system "${extract.cmd} ${extract.pre_args} ${extract.post_args} [shellescape ${distpath}/[format $my_distname_format(${my_arch}) ${my_distfile_type}]${extract.suffix}]"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "${extract.cmd} ${extract.pre_args} ${extract.post_args} '${distpath}/[format $my_distname_format(${my_arch}) ${my_distfile_type}]${extract.suffix}'"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span> }
move ${extract.dir}/[format ${my_worksrcdir_format} [join [lrange [split ${version} .] 0 1] "_"]] ${my_build_dir}/${my_arch}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/alienarena/Portfile b/games/alienarena/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e485b3cb175..4e33b987ede 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/alienarena/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/alienarena/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,7 +70,11 @@ if {${name} eq ${subport}} {
</span>
pre-extract {
# Create list of data files we want to exclude.
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.6.99] >= 0} {
</span> system -W ${workpath} "${extract.cmd} ${extract.pre_args} [shellescape ${distpath}/${distfiles}] | tar -tf - --exclude '*.cfg' [shellescape ${worksrcdir}/data1] | grep -v /$ > datafiles.txt"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${workpath} "${extract.cmd} ${extract.pre_args} '${distpath}/${distfiles}' | tar -tf - --exclude '*.cfg' '${worksrcdir}/data1' | grep -v /$ > datafiles.txt"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span> }
# Avoid extracting data files.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/mystonline-cider/Portfile b/games/mystonline-cider/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6dabf68a787..7a2c4c25350 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/mystonline-cider/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/mystonline-cider/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -146,15 +146,24 @@ proc my_attach_disk_image {disk_image} {
</span> global workpath
set tmp_disk_image_dir [mkdtemp "${workpath}/.tmp/disk_image.XXXXXXXX"]
set tmp_disk_image ${tmp_disk_image_dir}/[file tail ${disk_image}].cdr
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system "hdiutil convert -quiet -ov -format UDTO -o [shellescape ${tmp_disk_image}] [shellescape ${disk_image}]"
</span> set mountpoint [mkdtemp "${workpath}/.tmp/mountpoint.XXXXXXXX"]
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.6.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "hdiutil convert -quiet -ov -format UDTO -o [shellescape ${tmp_disk_image}] [shellescape ${disk_image}]"
</span> system "hdiutil attach -quiet [shellescape ${tmp_disk_image}] -mountpoint [shellescape ${mountpoint}] -private -nobrowse -noautoopen -noautofsck -noverify -readonly"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "hdiutil convert -quiet -ov -format UDTO -o '${tmp_disk_image}' '${disk_image}'"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "hdiutil attach -quiet '${tmp_disk_image}' -mountpoint '${mountpoint}' -private -nobrowse -noautoopen -noautofsck -noverify -readonly"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span> return ${mountpoint}
}
# Unmounts a disk image.
proc my_detach_disk_image {mountpoint} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.6.99] >= 0} {
</span> system "hdiutil detach [shellescape ${mountpoint}] -force"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "hdiutil detach '${mountpoint}' -force"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span> file delete -force ${mountpoint}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/curl/Portfile b/net/curl/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 154a7a153e6..006a292b592 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/curl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/curl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -259,7 +259,11 @@ subport curl-ca-bundle {
</span> ${worksrcdir}/lib/mk-ca-bundle.pl
post-extract {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.6.99] >= 0} {
</span> system -W ${workpath} "unzip -q -a [shellescape ${distpath}/${certdata_distfile}]"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${workpath} "unzip -q -a '${distpath}/${certdata_distfile}'"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span> move ${workpath}/mozilla-central-${certdata_commit}/${certdata_path} ${worksrcpath}/${certdata_file}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/pure/pure-reduce/Portfile b/pure/pure-reduce/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 447a44e9e32..0380db84c14 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/pure/pure-reduce/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/pure/pure-reduce/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,7 +31,11 @@ depends_lib-append port:gmp
</span> extract.only ${pure_reduce_distfile}
post-extract {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.6.99] >= 0} {
</span> system -W ${worksrcpath} "tar xjf [shellescape ${distpath}/${reduce_distfile}]"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath} "tar xjf '${distpath}/${reduce_distfile}'"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span> }
patchfiles patch-Makefile.diff
</pre><pre style='margin:0'>
</pre>