diff options
Diffstat (limited to 'app-admin/sysstat')
| -rw-r--r-- | app-admin/sysstat/Manifest | 4 | ||||
| -rw-r--r-- | app-admin/sysstat/files/sysstat-12.6.2-check_overflow.patch | 27 | ||||
| -rw-r--r-- | app-admin/sysstat/files/sysstat-12.6.2-defs_and_flags.patch | 18 | ||||
| -rw-r--r-- | app-admin/sysstat/metadata.xml | 8 | ||||
| -rw-r--r-- | app-admin/sysstat/sysstat-12.5.5.ebuild | 87 | ||||
| -rw-r--r-- | app-admin/sysstat/sysstat-12.6.2-r1.ebuild (renamed from app-admin/sysstat/sysstat-12.5.4.ebuild) | 49 | ||||
| -rw-r--r-- | app-admin/sysstat/sysstat-12.6.2-r2.ebuild (renamed from app-admin/sysstat/sysstat-12.6.0.ebuild) | 18 |
7 files changed, 84 insertions, 127 deletions
diff --git a/app-admin/sysstat/Manifest b/app-admin/sysstat/Manifest index 2266ddcd5477..128a93c378bd 100644 --- a/app-admin/sysstat/Manifest +++ b/app-admin/sysstat/Manifest @@ -1,3 +1 @@ -DIST sysstat-12.5.4.tar.gz 1474379 BLAKE2B 73bd4ebc44cc57cd3dba4fecbcd45026929bdbeab6b99c5b13db7d37252dff8da987ee5ac00d545aebdc72f924d0100166e9e876f6684e064f7020f3fa7a7cb5 SHA512 c051f136d404684a21b11e968968e34f0f114b4568369c6449c64b7745269065a3dc492039ded7c415fe39970aca54cc81646589b0959ade43e9be6f6cd4c0dc -DIST sysstat-12.5.5.tar.gz 1481620 BLAKE2B baf4d57eb369d75787e3fce48b29909f90ad5e981996930538ff0a60e668853457440bcea8323cfa10d86f7069b0f4e24e27d62aa09572bd1c9535c2bd730451 SHA512 66ccbf0fbaf783fac3cf2b52daf53a8d5bc6d182a66fa0b2965717cf5afc5e54590f08711948f18806b9b95c9f06a45376a1d18b5081d63a5214bc55f81f5696 -DIST sysstat-12.6.0.tar.gz 1454167 BLAKE2B 84213e1d63e6d44e889e9763c9f47c769805baf65715199b1ddb3472ce68c37b3b46229af43ecf0cd85d6c09be85273e90b96a975304cf2f6695298b3e552630 SHA512 f4d0e0dead0cce84782e985c8074871c45e77949c2bcfefd5642280e961f39e9eaa9f9fc93c013d79deba6e3703626894dd665ff64db72550d1c24f404780a5f +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 fb441b90a240..b1ea97d19a2d 100644 --- a/app-admin/sysstat/metadata.xml +++ b/app-admin/sysstat/metadata.xml @@ -2,15 +2,13 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>gyakovlev@gentoo.org</email> - <name>Georgy Yakovlev</name> - </maintainer> - <maintainer type="person"> <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> - <flag name="lto">Build using Link Time Optimizations (LTO)</flag> </use> </pkgmetadata> diff --git a/app-admin/sysstat/sysstat-12.5.5.ebuild b/app-admin/sysstat/sysstat-12.5.5.ebuild deleted file mode 100644 index 655a3391632c..000000000000 --- a/app-admin/sysstat/sysstat-12.5.5.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit eutils flag-o-matic systemd toolchain-funcs - -DESCRIPTION="System performance tools for Linux" -HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/" -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" - -CDEPEND=" - nls? ( virtual/libintl ) - lm-sensors? ( sys-apps/lm-sensors:= ) -" -DEPEND=" - ${CDEPEND} - nls? ( sys-devel/gettext ) -" -RDEPEND=" - ${CDEPEND} - !dcron? ( !sys-process/dcron ) - selinux? ( sec-policy/selinux-sysstat ) -" - -REQUIRED_USE="dcron? ( !systemd )" - -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 - 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 - - sa_lib_dir=/usr/lib/sa \ - conf_dir=/etc \ - econf \ - $(use_enable !systemd use-crond) \ - $(use_enable lm-sensors sensors) \ - $(use_enable nls) \ - $(usex debug --enable-debuginfo '') \ - --disable-compress-manpg \ - --enable-copy-only \ - --enable-documentation \ - --enable-install-cron \ - --with-systemdsystemunitdir=$(systemd_get_systemunitdir) -} - -src_compile() { - LFLAGS="${LDFLAGS}" default -} - -src_install() { - keepdir /var/log/sa - - emake \ - CHOWN=true \ - DESTDIR="${D}" \ - DOC_DIR=/usr/share/doc/${PF} \ - MANGRPARG='' \ - install - - dodoc -r contrib/ - - newinitd "${FILESDIR}"/${PN}.init.d ${PN} - systemd_dounit ${PN}.service - - rm "${D}"/usr/share/doc/${PF}/COPYING || die -} diff --git a/app-admin/sysstat/sysstat-12.5.4.ebuild b/app-admin/sysstat/sysstat-12.6.2-r1.ebuild index ddcb57509fa0..6fdcaea03441 100644 --- a/app-admin/sysstat/sysstat-12.5.4.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.6.0.ebuild b/app-admin/sysstat/sysstat-12.6.2-r2.ebuild index f3e73e2c3c77..17f79510f663 100644 --- a/app-admin/sysstat/sysstat-12.6.0.ebuild +++ b/app-admin/sysstat/sysstat-12.6.2-r2.ebuild @@ -1,17 +1,18 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 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 lto selinux systemd" +IUSE="dcron debug nls lm-sensors selinux systemd" BDEPEND=" virtual/pkgconfig @@ -33,6 +34,11 @@ RDEPEND=" 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 dcron; then sed -i 's/@CRON_OWNER@ //g' cron/sysstat.crond.in || die @@ -43,12 +49,12 @@ src_prepare() { src_configure() { tc-export AR + # --enable-lto only appends -flto sa_lib_dir=/usr/lib/sa \ conf_dir=/etc \ econf \ $(use_enable !systemd use-crond) \ $(use_enable lm-sensors sensors) \ - $(use_enable lto) \ $(use_enable nls) \ $(usex debug --enable-debuginfo '') \ --disable-compress-manpg \ @@ -60,10 +66,6 @@ src_configure() { --with-systemdsystemunitdir=$(systemd_get_systemunitdir) } -src_compile() { - LFLAGS="${LDFLAGS}" default -} - src_install() { keepdir /var/log/sa |