Re: [OE-core] [PATCH 18/24] procps: update 3.3.16 -> 3.3.17

["Khem Raj" <raj.khem@gmail.com>]

On 2/28/21 7:36 AM, Alexander Kanavin wrote:
> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> ---
>   .../procps/0001-w.c-correct-musl-builds.patch | 44 +++++++++++++++++++
>   ...02-proc-escape.c-add-missing-include.patch | 23 ++++++++++
>   .../{procps_3.3.16.bb => procps_3.3.17.bb}    |  4 +-
>   3 files changed, 70 insertions(+), 1 deletion(-)
>   create mode 100644 meta/recipes-extended/procps/procps/0001-w.c-correct-musl-builds.patch
>   create mode 100644 meta/recipes-extended/procps/procps/0002-proc-escape.c-add-missing-include.patch
>   rename meta/recipes-extended/procps/{procps_3.3.16.bb => procps_3.3.17.bb} (94%)
> 
> diff --git a/meta/recipes-extended/procps/procps/0001-w.c-correct-musl-builds.patch b/meta/recipes-extended/procps/procps/0001-w.c-correct-musl-builds.patch
> new file mode 100644
> index 0000000000..c92ad28e4f
> --- /dev/null
> +++ b/meta/recipes-extended/procps/procps/0001-w.c-correct-musl-builds.patch
> @@ -0,0 +1,44 @@
> +From 22f8d25567b8d64bdbab0fb0b4915b4362561d9b Mon Sep 17 00:00:00 2001
> +From: Alexander Kanavin <alex.kanavin@gmail.com>
> +Date: Wed, 24 Feb 2021 21:14:31 +0000
> +Subject: [PATCH] w.c: correct musl builds
> +
> +No need to redefine UT_ stuff to something that does not exist.
> +
> +UT_ is already provided in musl but via utmp.h header, so include
> +it always.
> +
> +Upstream-Status: Submitted [https://gitlab.com/procps-ng/procps/-/merge_requests/126]
> +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> +---
> + w.c | 9 +--------
> + 1 file changed, 1 insertion(+), 8 deletions(-)
> +
> +diff --git a/w.c b/w.c
> +index 9d07ac9..d10639b 100644
> +--- a/w.c
> ++++ b/w.c
> +@@ -57,9 +57,8 @@
> + #include <unistd.h>
> + #ifdef HAVE_UTMPX_H
> + #	include <utmpx.h>
> +-#else
> +-#	include <utmp.h>
> + #endif
> ++#include <utmp.h>

this would mean when utmpx.h is provided ( e.g. ) it will now include 
both, which is a change perhaps to look more into, it might want them to 
be exclusive.

> + #include <arpa/inet.h>
> +
> + static int ignoreuser = 0;	/* for '-u' */
> +@@ -72,12 +71,6 @@ typedef struct utmpx utmp_t;
> + typedef struct utmp utmp_t;
> + #endif
> +
> +-#if !defined(UT_HOSTSIZE) || defined(__UT_HOSTSIZE)
> +-#	define UT_HOSTSIZE __UT_HOSTSIZE
> +-#	define UT_LINESIZE __UT_LINESIZE
> +-#	define UT_NAMESIZE __UT_NAMESIZE
> +-#endif
> +-
> + #ifdef W_SHOWFROM
> + # define FROM_STRING "on"
> + #else
> diff --git a/meta/recipes-extended/procps/procps/0002-proc-escape.c-add-missing-include.patch b/meta/recipes-extended/procps/procps/0002-proc-escape.c-add-missing-include.patch
> new file mode 100644
> index 0000000000..5fa1ac9d78
> --- /dev/null
> +++ b/meta/recipes-extended/procps/procps/0002-proc-escape.c-add-missing-include.patch
> @@ -0,0 +1,23 @@
> +From 4f964821398dff7ab21fec63da15e1e00b2e9277 Mon Sep 17 00:00:00 2001
> +From: Alexander Kanavin <alex.kanavin@gmail.com>
> +Date: Wed, 24 Feb 2021 21:16:14 +0000
> +Subject: [PATCH] proc/escape.c: add missing include
> +
> +Upstream-Status: Submitted [https://gitlab.com/procps-ng/procps/-/merge_requests/126]
> +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> +---
> + proc/escape.c | 1 +
> + 1 file changed, 1 insertion(+)
> +
> +diff --git a/proc/escape.c b/proc/escape.c
> +index 2e8fb7d..e1f4612 100644
> +--- a/proc/escape.c
> ++++ b/proc/escape.c
> +@@ -21,6 +21,7 @@
> + #include <sys/types.h>
> + #include <string.h>
> + #include <limits.h>
> ++#include <langinfo.h>
> + #include "procps.h"
> + #include "escape.h"
> + #include "readproc.h"
> diff --git a/meta/recipes-extended/procps/procps_3.3.16.bb b/meta/recipes-extended/procps/procps_3.3.17.bb
> similarity index 94%
> rename from meta/recipes-extended/procps/procps_3.3.16.bb
> rename to meta/recipes-extended/procps/procps_3.3.17.bb
> index ef3ac86e97..c74a901d9a 100644
> --- a/meta/recipes-extended/procps/procps_3.3.16.bb
> +++ b/meta/recipes-extended/procps/procps_3.3.17.bb
> @@ -14,8 +14,10 @@ inherit autotools gettext pkgconfig update-alternatives
>   
>   SRC_URI = "git://gitlab.com/procps-ng/procps.git;protocol=https \
>              file://sysctl.conf \
> +           file://0001-w.c-correct-musl-builds.patch \
> +           file://0002-proc-escape.c-add-missing-include.patch \
>              "
> -SRCREV = "59c88e18f29000ceaf7e5f98181b07be443cf12f"
> +SRCREV = "19a508ea121c0c4ac6d0224575a036de745eaaf8"
>   
>   S = "${WORKDIR}/git"
>   
> 
> 
> 
> 
>