<pre style='margin:0'>
Frank Schima (mf2k) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/939d35c6db739d10bd5034765bcdb86b1a9ff6f7">https://github.com/macports/macports-ports/commit/939d35c6db739d10bd5034765bcdb86b1a9ff6f7</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 939d35c macos-fortress: Update and Bugfixes (#5997)
</span>939d35c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 939d35c6db739d10bd5034765bcdb86b1a9ff6f7
</span>Author: Steve Smith <essandess@users.noreply.github.com>
AuthorDate: Tue Dec 17 13:37:55 2019 -0500
<span style='display:block; white-space:pre;color:#404040;'> macos-fortress: Update and Bugfixes (#5997)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * Update to version 2019.12.15
</span><span style='display:block; white-space:pre;color:#404040;'> * Update Easylist to PAC
</span><span style='display:block; white-space:pre;color:#404040;'> * Fix typo in check script
</span><span style='display:block; white-space:pre;color:#404040;'> * Add launchd daemon example to set environment variables at boot
</span>---
net/macos-fortress/Portfile | 34 +++++++++++++++++-----
.../files/macosfortress_setup_check.sh | 2 +-
.../files/private.myserver.launchctl-setenv.plist | 16 ++++++++++
3 files changed, 43 insertions(+), 9 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/macos-fortress/Portfile b/net/macos-fortress/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b4ad610..03b341b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/macos-fortress/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/macos-fortress/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,7 @@
</span> PortSystem 1.0
name macos-fortress
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2019.12.08
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2019.12.15
</span> revision 0
categories net security
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -125,7 +125,11 @@ set notes_pf "The PF configuration provides an adaptive firewall\
</span> provided by the crowd-sourced lists dshield and emergingthreats. PF\
uses this environment variable (with default value):
<span style='display:block; white-space:pre;background:#ffe0e0;'>-\t\${PF_CONF:-${pf_conf}}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+\t\${PF_CONF:-${pf_conf}}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ To change site-specific launchd environment variables, use the launchd plist:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+\t${prefix}/share/${name}/private.myserver.launchctl-setenv.plist"
</span>
set notes_proxy "The proxy uses a chain of squid (port 3128) and\
privoxy (port 8118) along with a blackhole provided by nginx (port 8119).\
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -143,6 +147,10 @@ set notes_proxy "The proxy uses a chain of squid (port 3128) and\
</span> \t\${PROXY_PAC_SERVER:-${proxy_pac_server}}
\t\${PROXY_PAC_DIRECTORY:-${proxy_pac_directory}}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ To change site-specific launchd environment variables, use the launchd plist:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+\t${prefix}/share/${name}/private.myserver.launchctl-setenv.plist
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> The native macOS web server is used by default to host the PAC file.\
This web server must be launched independently with the command
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -169,12 +177,17 @@ if {${name} eq ${subport}} {
</span> port:${name}-pf \
port:${name}-proxy
destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d ${destroot}${prefix}/share/${name}/logrotate.d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/share/${name} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/share/${name}/logrotate.d
</span> xinstall -m 0755 \
${filespath}/macosfortress_setup_check.sh ${destroot}${prefix}/bin
xinstall -m 0644 \
${filespath}/logrotate.d.macos-fortress \
${destroot}${prefix}/share/${name}/logrotate.d/macos-fortress
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${filespath}/private.myserver.launchctl-setenv.plist \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/share/${name}
</span> foreach cmd [list \
"s|@PREFIX@|${prefix}|g" \
"s|@NAME@|${name}|g" \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -597,8 +610,8 @@ subport ${name}-proxy {
</span> subport ${name}-easylistpac {
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup essandess easylist-pac-privoxy c58c8fe
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 2019.12.08
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup essandess easylist-pac-privoxy 67d66d5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 2019.12.15
</span> revision 0
description EasyList Tracker and Adblocks to Proxy Auto Configuration (PAC) File
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -614,9 +627,9 @@ subport ${name}-easylistpac {
</span>
homepage https://github.com/essandess/easylist-pac-privoxy
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 1651a30c21adecf60dfb17f0edc834e5815cfe2e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 26ca4bbef4f7f099714f0684cbeb7d9f9bb458def2f46a8823840117bf04ce73 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 81719
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 79d6f230c561fb492b957a75de79bd1cdf01b79c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 da5f6a8717519d40d17360da6c746d56e4ee43d8afe5f10846dedc30501a615f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 81748
</span>
depends_lib-append \
port:adblock2privoxy \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -697,6 +710,11 @@ test -f \"\${PROXY_PAC_DIRECTORY}/proxy.pac.orig\" \\
</span> \t\${PROXY_PAC_DIRECTORY:-${proxy_pac_directory}}
\t\${PROXY_PAC_SERVER:-${proxy_pac_server}}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ To change site-specific launchd environment variables,\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ use the launchd plist:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+\t${prefix}/share/${name}/private.myserver.launchctl-setenv.plist
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> The native macOS Web Server must be started with the command:
sudo apachectl start
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/macos-fortress/files/macosfortress_setup_check.sh b/net/macos-fortress/files/macosfortress_setup_check.sh
</span><span style='display:block; white-space:pre;color:#808080;'>index 304067a..7acd9b0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/macos-fortress/files/macosfortress_setup_check.sh
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/macos-fortress/files/macosfortress_setup_check.sh
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,7 +39,7 @@ then
</span> PROXY_PAC_DIRECTORY="${PROXY_PAC_DIRECTORY:-@PROXY_PAC_DIRECTORY@}"
else
# macOS Server for proxy.pac
<span style='display:block; white-space:pre;background:#ffe0e0;'>- PROXY_PAC_DIRECTORY="${PROXY_PAC_DIRECTORY:-/Library/WebServer/Sites/${PROXY_HSOTNAME}}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PROXY_PAC_DIRECTORY="${PROXY_PAC_DIRECTORY:-/Library/WebServer/Sites/${PROXY_HOSTNAME}}"
</span> fi
fname_exists () { [ -f "${FNAME}" ] && echo "[✅] ${FNAME} exists" || echo "[❌] ${FNAME} DOESN'T EXIST!"; }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/macos-fortress/files/private.myserver.launchctl-setenv.plist b/net/macos-fortress/files/private.myserver.launchctl-setenv.plist
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..333fe9e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/macos-fortress/files/private.myserver.launchctl-setenv.plist
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+<?xml version="1.0" encoding="UTF-8"?>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+<!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:#e0ffe0;'>+<plist version="1.0">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+<dict>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <key>Label</key>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <string>private.myserver.launchctl-setenv</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <key>ProgramArguments</key>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <array>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <string>/bin/bash</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <string>-c</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <string>/bin/launchctl setenv PROXY_PAC_DIRECTORY /Library/WebServer/Sites/proxy.myserver.private ; /bin/launchctl setenv PROXY_PAC_SERVER 10.0.1.3</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </array>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <key>RunAtLoad</key>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <true/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+</dict>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+</plist>
</span></pre><pre style='margin:0'>
</pre>