From 64675fea82fa9b306a42dde7cf45c90111d58722 Mon Sep 17 00:00:00 2001 From: Sven Eckelmann Date: Tue, 10 Dec 2024 22:37:57 +0100 Subject: [PATCH 1/3] alfred: update to version 2024.4 * (no changes) Signed-off-by: Sven Eckelmann --- alfred/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/alfred/Makefile b/alfred/Makefile index 6d4232d..82028be 100644 --- a/alfred/Makefile +++ b/alfred/Makefile @@ -3,12 +3,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=alfred -PKG_VERSION:=2024.3 +PKG_VERSION:=2024.4 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION) -PKG_HASH:=d7114338c1a064695af71d58de03677a7219b07c55429b80f86dc03c0249ffea +PKG_HASH:=d3a5ad906b728036e4735f9d64a72b9731f16f81f3d8df40cb478591a3bd2294 PKG_MAINTAINER:=Simon Wunderlich PKG_LICENSE:=GPL-2.0-only MIT From c6857eaa4e1693c302dde164e73eb536e1136ab0 Mon Sep 17 00:00:00 2001 From: Sven Eckelmann Date: Tue, 10 Dec 2024 22:38:29 +0100 Subject: [PATCH 2/3] batctl: update to version 2024.4 * coding style cleanups and refactoring * drop explicit requirement to run as root Signed-off-by: Sven Eckelmann --- batctl/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/batctl/Makefile b/batctl/Makefile index daee9dc..6ef05a5 100644 --- a/batctl/Makefile +++ b/batctl/Makefile @@ -3,12 +3,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=batctl -PKG_VERSION:=2024.3 +PKG_VERSION:=2024.4 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION) -PKG_HASH:=665e655eda381415218a4d5f5fd77ff33c4fa9b5edbb7e88e839096961e3600b +PKG_HASH:=e42bdf1a4ecb4b188bcd3aca17e120496a42b6547593b917e3ffcf943e3f2913 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) PKG_MAINTAINER:=Simon Wunderlich From 8462c0bf009c5283e57905c2a44274ecff149562 Mon Sep 17 00:00:00 2001 From: Sven Eckelmann Date: Tue, 10 Dec 2024 22:40:19 +0100 Subject: [PATCH 3/3] batman-adv: update to version 2024.4 * support latest kernels (5.4 - 6.13) * coding style cleanups and refactoring * bugs squashed: - prevent transmission of uninitialized memory for TT TVLVs - avoid stuck, overfull translation table changes list Signed-off-by: Sven Eckelmann --- batman-adv/Makefile | 6 +-- ...v-move-asm-unaligned.h-to-linux-unal.patch | 42 +++++++++++++++++++ batman-adv/src/compat-hacks.h | 6 +++ 3 files changed, 51 insertions(+), 3 deletions(-) create mode 100644 batman-adv/patches/0003-Revert-batman-adv-move-asm-unaligned.h-to-linux-unal.patch diff --git a/batman-adv/Makefile b/batman-adv/Makefile index d38ec6d..3c0544d 100644 --- a/batman-adv/Makefile +++ b/batman-adv/Makefile @@ -3,12 +3,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=batman-adv -PKG_VERSION:=2024.3 -PKG_RELEASE:=2 +PKG_VERSION:=2024.4 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION) -PKG_HASH:=b96817ed1f4f48917c32550a84faad8c87ecf53aa6f6f46cc26554b999b57ff3 +PKG_HASH:=a554df6fc7abccc6b243f56ea7b184486c95ea986db1133f87aafe237da92f21 PKG_EXTMOD_SUBDIRS:=net/batman-adv PKG_MAINTAINER:=Simon Wunderlich diff --git a/batman-adv/patches/0003-Revert-batman-adv-move-asm-unaligned.h-to-linux-unal.patch b/batman-adv/patches/0003-Revert-batman-adv-move-asm-unaligned.h-to-linux-unal.patch new file mode 100644 index 0000000..d072f53 --- /dev/null +++ b/batman-adv/patches/0003-Revert-batman-adv-move-asm-unaligned.h-to-linux-unal.patch @@ -0,0 +1,42 @@ +From: Sven Eckelmann +Date: Tue, 10 Dec 2024 22:31:33 +0100 +Subject: Revert "batman-adv: move asm/unaligned.h to linux/unaligned.h" + +This header is only available with Linux 6.12 + +This reverts commit ee60832ebec47a023d634b06f9434103ec090aed. + +--- a/compat-include/linux/unaligned.h ++++ /dev/null +@@ -1,20 +0,0 @@ +-/* SPDX-License-Identifier: GPL-2.0 */ +-/* Copyright (C) B.A.T.M.A.N. contributors: +- * +- * Marek Lindner, Simon Wunderlich +- * +- * This file contains macros for maintaining compatibility with older versions +- * of the Linux kernel. +- */ +- +-#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_UNALIGNED_H_ +-#define _NET_BATMAN_ADV_COMPAT_LINUX_UNALIGNED_H_ +- +-#include +-#if LINUX_VERSION_IS_GEQ(6, 12, 0) +-#include_next +-#else +-#include +-#endif +- +-#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_UNALIGNED_H_ */ +--- a/net/batman-adv/distributed-arp-table.c ++++ b/net/batman-adv/distributed-arp-table.c +@@ -7,7 +7,7 @@ + #include "distributed-arp-table.h" + #include "main.h" + +-#include ++#include + #include + #include + #include diff --git a/batman-adv/src/compat-hacks.h b/batman-adv/src/compat-hacks.h index 8f65956..5d536a8 100644 --- a/batman-adv/src/compat-hacks.h +++ b/batman-adv/src/compat-hacks.h @@ -5,6 +5,12 @@ #include /* LINUX_VERSION_CODE */ #include +#if LINUX_VERSION_IS_LESS(6, 10, 0) + +#define __counted_by_be(member) + +#endif /* LINUX_VERSION_IS_LESS(6, 10, 0) */ + /* */ #include