<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/9fe67f194d88e5c689c588b91022b32e2a57898a">https://github.com/macports/macports-ports/commit/9fe67f194d88e5c689c588b91022b32e2a57898a</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 9fe67f194d8 adblock2privoxy: Fix notes formatting typos
</span>9fe67f194d8 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 9fe67f194d88e5c689c588b91022b32e2a57898a
</span>Author: Steven Thomas Smith <s.t.smith@ieee.org>
AuthorDate: Wed Dec 22 15:04:10 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> adblock2privoxy: Fix notes formatting typos
</span>---
www/adblock2privoxy/Portfile | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/adblock2privoxy/Portfile b/www/adblock2privoxy/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 93c0ea1f4bf..7030fe6813f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/adblock2privoxy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/adblock2privoxy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -339,7 +339,8 @@ ADBLOCK2PRIVOXY_DH
</span> certificate from e.g. Privoxy's certificate authority (CA). As sudo:
# Example, more likely use ${prefix}/etc/privoxy/CA
<span style='display:block; white-space:pre;background:#ffe0e0;'>- cp -R ${prefix}/etc/privoxy/ca.macports ca.adblock2privoxy && cd ca.adblock2privoxy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cp -R ${prefix}/etc/privoxy/ca.macports ca.adblock2privoxy \\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ && cd ca.adblock2privoxy
</span> cp ${tls_cert_dir}/openssl.cnf .
# edit openssl.cnf for your local organizationName, commonName, etc.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -354,14 +355,14 @@ ADBLOCK2PRIVOXY_DH
</span> -algorithm EC -pkeyopt ec_paramgen_curve:P-384 -aes256 \\
-pass file:passphrase.txt
openssl ec -in adblock2privoxy-nginx.key.pem \\
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -passin file:passphrase.txt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -passin file:passphrase.txt \\
</span> -out adblock2privoxy-nginx.key.pem.decrypted
chmod go-rwx adblock2privoxy-nginx.key.pem.decrypted
# Server certificate CSR
openssl req -config openssl.cnf -new -sha256 \\
-extensions server_cert -key adblock2privoxy-nginx.key.pem \\
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -passin file:passphrase.txt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -passin file:passphrase.txt \\
</span> -out adblock2privoxy-nginx.csr.pem -batch
# Server certificate (825 days maximum validity)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -369,7 +370,7 @@ ADBLOCK2PRIVOXY_DH
</span> openssl ca -config openssl.cnf -days 825 -notext -md sha256 \\
-extensions server_cert -in adblock2privoxy-nginx.csr.pem \\
-out adblock2privoxy-nginx.cert.pem \\
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -passin file:passphrase.txt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -passin file:passphrase.txt \\
</span> -subj '/CN=adblock2privoxy-nginx' -batch
# Server certificate chain of trust
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -383,7 +384,8 @@ ADBLOCK2PRIVOXY_DH
</span> # Install the adblock2privoxy PKI
cp -p ca.key.pem ca.cert.pem passphrase.txt \\
adblock2privoxy-nginx.cert.pem adblock2privoxy-nginx.chain.pem \\
<span style='display:block; white-space:pre;background:#ffe0e0;'>- adblock2privoxy-nginx.key.pem adblock2privoxy-nginx.key.pem.decrypted \\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ adblock2privoxy-nginx.key.pem \\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ adblock2privoxy-nginx.key.pem.decrypted \\
</span> ${tls_cert_dir}
"
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -490,8 +492,9 @@ ${prefix}/etc/${name}/adblock2privoxy_blocklist.txt.
</span>
Example production run:
<span style='display:block; white-space:pre;background:#ffe0e0;'>- adblock2privoxy -p ${prefix}/etc/adblock2privoxy/privoxy -w ${prefix}/etc/adblock2privoxy/css -d ${adblock2privoxy_css_server} \\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- \$(< ${prefix}/etc/${name}/adblock2privoxy_blocklist.txt)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ adblock2privoxy -p ${prefix}/etc/adblock2privoxy/privoxy \\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -w ${prefix}/etc/adblock2privoxy/css -d ${adblock2privoxy_css_server} \\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \$(< ${prefix}/etc/${name}/adblock2privoxy_blocklist.txt)
</span>
Update run:
</pre><pre style='margin:0'>
</pre>