From e1a38c66263f60ff55925327a510b070851122b6 Mon Sep 17 00:00:00 2001 From: Stijn Tintel Date: Mon, 28 Oct 2024 19:18:07 +0200 Subject: [PATCH 1/2] keepalived: bump to 2.3.0 Release notes: https://www.keepalived.org/release-notes/Release-2.3.0.html Drop upstreamed patch 0001-vrrp-remove-logging-on-status-output.patch. Signed-off-by: Stijn Tintel --- net/keepalived/Makefile | 6 ++--- ...vrrp-remove-logging-on-status-output.patch | 24 ------------------- 2 files changed, 3 insertions(+), 27 deletions(-) delete mode 100644 net/keepalived/patches/0001-vrrp-remove-logging-on-status-output.patch diff --git a/net/keepalived/Makefile b/net/keepalived/Makefile index 31292398733a2..a5d6881647db3 100644 --- a/net/keepalived/Makefile +++ b/net/keepalived/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=keepalived -PKG_VERSION:=2.2.8 -PKG_RELEASE:=9 +PKG_VERSION:=2.3.0 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://www.keepalived.org/software -PKG_HASH:=85882eb62974f395d4c631be990a41a839594a7e62fbfebcb5649a937a7a1bb6 +PKG_HASH:=39a201fb043c426a48ac7de1ceb96d9fc8ef46e30e521b76ffe35855955c8177 PKG_CPE_ID:=cpe:/a:keepalived:keepalived PKG_LICENSE:=GPL-2.0-or-later diff --git a/net/keepalived/patches/0001-vrrp-remove-logging-on-status-output.patch b/net/keepalived/patches/0001-vrrp-remove-logging-on-status-output.patch deleted file mode 100644 index 1988a0b196d5a..0000000000000 --- a/net/keepalived/patches/0001-vrrp-remove-logging-on-status-output.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 6cce75f4eb65551a61d2e4ba775637b288c1d592 Mon Sep 17 00:00:00 2001 -From: Florian Eckert -Date: Mon, 6 May 2024 13:10:55 +0200 -Subject: [PATCH] vrrp: remove logging on status output - -A message is output to the log each time the status is queried. This is -not necessary and can therefore be omitted. - -Signed-off-by: Florian Eckert ---- - keepalived/vrrp/vrrp_daemon.c | 2 -- - 1 file changed, 2 deletions(-) - ---- a/keepalived/vrrp/vrrp_daemon.c -+++ b/keepalived/vrrp/vrrp_daemon.c -@@ -755,8 +755,6 @@ sigusr2_vrrp(__attribute__((unused)) voi - static void - sigjson_vrrp(__attribute__((unused)) void *v, __attribute__((unused)) int sig) - { -- log_message(LOG_INFO, "Printing VRRP as json for process(%d) on signal", -- getpid()); - thread_add_event(master, print_vrrp_json, NULL, 0); - } - #endif From 0cbb926b8301c2e577166b57474a53c153fc1801 Mon Sep 17 00:00:00 2001 From: Stijn Tintel Date: Mon, 28 Oct 2024 19:19:57 +0200 Subject: [PATCH 2/2] keepalived: bump to 2.3.1 Release notes: https://www.keepalived.org/release-notes/Release-2.3.1.html Signed-off-by: Stijn Tintel --- net/keepalived/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/keepalived/Makefile b/net/keepalived/Makefile index a5d6881647db3..06c6b128a172d 100644 --- a/net/keepalived/Makefile +++ b/net/keepalived/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=keepalived -PKG_VERSION:=2.3.0 +PKG_VERSION:=2.3.1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://www.keepalived.org/software -PKG_HASH:=39a201fb043c426a48ac7de1ceb96d9fc8ef46e30e521b76ffe35855955c8177 +PKG_HASH:=92f4b69bfd998e2306d1995ad16fdad1b59e70be694c883385c5f55e02c62aa3 PKG_CPE_ID:=cpe:/a:keepalived:keepalived PKG_LICENSE:=GPL-2.0-or-later