Re: [ptxdist] [APPLIED] procps: Version bump. 4.0.4 -> 4.0.5

[Michael Olbrich <m.olbrich@pengutronix.de>]

Thanks, applied as 25dca462ba26d13bc329e7b0555886860c2c6804.

Michael

[sent from post-receive hook]

On Thu, 16 Jan 2025 17:09:56 +0100, Christian Melki <christian.melki@t2data.com> wrote:
> Minor changes.
> https://gitlab.com/procps-ng/procps/-/releases/v4.0.5
> 
> * Remove patchset. Included in the release.
> 
> * Fix pidwait disable, now available in the release.
> 
> * Add 2038 global option.
> 
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> Message-Id: <20250102185407.2233541-1-christian.melki@t2data.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/patches/procps-ng-4.0.4/0001-build-sys-Add-systemd-elogind-to-w.patch b/patches/procps-ng-4.0.4/0001-build-sys-Add-systemd-elogind-to-w.patch
> deleted file mode 100644
> index 6eb5de4e184b..000000000000
> --- a/patches/procps-ng-4.0.4/0001-build-sys-Add-systemd-elogind-to-w.patch
> +++ /dev/null
> @@ -1,42 +0,0 @@
> -From: Craig Small <csmall@dropbear.xyz>
> -Date: Thu, 31 Aug 2023 22:24:23 +1000
> -Subject: [PATCH] build-sys: Add systemd/elogind to w
> -
> -Depending on the compiler flags, w needs to be explictly linked
> -to libsystemd or elogind even though libproc2 is linked to it.
> -
> -Signed-off-by: Craig Small <csmall@dropbear.xyz>
> ----
> - Makefile.am | 7 +++++++
> - NEWS        | 3 +++
> - 2 files changed, 10 insertions(+)
> -
> -diff --git a/Makefile.am b/Makefile.am
> -index f70c8fb1eb49..ddfc0141d869 100644
> ---- a/Makefile.am
> -+++ b/Makefile.am
> -@@ -149,6 +149,13 @@ endif
> - 
> - dist_man_MANS += man/w.1
> - src_w_SOURCES = src/w.c local/fileutils.c
> -+src_w_LDADD = $(LDADD)
> -+if WITH_SYSTEMD
> -+src_w_LDADD += @SYSTEMD_LIBS@
> -+endif
> -+if WITH_ELOGIND
> -+src_w_LDADD += @ELOGIND_LIBS@
> -+endif
> - else
> -   EXTRA_DIST += man/w.1
> - endif
> -diff --git a/NEWS b/NEWS
> -index 3f2158d40683..4ad9f74e8c2e 100644
> ---- a/NEWS
> -+++ b/NEWS
> -@@ -1,3 +1,6 @@
> -+procps-ng-NEXT
> -+---------------
> -+
> - procps-ng-4.0.4
> - ---------------
> -   * library (API & ABI unchanged)
> diff --git a/patches/procps-ng-4.0.4/autogen.sh b/patches/procps-ng-4.0.4/autogen.sh
> deleted file mode 120000
> index 9f8a4cb7ddcb..000000000000
> --- a/patches/procps-ng-4.0.4/autogen.sh
> +++ /dev/null
> @@ -1 +0,0 @@
> -../autogen.sh
> \ No newline at end of file
> diff --git a/patches/procps-ng-4.0.4/series b/patches/procps-ng-4.0.4/series
> deleted file mode 100644
> index fecb289bb899..000000000000
> --- a/patches/procps-ng-4.0.4/series
> +++ /dev/null
> @@ -1,4 +0,0 @@
> -# generated by git-ptx-patches
> -#tag:base --start-number 1
> -0001-build-sys-Add-systemd-elogind-to-w.patch
> -# c14bc921db0bebb737d88875f00cb44f  - git-ptx-patches magic
> diff --git a/rules/procps.make b/rules/procps.make
> index 44153fe060dc..79ecaf927833 100644
> --- a/rules/procps.make
> +++ b/rules/procps.make
> @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_PROCPS) += procps
>  #
>  # Paths and names
>  #
> -PROCPS_VERSION	:= 4.0.4
> -PROCPS_MD5	:= 2f747fc7df8ccf402d03e375c565cf96
> +PROCPS_VERSION	:= 4.0.5
> +PROCPS_MD5	:= 90803e64f51f192f3325d25c3335d057
>  PROCPS		:= procps-ng-$(PROCPS_VERSION)
>  PROCPS_SUFFIX	:= tar.xz
>  PROCPS_URL	:= $(call ptx/mirror, SF, procps-ng/Production/$(PROCPS).$(PROCPS_SUFFIX))
> @@ -48,6 +48,7 @@ PROCPS_CONF_OPT	:= \
>  	--disable-libselinux \
>  	--disable-harden-flags \
>  	--$(call ptx/endis, PTXCONF_PROCPS_PIDOF)-pidof \
> +	--$(call ptx/endis, PTXCONF_PROCPS_PIDWAIT)-pidwait \
>  	--disable-kill \
>  	--$(call ptx/endis, PTXCONF_PROCPS_W)-w \
>  	--disable-skill \
> @@ -59,6 +60,7 @@ PROCPS_CONF_OPT	:= \
>  	--disable-numa \
>  	--disable-w-from \
>  	--enable-whining \
> +	--$(call ptx/endis, PTXDIST_Y2038)-year2038 \
>  	--without-libiconv-prefix \
>  	--without-libintl-prefix \
>  	--$(call ptx/wwo, PTXCONF_PROCPS_USES_NCURSES)-ncurses \