mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-01-29 21:08:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

sysstat: update 12.6.2 -> 12.7.4

Browse Source 
Old homepage is no longer being updated and will be taken down soon.
Let's switch to git, as the new homepage is still being set up.

Upstream has confirmed that odd-even version scheme is no longer in place:
https://github.com/sysstat/sysstat/issues/373

(From OE-Core rev: f9d64fc36c963e6d53b1e686fdd6e998c606c413)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2023-09-17 11:38:47 +02:00
committed by Richard Purdie
parent b48000bba3
commit a990c6ce15
3 changed files with 10 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
meta/recipes-extended/sysstat/sysstat/0001-configure.in-remove-check-for-chkconfig.patch
View File

@@ -1,7 +1,7 @@
From 1590cc614aaf0fb81cd804414d6c9d5a9227352c Mon Sep 17 00:00:00 2001
From: Wenlin Kang <wenlin.kang@windriver.com>
Date: Tue, 5 Nov 2019 16:16:44 +0800
Subject: [PATCH] configure.in: remove check for chkconfig
Subject: [PATCH] configure.ac: remove check for chkconfig
chkconfig can't work on cross-platform, so should remove check for it.
@@ -9,13 +9,13 @@ Upstream-Status: Inappropriate [ embedded specific ]
Signed-off-by: Wenlin Kang <wenlin.kang@windriver.com>
---
configure.in | 3 ++-
configure.ac | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/configure.in b/configure.in
diff --git a/configure.ac b/configure.ac
index 48b9a31..cedeb43 100644
--- a/configure.in
+++ b/configure.in
--- a/configure.ac
+++ b/configure.ac
@@ -42,7 +42,8 @@ AC_SUBST(VER_JSON)
AC_SUBST(VER_XML)

46
meta/recipes-extended/sysstat/sysstat/CVE-2023-33204.patch
View File

@@ -1,46 +0,0 @@
From 0764cb56df4a5afdf04980c9eb6735f789f5aa42 Mon Sep 17 00:00:00 2001
From: Pavel Kopylov <pkopylov@cloudlinux.com>
Date: Wed, 17 May 2023 11:33:45 +0200
Subject: [PATCH] Fix an overflow which is still possible for some values.
CVE: CVE-2023-33204
Upstream-Status: Backport [https://github.com/sysstat/sysstat/commit/954ff2e2673c]
Backport Changes:
Adopt additional changes as per following merge commit of pull request:
https://github.com/sysstat/sysstat/commit/6f8dc568e6ab
Signed-off-by: Xiangyu Chen <xiangyu.chen@windriver.com>
Signed-off-by: Sanjay Chitroda <schitrod@cisco.com>
---
common.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/common.c b/common.c
index a3d31a5..138920c 100644
--- a/common.c
+++ b/common.c
@@ -447,15 +447,17 @@ int check_dir(char *dirname)
void check_overflow(unsigned int val1, unsigned int val2,
unsigned int val3)
{
- if ((unsigned long long) val1 * (unsigned long long) val2 *
- (unsigned long long) val3 > UINT_MAX) {
+ if ((val1 != 0) && (val2 != 0) && (val3 != 0) &&
+ (((unsigned long long)UINT_MAX / (unsigned long long)val1 <
+ (unsigned long long)val2) ||
+ ((unsigned long long)UINT_MAX / ((unsigned long long)val1 *
+ (unsigned long long)val2) < (unsigned long long)val3))) {
#ifdef DEBUG
- fprintf(stderr, "%s: Overflow detected (%llu). Aborting...\n",
- __FUNCTION__, (unsigned long long) val1 * (unsigned long long) val2 *
- (unsigned long long) val3);
+ fprintf(stderr, "%s: Overflow detected (%u,%u,%u). Aborting...\n",
+ __FUNCTION__, val1, val2, val3);
#endif
exit(4);
- }
+ }
}
#ifndef SOURCE_SADC

11
meta/recipes-extended/sysstat/sysstat_12.6.2.bb → meta/recipes-extended/sysstat/sysstat_12.7.4.bb
View File

@@ -1,25 +1,24 @@
SUMMARY = "System performance tools"
DESCRIPTION = "The sysstat utilities are a collection of performance monitoring tools for Linux."
HOMEPAGE = "http://sebastien.godard.pagesperso-orange.fr/"
HOMEPAGE = "https://sysstat.github.io/"
LICENSE = "GPL-2.0-or-later"
SECTION = "console/utils"
SRC_URI = "http://pagesperso-orange.fr/sebastien.godard/${BP}.tar.xz \
SRC_URI = "git://github.com/sysstat/sysstat.git;protocol=https;branch=master \
file://99_sysstat \
file://sysstat.service \
file://0001-configure.in-remove-check-for-chkconfig.patch \
file://CVE-2023-33204.patch \
"
LIC_FILES_CHKSUM = "file://COPYING;md5=a23a74b3f4caf9616230789d94217acb"
SRC_URI[sha256sum] = "3e77134aedaa6fc57d9745da67edfd8990e19adee71ac47196229261c563fb48"
UPSTREAM_CHECK_URI = "http://sebastien.godard.pagesperso-orange.fr/download.html"
SRCREV = "1df0d61306ae826c896a5cf6f665d58c671c0498"
S = "${WORKDIR}/git"
DEPENDS += "base-passwd"
# autotools-brokensep as this package doesn't use automake
inherit autotools-brokensep gettext systemd upstream-version-is-even
inherit autotools-brokensep gettext systemd
PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
PACKAGECONFIG[lm-sensors] = "--enable-sensors,--disable-sensors,lmsensors,lmsensors-libsensors"