commit: bf95034b43245f537172f12c27141cafaba4857f Author: Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr> AuthorDate: Thu Sep 11 12:07:25 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Sep 17 21:27:41 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf95034b
net-analyzer/driftnet: fix 1.3.0 with libwebsockets:0/20 fix arguments to build with libwebsockets:0/20 Bug: https://bugs.gentoo.org/962581 Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr> Part-of: https://github.com/gentoo/gentoo/pull/43741 Closes: https://github.com/gentoo/gentoo/pull/43741 Signed-off-by: Sam James <sam <AT> gentoo.org> net-analyzer/driftnet/driftnet-1.3.0.ebuild | 3 ++- .../files/driftnet-1.3.0-libwebsocket_compat.patch | 31 ++++++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/net-analyzer/driftnet/driftnet-1.3.0.ebuild b/net-analyzer/driftnet/driftnet-1.3.0.ebuild index 3d2fa78cc783..273225a06c40 100644 --- a/net-analyzer/driftnet/driftnet-1.3.0.ebuild +++ b/net-analyzer/driftnet/driftnet-1.3.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -39,6 +39,7 @@ PATCHES=( "${FILESDIR}"/${PN}-1.3.0-CFLAGS.patch "${FILESDIR}"/${PN}-1.3.0-gtk.patch "${FILESDIR}"/${PN}-1.3.0-musl-stdint.patch + "${FILESDIR}"/${PN}-1.3.0-libwebsocket_compat.patch ) src_prepare() { diff --git a/net-analyzer/driftnet/files/driftnet-1.3.0-libwebsocket_compat.patch b/net-analyzer/driftnet/files/driftnet-1.3.0-libwebsocket_compat.patch new file mode 100644 index 000000000000..936dd10474a1 --- /dev/null +++ b/net-analyzer/driftnet/files/driftnet-1.3.0-libwebsocket_compat.patch @@ -0,0 +1,31 @@ +fix arguments to build with libwebsockets:0/20 +https://bugs.gentoo.org/962581 +PR pending for driftnet-1.5.0 uses another schema +https://github.com/deiv/driftnet/pull/57.patch +--- a/src/http_display/httpd.c ++++ b/src/http_display/httpd.c +@@ -188,10 +188,22 @@ static void * http_server_dispatch(void *arg) + 0, + 0, + 0, +- LWSMPRO_FILE, /* mount type is a directory in a filesystem */ ++#if LWS_LIBRARY_VERSION_MAJOR >= 4 && LWS_LIBRARY_VERSION_MINOR > 3 ++ 0, /* check cache always */ ++#endif ++ LWSMPRO_FILE, /* mount type is a directory in a filesystem */ + 1, /* strlen("/"), ie length of the mountpoint */ + NULL, +- { NULL, NULL } // sentinel ++#if LWS_LIBRARY_VERSION_MAJOR >= 4 && LWS_LIBRARY_VERSION_MINOR > 3 ++ NULL, /* chroot_path */ ++ NULL, /* working directory, default /tmp */ ++ NULL, /* override the headers */ ++ 0, /* keepalive_timeout */ ++#endif ++#if LWS_LIBRARY_VERSION_MAJOR <= 4 && LWS_LIBRARY_VERSION_MINOR < 3 ++ NULL, /* sentinel */ ++ NULL, /* sentinel */ ++#endif + }; + + memset(&info, 0, sizeof info);
