<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e8e3a87865a58a58306cc4a86755a8c0cd71dfa3">https://github.com/macports/macports-ports/commit/e8e3a87865a58a58306cc4a86755a8c0cd71dfa3</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 e8e3a87865a PG_gpg_verify: Use MacPorts's shellescape
</span>e8e3a87865a is described below

<span style='display:block; white-space:pre;color:#808000;'>commit e8e3a87865a58a58306cc4a86755a8c0cd71dfa3
</span>Author: Steven Thomas Smith <s.t.smith@ieee.org>
AuthorDate: Thu Feb 8 18:24:35 2024 -0500

<span style='display:block; white-space:pre;color:#404040;'>    PG_gpg_verify: Use MacPorts's shellescape
</span>---
 _resources/port1.0/group/gpg_verify-1.0.tcl | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/gpg_verify-1.0.tcl b/_resources/port1.0/group/gpg_verify-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 9f20b54bdce..92d08d6478d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/gpg_verify-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/gpg_verify-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,23 +52,18 @@ pre-checksum {
</span>     }
 }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Remove this proc and switch to shellescape once MacPorts 2.7.0 is released.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-proc gpg_verify.shellescape {arg} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    return [regsub -all -- {[^A-Za-z0-9.:@%/+=_-]} $arg {\\&}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> proc gpg_verify.verify_gpg_signature {pubkey_file signature_file test_file} {
     # pre-load public key to avoid keyserver downtime issues
     # https://pgp.mit.edu/pks/lookup?op=get&search=0x${gpg_keyid}
     # note: tcl exec will return error if error messages not directed to /dev/null
     system "[option gpg_verify.gpg] \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        --homedir [gpg_verify.shellescape [option gpg_verify.gpg_homedir]] \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        --import [gpg_verify.shellescape ${pubkey_file}] 2>/dev/null || /usr/bin/true"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        --homedir [shellescape [option gpg_verify.gpg_homedir]] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        --import [shellescape ${pubkey_file}] 2>/dev/null || /usr/bin/true"
</span>     set gpg_verification [exec /bin/sh -c \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "if [gpg_verify.shellescape [option gpg_verify.gpg]] \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            --homedir [gpg_verify.shellescape [option gpg_verify.gpg_homedir]] \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            --verify [gpg_verify.shellescape ${signature_file}] \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            [gpg_verify.shellescape ${test_file}] 2>/dev/null; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "if [shellescape [option gpg_verify.gpg]] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            --homedir [shellescape [option gpg_verify.gpg_homedir]] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            --verify [shellescape ${signature_file}] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            [shellescape ${test_file}] 2>/dev/null; \
</span>             then echo 'VERIFIED'; else echo 'UNVERIFIED'; fi"]
     if {[string trim ${gpg_verification}] ne "VERIFIED"} {
         error "GPG signature verification failed on ${test_file} with pubkey file ${pubkey_file}."
</pre><pre style='margin:0'>

</pre>