<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/55a587a5bec93fef6adbf4a0c70ea15e94de514d">https://github.com/macports/macports-ports/commit/55a587a5bec93fef6adbf4a0c70ea15e94de514d</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 55a587a5bec privoxy: Bugfix
</span>55a587a5bec is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 55a587a5bec93fef6adbf4a0c70ea15e94de514d
</span>Author: Steven Thomas Smith <s.t.smith@ieee.org>
AuthorDate: Thu Nov 4 12:59:11 2021 -0400

<span style='display:block; white-space:pre;color:#404040;'>    privoxy: Bugfix
</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/63794
</span><span style='display:block; white-space:pre;color:#404040;'>    * Fixes: https://trac.macports.org/ticket/63795
</span>---
 www/privoxy/Portfile | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/privoxy/Portfile b/www/privoxy/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8c851310de8..24161991c1f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/privoxy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/privoxy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup           perl5 1.0
</span> 
 name                privoxy
 version             3.0.32
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            3
</span> categories          www security net
 platforms           darwin
 license             GPL-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -188,6 +188,7 @@ variant https_inspection \
</span>     depends_lib-append \
                     path:share/apple-pki-bundle/apple-pki-bundle.pem:apple-pki-bundle \
                     path:share/curl/curl-ca-bundle.crt:curl-ca-bundle \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                    path:bin/openssl:openssl \
</span>                     path:lib/libssl.dylib:openssl
 
     # diff -Naur privoxy-orig/match-all.action privoxy-new/match-all.action | sed -E -e 's/privoxy-(orig|new)/./g' > patch-match-all.action.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -204,10 +205,17 @@ variant https_inspection \
</span>     # random 4-word-based passphrase
     proc correct_horse_battery_staple {} {
         # ignore errors from sf-pwgen if the password is shorter than requested
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        return \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        set passphrase \
</span>             [join [exec sh -c "sf-pwgen \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                  --algorithm memorable --count 2 --length 16 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                              2>/dev/null || true"] -]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                --algorithm memorable --count 2 --length 16 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    2>/dev/null || true"] -]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # set random passphrase if sf-pwgen's is too short for some reason
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        if {[string length ${passphrase}] < 20} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            set passphrase \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                [exec sh -c "openssl rand -base64 22 2>/dev/null \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    | rev | cut -b 2- | rev || true"]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        return ${passphrase}
</span>     }
 
     configure.args-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -282,6 +290,11 @@ variant https_inspection \
</span>             [open ${tls_ca_dir}/private/passphrase.txt w 0600]
         puts ${tls_ca_passphrase_fd} \
             ${tls_ca_passphrase}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+        # openssl password file apparently requires newline in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # the context `openssl pkcs12`, or will throw the error:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # "Error reading password from BIO"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # https://github.com/openssl/openssl/blob/3841d0f6f02e1ad3a54beabf1d5395bd1c383254/apps/lib/apps.c#L330
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        puts ${tls_ca_passphrase_fd} "\n"
</span>         close ${tls_ca_passphrase_fd}
         # create the root CA
         system -W ${tls_ca_dir} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -318,7 +331,7 @@ variant https_inspection \
</span>             openssl pkcs12 -export -out certs/ca.p12 \\
                 -inkey private/ca.key.pem -in certs/ca.cert.pem \\
                 -passin file:private/passphrase.txt \\
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                -passout pass:\$'${tls_ca_passphrase}'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                -passout file:private/passphrase.txt
</span> TLS_PRIVOXY_ROOT_CA
 "
 
</pre><pre style='margin:0'>

</pre>