MIRRORS/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2025-12-15 23:05:34 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

keepalived: upgrade 2.3.2 -> 2.3.4

Browse Source 
0001-vrrp-Don-t-include-linux-if_ether.h-if-not-needed.patch is included
in this release, so drop the patch.

Many changes and updates, easier to look in the changelogs themselves
rather than pasting here:
https://www.keepalived.org/release-notes/Release-2.3.3.html
https://www.keepalived.org/release-notes/Release-2.3.4.html

Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Gyorgy Sarvari 2025-09-24 11:11:22 +02:00 committed by Khem Raj
parent 0571309be4
commit 6ac3bc3950
No known key found for this signature in database
GPG Key ID: BB053355919D3314
3 changed files with 3 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meta-networking/recipes-daemons/keepalived/keepalived/0001-configure.ac-Do-not-emit-compiler-flags-into-object-.patch
View File

@ -15,8 +15,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
--- a/configure.ac
+++ b/configure.ac
@@ -1013,8 +1013,7 @@ if test "$enable_hardening" != no; then
"-Wp,-D_FORTIFY_SOURCE=$FORTIFY_SOURCE" \
@@ -1066,8 +1066,7 @@ if test "$enable_hardening" != no; then
"-Wformat -Werror=format-security" \
"-fexceptions" \
"-fstack-protector-strong" \
- "--param=ssp-buffer-size=4" \

34
meta-networking/recipes-daemons/keepalived/keepalived/0001-vrrp-Don-t-include-linux-if_ether.h-if-not-needed.patch
View File

@ -1,34 +0,0 @@
From f129c588f7c8a66e595d8ae96a43d585018e79cd Mon Sep 17 00:00:00 2001
From: Quentin Armitage <quentin@armitage.org.uk>
Date: Thu, 7 Nov 2024 11:09:43 +0000
Subject: [PATCH] vrrp: Don't include <linux/if_ether.h> if not needed
The musl headers do not allow including both <linux/if_ether.h> and
<net/ethernet.h> since they both define struct ethhdr.
It is likely that we do not need to include <linux/if_ether.h> at all
since with both glibc and musl including <net/ethernet.h> is sufficient,
but removing <linux/if_ether.h> is for another day.
Upstream-Status: Backport [https://github.com/acassen/keepalived/commit/f129c588f7c8a66e595d8ae96a43d585018e79cd]
Signed-off-by: Quentin Armitage <quentin@armitage.org.uk>
---
keepalived/vrrp/vrrp.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/keepalived/vrrp/vrrp.c b/keepalived/vrrp/vrrp.c
index 96b2c4c8..4b06e387 100644
--- a/keepalived/vrrp/vrrp.c
+++ b/keepalived/vrrp/vrrp.c
@@ -40,8 +40,10 @@
#include <netinet/ip6.h>
#include <stdint.h>
#include <net/if_arp.h>
-#include <linux/if_ether.h>
#include <net/ethernet.h>
+#if !defined ETH_HLEN || !defined ETH_ZLEN
+#include <linux/if_ether.h> /* This may not be needed at all - try removing and see if any issues raised */
+#endif
#ifdef _NETWORK_TIMESTAMP_
#include <linux/net_tstamp.h>
#endif

3
meta-networking/recipes-daemons/keepalived/keepalived_2.3.2.bb → meta-networking/recipes-daemons/keepalived/keepalived_2.3.4.bb
View File

@ -12,9 +12,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
SRC_URI = "http://www.keepalived.org/software/${BP}.tar.gz \
file://0001-configure.ac-Do-not-emit-compiler-flags-into-object-.patch \
file://0001-vrrp-Don-t-include-linux-if_ether.h-if-not-needed.patch \
"
SRC_URI[sha256sum] = "77f4a22e5a23fa8e49b8916acdfb584c864e72905a2f1de2a7f62ed40a896160"
SRC_URI[sha256sum] = "6afd95ddb7d3e0d3b8b8e5b3a489144131b61a01b06d29e883d0c44acc8a36bf"
UPSTREAM_CHECK_URI = "https://github.com/acassen/keepalived/releases"
DEPENDS = "libnfnetlink openssl"