diff --git a/batmand/Makefile b/batmand/Makefile index 90eba50d4..7ed39e2a7 100644 --- a/batmand/Makefile +++ b/batmand/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=batmand -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://git.open-mesh.org/batmand.git @@ -37,7 +37,6 @@ B.A.T.M.A.N. layer 3 routing daemon endef MAKE_FLAGS += \ - EXTRA_CFLAGS='-DDEBUG_MALLOC -DMEMORY_USAGE -DPROFILE_DATA -DREVISION_VERSION=\"\ rv$(PKG_SOURCE_VERSION)\" -D_GNU_SOURCE' \ REVISION="$(PKG_SOURCE_VERSION)" \ CC="$(TARGET_CC)" \ UNAME="Linux" \ diff --git a/batmand/patches/100-allocate-include-string-h.patch b/batmand/patches/100-allocate-include-string-h.patch new file mode 100644 index 000000000..052bebecf --- /dev/null +++ b/batmand/patches/100-allocate-include-string-h.patch @@ -0,0 +1,27 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Josef Schlehofer +Date: Wed, 6 Aug 2026 12:00:00 +0200 +Subject: [PATCH] allocate: include string.h for memcpy + +memcpy() is used in debugRealloc() without including string.h. Since +GCC 14 treats implicit function declarations as a hard error, the +build fails: + + allocate.c:349:17: error: implicit declaration of function + 'memcpy' [-Wimplicit-function-declaration] + +Signed-off-by: Josef Schlehofer +--- + allocate.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/allocate.c ++++ b/allocate.c +@@ -23,6 +23,7 @@ + + #include + #include ++#include + + #include "os.h" + #include "allocate.h" diff --git a/batmand/test-version.sh b/batmand/test-version.sh new file mode 100644 index 000000000..9644775f5 --- /dev/null +++ b/batmand/test-version.sh @@ -0,0 +1,17 @@ +#!/bin/sh + +# shellcheck shell=busybox + +case "$PKG_NAME" in +batmand) + # The version of batmand is derived from the source date and git + # hash, which the binary does not report. Check that the binary + # starts and prints its version banner instead. + batmand -v 2>&1 | grep -F "B.A.T.M.A.N." + ;; + +*) + echo "Untested package: $PKG_NAME" >&2 + exit 1 + ;; +esac diff --git a/vis/Makefile b/vis/Makefile index ff1d608cc..88cc4eb3f 100644 --- a/vis/Makefile +++ b/vis/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=vis -PKG_RELEASE:=10 +PKG_RELEASE:=11 PKG_SOURCE_PROTO:=git PKG_SOURCE_DATE:=2013-04-07 @@ -37,8 +37,7 @@ visualization server for B.A.T.M.A.N. layer 3 endef MAKE_FLAGS += \ - EXTRA_CFLAGS='-DDEBUG_MALLOC -DMEMORY_USAGE -DPROFILE_DATA -DREVISION_VERSION=\"\ rv$(PKG_REV)\" -D_GNU_SOURCE' \ - REVISION="$(PKG_REV)" \ + REVISION="$(PKG_SOURCE_VERSION)" \ CC="$(TARGET_CC)" \ vis diff --git a/vis/test-version.sh b/vis/test-version.sh new file mode 100644 index 000000000..e80a1963a --- /dev/null +++ b/vis/test-version.sh @@ -0,0 +1,17 @@ +#!/bin/sh + +# shellcheck shell=busybox + +case "$PKG_NAME" in +vis) + # The version of vis is derived from the source date and git + # hash, which the binary does not report. Check that the binary + # starts and prints its version banner instead. + vis -v 2>&1 | grep -F "B.A.T.M.A.N." + ;; + +*) + echo "Untested package: $PKG_NAME" >&2 + exit 1 + ;; +esac