* [ptxdist] [PATCH v2] procps: Version bump. 4.0.3 -> 4.0.4
@ 2023-09-18 17:48 Christian Melki
2023-09-24 5:44 ` [ptxdist] [APPLIED] " Michael Olbrich
0 siblings, 1 reply; 2+ messages in thread
From: Christian Melki @ 2023-09-18 17:48 UTC (permalink / raw)
To: ptxdist
Minor release. Bugfixes and some minor enhancements.
https://gitlab.com/procps-ng/procps/-/releases/v4.0.4
Plugs CVE:
CVE-2023-4016 ps buffer overflow.
* Add patch to explicitly link w with the correct library.
Needed to build with systemd.
Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
...1-build-sys-Add-systemd-elogind-to-w.patch | 42 +++++++++++++++++++
patches/procps-ng-4.0.4/series | 4 ++
rules/procps.make | 4 +-
3 files changed, 48 insertions(+), 2 deletions(-)
create mode 100644 patches/procps-ng-4.0.4/0001-build-sys-Add-systemd-elogind-to-w.patch
create mode 100644 patches/procps-ng-4.0.4/series
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
new file mode 100644
index 000000000..6eb5de4e1
--- /dev/null
+++ b/patches/procps-ng-4.0.4/0001-build-sys-Add-systemd-elogind-to-w.patch
@@ -0,0 +1,42 @@
+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/series b/patches/procps-ng-4.0.4/series
new file mode 100644
index 000000000..fecb289bb
--- /dev/null
+++ b/patches/procps-ng-4.0.4/series
@@ -0,0 +1,4 @@
+# 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 9ed658f70..40110d909 100644
--- a/rules/procps.make
+++ b/rules/procps.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_PROCPS) += procps
#
# Paths and names
#
-PROCPS_VERSION := 4.0.3
-PROCPS_MD5 := 22b287bcd758831cbaf3356cd3054fe7
+PROCPS_VERSION := 4.0.4
+PROCPS_MD5 := 2f747fc7df8ccf402d03e375c565cf96
PROCPS := procps-ng-$(PROCPS_VERSION)
PROCPS_SUFFIX := tar.xz
PROCPS_URL := $(call ptx/mirror, SF, procps-ng/Production/$(PROCPS).$(PROCPS_SUFFIX))
--
2.34.1
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [ptxdist] [APPLIED] procps: Version bump. 4.0.3 -> 4.0.4
2023-09-18 17:48 [ptxdist] [PATCH v2] procps: Version bump. 4.0.3 -> 4.0.4 Christian Melki
@ 2023-09-24 5:44 ` Michael Olbrich
0 siblings, 0 replies; 2+ messages in thread
From: Michael Olbrich @ 2023-09-24 5:44 UTC (permalink / raw)
To: ptxdist; +Cc: Christian Melki
Thanks, applied as bb4429b9579d457ce499167e2d814e115e824036.
Michael
[sent from post-receive hook]
On Sun, 24 Sep 2023 07:44:44 +0200, Christian Melki <christian.melki@t2data.com> wrote:
> Minor release. Bugfixes and some minor enhancements.
> https://gitlab.com/procps-ng/procps/-/releases/v4.0.4
>
> Plugs CVE:
> CVE-2023-4016 ps buffer overflow.
>
> * Add patch to explicitly link w with the correct library.
> Needed to build with systemd.
>
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> Message-Id: <20230918174817.28971-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
> new file mode 100644
> index 000000000000..6eb5de4e184b
> --- /dev/null
> +++ b/patches/procps-ng-4.0.4/0001-build-sys-Add-systemd-elogind-to-w.patch
> @@ -0,0 +1,42 @@
> +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
> new file mode 120000
> index 000000000000..9f8a4cb7ddcb
> --- /dev/null
> +++ b/patches/procps-ng-4.0.4/autogen.sh
> @@ -0,0 +1 @@
> +../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
> new file mode 100644
> index 000000000000..fecb289bb899
> --- /dev/null
> +++ b/patches/procps-ng-4.0.4/series
> @@ -0,0 +1,4 @@
> +# 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 9ed658f70176..40110d909862 100644
> --- a/rules/procps.make
> +++ b/rules/procps.make
> @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_PROCPS) += procps
> #
> # Paths and names
> #
> -PROCPS_VERSION := 4.0.3
> -PROCPS_MD5 := 22b287bcd758831cbaf3356cd3054fe7
> +PROCPS_VERSION := 4.0.4
> +PROCPS_MD5 := 2f747fc7df8ccf402d03e375c565cf96
> PROCPS := procps-ng-$(PROCPS_VERSION)
> PROCPS_SUFFIX := tar.xz
> PROCPS_URL := $(call ptx/mirror, SF, procps-ng/Production/$(PROCPS).$(PROCPS_SUFFIX))
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-09-24 5:47 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-09-18 17:48 [ptxdist] [PATCH v2] procps: Version bump. 4.0.3 -> 4.0.4 Christian Melki
2023-09-24 5:44 ` [ptxdist] [APPLIED] " Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox