Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/app-admin/sysstat
diff options
context:
space:
mode:
Diffstat (limited to 'app-admin/sysstat')
-rw-r--r--app-admin/sysstat/Manifest3
-rw-r--r--app-admin/sysstat/files/sysstat-12.6.2-check_overflow.patch27
-rw-r--r--app-admin/sysstat/files/sysstat-12.6.2-defs_and_flags.patch18
-rw-r--r--app-admin/sysstat/metadata.xml9
-rw-r--r--app-admin/sysstat/sysstat-12.6.2-r1.ebuild (renamed from app-admin/sysstat/sysstat-12.5.3.ebuild)49
-rw-r--r--app-admin/sysstat/sysstat-12.6.2-r2.ebuild (renamed from app-admin/sysstat/sysstat-12.5.4.ebuild)54
6 files changed, 103 insertions, 57 deletions
diff --git a/app-admin/sysstat/Manifest b/app-admin/sysstat/Manifest
index 8dbc691b6c57..128a93c378bd 100644
--- a/app-admin/sysstat/Manifest
+++ b/app-admin/sysstat/Manifest
@@ -1,2 +1 @@
-DIST sysstat-12.5.3.tar.gz 1504415 BLAKE2B a3dc267182939190441b6cfebff938881fe4a06a8c7d1c406c014ddc28c0ecb33af5f480b77cce56bfcd4c7af81c4fec09eccb989561dd979f03a94ea6521f5b SHA512 3f09ff2e7ca38497eb07dcd8770c0b7fe5cfa1140537b215a1648446f65d933852b97dd5a1a9596afa57b04f20da64385e3b2e384be8d7b5902f228dc01230a5
-DIST sysstat-12.5.4.tar.gz 1474379 BLAKE2B 73bd4ebc44cc57cd3dba4fecbcd45026929bdbeab6b99c5b13db7d37252dff8da987ee5ac00d545aebdc72f924d0100166e9e876f6684e064f7020f3fa7a7cb5 SHA512 c051f136d404684a21b11e968968e34f0f114b4568369c6449c64b7745269065a3dc492039ded7c415fe39970aca54cc81646589b0959ade43e9be6f6cd4c0dc
+DIST sysstat-12.6.2.tar.gz 1455025 BLAKE2B aba2d8fd5fae8d6df740173d7ccd60beb0628c4c2205342f72ec03d6c48995d397de0d6f2cace24accf1a9274da37cf3bba86888717bc8d62d262ffd1c6f995e SHA512 376047de55598c6f671b999203809219a40206a9c58499399681af9ebe6048dd4da96c8ef5827d75cc369a7b69c3f1aadef1a5e8deec318a12b230d61f09fc08
diff --git a/app-admin/sysstat/files/sysstat-12.6.2-check_overflow.patch b/app-admin/sysstat/files/sysstat-12.6.2-check_overflow.patch
new file mode 100644
index 000000000000..413cdad8b015
--- /dev/null
+++ b/app-admin/sysstat/files/sysstat-12.6.2-check_overflow.patch
@@ -0,0 +1,27 @@
+From 954ff2e2673cef48f0ed44668c466eab041db387 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.
+
+---
+ common.c | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/common.c b/common.c
+index 48493b5f..12cd8d9f 100644
+--- a/common.c
++++ b/common.c
+@@ -431,8 +431,11 @@ 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 *
diff --git a/app-admin/sysstat/files/sysstat-12.6.2-defs_and_flags.patch b/app-admin/sysstat/files/sysstat-12.6.2-defs_and_flags.patch
new file mode 100644
index 000000000000..854a66219ff9
--- /dev/null
+++ b/app-admin/sysstat/files/sysstat-12.6.2-defs_and_flags.patch
@@ -0,0 +1,18 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -94,10 +94,14 @@
+ endif
+
+ # Compiler flags
++ifndef CPPFLAGS
++CPPFLAGS = @CPPFLAGS@
++endif
++CPPFLAGS += @DEFS@
+ ifndef CFLAGS
+ CFLAGS = @CFLAGS@
+ endif
+-CFLAGS += -Wall -Wstrict-prototypes -pipe -O2
++CFLAGS += $(CPPFLAGS)
+
+ ifndef DFLAGS
+ DFLAGS = @DFLAGS@
diff --git a/app-admin/sysstat/metadata.xml b/app-admin/sysstat/metadata.xml
index 50a898b9e1ca..b1ea97d19a2d 100644
--- a/app-admin/sysstat/metadata.xml
+++ b/app-admin/sysstat/metadata.xml
@@ -1,10 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>gyakovlev@gentoo.org</email>
- <name>Georgy Yakovlev</name>
+ <email>marecki@gentoo.org</email>
+ <name>Marek Szuba</name>
</maintainer>
+ <upstream>
+ <remote-id type="github">sysstat/sysstat</remote-id>
+ </upstream>
<use>
<flag name="dcron">Adjust cronjobs to work properly under <pkg>sys-process/dcron</pkg></flag>
</use>
diff --git a/app-admin/sysstat/sysstat-12.5.3.ebuild b/app-admin/sysstat/sysstat-12.6.2-r1.ebuild
index ddcb57509fa0..6fdcaea03441 100644
--- a/app-admin/sysstat/sysstat-12.5.3.ebuild
+++ b/app-admin/sysstat/sysstat-12.6.2-r1.ebuild
@@ -1,55 +1,54 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
-inherit eutils flag-o-matic systemd toolchain-funcs
+EAPI=8
+
+inherit systemd toolchain-funcs
DESCRIPTION="System performance tools for Linux"
-HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
+HOMEPAGE="https://sysstat.github.io/"
SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="dcron debug nls lm-sensors selinux static systemd"
+IUSE="dcron debug nls lm-sensors selinux systemd"
-CDEPEND="
+BDEPEND="
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+"
+
+COMMON_DEPEND="
nls? ( virtual/libintl )
lm-sensors? ( sys-apps/lm-sensors:= )
"
-DEPEND="
- ${CDEPEND}
- nls? ( sys-devel/gettext )
-"
+
+DEPEND="${COMMON_DEPEND}"
+
RDEPEND="
- ${CDEPEND}
+ ${COMMON_DEPEND}
!dcron? ( !sys-process/dcron )
selinux? ( sec-policy/selinux-sysstat )
"
REQUIRED_USE="dcron? ( !systemd )"
+PATCHES=(
+ "${FILESDIR}"/${PN}-12.6.2-check_overflow.patch
+)
+
src_prepare() {
- if use nls; then
- strip-linguas -i nls/
- local lingua pofile
- for pofile in nls/*.po; do
- lingua=${pofile/nls\/}
- lingua=${lingua/.po}
- if ! has ${lingua} ${LINGUAS}; then
- rm "nls/${lingua}.po" || die
- fi
- done
+ if use dcron; then
+ sed -i 's/@CRON_OWNER@ //g' cron/sysstat.crond.in || die
fi
-
- use dcron && { sed -i 's/@CRON_OWNER@ //g' cron/sysstat.crond.in || die ; }
default
}
src_configure() {
tc-export AR
- use static && append-ldflags -static
+ # --enable-lto only appends -flto
sa_lib_dir=/usr/lib/sa \
conf_dir=/etc \
econf \
@@ -58,6 +57,8 @@ src_configure() {
$(use_enable nls) \
$(usex debug --enable-debuginfo '') \
--disable-compress-manpg \
+ --disable-stripping \
+ --disable-pcp \
--enable-copy-only \
--enable-documentation \
--enable-install-cron \
diff --git a/app-admin/sysstat/sysstat-12.5.4.ebuild b/app-admin/sysstat/sysstat-12.6.2-r2.ebuild
index 655a3391632c..17f79510f663 100644
--- a/app-admin/sysstat/sysstat-12.5.4.ebuild
+++ b/app-admin/sysstat/sysstat-12.6.2-r2.ebuild
@@ -1,55 +1,55 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
-inherit eutils flag-o-matic systemd toolchain-funcs
+EAPI=8
+
+inherit systemd toolchain-funcs
DESCRIPTION="System performance tools for Linux"
-HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
+HOMEPAGE="https://sysstat.github.io/"
SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="dcron debug nls lm-sensors selinux static systemd"
+IUSE="dcron debug nls lm-sensors selinux systemd"
+
+BDEPEND="
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+"
-CDEPEND="
+COMMON_DEPEND="
nls? ( virtual/libintl )
lm-sensors? ( sys-apps/lm-sensors:= )
"
-DEPEND="
- ${CDEPEND}
- nls? ( sys-devel/gettext )
-"
+
+DEPEND="${COMMON_DEPEND}"
+
RDEPEND="
- ${CDEPEND}
+ ${COMMON_DEPEND}
!dcron? ( !sys-process/dcron )
selinux? ( sec-policy/selinux-sysstat )
"
REQUIRED_USE="dcron? ( !systemd )"
+PATCHES=(
+ "${FILESDIR}"/${PN}-12.6.2-check_overflow.patch
+ "${FILESDIR}"/${PN}-12.6.2-defs_and_flags.patch
+)
+
src_prepare() {
- if use nls; then
- strip-linguas -i nls/
- local lingua pofile
- for pofile in nls/*.po; do
- lingua=${pofile/nls\/}
- lingua=${lingua/.po}
- if ! has ${lingua} ${LINGUAS}; then
- rm "nls/${lingua}.po" || die
- fi
- done
+ if use dcron; then
+ sed -i 's/@CRON_OWNER@ //g' cron/sysstat.crond.in || die
fi
-
- use dcron && { sed -i 's/@CRON_OWNER@ //g' cron/sysstat.crond.in || die ; }
default
}
src_configure() {
tc-export AR
- use static && append-ldflags -static
+ # --enable-lto only appends -flto
sa_lib_dir=/usr/lib/sa \
conf_dir=/etc \
econf \
@@ -58,16 +58,14 @@ src_configure() {
$(use_enable nls) \
$(usex debug --enable-debuginfo '') \
--disable-compress-manpg \
+ --disable-stripping \
+ --disable-pcp \
--enable-copy-only \
--enable-documentation \
--enable-install-cron \
--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
}
-src_compile() {
- LFLAGS="${LDFLAGS}" default
-}
-
src_install() {
keepdir /var/log/sa