<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/5205849bdcf43f2df09f8dd7ba384267cbd1c57b">https://github.com/macports/macports-ports/commit/5205849bdcf43f2df09f8dd7ba384267cbd1c57b</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 5205849bdcf adblock2privoxy: Update to version 2.1.1; Add proxy_settings variant
</span>5205849bdcf is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 5205849bdcf43f2df09f8dd7ba384267cbd1c57b
</span>Author: Steven Thomas Smith <s.t.smith@ieee.org>
AuthorDate: Fri Dec 8 20:27:35 2023 -0500

<span style='display:block; white-space:pre;color:#404040;'>    adblock2privoxy: Update to version 2.1.1; Add proxy_settings variant
</span>---
 www/adblock2privoxy/Portfile          | 64 +++++++++++++++++++++++++++++++----
 www/adblock2privoxy/files/openssl.cnf |  2 +-
 2 files changed, 59 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 9d24f26d0f6..7de0b2824a3 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;'>@@ -3,8 +3,8 @@
</span> PortSystem          1.0
 
 name                adblock2privoxy
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version             2.1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version             2.1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            0
</span> categories          www haskell
 maintainers         {ieee.org:s.t.smith @essandess} openmaintainer
 license             GPL-3
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,9 +34,9 @@ homepage            https://github.com/essandess/adblock2privoxy
</span> 
 master_sites        https://hackage.haskell.org/package/${name}-${version}
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums           rmd160  da82eb5ece0f97b9ebf3ec97f6631f45d4bb30c5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  1c5ac2cb54cc9fd336a5ece50a8acbfaee13281ffe8c3a9d8c8b8b44f5859e70 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    42526
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums           rmd160  8b24682972d938c8765be4762f54899b8fb90894 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  db96a909df68576d9c08b565a8f5c2e63ef05eb121dc959b03c151d1422f5d6d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    42545
</span> 
 depends_lib-append  port:zlib
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -143,6 +143,58 @@ post-destroot {
</span> set tls_ca_dir      ${prefix}/etc/${name}/ca.macports
 set tls_cert_dir    ${prefix}/etc/${name}/certs
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set optional_proxy  http://localhost:8080
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set proxy_message \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "Startupitem configured to use a proxy. Please set the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+environment variables http_proxy and https_proxy and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+install this port variant a sudo command that sets
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+these variables, e.g.:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+\tsudo -E port install ${name} +proxy_settings
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+\tsudo env http_proxy=${optional_proxy} port install ${name} +proxy_settings
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+or edit the startupitem:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+\t${prefix}/etc/${startupitem.location}/org.macports.${name}/org.macports.${name}.plist
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+to change the proxy settings and reload the port."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant proxy_settings \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    description {Include proxy settings in the startupitem plist.} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # Note: `sudo launchctl setenv` is no longer functional on macOS Ventura+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    notes-append ${proxy_message}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    post-activate {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        if { [info exists ::env(http_proxy)] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            set http_proxy $env(http_proxy)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            set http_proxy ${optional_proxy}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        if { [info exists ::env(https_proxy)] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            set https_proxy $env(https_proxy)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            set https_proxy ${http_proxy}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # org.macports.adblock2privoxy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        reinplace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            "s|^<key>ProgramArguments</key>|<key>EnvironmentVariables</key>\\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+<dict>\\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   <key>http_proxy</key>\\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   <string>${http_proxy}</string>\\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   <key>https_proxy</key>\\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   <string>${https_proxy}</string>\\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+</dict>\\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+&|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        ${prefix}/etc/${startupitem.location}/org.macports.${name}/org.macports.${name}.plist
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        ui_msg "${proxy_message}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+The startupitem is configured to use the proxy settings:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+\thttp_proxy=${http_proxy}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+\thttps_proxy=${https_proxy}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant https_inspection \
     description {HTTPS CSS Server for use with 'privoxy +https_inspection'.} {
     depends_build-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -275,7 +327,7 @@ variant https_inspection \
</span> 
             # Server certificate CSR
             openssl req -config openssl.cnf -new -sha256 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                 -extensions server_cert -key adblock2privoxy-nginx.key.pem \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                 -key adblock2privoxy-nginx.key.pem \
</span>                  -passin file:passphrase.txt \
                  -out adblock2privoxy-nginx.csr.pem -batch
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/adblock2privoxy/files/openssl.cnf b/www/adblock2privoxy/files/openssl.cnf
</span><span style='display:block; white-space:pre;color:#808080;'>index 52ee6ac669e..05321717a2f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/adblock2privoxy/files/openssl.cnf
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/adblock2privoxy/files/openssl.cnf
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -73,7 +73,7 @@
</span> # chmod go-rwx adblock2privoxy-nginx.key.pem.decrypted
 
 # Server certificate CSR
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# openssl req -config openssl.cnf -new -sha256 -extensions server_cert \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# openssl req -config openssl.cnf -new -sha256 \
</span> #     -key adblock2privoxy-nginx.key.pem -passin file:passphrase.txt \
 #     -out adblock2privoxy-nginx.csr.pem -batch
 
</pre><pre style='margin:0'>

</pre>