Initial commit
This commit is contained in:
Your Name
@@ -0,0 +1,71 @@
|
||||
SUMMARY = "System performance tools"
|
||||
DESCRIPTION = "The sysstat utilities are a collection of performance monitoring tools for Linux."
|
||||
HOMEPAGE = "http://sebastien.godard.pagesperso-orange.fr/"
|
||||
LICENSE = "GPL-2.0-or-later"
|
||||
SECTION = "console/utils"
|
||||
|
||||
SRC_URI = "http://pagesperso-orange.fr/sebastien.godard/${BP}.tar.xz \
|
||||
file://99_sysstat \
|
||||
file://sysstat.service \
|
||||
"
|
||||
|
||||
UPSTREAM_CHECK_URI = "http://sebastien.godard.pagesperso-orange.fr/download.html"
|
||||
|
||||
DEPENDS += "base-passwd"
|
||||
|
||||
# autotools-brokensep as this package doesn't use automake
|
||||
inherit autotools-brokensep gettext systemd upstream-version-is-even
|
||||
|
||||
PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
|
||||
PACKAGECONFIG[lm-sensors] = "--enable-sensors,--disable-sensors,lmsensors,lmsensors-libsensors"
|
||||
PACKAGECONFIG[cron] = "--enable-install-cron --enable-copy-only,--disable-install-cron --disable-copy-only"
|
||||
PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir}"
|
||||
|
||||
EXTRA_OECONF += "--disable-stripping"
|
||||
|
||||
SYSTEMD_PACKAGES = "${PN}"
|
||||
SYSTEMD_SERVICE:${PN} = "sysstat.service"
|
||||
SYSTEMD_AUTO_ENABLE = "enable"
|
||||
|
||||
do_configure:prepend() {
|
||||
export sa_lib_dir=${libexecdir}/sa
|
||||
}
|
||||
|
||||
do_install() {
|
||||
autotools_do_install
|
||||
|
||||
# Don't version the documentation
|
||||
mv ${D}${docdir}/${BP} ${D}${docdir}/${BPN}
|
||||
|
||||
# don't install /var/log/sa when populating rootfs. Do it through volatile
|
||||
rm -rf ${D}/var
|
||||
if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
|
||||
install -d ${D}/etc/default/volatiles
|
||||
install -m 0644 ${WORKDIR}/99_sysstat ${D}/etc/default/volatiles
|
||||
fi
|
||||
if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
|
||||
install -d ${D}${sysconfdir}/tmpfiles.d
|
||||
echo "d ${localstatedir}/log/sa - - - -" \
|
||||
> ${D}${sysconfdir}/tmpfiles.d/sysstat.conf
|
||||
|
||||
# Unless both cron and systemd are enabled, install our own
|
||||
# systemd unit file. Otherwise the package will install one.
|
||||
if ${@bb.utils.contains('PACKAGECONFIG', 'cron systemd', 'false', 'true', d)}; then
|
||||
install -d ${D}${systemd_system_unitdir}
|
||||
install -m 0644 ${WORKDIR}/sysstat.service ${D}${systemd_system_unitdir}
|
||||
sed -i -e 's#@LIBEXECDIR@#${libexecdir}#g' ${D}${systemd_system_unitdir}/sysstat.service
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst:${PN} () {
|
||||
if [ ! -n "$D" ]; then
|
||||
if [ -e /etc/init.d/populate-volatile.sh ]; then
|
||||
/etc/init.d/populate-volatile.sh update
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
FILES:${PN} += "${systemd_system_unitdir} ${nonarch_base_libdir}/systemd"
|
||||
|
||||
TARGET_CC_ARCH += "${LDFLAGS}"
|
||||
+31
@@ -0,0 +1,31 @@
|
||||
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
|
||||
|
||||
chkconfig can't work on cross-platform, so should remove check for it.
|
||||
|
||||
Upstream-Status: Inappropriate [ embedded specific ]
|
||||
|
||||
Signed-off-by: Wenlin Kang <wenlin.kang@windriver.com>
|
||||
---
|
||||
configure.in | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.in b/configure.in
|
||||
index 48b9a31..cedeb43 100644
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -42,7 +42,8 @@ AC_SUBST(VER_JSON)
|
||||
AC_SUBST(VER_XML)
|
||||
|
||||
AC_PATH_PROG(PATH_CP, cp)
|
||||
-AC_PATH_PROG(PATH_CHKCONFIG, chkconfig)
|
||||
+#AC_PATH_PROG(PATH_CHKCONFIG, chkconfig)
|
||||
+AC_SUBST(PATH_CHKCONFIG)
|
||||
|
||||
# Check for systemd
|
||||
AC_CHECK_PROG(PKG_CONFIG, pkg-config, pkg-config)
|
||||
--
|
||||
1.9.1
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
d root root 0755 /var/log/sa none
|
||||
@@ -0,0 +1,46 @@
|
||||
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
|
||||
@@ -0,0 +1,12 @@
|
||||
[Unit]
|
||||
Description=Resets System Activity Logs
|
||||
|
||||
[Service]
|
||||
Type=oneshot
|
||||
RemainAfterExit=yes
|
||||
User=root
|
||||
ExecStart=@LIBEXECDIR@/sa/sa1 --boot
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
require sysstat.inc
|
||||
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=a23a74b3f4caf9616230789d94217acb"
|
||||
|
||||
SRC_URI += "file://0001-configure.in-remove-check-for-chkconfig.patch \
|
||||
file://CVE-2023-33204.patch \
|
||||
"
|
||||
|
||||
SRC_URI[sha256sum] = "3e77134aedaa6fc57d9745da67edfd8990e19adee71ac47196229261c563fb48"
|
||||
Reference in New Issue
Block a user