From d08b1447ba08ea894b76175ec784fb32aae359ec Mon Sep 17 00:00:00 2001 From: Sven Eckelmann Date: Fri, 23 May 2025 11:22:03 +0200 Subject: [PATCH] batmand: Fix FTBFS with recent musl The build failed because various string functions couldn't be found. This happened because the indirect include of string.h is now gone. Signed-off-by: Sven Eckelmann --- batmand/Makefile | 2 +- ...batmand-Add-missing-string.h-include.patch | 50 +++++++++++++++++++ 2 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 batmand/patches/0002-batmand-Add-missing-string.h-include.patch diff --git a/batmand/Makefile b/batmand/Makefile index f015d87..42362a1 100644 --- a/batmand/Makefile +++ b/batmand/Makefile @@ -13,7 +13,7 @@ PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://git.open-mesh.org/batmand.git PKG_REV:=b67a7087b51d7a5e90d27ac39116d1f57257c86e PKG_VERSION:=1440 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_LICENSE:=GPL-2.0 PKG_SOURCE_VERSION:=$(PKG_REV) diff --git a/batmand/patches/0002-batmand-Add-missing-string.h-include.patch b/batmand/patches/0002-batmand-Add-missing-string.h-include.patch new file mode 100644 index 0000000..1630379 --- /dev/null +++ b/batmand/patches/0002-batmand-Add-missing-string.h-include.patch @@ -0,0 +1,50 @@ +From: Sven Eckelmann +Date: Fri, 23 May 2025 11:15:53 +0200 +Subject: batmand: Add missing string.h include + +The build failed because various string functions couldn't be found. This +happened because the indirect include of string.h is now gone in musl +1.2.5. + +Signed-off-by: Sven Eckelmann + +--- a/hna.c ++++ b/hna.c +@@ -27,6 +27,7 @@ + + #include + #include ++#include + #include + + +--- a/linux/kernel.c ++++ b/linux/kernel.c +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + + #include "../os.h" + #include "../batman.h" +--- a/linux/route.c ++++ b/linux/route.c +@@ -29,6 +29,7 @@ + #include /* ifr_if, ifr_tun */ + #include + #include ++#include + #include + + #include "../os.h" +--- a/linux/tun.c ++++ b/linux/tun.c +@@ -32,6 +32,7 @@ + #include + #include + #include /* system() */ ++#include + #include /* WEXITSTATUS */ + + #include "../os.h" -- 2.30.2