<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/7d4f8b1e87796a5d8927f1a353265f8f878c54ab">https://github.com/macports/macports-ports/commit/7d4f8b1e87796a5d8927f1a353265f8f878c54ab</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 7d4f8b1e877 macos-fortress: Update to Python39 dependencies
</span>7d4f8b1e877 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7d4f8b1e87796a5d8927f1a353265f8f878c54ab
</span>Author: Steven Thomas Smith <s.t.smith@ieee.org>
AuthorDate: Wed Feb 24 21:37:32 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> macos-fortress: Update to Python39 dependencies
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * Update to Python39 dependencies
</span><span style='display:block; white-space:pre;color:#404040;'> * Add ARD ports per https://support.apple.com/guide/remote-desktop/tcp-and-udp-port-reference-apd0c903fec/mac
</span>---
net/macos-fortress/Portfile | 36 ++++++++++++++++++++----------------
net/macos-fortress/files/pf.conf | 4 ++--
2 files changed, 22 insertions(+), 18 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 5fe8f879235..eeb8ac33df1 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,13 +3,14 @@
</span> PortSystem 1.0
name macos-fortress
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2020.12.13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2021.02.28
</span> revision 0
categories net security
platforms darwin
license MIT
maintainers {ieee.org:s.t.smith @essandess} openmaintainer
<span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://github.com/essandess/macOS-Fortress
</span>
if {${subport} ne "${name}-easylistpac"} {
master_sites
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,9 +24,12 @@ build {}
</span> # perl5 and python3 major versions
set perl5_major_version \
5.28
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set python3_version 3.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set python3_version_nickname \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [join [lrange [split ${python3_version} .] 0 1] {}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Use ${python.default_version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# name consistency with ${prefix}/var/macports/sources/rsync.macports.org/macports/release/tarballs/ports/_resources/port1.0/group/python-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_default_version 39
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_version ${python_default_version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_branch [string index ${python_version} 0].[string range ${python_version} 1 end]
</span>
set pf_conf ${prefix}/etc/${name}/pf.conf
set pf_conf_prefix "\${prefix}/etc/${name}/pf.conf"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -183,8 +187,6 @@ if {${name} eq ${subport}} {
</span> emergingthreats, hosts file, and a proxy \
autoconfiguration (PAC) file.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- homepage https://github.com/essandess/macOS-Fortress
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_lib-append \
port:${name}-pf \
port:${name}-proxy
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -267,9 +269,9 @@ ${notes_proxy}"
</span>
subport ${name}-pf {
description PF Firewall with dhield, emergingthreats, and \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- adaptive bruteforce blocks
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ adaptive bruteforce blocks
</span> long_description \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${description}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {*}${description}
</span>
depends_lib-append \
port:${name}-dshield \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -398,9 +400,9 @@ interface : ${interface}
</span>
subport ${name}-dshield {
description DShield is a community-based collaborative firewall \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- log correlation system.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ log correlation system.
</span> long_description \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${description}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {*}${description}
</span>
depends_run-append \
port:gnupg2 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -468,7 +470,7 @@ sudo launchctl kickstart -k system/org.macports.${subport}"
</span> subport ${name}-emergingthreats {
description Emerging Threats rule server.
long_description \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${description}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {*}${description}
</span>
depends_run-append \
port:wget
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -519,6 +521,8 @@ sudo launchctl kickstart -k system/org.macports.${subport}"
</span>
subport ${name}-proxy {
description Blackhole and Privatizing Proxy.
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ long_description \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {*}${description}
</span>
depends_lib-append \
port:${name}-easylistpac \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -654,10 +658,10 @@ subport ${name}-easylistpac {
</span>
depends_lib-append \
port:adblock2privoxy \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:python${python3_version_nickname} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python3_version_nickname}-matplotlib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python3_version_nickname}-numpy \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python3_version_nickname}-scikit-learn
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python${python_version} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python_version}-matplotlib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python_version}-numpy \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python_version}-scikit-learn
</span>
destroot {
xinstall -d ${destroot}${prefix}/etc/${name}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -666,7 +670,7 @@ subport ${name}-easylistpac {
</span> xinstall -m 0644 proxy.pac \
${destroot}${prefix}/etc/${name}/proxy.pac.macports
reinplace -E \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "1s|env\[\[:space:\]\]+python3|env ${prefix}/bin/python${python3_version}|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "1s|env\[\[:space:\]\]+python3|env ${prefix}/bin/python${python_branch}|" \
</span> ${destroot}${prefix}/bin/easylist_pac.py
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/macos-fortress/files/pf.conf b/net/macos-fortress/files/pf.conf
</span><span style='display:block; white-space:pre;color:#808080;'>index fe29ee8291e..564fe09fbdf 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/macos-fortress/files/pf.conf
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/macos-fortress/files/pf.conf
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -168,9 +168,9 @@ pass in quick inet proto udp from port bootps to port bootpc
</span> pass out quick inet proto udp from port bootpc to port bootps
# LAN services: block access, except from localnet
<span style='display:block; white-space:pre;background:#ffe0e0;'>-lan_udp_services = "{ domain, 5001, postgresql }"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+lan_udp_services = "{ domain, net-assistant, 5001, 5900, postgresql }"
</span> lan_tcp_services = "{ domain, auth, nntp, www, \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 311, 3128, 5001, 5900:5909, privoxy, postgresql, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 311, 3128, net-assistant, 5001, 5900, privoxy, postgresql, \
</span> 8123, 8180, 8181, 9150, 9151 }"
block in proto tcp from any to $int_if port $lan_tcp_services
block in proto udp from any to $int_if port $lan_udp_services
</pre><pre style='margin:0'>
</pre>