<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/37ff3284fe5a554c691bdaca9ee6c8cac9186729">https://github.com/macports/macports-ports/commit/37ff3284fe5a554c691bdaca9ee6c8cac9186729</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 37ff3284fe5 adblock2privoxy: Update to version 2.3.0 * Update to version 2.3.0 * Add man pages * Add initialization script * Add option to use .env file for local environment variables * Remove SIP-defunct launchctl daemon
</span>37ff3284fe5 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 37ff3284fe5a554c691bdaca9ee6c8cac9186729
</span>Author: Steven Thomas Smith <s.t.smith@ieee.org>
AuthorDate: Sat Feb 17 21:08:54 2024 -0500
<span style='display:block; white-space:pre;color:#404040;'> adblock2privoxy: Update to version 2.3.0
</span><span style='display:block; white-space:pre;color:#404040;'> * Update to version 2.3.0
</span><span style='display:block; white-space:pre;color:#404040;'> * Add man pages
</span><span style='display:block; white-space:pre;color:#404040;'> * Add initialization script
</span><span style='display:block; white-space:pre;color:#404040;'> * Add option to use .env file for local environment variables
</span><span style='display:block; white-space:pre;color:#404040;'> * Remove SIP-defunct launchctl daemon
</span>---
www/adblock2privoxy/Portfile | 65 ++++++++++++++--------
.../files/adblock2privoxy_initialize.sh | 8 +++
.../files/private.myserver.launchctl-setenv.plist | 16 ------
3 files changed, 50 insertions(+), 39 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 5f2687193de..e7f93994ea3 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,7 +3,7 @@
</span> PortSystem 1.0
name adblock2privoxy
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.2.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.3.0
</span> revision 0
categories www haskell
maintainers {ieee.org:s.t.smith @essandess} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,15 +32,14 @@ long_description {*}${description}. \
</span>
homepage https://github.com/essandess/adblock2privoxy
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites https://hackage.haskell.org/package/${name}-${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 0ee221d7c1d0abc0494347eb27e98a0e8e30f5f3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 992fd7279e4e24508a6c3da556bb8c34a98dcbd881cadb2b075c2bbb80c8ec64 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 42522
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 2c672d9742a76fd01f0715e2b0ac45c4a6f4a9bd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 bd6a0b2f7a922a314608392ff2aad299f28337c5c97d6723b03c7abdfb4c5f29 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 44257
</span>
depends_lib-append port:zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_run-append port:nginx \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_run-append port:bash \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:nginx \
</span> port:privoxy \
port:wget
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -118,10 +117,21 @@ if { [variant_isset "stack"] } {
</span> }
post-destroot {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 -W ${worksrcpath} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ man/man1/${name}.1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/share/man/man1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> xinstall -d \
${destroot}${prefix}/etc/${name} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/etc/${name}/privoxy \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/etc/${name}/css
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/etc/${name}/bin \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/etc/${name}/css \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/etc/${name}/privoxy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0755 -W ${filespath} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ adblock2privoxy_initialize.sh \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/etc/${name}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@PREFIX@|${prefix}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/etc/${name}/bin/adblock2privoxy_initialize.sh
</span>
xinstall -m 0644 -W ${filespath} \
adblock2privoxy_blocklist.txt \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -134,10 +144,6 @@ post-destroot {
</span> ${destroot}${prefix}/etc/${name}/css/default.html.macports
reinplace "s|@PREFIX@|${prefix}|g" \
${destroot}${prefix}/etc/${name}/nginx.conf.macports
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0644 -W ${filespath} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- private.myserver.launchctl-setenv.plist \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/share/${name}
</span> }
set tls_ca_dir ${prefix}/etc/${name}/ca.macports
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -483,14 +489,20 @@ if { ![variant_isset "https_inspection"] } {
</span> startupitem.create yes
startupitems \
name ${name} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- init "ADBLOCK2PRIVOXY_CSS_SERVER=\"\${ADBLOCK2PRIVOXY_CSS_SERVER:-${adblock2privoxy_css_server}}\"" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- start [list "( IFS=\$'\\n' ADBLOCK2PRIVOXY_BLOCKLIST=(\$(grep -v -e '^ *#' < \${prefix}/etc/${name}/adblock2privoxy_blocklist.txt \\" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ init [list "if \[ -f \"\${prefix}/etc/adblock2privoxy/ADBLOCK2PRIVOXY.env\" ]; then" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "\tset -a" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "\t. <(grep -E -o -e '^\[\[:alnum:]_]+=\[^\[:space:]\;]+\$' \"${prefix}/etc/adblock2privoxy/ADBLOCK2PRIVOXY.env\" | grep -E -v '^\[\[:space:]]*(#|\$)|\\\$\\(|`')" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "\tset +a" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "fi" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "ADBLOCK2PRIVOXY_CSS_SERVER=\"\${ADBLOCK2PRIVOXY_CSS_SERVER:-${adblock2privoxy_css_server}}\"" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ start [list "( IFS=\$'\\n' ADBLOCK2PRIVOXY_BLOCKLIST=(\$(grep -v -e '^ *#' < \"\${prefix}/etc/${name}/adblock2privoxy_blocklist.txt\" \\" \
</span> "\t| while read -r t; do if \"\${prefix}/bin/wget\" --max-redirect=0 -S --spider \"\${t}\" 2>&1 | grep -q 'HTTP/1.1 200 OK'; then echo \"\${t}\"; fi done)); \\" \
"/bin/test -f \"\${prefix}/etc/adblock2privoxy/privoxy/ab2p.task\" \\" \
"&& \"\${prefix}/bin/adblock2privoxy\" -t \"\${prefix}/etc/adblock2privoxy/privoxy/ab2p.task\" \\" \
"|| \"\${prefix}/bin/adblock2privoxy\" -p \"\${prefix}/etc/adblock2privoxy/privoxy\" \\" \
"\t-w \"\${prefix}/etc/adblock2privoxy/css\" \\" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "\t-d \${ADBLOCK2PRIVOXY_CSS_SERVER} ${ab2p_use_http_flag} \\" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "\t-d \"\${ADBLOCK2PRIVOXY_CSS_SERVER}\" ${ab2p_use_http_flag} \\" \
</span> "\t\"\${ADBLOCK2PRIVOXY_BLOCKLIST\[@]}\" \\" \
") && \"\${prefix}/bin/port\" reload privoxy" \
] \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -513,8 +525,12 @@ startupitems-append \
</span> "fi" \
]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-activate {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-destroot {
</span> # org.macports.adblock2privoxy
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "1s|^(#!\[\[:space:]]*)/bin/sh|\\1/usr/bin/env bash|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/etc/${startupitem.location}/org.macports.${name}/${name}.wrapper
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> reinplace \
"s|^<key>ProgramArguments</key>|<key>StartCalendarInterval</key>\\
<array>\\
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -532,8 +548,10 @@ post-activate {
</span> <key>StandardOutPath</key>\\
<string>${prefix}/var/log/${name}.log</string>\\
&|" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${prefix}/etc/${startupitem.location}/org.macports.${name}/org.macports.${name}.plist
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${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;'>+post-activate {
</span> foreach f [list \
${prefix}/etc/${name}/adblock2privoxy_blocklist.txt \
${prefix}/etc/${name}/nginx.conf \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -579,15 +597,16 @@ Update run:
</span> adblock2privoxy -t ${prefix}/etc/adblock2privoxy/privoxy/ab2p.task
The CSS web server domain name or IP address is specified by the\
<span style='display:block; white-space:pre;background:#ffe0e0;'>-environment variables (with default values):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+environment variable ADBLOCK2PRIVOXY_CSS_SERVER (with default value):
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- \${ADBLOCK2PRIVOXY_CSS_SERVER:-${adblock2privoxy_css_server}}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ADBLOCK2PRIVOXY_CSS_SERVER=${adblock2privoxy_css_server}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-To change site-specific launchd environment variables,\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use the launchd plist:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+To change this or site-specific environment variables, set them in the\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+optional file
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${prefix}/share/${name}/private.myserver.launchctl-setenv.plist
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${prefix}/etc/adblock2privoxy/ADBLOCK2PRIVOXY.env
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+Please note that the macOS command `launchctl setenv` is now prohibited by SIP.
</span> "
if { [variant_isset "initialize_always"] } {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/adblock2privoxy/files/adblock2privoxy_initialize.sh b/www/adblock2privoxy/files/adblock2privoxy_initialize.sh
</span>new file mode 100755
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..3353abdfb87
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/adblock2privoxy/files/adblock2privoxy_initialize.sh
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#!/bin/sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+prefix=@PREFIX@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+rm ${prefix}/etc/adblock2privoxy/{css,privoxy}/ab2p.*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+find ${prefix}/etc/adblock2privoxy/css -type d -depth 1 -exec rm -fr {} 2>/dev/null ';'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+launchctl kickstart -k system/org.macports.adblock2privoxy
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/adblock2privoxy/files/private.myserver.launchctl-setenv.plist b/www/adblock2privoxy/files/private.myserver.launchctl-setenv.plist
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 9519d18b4fc..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/adblock2privoxy/files/private.myserver.launchctl-setenv.plist
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-<?xml version="1.0" encoding="UTF-8"?>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-<plist version="1.0">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-<dict>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <key>Label</key>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <string>private.myserver.launchctl-setenv</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <key>ProgramArguments</key>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <array>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <string>/bin/bash</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <string>-c</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <string>/bin/launchctl setenv ADBLOCK2PRIVOXY_CSS_SERVER 10.0.1.3:8119</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- </array>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <key>RunAtLoad</key>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <true/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-</dict>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-</plist>
</span></pre><pre style='margin:0'>
</pre>