[meta-networking] keepalived: 2.2.2 -> 2.2.8

From: Lee Chee Yang <chee.yang.lee@intel.com>

add EXTRA_CFLAGS to Fix reproducibility.

Signed-off-by: Lee Chee Yang <chee.yang.lee@intel.com>
---
 ...layer4-Change-order-of-include-files.patch | 60 -------------------
 ...eepalived_2.2.2.bb => keepalived_2.2.8.bb} |  5 +-
 2 files changed, 3 insertions(+), 62 deletions(-)
 delete mode 100644 meta-networking/recipes-daemons/keepalived/keepalived/0001-layer4-Change-order-of-include-files.patch
 rename meta-networking/recipes-daemons/keepalived/{keepalived_2.2.2.bb => keepalived_2.2.8.bb} (91%)

On Tue, Sep 12, 2023 at 4:56 AM Lee Chee Yang <chee.yang.lee@intel.com> wrote:
>
> From: Lee Chee Yang <chee.yang.lee@intel.com>
>
> add EXTRA_CFLAGS to Fix reproducibility.
>
> Signed-off-by: Lee Chee Yang <chee.yang.lee@intel.com>
> ---
>  ...layer4-Change-order-of-include-files.patch | 60 -------------------
>  ...eepalived_2.2.2.bb => keepalived_2.2.8.bb} |  5 +-
>  2 files changed, 3 insertions(+), 62 deletions(-)
>  delete mode 100644 meta-networking/recipes-daemons/keepalived/keepalived/0001-layer4-Change-order-of-include-files.patch

is this issue fixed differently upstream? if so it would be good to
document in commit message.

>  rename meta-networking/recipes-daemons/keepalived/{keepalived_2.2.2.bb => keepalived_2.2.8.bb} (91%)
>
> diff --git a/meta-networking/recipes-daemons/keepalived/keepalived/0001-layer4-Change-order-of-include-files.patch b/meta-networking/recipes-daemons/keepalived/keepalived/0001-layer4-Change-order-of-include-files.patch
> deleted file mode 100644
> index 678a208ac3..0000000000
> --- a/meta-networking/recipes-daemons/keepalived/keepalived/0001-layer4-Change-order-of-include-files.patch
> +++ /dev/null
> @@ -1,60 +0,0 @@
> -From a85ca79143a87286f793957e803ee3daf03c2b57 Mon Sep 17 00:00:00 2001
> -From: Khem Raj <raj.khem@gmail.com>
> -Date: Tue, 6 Jul 2021 14:06:44 -0700
> -Subject: [PATCH] layer4: Change order of include files
> -
> -curent order to include standard headers first is causing an isue with
> -glibc 2.34 + kernel-headers 5.13+ where order of including netinet/in.h
> -and linux/in.h matters and it does not define __UAPI_DEF_IN_IPPROTO
> -before including linux/in.h and then later includes netinet/in.h which
> -then means lot of definitions will be defined twice and compile would
> -fail. Re-ordering the local headers to appear first solves the issue
> -amicably, and I think this is right order too
> -
> -Upsteam-Status: Pending
> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ----
> -Upstream-Status: Pending
> -
> - keepalived/core/layer4.c | 21 ++++++++++-----------
> - 1 file changed, 10 insertions(+), 11 deletions(-)
> -
> -diff --git a/keepalived/core/layer4.c b/keepalived/core/layer4.c
> -index 90cdc84..c122c29 100644
> ---- a/keepalived/core/layer4.c
> -+++ b/keepalived/core/layer4.c
> -@@ -23,6 +23,16 @@
> -
> - #include "config.h"
> -
> -+#include "layer4.h"
> -+#include "logger.h"
> -+#include "scheduler.h"
> -+#ifdef _WITH_LVS_
> -+#include "check_api.h"
> -+#endif
> -+#include "bitops.h"
> -+#include "utils.h"
> -+#include "align.h"
> -+
> - #include <stdio.h>
> - #include <errno.h>
> - #include <unistd.h>
> -@@ -33,17 +43,6 @@
> - #include <sys/time.h>
> - #endif
> - #include <linux/errqueue.h>
> --#include <netinet/in.h>
> --
> --#include "layer4.h"
> --#include "logger.h"
> --#include "scheduler.h"
> --#ifdef _WITH_LVS_
> --#include "check_api.h"
> --#endif
> --#include "bitops.h"
> --#include "utils.h"
> --#include "align.h"
> -
> - // #define ICMP_DEBUG 1
> -
> diff --git a/meta-networking/recipes-daemons/keepalived/keepalived_2.2.2.bb b/meta-networking/recipes-daemons/keepalived/keepalived_2.2.8.bb
> similarity index 91%
> rename from meta-networking/recipes-daemons/keepalived/keepalived_2.2.2.bb
> rename to meta-networking/recipes-daemons/keepalived/keepalived_2.2.8.bb
> index 204d2fd116..dd193b12fc 100644
> --- a/meta-networking/recipes-daemons/keepalived/keepalived_2.2.2.bb
> +++ b/meta-networking/recipes-daemons/keepalived/keepalived_2.2.8.bb
> @@ -11,9 +11,8 @@ LICENSE = "GPL-2.0-only"
>  LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
>
>  SRC_URI = "http://www.keepalived.org/software/${BP}.tar.gz \
> -           file://0001-layer4-Change-order-of-include-files.patch \
>             "
> -SRC_URI[sha256sum] = "103692bd5345a4ed9f4581632ea636214fdf53e45682e200aab122c4fa674ece"
> +SRC_URI[sha256sum] = "85882eb62974f395d4c631be990a41a839594a7e62fbfebcb5649a937a7a1bb6"
>  UPSTREAM_CHECK_URI = "https://github.com/acassen/keepalived/releases"
>
>  DEPENDS = "libnfnetlink openssl"
> @@ -29,6 +28,8 @@ PACKAGECONFIG[systemd] = "--with-init=systemd --with-systemdsystemunitdir=${syst
>
>  EXTRA_OEMAKE = "initdir=${sysconfdir}/init.d"
>
> +export EXTRA_CFLAGS = "${CFLAGS}"
> +
>  do_install:append() {
>      if [ -f ${D}${sysconfdir}/init.d/${BPN} ]; then
>          chmod 0755 ${D}${sysconfdir}/init.d/${BPN}
> --
> 2.37.3
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#104845): https://lists.openembedded.org/g/openembedded-devel/message/104845
> Mute This Topic: https://lists.openembedded.org/mt/101313106/1997914
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>