gentoo auto-resync : 13:04:2025 - 08:44:57

5 files changed, 12 insertions, 345 deletions

diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 9ad4e82277c0..db4407ebdcb3 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index 2f8d40191e30..5a6d862acc0f 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -1,15 +1,13 @@
-AUX 0001-Allow-using-obexd-without-systemd-in-the-user-session-r3.patch 698 BLAKE2B 41f16a7227518616160aecd016f462f2e636166ddc546aa4fe099e3c6146648b2e0985b97b97eeb3941ebb8666a9ba83803dc773e3d752adc1177c50e7073390 SHA512 144cfa6b1608c59cd49f23871d3fb63fd4b4d08bd0a5fe51ce775218d8d46ef22bd11e2ae3b571d42b7571bbbfe1d5b5e7e49864f1e147242ecddb1c3976b611
 AUX 0001-Allow-using-obexd-without-systemd-in-the-user-session-r4.patch 611 BLAKE2B a89b870f9b7669a6bd8d8efa56f0d88e0d4d738a21c8109645eda31bd7383a02634ed24e613d647999917cba057099cf1f106320d6752964dcb0b846f368edc8 SHA512 0b73595a050d7d59d299eabd36944cd81cbe22beb3d70146c3ec0155c2ec3163c719c09a30b44784e8c311306ee376375e6a29bee4e55748aa4f599b874ffa34
 AUX bluetooth-conf.d 21 BLAKE2B 7c94e499438f441fc18f0b50178e707982ac91871a74b2e7a35c9930d32441a89f742993e993e3003f9bcb5e3ee9adde2ab1cbe33b27245b1b1e91e7c3dc1a0b SHA512 45befd3fb42ea3462fa6e1ee9f3ee9591e197d4925a4c9df6733bacfe44cf44f54ed3aad6fd7a6a2953da54b93460a1cf0ea1cadf0d7e47f811e4c3182af74d5
 AUX bluetooth-init.d-r5 313 BLAKE2B 6bad1b9a75de5927ab22a229d6ce18247b32a79b994078338eff33df7f74a7dc4a5266212f6d0150101600e3a864a9b64ce6a576208218750bfbe88bc5911baa SHA512 95aff192be6207047fc01b42754bcd34d5cd7f82c16486fdd81bb1d14be040e4f3e9bafd8dc2f4e8b87bf1eb50f6634f526feaf2b38c0c6807f40784d84dac96
-AUX bluez-5.78-musl-1.2.5.patch 8604 BLAKE2B 03d961af3e05de95a7c14aa8bbbb70baebd521a433ff7cbcede2532d2db10792718f4d0df024a39cbb23a53a2a1b1a42b23dac2a9ec1069d6c0292bce34ccd03 SHA512 29fe6de760478943622700217a0648738cd5b42e354fcf6866ada2cbe24de5212ff0489c3f349ca25ea7538f4efbbebeb453f7d789c41e10b982ee968638e1c8
 AUX bluez-5.79-c23.patch 4209 BLAKE2B 6455b3f9dabd9338500f2a043542ca97b7a0a9ea9a226d57f26e7974ed6d3edef533ece3e0e147b649f995c122cc256e55a064792f1816edc49f5b6d381a08e6 SHA512 3a470b0ab5e085d3f40cef092a641135685b997252b565dbd2852b47e6fd20cebbf79d6b04ac773c46f255886f5c62520feb0454887a290c8c7e0ba852b6f4f3
 AUX bluez-5.79-musl-gdbus.patch 695 BLAKE2B c9c3dc790e9bbc5cddd6295aefb7d33f648dac64d1af41612cde440f5f1110c6a5a8a004fe2e3d6bcb82a9b55d528ca0e3186df8ae22c47021fc3c8931859811 SHA512 5dbbae8193987abaf8db982435aeac9ba6f69e5491d5c553985fce13d5b548929c0a363341a45708ea7e6d7dc656d6d9c3f4669ab860ea038df43c29f2b70796
 AUX bluez-5.79-slibtoolize.patch 1298 BLAKE2B 973f601202cce93827dba6d57ded8319a89499d5b2d21cc50fa952f4e6e7e33ae3b727a0ba97f026b1c094c49faa2baa4aeabb476e45378a29f65a05a3606928 SHA512 b121ed4c3d00b9819e926646bbb14df5cef29cad1d5966d07268a3111167ea06823952087aff19f2c505cd8861de6067d926e46da21225eb82cd765c5d842923
 AUX bluez-disable-test-vcp.patch 704 BLAKE2B f60e0dde73c024b9347c026906642c040bc17c5af7818a9328e1c86151ef47f91e903945199119390d8cd072cda62a85b4ee525a6289226032eb1baf5db94e7a SHA512 e7a07f26d92caaf11a457a8504219973da0aa80f2c97b36af2135aa36f7f4b52978f632c9c5123d66d71b4b65a780710dea802ca0dcaabc5c051f7b7d21763cf
 AUX bluez-udevadm-path-r1.patch 564 BLAKE2B 0b4dc12f55ab60d254aa3365baf35186a5913026dbfcbc3da41c113b3c423c81189b87016dabcb2c505b684cad376d10d10df9aa17558b8fd022928995931e0e SHA512 d9b0dd452258e425802cf5ad4980a77796be79e94bf6ce641927c5ab7ea1117ce6589063f3a0b96bf25e81303234279a09d58484fec49cfc6aa1db46f245f9c6
-DIST bluez-5.78.tar.xz 2441672 BLAKE2B 7fe65e926b2a692fcf96bb9c694c42ad8c0bd2d19bf534427128bfbd1eb4d9e3e63f2bdc4659ee8654967a0ac7866a561bc4bd4656d19e0dcb7cc5ce976eb6b2 SHA512 0c591a42742c167ff51e088d898b751f11cb4808ec2f17d9a85bc247a32d4fe18fa17503d188ffad6d9393ad590574518055abe5beeb788aca07d5ba957e4e4d
 DIST bluez-5.79.tar.xz 2457612 BLAKE2B e908bc000b45832845a09ea7e906d39e107e4934fef4efc9a78b278b7f8ae914ed3a573ef53512de7076a3b1ca8115634fb502cb8d1d0c8516febe05f9e059f8 SHA512 74d47b1eb9b9904798f5c8093674743a14a509d22c33003cf253a1ab0c11a564e6a10a808e087e3fb7f3589d3cba1868ec9bf2923703cdc36a293c95af1d0d76
-EBUILD bluez-5.78.ebuild 8693 BLAKE2B a5173d38c85234b3b3c78c203302b2bd367d732463f85a074cb641ddd1c65aceb6922584cfcac3b6ba0d844d6341fe61129b9b941675c4dbc78b88aba8a591a9 SHA512 b830ea9b58822c14543c3221c2d0c58212c78e34576560b8d3db12d6aa92749c53c509f2bdb579f72defc7c01f3c9d98869d138f1a9e743296daeea4ee0a51df
+DIST bluez-5.82.tar.xz 2471984 BLAKE2B caf040e478c7548e1d7c87283a8bc3c34d4005112cb02faf1ddda835d2db8497227d2fb1367bdc3d6cfc844cc0d94dcdc712ea11df21298ee6da32ad6264591e SHA512 8efbef24849f122cfe1b1b0dcedbc5369f97741603497099a673ff7be87af7935b8e0c8c58e10f6969372c8af932165d38a0c39e518501ba0d7e0c2fffb70bad
 EBUILD bluez-5.79.ebuild 8972 BLAKE2B 244710429fb7d84285625f67a6cce7a16ffe8551f1ffa33e03bc128f55cf27b4e697263d3a20219dd81888d6ede421892146f3c120ac8141ecb9ebb9992e5193 SHA512 7124237b5b735ae8c40edd669d07722fa5a22a3f9ffa25d53967ade0aaddf215361003356e91420229486278c5b9d68ab035db74a87470035d475fc673cac464
+EBUILD bluez-5.82.ebuild 8758 BLAKE2B ae0a7f7427ff2bdcd9f9326b8d32c8d4f34a1f17d6c964ea0596cdb1652629012495658a92a0f12ebe0074f3e563ca3398dceb41d6845215d2544c142c9b1121 SHA512 b663f2bbbaacdf50e32028d40bd34c0f9c92aeffdeb0659da6d818d42f50b6d10c688eb572120eb97139371afd1af5183ace81f4cd845b2af859afbb120e762a
 MISC metadata.xml 1150 BLAKE2B 830a8e0c89fcc18af92e063ceb3632c97eed9f7424ac5214dd4c853b142d03bba6d629b86fc41ecc28a450a9b7989a21faaae1b95654cb8f16ce2ceb3a97e025 SHA512 44e4489f48634d1b1ff300ccba0f7caa74b76ac7325d38d395ee53763906743f7b622b028a01d32e963952a23da560c16b8cd6771a9001ba90845b59293a6101
diff --git a/net-wireless/bluez/bluez-5.78.ebuild b/net-wireless/bluez/bluez-5.82.ebuild
index 9428a4093a9a..506d0e66245a 100644
--- a/net-wireless/bluez/bluez-5.78.ebuild
+++ b/net-wireless/bluez/bluez-5.82.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,8 +12,8 @@ SRC_URI="https://www.kernel.org/pub/linux/bluetooth/${P}.tar.xz"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0/3"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv x86"
-IUSE="btpclient cups doc debug deprecated extra-tools experimental +mesh midi +obex +readline selinux systemd test test-programs +udev"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~x86"
+IUSE="btpclient cups doc debug deprecated extra-tools experimental man +mesh midi +obex +readline selinux systemd test test-programs +udev"
 
 # Since this release all remaining extra-tools need readline support, but this could
 # change in the future, hence, this REQUIRED_USE constraint could be dropped
@@ -33,8 +33,8 @@ TEST_DEPS="${PYTHON_DEPS}
 	')
 "
 BDEPEND="
-	dev-python/docutils
 	virtual/pkgconfig
+	man? ( dev-python/docutils )
 	test? ( ${TEST_DEPS} )
 "
 DEPEND="
@@ -66,9 +66,10 @@ PATCHES=(
 	# https://bugs.gentoo.org/539844
 	# https://github.com/bluez/bluez/issues/268
 	"${FILESDIR}"/${PN}-udevadm-path-r1.patch
-	# bug #926344
-	# https://github.com/bluez/bluez/issues/843
-	"${FILESDIR}"/${PN}-5.78-musl-1.2.5.patch
+
+	# https://bugs.gentoo.org/928365
+	# https://github.com/bluez/bluez/issues/726
+	"${FILESDIR}"/${PN}-disable-test-vcp.patch
 )
 
 pkg_setup() {
@@ -104,7 +105,7 @@ src_prepare() {
 	default
 
 	# https://github.com/bluez/bluez/issues/806
-	eapply "${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-session-r3.patch
+	eapply "${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-session-r4.patch
 
 	eautoreconf
 
@@ -140,7 +141,6 @@ multilib_src_configure() {
 		--enable-threads \
 		--enable-library \
 		--enable-tools \
-		--enable-manpages \
 		--enable-monitor \
 		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
 		--with-systemduserunitdir="$(systemd_get_userunitdir)" \
@@ -149,6 +149,7 @@ multilib_src_configure() {
 		$(multilib_native_use_enable cups) \
 		$(multilib_native_use_enable deprecated) \
 		$(multilib_native_use_enable experimental) \
+		$(multilib_native_use_enable man manpages) \
 		$(multilib_native_use_enable mesh) \
 		$(multilib_native_use_enable mesh external-ell) \
 		$(multilib_native_use_enable midi) \
diff --git a/net-wireless/bluez/files/0001-Allow-using-obexd-without-systemd-in-the-user-session-r3.patch b/net-wireless/bluez/files/0001-Allow-using-obexd-without-systemd-in-the-user-session-r3.patch
deleted file mode 100644
index bb4c838b9545..000000000000
--- a/net-wireless/bluez/files/0001-Allow-using-obexd-without-systemd-in-the-user-session-r3.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-https://github.com/bluez/bluez/issues/806
-https://bugs.gentoo.org/928417
---- bluez-5.73.orig/Makefile.obexd	2024-04-02 10:38:48.743419656 +0200
-+++ bluez-5.73/Makefile.obexd	2024-04-02 10:40:53.300086281 +0200
-@@ -1,13 +1,13 @@
- # SPDX-License-Identifier: GPL-2.0
- if OBEX
- 
-+dbussessionbusdir = $(DBUS_SESSIONBUSDIR)
-+dbussessionbus_DATA = obexd/src/org.bluez.obex.service
-+
- if SYSTEMD
- systemduserunitdir = $(SYSTEMD_USERUNITDIR)
- systemduserunit_DATA = obexd/src/obex.service
- 
--dbussessionbusdir = $(DBUS_SESSIONBUSDIR)
--dbussessionbus_DATA = obexd/src/org.bluez.obex.service
--
- obexd-add-service-symlink:
- 	$(LN_S) -f obex.service $(DESTDIR)$(SYSTEMD_USERUNITDIR)/dbus-org.bluez.obex.service
diff --git a/net-wireless/bluez/files/bluez-5.78-musl-1.2.5.patch b/net-wireless/bluez/files/bluez-5.78-musl-1.2.5.patch
deleted file mode 100644
index 0ee929faa3e4..000000000000
--- a/net-wireless/bluez/files/bluez-5.78-musl-1.2.5.patch
+++ /dev/null
@@ -1,312 +0,0 @@
-https://bugs.gentoo.org/926344
-
-hex2hcd: https://github.com/bluez/bluez/pull/897 (https://lore.kernel.org/linux-bluetooth/20240710123002.5639-1-rahul@sandhuservices.dev/)
-rpl:
- 1) https://github.com/bluez/bluez/commit/690eccbe8562cc33f33503af67beb313ca737817
- 2) https://github.com/bluez/bluez/issues/843#issuecomment-2354143400
-
-From e2f12111385dc4c21e2ef435025e1ddf8c386fa2 Mon Sep 17 00:00:00 2001
-From: Rahul Sandhu <rahul@sandhuservices.dev>
-Date: Wed, 10 Jul 2024 11:12:30 +0100
-Subject: [PATCH] tools/hex2hcd: fix musl compatibility
-
-The call to basename() relies on a GNU extension
-to take a const char * vs a char *. Let's define
-a trivial helper function to ensure compatibility
-with musl.
-
-Downstream gentoo bug: https://bugs.gentoo.org/926344
-Fixes: #843
-Signed-off-by: Rahul Sandhu <rahul@sandhuservices.dev>
----
- tools/hex2hcd.c | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/tools/hex2hcd.c b/tools/hex2hcd.c
-index e6dca5a810..42c95b759b 100644
---- a/tools/hex2hcd.c
-+++ b/tools/hex2hcd.c
-@@ -285,6 +285,11 @@ static void ver_parse_file(const char *pathname)
- 	prev->next = ver;
- }
- 
-+static const char *helper_basename(const char *path) {
-+  const char *base = strrchr(path, '/');
-+  return base ? base + 1 : path;
-+}
-+
- static void ver_parse_entry(const char *pathname)
- {
- 	struct stat st;
-@@ -302,7 +307,7 @@ static void ver_parse_entry(const char *pathname)
- 	}
- 
- 	if (S_ISREG(st.st_mode)) {
--		ver_parse_file(basename(pathname));
-+		ver_parse_file(helper_basename(pathname));
- 		goto done;
- 	}
- 
-From 690eccbe8562cc33f33503af67beb313ca737817 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 27 Aug 2024 23:09:26 -0700
-Subject: [PATCH] mesh: Provide GNU basename compatible implementation
-
-Call to basename() relies on a GNU extension
-to take a const char * vs a char *. Let's define
-a trivial helper function to ensure compatibility
-with musl.
-
-Fixes: https://github.com/bluez/bluez/issues/843
----
- configure.ac            | 11 ++++++++++-
- mesh/mesh-config-json.c |  4 +++-
- mesh/missing.h          | 21 +++++++++++++++++++++
- mesh/rpl.c              |  1 +
- tools/hex2hcd.c         |  1 +
- tools/missing.h         | 21 +++++++++++++++++++++
- 6 files changed, 57 insertions(+), 2 deletions(-)
- create mode 100644 mesh/missing.h
- create mode 100644 tools/missing.h
-
-diff --git a/configure.ac b/configure.ac
-index 790a19560d..7093e41ff7 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -70,7 +70,16 @@ AC_CHECK_LIB(pthread, pthread_create, dummy=yes,
- AC_CHECK_LIB(dl, dlopen, dummy=yes,
- 			AC_MSG_ERROR(dynamic linking loader is required))
- 
--AC_CHECK_HEADERS(linux/types.h linux/if_alg.h linux/uinput.h linux/uhid.h sys/random.h)
-+AC_CHECK_HEADERS(string.h linux/types.h linux/if_alg.h linux/uinput.h linux/uhid.h sys/random.h)
-+
-+# basename may be only available in libgen.h with the POSIX behavior,
-+# not desired here
-+AC_CHECK_DECLS([basename], [],
-+				AC_MSG_WARN([GNU basename extension not found]),
-+				[#define _GNU_SOURCE 1
-+				 #include <string.h>
-+				 ])
-+
- 
- PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.28)
- 
-diff --git a/mesh/mesh-config-json.c b/mesh/mesh-config-json.c
-index c198627c6f..a17a48b6d1 100644
---- a/mesh/mesh-config-json.c
-+++ b/mesh/mesh-config-json.c
-@@ -28,6 +28,7 @@
- #include <ell/ell.h>
- #include <json-c/json.h>
- 
-+#include "mesh/missing.h"
- #include "mesh/mesh-defs.h"
- #include "mesh/util.h"
- #include "mesh/mesh-config.h"
-@@ -2694,7 +2695,8 @@ bool mesh_config_load_nodes(const char *cfgdir_name, mesh_config_node_func_t cb,
- 
- void mesh_config_destroy_nvm(struct mesh_config *cfg)
- {
--	char *node_dir, *node_name;
-+	char *node_dir;
-+	const char *node_name;
- 	char uuid[33];
- 
- 	if (!cfg)
-diff --git a/mesh/missing.h b/mesh/missing.h
-new file mode 100644
-index 0000000000..464df9b1c3
---- /dev/null
-+++ b/mesh/missing.h
-@@ -0,0 +1,21 @@
-+// SPDX-License-Identifier: LGPL-2.1-or-later
-+/*
-+ *
-+ *  BlueZ - Bluetooth protocol stack for Linux
-+ *
-+ *  Copyright (C) 2024  Khem Raj <raj.khem@gmail.com>
-+ *
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
-+#endif
-+#if !HAVE_DECL_BASENAME
-+#include <string.h>
-+static inline const char *basename(const char *path)
-+{
-+	const char *base = strrchr(path, '/');
-+
-+	return base ? base + 1 : path;
-+}
-+#endif
-diff --git a/mesh/rpl.c b/mesh/rpl.c
-index fb225dddd6..2fa17d72f6 100644
---- a/mesh/rpl.c
-+++ b/mesh/rpl.c
-@@ -24,6 +24,7 @@
- 
- #include <ell/ell.h>
- 
-+#include "mesh/missing.h"
- #include "mesh/mesh-defs.h"
- 
- #include "mesh/node.h"
-diff --git a/tools/hex2hcd.c b/tools/hex2hcd.c
-index e6dca5a810..452ab2beb5 100644
---- a/tools/hex2hcd.c
-+++ b/tools/hex2hcd.c
-@@ -24,6 +24,7 @@
- #include <stdlib.h>
- #include <stdbool.h>
- #include <sys/stat.h>
-+#include "tools/missing.h"
- 
- static ssize_t process_record(int fd, const char *line, uint16_t *upper_addr)
- {
-diff --git a/tools/missing.h b/tools/missing.h
-new file mode 100644
-index 0000000000..464df9b1c3
---- /dev/null
-+++ b/tools/missing.h
-@@ -0,0 +1,21 @@
-+// SPDX-License-Identifier: LGPL-2.1-or-later
-+/*
-+ *
-+ *  BlueZ - Bluetooth protocol stack for Linux
-+ *
-+ *  Copyright (C) 2024  Khem Raj <raj.khem@gmail.com>
-+ *
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
-+#endif
-+#if !HAVE_DECL_BASENAME
-+#include <string.h>
-+static inline const char *basename(const char *path)
-+{
-+	const char *base = strrchr(path, '/');
-+
-+	return base ? base + 1 : path;
-+}
-+#endif
-
-From e882342db836d267a9ca4d0886e6828a2aba67b4 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 16 Sep 2024 15:11:01 -0700
-Subject: [PATCH] mesh: Move local basename into utility file
-
-Defining an override via a missing.h can prove difficult when a file
-needs to use basename and dirname both the APIs and needs to include
-libgen.h for them, in such situations there will be signature clash
-for basename function.
----
- mesh/mesh-config-json.c |  3 +--
- mesh/missing.h          | 21 ---------------------
- mesh/rpl.c              |  3 +--
- mesh/util.c             | 10 ++++++++++
- mesh/util.h             |  5 +++++
- 5 files changed, 17 insertions(+), 25 deletions(-)
- delete mode 100644 mesh/missing.h
-
-diff --git a/mesh/mesh-config-json.c b/mesh/mesh-config-json.c
-index a17a48b6d..5372130d7 100644
---- a/mesh/mesh-config-json.c
-+++ b/mesh/mesh-config-json.c
-@@ -28,7 +28,6 @@
- #include <ell/ell.h>
- #include <json-c/json.h>
- 
--#include "mesh/missing.h"
- #include "mesh/mesh-defs.h"
- #include "mesh/util.h"
- #include "mesh/mesh-config.h"
-@@ -2708,7 +2707,7 @@ void mesh_config_destroy_nvm(struct mesh_config *cfg)
- 	if (!hex2str(cfg->uuid, 16, uuid, sizeof(uuid)))
- 		return;
- 
--	node_name = basename(node_dir);
-+	node_name = mesh_basename(node_dir);
- 
- 	/* Make sure path name of node follows expected guidelines */
- 	if (strcmp(node_name, uuid))
-diff --git a/mesh/missing.h b/mesh/missing.h
-deleted file mode 100644
-index 464df9b1c..000000000
---- a/mesh/missing.h
-+++ /dev/null
-@@ -1,21 +0,0 @@
--// SPDX-License-Identifier: LGPL-2.1-or-later
--/*
-- *
-- *  BlueZ - Bluetooth protocol stack for Linux
-- *
-- *  Copyright (C) 2024  Khem Raj <raj.khem@gmail.com>
-- *
-- */
--
--#ifdef HAVE_CONFIG_H
--#include <config.h>
--#endif
--#if !HAVE_DECL_BASENAME
--#include <string.h>
--static inline const char *basename(const char *path)
--{
--	const char *base = strrchr(path, '/');
--
--	return base ? base + 1 : path;
--}
--#endif
-diff --git a/mesh/rpl.c b/mesh/rpl.c
-index 2fa17d72f..69533bf43 100644
---- a/mesh/rpl.c
-+++ b/mesh/rpl.c
-@@ -24,7 +24,6 @@
- 
- #include <ell/ell.h>
- 
--#include "mesh/missing.h"
- #include "mesh/mesh-defs.h"
- 
- #include "mesh/node.h"
-@@ -147,7 +146,7 @@ static void get_entries(const char *iv_path, struct l_queue *rpl_list)
- 	if (!dir)
- 		return;
- 
--	iv_txt = basename(iv_path);
-+	iv_txt = mesh_basename(iv_path);
- 	if (sscanf(iv_txt, "%08x", &iv_index) != 1) {
- 		closedir(dir);
- 		return;
-diff --git a/mesh/util.c b/mesh/util.c
-index 82b57f642..73f13aab7 100644
---- a/mesh/util.c
-+++ b/mesh/util.c
-@@ -161,3 +161,13 @@ void enable_debug(void)
- 	debug_enabled = true;
- 	l_debug_enable("*");
- }
-+
-+#if !HAVE_DECL_BASENAME
-+#include <string.h>
-+const char *mesh_basename(const char *path)
-+{
-+	const char *base = strrchr(path, '/');
-+
-+	return base ? base + 1 : path;
-+}
-+#endif
-diff --git a/mesh/util.h b/mesh/util.h
-index 085ec3330..bb417dc40 100644
---- a/mesh/util.h
-+++ b/mesh/util.h
-@@ -16,3 +16,8 @@ void print_packet(const char *label, const void *data, uint16_t size);
- int create_dir(const char *dir_name);
- void del_path(const char *path);
- void enable_debug(void);
-+#if !HAVE_DECL_BASENAME
-+const char *mesh_basename(const char *path);
-+#else
-+#define mesh_basename basename
-+#endif