From b90d48a1c1355b58e40b17e2e94a3ce627888670 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 19 Nov 2024 23:56:39 -0800 Subject: keepalived: Upgrade to 2.3.2 Changes are https://www.keepalived.org/release-notes/Release-2.3.0.html https://www.keepalived.org/release-notes/Release-2.3.1.html https://www.keepalived.org/release-notes/Release-2.3.2.html Signed-off-by: Khem Raj --- ...c-Do-not-emit-compiler-flags-into-object-.patch | 6 +-- .../recipes-daemons/keepalived/keepalived_2.2.8.bb | 56 ---------------------- .../recipes-daemons/keepalived/keepalived_2.3.2.bb | 56 ++++++++++++++++++++++ 3 files changed, 58 insertions(+), 60 deletions(-) delete mode 100644 meta-networking/recipes-daemons/keepalived/keepalived_2.2.8.bb create mode 100644 meta-networking/recipes-daemons/keepalived/keepalived_2.3.2.bb (limited to 'meta-networking') diff --git a/meta-networking/recipes-daemons/keepalived/keepalived/0001-configure.ac-Do-not-emit-compiler-flags-into-object-.patch b/meta-networking/recipes-daemons/keepalived/keepalived/0001-configure.ac-Do-not-emit-compiler-flags-into-object-.patch index 1f9f8b30b1..e44e2035c2 100644 --- a/meta-networking/recipes-daemons/keepalived/keepalived/0001-configure.ac-Do-not-emit-compiler-flags-into-object-.patch +++ b/meta-networking/recipes-daemons/keepalived/keepalived/0001-configure.ac-Do-not-emit-compiler-flags-into-object-.patch @@ -13,12 +13,10 @@ Signed-off-by: Khem Raj configure.ac | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -diff --git a/configure.ac b/configure.ac -index fae16f1..677b94a 100644 --- a/configure.ac +++ b/configure.ac -@@ -904,8 +904,7 @@ if test "$enable_hardening" != no; then - "-Wp,-D_FORTIFY_SOURCE=2" \ +@@ -1013,8 +1013,7 @@ if test "$enable_hardening" != no; then + "-Wp,-D_FORTIFY_SOURCE=$FORTIFY_SOURCE" \ "-fexceptions" \ "-fstack-protector-strong" \ - "--param=ssp-buffer-size=4" \ diff --git a/meta-networking/recipes-daemons/keepalived/keepalived_2.2.8.bb b/meta-networking/recipes-daemons/keepalived/keepalived_2.2.8.bb deleted file mode 100644 index c4d59d3caa..0000000000 --- a/meta-networking/recipes-daemons/keepalived/keepalived_2.2.8.bb +++ /dev/null @@ -1,56 +0,0 @@ -SUMMARY = "High Availability monitor built upon LVS, VRRP and service pollers" -DESCRIPTION = "Keepalived is a routing software written in C. The main goal \ -of this project is to provide simple and robust facilities for loadbalancing \ -and high-availability to Linux system and Linux based infrastructures. \ -Loadbalancing framework relies on well-known and widely used Linux Virtual \ -Server (IPVS) kernel module providing Layer4 loadbalancing \ -" -HOMEPAGE = "http://www.keepalived.org/" - -LICENSE = "GPL-2.0-only" -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 \ - " -SRC_URI[sha256sum] = "85882eb62974f395d4c631be990a41a839594a7e62fbfebcb5649a937a7a1bb6" -UPSTREAM_CHECK_URI = "https://github.com/acassen/keepalived/releases" - -DEPENDS = "libnfnetlink openssl" - -inherit autotools pkgconfig systemd - -PACKAGECONFIG ??= "libnl snmp \ - ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ -" -PACKAGECONFIG[libnl] = "--enable-libnl,--disable-libnl,libnl" -PACKAGECONFIG[snmp] = "--enable-snmp,--disable-snmp,net-snmp" -PACKAGECONFIG[systemd] = "--with-init=systemd --with-systemdsystemunitdir=${systemd_system_unitdir},--with-init=SYSV,systemd" - -EXTRA_OEMAKE = "initdir=${sysconfdir}/init.d" - -export EXTRA_CFLAGS = "${CFLAGS}" - -do_configure:append() { - sed -i -e 's|${WORKDIR}||g' ${B}/lib/config.h -} - -do_install:append() { - if [ -f ${D}${sysconfdir}/init.d/${BPN} ]; then - chmod 0755 ${D}${sysconfdir}/init.d/${BPN} - sed -i 's#rc.d/##' ${D}${sysconfdir}/init.d/${BPN} - fi - - if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then - install -D -m 0644 ${B}/${BPN}/${BPN}.service ${D}${systemd_system_unitdir}/${BPN}.service - fi -} - -PACKAGE_BEFORE_PN = "${PN}-samples" - -FILES:${PN} += "${datadir}/snmp/mibs/KEEPALIVED-MIB.txt" - -FILES:${PN}-samples = "${sysconfdir}/keepalived/samples ${sysconfdir}/keepalived/keepalived.conf.sample" - -SYSTEMD_SERVICE:${PN} = "keepalived.service" -SYSTEMD_AUTO_ENABLE ?= "disable" diff --git a/meta-networking/recipes-daemons/keepalived/keepalived_2.3.2.bb b/meta-networking/recipes-daemons/keepalived/keepalived_2.3.2.bb new file mode 100644 index 0000000000..2cb76e6d41 --- /dev/null +++ b/meta-networking/recipes-daemons/keepalived/keepalived_2.3.2.bb @@ -0,0 +1,56 @@ +SUMMARY = "High Availability monitor built upon LVS, VRRP and service pollers" +DESCRIPTION = "Keepalived is a routing software written in C. The main goal \ +of this project is to provide simple and robust facilities for loadbalancing \ +and high-availability to Linux system and Linux based infrastructures. \ +Loadbalancing framework relies on well-known and widely used Linux Virtual \ +Server (IPVS) kernel module providing Layer4 loadbalancing \ +" +HOMEPAGE = "http://www.keepalived.org/" + +LICENSE = "GPL-2.0-only" +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 \ + " +SRC_URI[sha256sum] = "77f4a22e5a23fa8e49b8916acdfb584c864e72905a2f1de2a7f62ed40a896160" +UPSTREAM_CHECK_URI = "https://github.com/acassen/keepalived/releases" + +DEPENDS = "libnfnetlink openssl" + +inherit autotools pkgconfig systemd + +PACKAGECONFIG ??= "libnl snmp \ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ +" +PACKAGECONFIG[libnl] = "--enable-libnl,--disable-libnl,libnl" +PACKAGECONFIG[snmp] = "--enable-snmp,--disable-snmp,net-snmp" +PACKAGECONFIG[systemd] = "--with-init=systemd --with-systemdsystemunitdir=${systemd_system_unitdir},--with-init=SYSV,systemd" + +EXTRA_OEMAKE = "initdir=${sysconfdir}/init.d" + +export EXTRA_CFLAGS = "${CFLAGS}" + +do_configure:append() { + sed -i -e 's|${WORKDIR}||g' ${B}/lib/config.h +} + +do_install:append() { + if [ -f ${D}${sysconfdir}/init.d/${BPN} ]; then + chmod 0755 ${D}${sysconfdir}/init.d/${BPN} + sed -i 's#rc.d/##' ${D}${sysconfdir}/init.d/${BPN} + fi + + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -D -m 0644 ${B}/${BPN}/${BPN}.service ${D}${systemd_system_unitdir}/${BPN}.service + fi +} + +PACKAGE_BEFORE_PN = "${PN}-samples" + +FILES:${PN} += "${datadir}/snmp/mibs/KEEPALIVED-MIB.txt" + +FILES:${PN}-samples = "${sysconfdir}/keepalived/samples ${sysconfdir}/keepalived/keepalived.conf.sample" + +SYSTEMD_SERVICE:${PN} = "keepalived.service" +SYSTEMD_AUTO_ENABLE ?= "disable" -- cgit v1.2.3-54-g00ecf