<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/f2766776b684fd7cdac14f388305fb0820965daf">https://github.com/macports/macports-ports/commit/f2766776b684fd7cdac14f388305fb0820965daf</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit f2766776b684fd7cdac14f388305fb0820965daf
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Sat Dec 25 09:01:46 2021 -0600

<span style='display:block; white-space:pre;color:#404040;'>    pass: Add missing patchfile
</span>---
 security/pass/Portfile                                |  5 +----
 .../files/patch-fix-unnecessary-reencryptions.diff    | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+), 4 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/pass/Portfile b/security/pass/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5544c24279f..55902cdbeb6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/pass/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/pass/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,10 +29,7 @@ checksums           rmd160  c1ac8d01ba88fad13cb5c7a6dcb2b7f3f58bb36c \
</span>                     size    65272
 
 patchfiles          patch-getopt-path.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Fix unecessary reencryptions on MacOS. See commit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# 04cd3023f48cd203f6c0193e57a427226e8b431c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append   patch-fix-unecessary-reencryptions.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append   patch-fix-unnecessary-reencryptions.diff
</span> 
 post-patch {
     reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/src/platform/darwin.sh
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/pass/files/patch-fix-unnecessary-reencryptions.diff b/security/pass/files/patch-fix-unnecessary-reencryptions.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..ef0e9eec5d5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/pass/files/patch-fix-unnecessary-reencryptions.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix unnecessary reencryptions on macOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+POSIX sed doesn't support \+ in BREs which causes the regex that
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+extracts a file's current keys to return nothing, meaning that files
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+are unnecessarily reencrypted.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This converts the regex in question to use ERE.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://git.zx2c4.com/password-store/commit/?id=04cd3023f48cd203f6c0193e57a427226e8b431c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/password-store.sh.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/password-store.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -129,7 +129,7 @@ reencrypt_path() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                   done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                   gpg_keys="$($GPG $PASSWORD_STORE_GPG_OPTS --list-keys --with-colons "${GPG_RECIPIENTS[@]}" | sed -n 's/^sub:[^idr:]*:[^:]*:[^:]*:\([^:]*\):[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[a-zA-Z]*e[a-zA-Z]*:.*/\1/p' | LC_ALL=C sort -u)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-          current_keys="$(LC_ALL=C $GPG $PASSWORD_STORE_GPG_OPTS -v --no-secmem-warning --no-permission-warning --decrypt --list-only --keyid-format long "$passfile" 2>&1 | sed -n 's/^gpg: public key is \([A-F0-9]\+\)$/\1/p' | LC_ALL=C sort -u)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++          current_keys="$(LC_ALL=C $GPG $PASSWORD_STORE_GPG_OPTS -v --no-secmem-warning --no-permission-warning --decrypt --list-only --keyid-format long "$passfile" 2>&1 | sed -nE 's/^gpg: public key is ([A-F0-9]+)$/\1/p' | LC_ALL=C sort -u)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           if [[ $gpg_keys != "$current_keys" ]]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                   echo "$passfile_display: reencrypting to ${gpg_keys//$'\n'/ }"
</span></pre><pre style='margin:0'>

</pre>