summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2022-11-10 09:06:51 +0000
committerSam James <sam@gentoo.org>2022-11-10 09:06:51 +0000
commitb7347f602b97d59931c7f42987b277a1757ef7bb (patch)
tree7dd5519639658b21f91d4136b0f343a9df54e9bb
parentnet-dns/nsd: Stabilize 4.5.0-r1 amd64, #880709 (diff)
downloadgentoo-b7347f602b97d59931c7f42987b277a1757ef7bb.tar.gz
gentoo-b7347f602b97d59931c7f42987b277a1757ef7bb.tar.bz2
gentoo-b7347f602b97d59931c7f42987b277a1757ef7bb.zip
net-dns/nsd: fix -Wincompatible-pointer-types
Signed-off-by: Sam James <sam@gentoo.org>
-rw-r--r--net-dns/nsd/files/nsd-4.6.1-incompatible-ptr-types.patch24
-rw-r--r--net-dns/nsd/nsd-4.6.1-r1.ebuild (renamed from net-dns/nsd/nsd-4.6.1.ebuild)1
2 files changed, 25 insertions, 0 deletions
diff --git a/net-dns/nsd/files/nsd-4.6.1-incompatible-ptr-types.patch b/net-dns/nsd/files/nsd-4.6.1-incompatible-ptr-types.patch
new file mode 100644
index 000000000000..4b87be966eb0
--- /dev/null
+++ b/net-dns/nsd/files/nsd-4.6.1-incompatible-ptr-types.patch
@@ -0,0 +1,24 @@
+https://github.com/NLnetLabs/nsd/issues/239
+https://github.com/NLnetLabs/nsd/commit/7162600301205c3c62a1695c0b29e079694b65ae
+
+From 7162600301205c3c62a1695c0b29e079694b65ae Mon Sep 17 00:00:00 2001
+From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
+Date: Thu, 10 Nov 2022 09:47:59 +0100
+Subject: [PATCH] - Fix #239: -Wincompatible-pointer-types warning in remote.c.
+
+--- a/remote.c
++++ b/remote.c
+@@ -1212,8 +1212,11 @@ do_stats(struct daemon_remote* rc, int peek, struct rc_state* rs)
+ /* force a reload */
+ xfrd_set_reload_now(xfrd);
+ #else
++ RES res;
++ res.ssl = rs->ssl;
++ res.fd = rs->fd;
+ (void)rc; (void)peek;
+- (void)ssl_printf(rs->ssl, "error no stats enabled at compile time\n");
++ (void)ssl_printf(&res, "error no stats enabled at compile time\n");
+ #endif /* BIND8_STATS */
+ }
+
+
diff --git a/net-dns/nsd/nsd-4.6.1.ebuild b/net-dns/nsd/nsd-4.6.1-r1.ebuild
index d3d5d3b51e9d..07c863ace2f5 100644
--- a/net-dns/nsd/nsd-4.6.1.ebuild
+++ b/net-dns/nsd/nsd-4.6.1-r1.ebuild
@@ -51,6 +51,7 @@ BDEPEND="
PATCHES=(
# Fix the paths in the munin plugin to match our install
"${FILESDIR}"/nsd_munin_.patch
+ "${FILESDIR}"/${P}-incompatible-ptr-types.patch
)
src_prepare() {