<pre style='margin:0'>
Daniel J. Luke (danielluke) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f197d0ddf5b419adaa40e753539a9f7676a98797">https://github.com/macports/macports-ports/commit/f197d0ddf5b419adaa40e753539a9f7676a98797</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 f197d0ddf5b bind9: update to 9.20.0
</span>f197d0ddf5b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f197d0ddf5b419adaa40e753539a9f7676a98797
</span>Author: Daniel J. Luke <dluke@macports.org>
AuthorDate: Tue Jul 23 11:18:41 2024 -0400
<span style='display:block; white-space:pre;color:#404040;'> bind9: update to 9.20.0
</span>---
net/bind9/Portfile | 14 ++++++------
net/bind9/files/atomics.patch | 40 -----------------------------------
net/bind9/files/patch-fix-rwlock.diff | 18 ----------------
3 files changed, 7 insertions(+), 65 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/bind9/Portfile b/net/bind9/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5c6a66e08d2..71b9de0c50e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/bind9/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/bind9/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup legacysupport 1.0
</span> PortGroup compiler_blacklist_versions 1.0
name bind9
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 9.18.28
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 9.20.0
</span> revision 0
categories net
maintainers {geeklair.net:dluke @danielluke} {jmr @jmroot}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,9 +30,9 @@ homepage https://www.isc.org/
</span> distname bind-${version}
master_sites isc:${name}/${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 a43a59ea79650417f9bfe3592a54e16b1ff22830 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 e7cce9a165f7b619eefc4832f0a8dc16b005d29e3890aed6008c506ea286a5e7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 5533340
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 a8aa369a644bc7b4cc6f53189e5beae5b2485645 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 cc580998017b51f273964058e8cb3aa5482bc785243dea71e5556ec565a13347 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 5760416
</span>
use_xz yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,7 +45,8 @@ depends_lib path:lib/libssl.dylib:openssl \
</span> path:lib/pkgconfig/jemalloc.pc:jemalloc \
port:json-c \
port:libidn2 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:lmdb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:lmdb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:liburcu
</span>
universal_variant \
no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -57,8 +58,7 @@ compiler.blacklist \
</span> {clang < 500} \
{clang >= 1500.0.40.1 < 1500.1.0.2.5 }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles lib_dns_Makefile.in.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-fix-rwlock.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles lib_dns_Makefile.in.patch
</span>
# tests require `sudo bin/tests/system/ifconfig.sh up`
test.run yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/bind9/files/atomics.patch b/net/bind9/files/atomics.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 39bf1058d9f..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/bind9/files/atomics.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,40 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Allow use of gcc-style __atomic* builtins in older clang versions.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Avoid use of const pointers with atomic_load because strictly C11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compliant compilers error on this. Using const became allowed in C17:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-http://www.open-std.org/jtc1/sc22/wg14/www/docs/n2244.htm#dr_459
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/isc/include/isc/stdatomic.h.orig 2022-10-10 18:01:57.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/isc/include/isc/stdatomic.h 2022-11-03 20:54:26.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -21,7 +21,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif /* HAVE_UCHAR_H */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* GCC 4.7.0 introduced __atomic builtins, but not the __GNUC_ATOMICS define */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if !defined(__GNUC_ATOMICS) && __GNUC__ == 4 && __GNUC_MINOR__ >= 7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* Clang 3.1 and later have the builtins but none define __GNUC_ATOMICS */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if !defined(__GNUC_ATOMICS) && ((__GNUC__ == 4 && __GNUC_MINOR__ >= 7) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ || defined(__clang__))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define __GNUC_ATOMICS
</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;'>---- lib/isc/netmgr/netmgr-int.h.orig 2022-10-10 18:44:05.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/isc/netmgr/netmgr-int.h 2022-11-03 20:57:03.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -244,7 +244,7 @@ typedef struct isc__networker {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define NMHANDLE_MAGIC ISC_MAGIC('N', 'M', 'H', 'D')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define VALID_NMHANDLE(t) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (ISC_MAGIC_VALID(t, NMHANDLE_MAGIC) && \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- atomic_load(&(t)->references) > 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ atomic_load((isc_refcount_t *)&(t)->references) > 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typedef void (*isc__nm_closecb)(isc_nmhandle_t *);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typedef struct isc_nm_http_session isc_nm_http_session_t;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/isc/netmgr/http.c.orig 2022-10-10 18:44:05.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/isc/netmgr/http.c 2022-11-03 21:02:50.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1672,7 +1672,7 @@ find_server_request_handler(const char *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- REQUIRE(VALID_NMSOCK(serversocket));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (atomic_load(&serversocket->listening)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (atomic_load((atomic_bool *)&serversocket->listening)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- handler = http_endpoints_find(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- request_path,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- http_get_listener_endpoints(serversocket, tid));
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/bind9/files/patch-fix-rwlock.diff b/net/bind9/files/patch-fix-rwlock.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 5dddd8aa74a..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/bind9/files/patch-fix-rwlock.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,18 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix PowerPC assembler syntax.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/isc/rwlock.c.orig 2023-12-08 20:09:37.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/isc/rwlock.c 2024-02-11 15:55:13.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -160,8 +160,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif (defined(__sparc) || defined(__sparc__)) && HAVE_SPARC_PAUSE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define isc_rwlock_pause() __asm__ __volatile__("pause")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif defined(__ppc__) || defined(_ARCH_PPC) || defined(_ARCH_PWR) || \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- defined(_ARCH_PWR2) || defined(_POWER)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ defined(_ARCH_PWR2) || defined(_POWER) || defined(__POWERPC__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define isc_rwlock_pause() __asm__ volatile("or r27,r27,r27")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define isc_rwlock_pause() __asm__ volatile("or 27,27,27")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else /* if defined(_MSC_VER) */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define isc_rwlock_pause()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif /* if defined(_MSC_VER) */
</span></pre><pre style='margin:0'>
</pre>