<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a64f314af5027bb61029934910664906113c5aa1">https://github.com/macports/macports-ports/commit/a64f314af5027bb61029934910664906113c5aa1</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 a64f314af50 dns-server: Update to version 9.16.13 with bugfixes and improvements
</span>a64f314af50 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a64f314af5027bb61029934910664906113c5aa1
</span>Author: Steven Thomas Smith <s.t.smith@ieee.org>
AuthorDate: Fri Mar 19 21:34:46 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> dns-server: Update to version 9.16.13 with bugfixes and improvements
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * Fixes:
</span><span style='display:block; white-space:pre;color:#404040;'> * https://trac.macports.org/ticket/62492
</span><span style='display:block; white-space:pre;color:#404040;'> * https://trac.macports.org/ticket/62493
</span><span style='display:block; white-space:pre;color:#404040;'> * https://trac.macports.org/ticket/62494
</span><span style='display:block; white-space:pre;color:#404040;'> * Minor Portfile formatting improvements
</span>---
net/dns-server/Portfile | 103 ++++++++++++++++++++++++----------------
net/dns-server/files/named.conf | 1 +
net/dns-server/files/rndc.conf | 6 +++
3 files changed, 69 insertions(+), 41 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/dns-server/Portfile b/net/dns-server/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f61eb9b12d0..741d56fd70d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/dns-server/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/dns-server/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,8 +4,8 @@ PortSystem 1.0
</span>
name dns-server
# use port:bind9's version as the version number
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 9.14.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 9.16.13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories net
platforms darwin freebsd sunos
supported_archs noarch
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,14 +14,18 @@ license BSD
</span> distfiles
description Domain Name System server configuration
<span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DNS server working configuration for named that provides a basic,\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- working, easily modifiable LAN DNS server. The configuration includes\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- example LAN, .private, and localhost zones, with example A, PTR,\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- and CNAME (alias) records, MX, SPF, DKIM, and DMARC records for email\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- servers, and URI, TXT, and SRV records for Kerberos servers. This\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configuration is based upon macOS Server.app's VPN server prior to\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- its deprecation in Server.app version 5.7. See `man named`.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description DNS server working configuration for named \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ that provides a basic, working, easily \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ modifiable LAN DNS server. The configuration \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ includes example LAN, .private, and localhost \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ zones, with example A, PTR, and CNAME (alias) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ records, MX, SPF, DKIM, and DMARC records for \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ email servers, and URI, TXT, and SRV records \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for Kerberos servers. This configuration is \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ based upon macOS Server.app's VPN server prior \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ to its deprecation in Server.app version 5.7. \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ See `man named`.
</span>
homepage https://www.isc.org/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,19 +42,24 @@ destroot {
</span> ${destroot}${prefix}/var/named \
${destroot}${prefix}/var/log/named
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Install the conf file template
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -o root -m 644 ${filespath}/named.conf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/etc/named.conf.macports
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Install the conf file templates
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach f { \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ named.conf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rndc.conf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -o root -m 644 ${filespath}/${f} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/etc/${f}.macports
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
# Install the db file templates
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach f "\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach f { \
</span> db.@LAN_REVERSE_IP_SUBNET@.in-addr.arpa \
db.@domain@.@tld@ \
db.@domain@.private \
localhost.zone \
named.ca \
named.local \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- " {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } {
</span> xinstall -o named -g named -m 644 ${filespath}/${f} \
${destroot}${prefix}/var/named/${f}.macports
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -87,28 +96,39 @@ post-activate {
</span> set client_lan_reverse_ip_address [exec /bin/sh -c "echo ${client_lan_ip_address} | /usr/bin/sed -E -e 's|(\[\[:digit:\]\]{1,3})\\.(\[\[:digit:\]\]{1,3})\\.(\[\[:digit:\]\]{1,3})\\.(\[\[:digit:\]\]{1,3})\$|\\4.\\3.\\2.\\1|'"]
# copy to actual config files if they don't already exist
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ![file exists ${prefix}/etc/named.conf] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Configure the conf file
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -o root -g named -m 644 ${prefix}/etc/named.conf.macports \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${prefix}/etc/named.conf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@PREFIX@|${prefix}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${prefix}/etc/named.conf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@LAN_REVERSE_IP_SUBNET@|${lan_reverse_ip_subnet}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${prefix}/etc/named.conf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@domain@|${named_domain}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${prefix}/etc/named.conf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@tld@|${named_tld}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${prefix}/etc/named.conf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach f { \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ named.conf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rndc.conf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ![file exists ${prefix}/etc/${f}] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Configure the conf file
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -o root -g named -m 644 ${prefix}/etc/${f}.macports \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${prefix}/etc/${f}
</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;'>+ ${prefix}/etc/${f}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -q "s|@LAN_REVERSE_IP_SUBNET@|${lan_reverse_ip_subnet}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${prefix}/etc/${f}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -q "s|@domain@|${named_domain}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${prefix}/etc/${f}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -q "s|@tld@|${named_tld}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${prefix}/etc/${f}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${f} eq {named.conf} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ && "${named_domain}.${named_tld}" eq "${named_domain}.private"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_warn "Duplicate zone '${named_domain}.${named_tld}' in \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+${prefix}/etc/named.conf that will cause a bind9 error. Please remove this \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+duplicate zone. See `port notes ${name}`."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
# Configure the db file templates
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach f "\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach f { \
</span> db.@LAN_REVERSE_IP_SUBNET@.in-addr.arpa \
db.@domain@.@tld@ \
db.@domain@.private \
localhost.zone \
named.ca \
named.local \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- " {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } {
</span> set f_renamed $f
set f_renamed [ strsed $f_renamed "s|@domain@|${named_domain}|" ]
set f_renamed [ strsed $f_renamed "s|@tld@|${named_tld}|" ]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -126,30 +146,30 @@ post-activate {
</span> named.ca \
named.local \
" {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@PREFIX@|${prefix}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -q "s|@PREFIX@|${prefix}|g" \
</span> ${prefix}/var/named/${f}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@host@|${named_host}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -q "s|@host@|${named_host}|g" \
</span> ${prefix}/var/named/${f}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@domain@|${named_domain}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -q "s|@domain@|${named_domain}|g" \
</span> ${prefix}/var/named/${f}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@tld@|${named_tld}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -q "s|@tld@|${named_tld}|g" \
</span> ${prefix}/var/named/${f}
# case sensitive for Kerberos REALMs
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@HOST@|[string toupper ${named_host}]|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -q "s|@HOST@|[string toupper ${named_host}]|g" \
</span> ${prefix}/var/named/${f}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@DOMAIN@|[string toupper ${named_domain}]|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -q "s|@DOMAIN@|[string toupper ${named_domain}]|g" \
</span> ${prefix}/var/named/${f}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@TLD@|[string toupper ${named_tld}]|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -q "s|@TLD@|[string toupper ${named_tld}]|g" \
</span> ${prefix}/var/named/${f}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@HOST_LAN_IP_ADDRESS@|${host_lan_ip_address}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -q "s|@HOST_LAN_IP_ADDRESS@|${host_lan_ip_address}|g" \
</span> ${prefix}/var/named/${f}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@LAN_REVERSE_IP_SUBNET@|${lan_reverse_ip_subnet}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -q "s|@LAN_REVERSE_IP_SUBNET@|${lan_reverse_ip_subnet}|g" \
</span> ${prefix}/var/named/${f}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@HOST_LAN_REVERSE_IP_ADDRESS@|${host_lan_reverse_ip_address}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -q "s|@HOST_LAN_REVERSE_IP_ADDRESS@|${host_lan_reverse_ip_address}|g" \
</span> ${prefix}/var/named/${f}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@CLIENT_LAN_IP_ADDRESS@|${client_lan_ip_address}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -q "s|@CLIENT_LAN_IP_ADDRESS@|${client_lan_ip_address}|g" \
</span> ${prefix}/var/named/${f}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@CLIENT_LAN_REVERSE_IP_ADDRESS@|${client_lan_reverse_ip_address}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -q "s|@CLIENT_LAN_REVERSE_IP_ADDRESS@|${client_lan_reverse_ip_address}|g" \
</span> ${prefix}/var/named/${f}
}
if { ![file exists ${prefix}/var/named/rndc.key] } {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -180,6 +200,7 @@ Users must reconfigure the installation for their own network\
</span> specifics by editing the files:
${prefix}/etc/named.conf
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${prefix}/etc/rndc.conf
</span> ${prefix}/var/named/db.*
Refer to the *.macports template files and `man named` for details.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/dns-server/files/named.conf b/net/dns-server/files/named.conf
</span><span style='display:block; white-space:pre;color:#808080;'>index 6ff97ccee71..fd55210e248 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/dns-server/files/named.conf
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/dns-server/files/named.conf
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,6 +20,7 @@ options {
</span> 8.8.8.8;
4.4.4.4;
};
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ dnssec-validation auto;
</span> pid-file "@PREFIX@/var/run/named/named.pid";
};
controls {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/dns-server/files/rndc.conf b/net/dns-server/files/rndc.conf
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..384e54a8dff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/dns-server/files/rndc.conf
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+include "@PREFIX@/var/named/rndc.key";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+options {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default-key "rndc-key";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default-server ::1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default-port 54;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+};
</span></pre><pre style='margin:0'>
</pre>