From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Sun, 24 Sep 2023 07:47:15 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1qkHxc-00901B-GB for lore@lore.pengutronix.de; Sun, 24 Sep 2023 07:47:15 +0200 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1qkHxa-0001hE-VX; Sun, 24 Sep 2023 07:47:14 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qkHvB-0006sz-4K; Sun, 24 Sep 2023 07:44:45 +0200 Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1qkHvA-008ZF2-N5; Sun, 24 Sep 2023 07:44:44 +0200 Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1qkHvA-000VmP-2A; Sun, 24 Sep 2023 07:44:44 +0200 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Sun, 24 Sep 2023 07:44:44 +0200 Message-Id: <20230924054444.122154-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230918174817.28971-1-christian.melki@t2data.com> References: <20230918174817.28971-1-christian.melki@t2data.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] procps: Version bump. 4.0.3 -> 4.0.4 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Christian Melki Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false Thanks, applied as bb4429b9579d457ce499167e2d814e115e824036. Michael [sent from post-receive hook] On Sun, 24 Sep 2023 07:44:44 +0200, Christian Melki 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 > Message-Id: <20230918174817.28971-1-christian.melki@t2data.com> > Signed-off-by: Michael Olbrich > > 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 > +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 > +--- > + 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))