<pre style='margin:0'>
Jeremy Lavergne (nerdling) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/425a561faf61baa50b33373d313d357469f63cfb">https://github.com/macports/macports-ports/commit/425a561faf61baa50b33373d313d357469f63cfb</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 425a561faf6 unbound: update to 1.19.0, unbreak build with gcc-4.2 (#21727)
</span>425a561faf6 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 425a561faf61baa50b33373d313d357469f63cfb
</span>Author: Sergey Fedorov <vital.had@gmail.com>
AuthorDate: Thu Dec 14 03:42:15 2023 +0800
<span style='display:block; white-space:pre;color:#404040;'> unbound: update to 1.19.0, unbreak build with gcc-4.2 (#21727)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * unbound: update to 1.19.0, unbreak build with gcc-4.2
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * unbound: non-functional: minor improvements to portfile
</span>---
net/unbound/Portfile | 25 ++++---
net/unbound/files/patch-macos_startup_fix.diff | 100 -------------------------
2 files changed, 13 insertions(+), 112 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/unbound/Portfile b/net/unbound/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 93f9bd25bb1..f009c0d8410 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/unbound/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/unbound/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,8 +4,8 @@ PortSystem 1.0
</span> PortGroup compiler_blacklist_versions 1.0
name unbound
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.18.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.19.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span>
categories net
license BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,12 +14,12 @@ maintainers {snc @nerdling} openmaintainer
</span> description Validating, recursive, and caching DNS resolver.
homepage https://nlnetlabs.nl/projects/unbound/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:flex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib path:lib/libssl.dylib:openssl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:flex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:expat \
</span> port:libsodium \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:expat
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/libssl.dylib:openssl
</span>
set unbounduser unbound
set unboundgroup unbound
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,14 +36,12 @@ long_description Unbound is a validating, recursive, and caching DNS \
</span>
master_sites http://unbound.net/downloads/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 4e77b7087c0c11cfe96d6963bd89ff040c137c43 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 3da95490a85cff6420f26fae0b84a49f5112df1bf1b7fc34f8724f02082cb712 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 6315297
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 5fd65ec9ebc6faff4c183297efe5669ce14e1f00 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 a97532468854c61c2de48ca4170de854fd3bc95c8043bb0cfb0fe26605966624 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 6336113
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# add fix for https://github.com/Homebrew/homebrew-core/pull/141705
</span> # add missing definition for older systems
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-macos_startup_fix.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-dnsport-ipv6tclass.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-dnsport-ipv6tclass.diff
</span>
configure.args-append --with-pidfile=${prefix}/var/run/${name}/${name}.pid \
--with-ssl=${prefix} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,6 +51,9 @@ configure.args-append --with-pidfile=${prefix}/var/run/${name}/${name}.pid \
</span> --enable-dnscrypt \
--disable-dsa
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# util/net_help.c: error: ‘for’ loop initial declaration used outside C99 mode
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cflags-append -std=c99
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {${os.major} == 10} {
compiler.blacklist *llvm-gcc-4.2 *gcc-4.0 gcc-3.3 clang
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/unbound/files/patch-macos_startup_fix.diff b/net/unbound/files/patch-macos_startup_fix.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index efda2fed1c9..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/unbound/files/patch-macos_startup_fix.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,100 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 17a557dfd5eadb8f0b812d25cea28deccaa62de9 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Philip Homburg <philip@nlnetlabs.nl>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Thu, 7 Sep 2023 15:35:32 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Fix #928 (1.18 doesn't start on macOS/SunOS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- services/listen_dnsport.c | 4 ++++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- util/fptr_wlist.c | 2 ++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- util/netevent.c | 14 +++++---------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3 files changed, 11 insertions(+), 9 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/services/listen_dnsport.c b/services/listen_dnsport.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 60f9b41e5..259347a36 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- services/listen_dnsport.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ services/listen_dnsport.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1498,9 +1498,13 @@ listen_create(struct comm_base* base, struct listen_port* ports,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else if(ports->ftype == listen_type_udpancil ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ports->ftype == listen_type_udpancil_dnscrypt) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(AF_INET6) && defined(IPV6_PKTINFO) && defined(HAVE_RECVMSG)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cp = comm_point_create_udp_ancil(base, ports->fd,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- front->udp_buff, ports->pp2_enabled, cb,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cb_arg, ports->socket);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ log_warn("This system does not support UDP ancilliary data.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(!cp) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- log_err("can't create commpoint");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/util/fptr_wlist.c b/util/fptr_wlist.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 3b88da235..43d38dc37 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- util/fptr_wlist.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ util/fptr_wlist.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -168,7 +168,9 @@ int
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fptr_whitelist_event(void (*fptr)(int, short, void *))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(fptr == &comm_point_udp_callback) return 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(AF_INET6) && defined(IPV6_PKTINFO) && defined(HAVE_RECVMSG)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else if(fptr == &comm_point_udp_ancil_callback) return 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else if(fptr == &comm_point_tcp_accept_callback) return 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else if(fptr == &comm_point_tcp_handle_callback) return 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else if(fptr == &comm_timer_callback) return 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/util/netevent.c b/util/netevent.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 204e4883c..9f4a6e6c3 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- util/netevent.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ util/netevent.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -850,10 +850,10 @@ static int consume_pp2_header(struct sldns_buffer* buf, struct comm_reply* rep,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(AF_INET6) && defined(IPV6_PKTINFO) && defined(HAVE_RECVMSG)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- comm_point_udp_ancil_callback(int fd, short event, void* arg)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if defined(AF_INET6) && defined(IPV6_PKTINFO) && defined(HAVE_RECVMSG)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct comm_reply rep;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct msghdr msg;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct iovec iov[1];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -972,14 +972,8 @@ comm_point_udp_ancil_callback(int fd, short event, void* arg)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(!rep.c || rep.c->fd == -1) /* commpoint closed */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (void)fd;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (void)event;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (void)arg;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fatal_exit("recvmsg: No support for IPV6_PKTINFO; IP_PKTINFO or IP_RECVDSTADDR. "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "Please disable interface-automatic");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* AF_INET6 && IPV6_PKTINFO && HAVE_RECVMSG */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* AF_INET6 && IPV6_PKTINFO && HAVE_RECVMSG */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- comm_point_udp_callback(int fd, short event, void* arg)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3860,7 +3854,7 @@ comm_point_create_udp(struct comm_base *base, int fd, sldns_buffer* buffer,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- evbits = UB_EV_READ | UB_EV_PERSIST;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* ub_event stuff */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- c->ev->ev = ub_event_new(base->eb->base, c->fd, evbits,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifdef USE_WINSOCK
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(USE_WINSOCK) || !(defined(AF_INET6) && defined(IPV6_PKTINFO) && defined(HAVE_RECVMSG))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- comm_point_udp_callback, c);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- comm_point_udp_ancil_callback, c);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3879,6 +3873,7 @@ comm_point_create_udp(struct comm_base *base, int fd, sldns_buffer* buffer,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return c;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(AF_INET6) && defined(IPV6_PKTINFO) && defined(HAVE_RECVMSG)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct comm_point*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- comm_point_create_udp_ancil(struct comm_base *base, int fd,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sldns_buffer* buffer, int pp2_enabled,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3941,6 +3936,7 @@ comm_point_create_udp_ancil(struct comm_base *base, int fd,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- c->event_added = 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return c;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static struct comm_point*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- comm_point_create_tcp_handler(struct comm_base *base,
</span></pre><pre style='margin:0'>
</pre>