diff --git a/net/nsd/Makefile b/net/nsd/Makefile index 00cebd844184..5ce499da5003 100644 --- a/net/nsd/Makefile +++ b/net/nsd/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.126 2024/07/29 20:25:53 ryoon Exp $ +# $NetBSD: Makefile,v 1.127 2024/09/21 16:09:29 he Exp $ -DISTNAME= nsd-4.10.0 +DISTNAME= nsd-4.10.1 CATEGORIES= net MASTER_SITES= http://www.nlnetlabs.nl/downloads/nsd/ diff --git a/net/nsd/distinfo b/net/nsd/distinfo index ecdf974de1de..2bd66ff26f13 100644 --- a/net/nsd/distinfo +++ b/net/nsd/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.85 2024/07/29 20:25:53 ryoon Exp $ +$NetBSD: distinfo,v 1.86 2024/09/21 16:09:29 he Exp $ -BLAKE2s (nsd-4.10.0.tar.gz) = e22ec8bb8a9262e9c217ab9d81222eb98d3062322c716a7323742754dcf2ce2c -SHA512 (nsd-4.10.0.tar.gz) = ebf65d9a3d56ba560b587dc3cf91b0b086c9267c67f4c6a6c415cc062a08a9d0deb50cc44189b741d5b7634fe07038f6a234999f5a0ee7df6609fc026127fb09 -Size (nsd-4.10.0.tar.gz) = 1388963 bytes +BLAKE2s (nsd-4.10.1.tar.gz) = e736a4afd563714e706fcb716c34750479c7abd5b6966370f0e807a274a4f50b +SHA512 (nsd-4.10.1.tar.gz) = b0f4bdca8a1c6fbbe99096abc8c5f8b34ef2e66dc0da44da253ab164b35ad0aaef5d05eb682b88cc68d8b1671f7b80abafee242a784ed6deb785adee7f6a53a9 +Size (nsd-4.10.1.tar.gz) = 1404799 bytes SHA1 (patch-aa) = d9a423d5faa8da9a213b21fd2712225ac9645091 +SHA1 (patch-simdzone_src_generic_endian.h) = 8eef6b7d9d878101dda1507a4804241b8258a971 diff --git a/net/nsd/patches/patch-simdzone_src_generic_endian.h b/net/nsd/patches/patch-simdzone_src_generic_endian.h new file mode 100644 index 000000000000..0b1308838016 --- /dev/null +++ b/net/nsd/patches/patch-simdzone_src_generic_endian.h @@ -0,0 +1,35 @@ +$NetBSD: patch-simdzone_src_generic_endian.h,v 1.1 2024/09/21 16:09:29 he Exp $ + +WHen borrowing code from NetBSD, make it build +*on* NetBSD, and don't cause redefinition issues... + +--- simdzone/src/generic/endian.h.orig 2024-09-21 15:58:37.017604378 +0000 ++++ simdzone/src/generic/endian.h +@@ -87,6 +87,11 @@ + #elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) + #include + #endif ++#if defined(__NetBSD__) ++/* Bring bswap{16,32,64} into scope: */ ++#include ++#include ++#endif + + #if !defined(LITTLE_ENDIAN) + # if defined(__ORDER_LITTLE_ENDIAN__) +@@ -122,6 +127,7 @@ + # endif + #endif + ++#if !defined(__NetBSD__) + static really_inline uint16_t bswap16(uint16_t x) + { + // Copied from src/common/lib/libc/gen/bswap16.c in NetBSD +@@ -155,6 +161,7 @@ static really_inline uint64_t bswap64(ui + ( (x >> 40) & 0x000000000000ff00ull ) | + ( (x >> 56) & 0x00000000000000ffull ); + } ++#endif /* ! __NetBSD__ */ + + # if BYTE_ORDER == LITTLE_ENDIAN + # define htobe(bits, x) bswap ## bits((x))