net-libs/libndp: Fix building with gcc 14

Thanks-to: ernsteiswuerfel
Closes: https://bugs.gentoo.org/922613
Signed-off-by: Pacho Ramos <pacho@gentoo.org>
This commit is contained in:
Pacho Ramos
2024-11-11 11:27:10 +01:00
parent 14b24fe29d
commit 5ef6e9bd3a
2 changed files with 93 additions and 0 deletions

View File

@@ -0,0 +1,63 @@
From dfd70608a6a2ea164b18e7874de58ef6fd781cef Mon Sep 17 00:00:00 2001
From: Solegaiter <159629996+Solegaiter@users.noreply.github.com>
Date: Tue, 18 Jun 2024 17:11:12 +0200
Subject: [PATCH] Patch libndp.c
This patches a bug that made it impossible to compile on gentoo musl. This is my first patch.
---
libndp/libndp.c | 37 +++++++++++++++++++++----------------
1 file changed, 21 insertions(+), 16 deletions(-)
diff --git a/libndp/libndp.c b/libndp/libndp.c
index 72ec92e..8c57092 100644
--- a/libndp/libndp.c
+++ b/libndp/libndp.c
@@ -200,27 +200,32 @@ static int myrecvfrom6(int sockfd, void *buf, size_t *buflen, int flags,
}
static int mysendto6(int sockfd, void *buf, size_t buflen, int flags,
- struct in6_addr *addr, uint32_t ifindex)
+ struct in6_addr *addr, uint32_t ifindex)
{
- struct sockaddr_in6 sin6;
- ssize_t ret;
+ struct sockaddr_in6 sin6;
+ ssize_t ret;
+ memset(&sin6, 0, sizeof(sin6));
+
+ memcpy(&sin6.sin6_addr, addr, sizeof(sin6.sin6_addr));
+
+ sin6.sin6_scope_id = ifindex;
- memset(&sin6, 0, sizeof(sin6));
- memcpy(&sin6.sin6_addr, addr, sizeof(sin6.sin6_addr));
- sin6.sin6_scope_id = ifindex;
resend:
- ret = sendto(sockfd, buf, buflen, flags, &sin6, sizeof(sin6));
- if (ret == -1) {
- switch(errno) {
- case EINTR:
- goto resend;
- default:
- return -errno;
- }
- }
- return 0;
+ ret = sendto(sockfd, buf, buflen, flags, (const struct sockaddr *)&sin6, sizeof(sin6));
+
+ if (ret == -1) {
+ switch(errno) {
+ case EINTR:
+ goto resend;
+ default:
+ return -errno;
+ }
+ }
+
+ return 0;
}
+
static const char *str_in6_addr(struct in6_addr *addr, char buf[static INET6_ADDRSTRLEN])
{
return inet_ntop(AF_INET6, addr, buf, INET6_ADDRSTRLEN);

View File

@@ -0,0 +1,30 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit gnome2 multilib-minimal
DESCRIPTION="Library for Neighbor Discovery Protocol"
HOMEPAGE="http://libndp.org https://github.com/jpirko/libndp"
SRC_URI="http://libndp.org/files/${P}.tar.gz"
LICENSE="LGPL-2.1+"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
PATCHES=(
# https://github.com/jpirko/libndp/issues/25
"${FILESDIR}/${P}-gcc14.patch"
)
multilib_src_configure() {
ECONF_SOURCE="${S}" \
gnome2_src_configure \
--disable-static \
--enable-logging
}
multilib_src_install() {
gnome2_src_install
}