subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: app\-admin\/sysstat\/, app\-admin\/sysstat\/files\/"

[gentoo-commits] repo/gentoo:master commit in: app-admin/sysstat/, app-admin/sysstat/files/

2024-04-05 Thread Marek Szuba

commit: 6c9edb049682b0742bda4f3d6eebd6c643632516
Author: Marek Szuba  gentoo  org>
AuthorDate: Fri Apr  5 23:34:54 2024 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Fri Apr  5 23:36:00 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c9edb04

app-admin/sysstat: actually use the results of configure tests

Signed-off-by: Marek Szuba  gentoo.org>

 .../files/sysstat-12.6.2-defs_and_flags.patch  | 18 +
 app-admin/sysstat/sysstat-12.6.2-r2.ebuild | 85 ++
 2 files changed, 103 insertions(+)

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 ..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/sysstat-12.6.2-r2.ebuild 
b/app-admin/sysstat/sysstat-12.6.2-r2.ebuild
new file mode 100644
index ..2645fb504348
--- /dev/null
+++ b/app-admin/sysstat/sysstat-12.6.2-r2.ebuild
@@ -0,0 +1,85 @@
+# 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://sebastien.godard.pagesperso-orange.fr/;
+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 systemd"
+
+BDEPEND="
+   virtual/pkgconfig
+   nls? ( sys-devel/gettext )
+"
+
+COMMON_DEPEND="
+   nls? ( virtual/libintl )
+   lm-sensors? ( sys-apps/lm-sensors:= )
+"
+
+DEPEND="${COMMON_DEPEND}"
+
+RDEPEND="
+   ${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 dcron; then
+   sed -i 's/@CRON_OWNER@ //g' cron/sysstat.crond.in || die
+   fi
+   default
+}
+
+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 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_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
+}

[gentoo-commits] repo/gentoo:master commit in: app-admin/sysstat/, app-admin/sysstat/files/

2023-05-23 Thread Marek Szuba

commit: ecf13248bdaba63272a52d2678ce688ffb161a9d
Author: Marek Szuba  gentoo  org>
AuthorDate: Tue May 23 19:23:23 2023 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Tue May 23 19:39:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecf13248

app-admin/sysstat: backport second part of CVE-2022-39377 fix

Bug: https://bugs.gentoo.org/880543
Signed-off-by: Marek Szuba  gentoo.org>

 .../files/sysstat-12.6.2-check_overflow.patch  | 18 +
 app-admin/sysstat/sysstat-12.6.2-r1.ebuild | 88 ++
 2 files changed, 106 insertions(+)

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 ..3f36fd7ff090
--- /dev/null
+++ b/app-admin/sysstat/files/sysstat-12.6.2-check_overflow.patch
@@ -0,0 +1,18 @@
+Backported upstream fix for the fix for CVE-2022-39377.
+
+--- 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/sysstat-12.6.2-r1.ebuild 
b/app-admin/sysstat/sysstat-12.6.2-r1.ebuild
new file mode 100644
index ..41f26b4b985a
--- /dev/null
+++ b/app-admin/sysstat/sysstat-12.6.2-r1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2023 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://sebastien.godard.pagesperso-orange.fr/;
+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"
+
+BDEPEND="
+   virtual/pkgconfig
+   nls? ( sys-devel/gettext )
+"
+
+COMMON_DEPEND="
+   nls? ( virtual/libintl )
+   lm-sensors? ( sys-apps/lm-sensors:= )
+"
+
+DEPEND="${COMMON_DEPEND}"
+
+RDEPEND="
+   ${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 dcron; then
+   sed -i 's/@CRON_OWNER@ //g' cron/sysstat.crond.in || die
+   fi
+   default
+}
+
+src_configure() {
+   tc-export AR
+
+   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 \
+   --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
+
+   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
+}

[gentoo-commits] repo/gentoo:master commit in: app-admin/sysstat/, app-admin/sysstat/files/

2021-05-25 Thread Georgy Yakovlev

commit: 5364b21ba4cfabef27909c6daf2f4ff362ecb932
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Tue May 25 21:10:54 2021 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Tue May 25 21:11:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5364b21b

app-admin/sysstat: drop 12.2.1

Signed-off-by: Georgy Yakovlev  gentoo.org>

 app-admin/sysstat/Manifest |  1 -
 app-admin/sysstat/files/sysstat-11.0.4-cron.patch  | 38 --
 app-admin/sysstat/files/sysstat-11.7.3-flags.patch | 11 ---
 app-admin/sysstat/sysstat-12.2.1.ebuild| 81 --
 4 files changed, 131 deletions(-)

diff --git a/app-admin/sysstat/Manifest b/app-admin/sysstat/Manifest
index 5c06d1f99be..ef94f3b20e1 100644
--- a/app-admin/sysstat/Manifest
+++ b/app-admin/sysstat/Manifest
@@ -1,2 +1 @@
-DIST sysstat-12.2.1.tar.gz 1227707 BLAKE2B 
566382d83a0230517d22e2630a9cb1aa631d761c914188a4e7fb15eddaedbd25b8a3dffa9893b1b2bbcc31d87a37cbe11b2b50ab0ec94a28f84018685d1b35c8
 SHA512 
a19d0978eb11071c228462cda496a59721541e57a1d15cb2d0964f287ac2d50b5587fa5bc2b8fe6be2a1f00cbf2e7c3bc59db6494e3e8c1906aa81437b30d073
 DIST sysstat-12.5.3.tar.gz 1504415 BLAKE2B 
a3dc267182939190441b6cfebff938881fe4a06a8c7d1c406c014ddc28c0ecb33af5f480b77cce56bfcd4c7af81c4fec09eccb989561dd979f03a94ea6521f5b
 SHA512 
3f09ff2e7ca38497eb07dcd8770c0b7fe5cfa1140537b215a1648446f65d933852b97dd5a1a9596afa57b04f20da64385e3b2e384be8d7b5902f228dc01230a5

diff --git a/app-admin/sysstat/files/sysstat-11.0.4-cron.patch 
b/app-admin/sysstat/files/sysstat-11.0.4-cron.patch
deleted file mode 100644
index 9d047ac6e9f..000
--- a/app-admin/sysstat/files/sysstat-11.0.4-cron.patch
+++ /dev/null
@@ -1,38 +0,0 @@
 a/Makefile.in
-+++ b/Makefile.in
-@@ -368,25 +368,19 @@
-   $(CHOWN) $(CRON_OWNER) $(DESTDIR)$(SA_DIR)
- ifdef SYSTEMD_UNIT_DIR
-   mkdir -p $(DESTDIR)$(SYSTEMD_UNIT_DIR)
--else
--  if [ -d /etc/cron.d ]; then \
--  mkdir -p $(DESTDIR)/etc/cron.d; \
--  elif [ -d /etc/cron.hourly -a -d /etc/cron.daily ]; then \
--  mkdir -p $(DESTDIR)/etc/cron.hourly $(DESTDIR)/etc/cron.daily; \
--  fi
--  if [ -d $(INIT_DIR) ]; then \
--  mkdir -p $(DESTDIR)$(INIT_DIR); \
--  elif [ -d $(RC_DIR) ]; then \
-+endif
-+ifeq ($(INSTALL_CRON),y)
-+  mkdir -p $(DESTDIR)/etc/cron.d; \
-+  mkdir -p $(DESTDIR)$(INIT_DIR); \
-+  if [ -d $(RC_DIR) ]; then \
-   mkdir -p $(DESTDIR)$(RC_DIR); \
-   fi
- endif
--  if [ -z "$(SYSTEMD_UNIT_DIR)" -o ! -d "$(DESTDIR)$(SYSTEMD_UNIT_DIR)" 
]; then \
--  if [ -d $(DESTDIR)/etc/cron.d ]; then \
--  $(INSTALL_DATA) cron/sysstat.crond 
$(DESTDIR)/etc/cron.d/sysstat; \
--  elif [ -d $(DESTDIR)/etc/cron.hourly -a -d 
$(DESTDIR)/etc/cron.daily ]; then \
--  $(INSTALL_BIN) cron/sysstat.cron.hourly 
$(DESTDIR)/etc/cron.hourly/sysstat; \
--  $(INSTALL_BIN) cron/sysstat.cron.daily 
$(DESTDIR)/etc/cron.daily/sysstat; \
--  fi \
-+  if [ -d $(DESTDIR)/etc/cron.d ]; then \
-+  $(INSTALL_DATA) cron/sysstat.crond 
$(DESTDIR)/etc/cron.d/sysstat; \
-+  elif [ -d $(DESTDIR)/etc/cron.hourly -a -d $(DESTDIR)/etc/cron.daily ]; 
then \
-+  $(INSTALL_BIN) cron/sysstat.cron.hourly 
$(DESTDIR)/etc/cron.hourly/sysstat; \
-+  $(INSTALL_BIN) cron/sysstat.cron.daily 
$(DESTDIR)/etc/cron.daily/sysstat; \
-   fi
- ifeq ($(COPY_ONLY),n)
-   if [ \( -z "$(SYSTEMD_UNIT_DIR)" -o ! -d 
"$(DESTDIR)$(SYSTEMD_UNIT_DIR)" \) -a ! -d $(DESTDIR)/etc/cron.d ]; then \

diff --git a/app-admin/sysstat/files/sysstat-11.7.3-flags.patch 
b/app-admin/sysstat/files/sysstat-11.7.3-flags.patch
deleted file mode 100644
index 9438a0fd8f7..000
--- a/app-admin/sysstat/files/sysstat-11.7.3-flags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 a/Makefile.in
-+++ b/Makefile.in
-@@ -71,7 +71,7 @@
- # Compiler flags
- CFLAGS = @CFLAGS@ -Wall -Wstrict-prototypes -pipe -O2
- DFLAGS = @DFLAGS@
--LFLAGS = @STRIP@
-+LFLAGS = $(LDFLAGS)
- DFLAGS += -DSA_DIR=\"$(SA_DIR)\" -DSADC_PATH=\"$(SADC_PATH)\"
- DFLAGS += $(DFSENSORS)
- 

diff --git a/app-admin/sysstat/sysstat-12.2.1.ebuild 
b/app-admin/sysstat/sysstat-12.2.1.ebuild
deleted file mode 100644
index f08a567e3b4..000
--- a/app-admin/sysstat/sysstat-12.2.1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2020 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="debug nls lm-sensors selinux static"
-
-CDEPEND="
-   nls? ( virtual/libintl

[gentoo-commits] repo/gentoo:master commit in: app-admin/sysstat/, app-admin/sysstat/files/

2018-04-11 Thread Jeroen Roovers

commit: 1ac08d9f1ba4d4a483794c5e58faf8ff610b3269
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Wed Apr 11 18:18:02 2018 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Wed Apr 11 18:20:03 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ac08d9f

app-admin/sysstat: Versions 11.6.3 11.7.3.

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 app-admin/sysstat/Manifest |  2 +
 app-admin/sysstat/files/sysstat-11.7.3-flags.patch | 11 +++
 app-admin/sysstat/sysstat-11.6.3.ebuild| 89 ++
 app-admin/sysstat/sysstat-11.7.3.ebuild| 89 ++
 4 files changed, 191 insertions(+)

diff --git a/app-admin/sysstat/Manifest b/app-admin/sysstat/Manifest
index 7a2b062410a..3f8244af0db 100644
--- a/app-admin/sysstat/Manifest
+++ b/app-admin/sysstat/Manifest
@@ -1,5 +1,7 @@
 DIST sysstat-11.4.0.tar.xz 343968 BLAKE2B 
e34da8cf0216f66fad3ade0ed40e8ec3b7641f7568ebcce5bc3122f888c90885ece346bf7f4f8e71e92435257ee5c6c0e5a89913c0e22a0ad28fa1018a73ea71
 SHA512 
4a5c81d75fdbc8dcaf80685f302688c39bd7143554e5a06cb324532ddb5180caac19b261182d5320f40b317bdb1e81664887acc7cedfeb5a95dc6ad37a898604
 DIST sysstat-11.6.1.tar.xz 470584 BLAKE2B 
e9f85567743e6f0f2958afed40919c8bea7fc52f053fdd9bc7480e942e9a4a5620287f72cf26feedf4b74fc698331da2c305864b0037cf11e0617af2bc0da63b
 SHA512 
55b3c361f7cda3d5efc0a42bef26d154c159a465ef45b56d2567f38aeec8c935c4e3b65a92eaf996abbf2d6a2604b2b8bba95741d707e8f387c9fadc05fafa93
 DIST sysstat-11.6.2.tar.xz 471452 BLAKE2B 
da0647f25e9f4ec4d320f664d2124bd2bd3cc42a78201f2c86480afeb6525b20c158e1577321a0316134fca7e77c04b303829104ae59b0d790ab29bff09889ed
 SHA512 
8f117601272d3d9b887c454d610d06f014b76902cdc68f6a11e693bdc58bb7ad1cac1006681774b3e6173f3cadd9b1f36e126d1d7501f0910b092d125d1c68ce
+DIST sysstat-11.6.3.tar.xz 527828 BLAKE2B 
4221252589652d949541d8ec8d7057abe90cafaae7b538d4fcb95aaa45f3da542539eb0742a910456c8ee134203207fc5e9485b0948a6c581f33eb949c2c
 SHA512 
37a770b4ff26abdb94c8d97fa49b094702e9f5fb12549fd012b9767c7f42ede50ce209085c7ad3b7cd2e208ba1e5bfe9425893f7bb0bbc517aed688300bf9712
 DIST sysstat-11.7.1.tar.xz 476916 BLAKE2B 
016c5b6e2759af440ecd3bfc9b66f2b01988ef2e889090ab9156a7fdea02d9a3e6e47f6852ea699cf865d2ccf79d3152c70f0e23daf199edb936cb55a9a28fa7
 SHA512 
c0a8ce7a412e16d7d471cc0421a0f5586143ef8253f9a38872a63687bba50f98eebab5d501f92c4d085da51af56343628c8154cbd2d260b314153a17e23ff2e8
 DIST sysstat-11.7.2.tar.xz 485264 BLAKE2B 
2915bf3eeb33d499517872acd9101e4b27e8f095b36cc106eeb8e6fc55806f9d1fa969d8c200ce4cb2bd7f0ed25b1a312e362bdc16ff7717f088c0f62780d025
 SHA512 
0e51c1e08cca4bb8489910d334d5f30c1854687a935f6734228d422b21827f035533f91d30d52c9a48c8be7fa15af66cd41d379a51e5a935b89eb6578e066d01
+DIST sysstat-11.7.3.tar.xz 543556 BLAKE2B 
f6042021a7c5047727ddbcd38cf6e9f88ca44adaf9f8a9e56cf84c9d9b4d61bef7e07ef910c54fdcc0342c8f9b28e9b114778f57f3ed70d8b950263086426387
 SHA512 
c752ebba4d25a30147e68d0cb44d93020bb9b44823812c99550f6b34b42fc6f015c28ef0e6609a1e33ae6e4de566ae2d0e8a4711e412a4298baf5721dd15d27f

diff --git a/app-admin/sysstat/files/sysstat-11.7.3-flags.patch 
b/app-admin/sysstat/files/sysstat-11.7.3-flags.patch
new file mode 100644
index 000..9438a0fd8f7
--- /dev/null
+++ b/app-admin/sysstat/files/sysstat-11.7.3-flags.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.in
 b/Makefile.in
+@@ -71,7 +71,7 @@
+ # Compiler flags
+ CFLAGS = @CFLAGS@ -Wall -Wstrict-prototypes -pipe -O2
+ DFLAGS = @DFLAGS@
+-LFLAGS = @STRIP@
++LFLAGS = $(LDFLAGS)
+ DFLAGS += -DSA_DIR=\"$(SA_DIR)\" -DSADC_PATH=\"$(SADC_PATH)\"
+ DFLAGS += $(DFSENSORS)
+ 

diff --git a/app-admin/sysstat/sysstat-11.6.3.ebuild 
b/app-admin/sysstat/sysstat-11.6.3.ebuild
new file mode 100644
index 000..b9b3e8d4288
--- /dev/null
+++ b/app-admin/sysstat/sysstat-11.6.3.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic multilib systemd toolchain-funcs
+
+DESCRIPTION="System performance tools for Linux"
+HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/;
+SRC_URI="${HOMEPAGE}${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86"
+IUSE="debug nls lm_sensors selinux static"
+
+CDEPEND="
+   nls? ( virtual/libintl )
+   lm_sensors? ( sys-apps/lm_sensors )
+"
+DEPEND="
+   ${CDEPEND}
+   nls? ( sys-devel/gettext )
+"
+RDEPEND="
+   ${CDEPEND}
+   selinux? ( sec-policy/selinux-sysstat )
+"
+PATCHES=(
+   "${FILESDIR}"/${PN}-10.0.4-flags.patch
+   "${FILESDIR}"/${PN}-11.0.4-cron.patch
+)
+
+SYSSTAT_FAKE_RC_DIR=Gentoo-does-not-use-rc.d
+
+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

[gentoo-commits] repo/gentoo:master commit in: app-admin/sysstat/, app-admin/sysstat/files/

2017-07-06 Thread Jeroen Roovers

commit: e4a78db8fc03360234ca1bd7845087a3ed7d36cb
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Thu Jul  6 19:41:19 2017 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Thu Jul  6 19:41:31 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4a78db8

app-admin/sysstat: Old.

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 app-admin/sysstat/Manifest |  1 -
 .../sysstat/files/sysstat-11.4.3-memalign.patch| 40 -
 app-admin/sysstat/sysstat-11.4.3-r1.ebuild | 96 --
 3 files changed, 137 deletions(-)

diff --git a/app-admin/sysstat/Manifest b/app-admin/sysstat/Manifest
index c8c0628e628..a6258551bac 100644
--- a/app-admin/sysstat/Manifest
+++ b/app-admin/sysstat/Manifest
@@ -1,5 +1,4 @@
 DIST sysstat-11.4.0.tar.xz 343968 SHA256 
b8518ca88acfcbc474a406022ee9c0c3210ccef4f0ec80e5b3e8c41dda8c16f2 SHA512 
4a5c81d75fdbc8dcaf80685f302688c39bd7143554e5a06cb324532ddb5180caac19b261182d5320f40b317bdb1e81664887acc7cedfeb5a95dc6ad37a898604
 WHIRLPOOL 
39f48929040405f83a0d3c49dcf2aac471deeadd10d31181ee03809a30573868a7da43df160688ad553d305221bd21c2e253f56913f8f8a53020fb66f62c05ba
-DIST sysstat-11.4.3.tar.xz 344572 SHA256 
02e9cafa5557fbae435d33e592373655df929d817ae711d31142dd2f7d4dcee7 SHA512 
20862a6fd735aa0a6d571ffe0e1aa755ce9c5d8a704739f0095d19861394ea3a45c93e9f46ac5f42b6719ba1aa21e33261ac28fde643d7f5c315d7f0a7b0d74d
 WHIRLPOOL 
64df9bf1a375ce7ebf727b07b10caa3b72ba3630a5a238e72dca017e09a65dbf3f1623f5e1115fb037974609e39c4fb4e3f2790c444b23eae4fb7af591bfd389
 DIST sysstat-11.4.4.tar.xz 344756 SHA256 
6585f08e24347d2d6462aee6ef97e80fe4cc869605193184500df0f80fa61cc8 SHA512 
918b8c54ab6bdde568106254d1550644f6e962896b1923f4145bfbfb6c65542b08182141d2164be51667fc0dc5df57d94cbeb34cf5f8dfacb224559caef0740c
 WHIRLPOOL 
09f873d65015037a780a5c8425bb2fc80c3124aa2560b8a8e1b3173676121b3e41d9606c2015439f00738be0da67c73ac92521bf882007c948e064d4c2ab5fed
 DIST sysstat-11.4.5.tar.xz 344796 SHA256 
785d754d64c746b21190773a846539ef2ee789bf908f05cd8245c234d15784ff SHA512 
e195e0fa4afa45e894fc1089ecdc7e77dd0532f0db0d10b717b32e642710baa96de31be01c70c8a1173359c8f65f34dc72ac2722ecd2c8e63bf286a6eed202fd
 WHIRLPOOL 
a35f673129b873a0fac657447905d7662eaa22f3bd80a095d5c440586d116a595dab68136a147f3f50b0019eb1e244a29c8cdff0fb4b8e6698f31920a901f623
 DIST sysstat-11.5.6.tar.xz 465576 SHA256 
83a81e0a6c1d39a0985310dc2944ac6214c963adb4dc8af24ae03a9ae8d0f3ac SHA512 
7541284a1a7bbd3eeccca1110176e5f261bba54ab27b1ea587d584e651e818c3c029aa07b98200e783257ebdffa48048f40dfbbaacb4cbbd1d51d40d7d48a64a
 WHIRLPOOL 
16eb9c5919506df7c6685436874bab0ea5b51c711a6932681925cfd2f37f7da953613aa3397f931cf94d0e35b2de66712dd7ff511e11cc513b6f5cc5288a2c60

diff --git a/app-admin/sysstat/files/sysstat-11.4.3-memalign.patch 
b/app-admin/sysstat/files/sysstat-11.4.3-memalign.patch
deleted file mode 100644
index ab5fa7dbc95..000
--- a/app-admin/sysstat/files/sysstat-11.4.3-memalign.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-sysstat declares 16 bytes alignment for many structs. But realloc does not
-guarantee 16 byte alignment (it maxes out at 8 bytes for most systems).
-Because of declared 16 byte alignement, the compiler is free to generate SIMD
-16 byte loads which require aligned addresses. Use posix_memalign instead to
-enforce 16 bytes data alignment to avoid crashes.
-
-https://github.com/sysstat/sysstat/issues/148
-
-Patch by Manoj Gupta 
-
 a/common.h
-+++ b/common.h
-@@ -11,6 +11,7 @@
- 
- #include 
- #include /* For __CPU_SETSIZE */
-+#include 
- #include 
- 
- #ifdef HAVE_SYS_SYSMACROS_H
-@@ -91,13 +92,18 @@
-   TYPE *_p_;  
 \
-   _p_ = S;
 \
-   if (SIZE) { 
 \
--  if ((S = (TYPE *) realloc(S, 
(SIZE))) == NULL) { \
-+  void *_ptr = NULL;  
 \
-+  int error = 
posix_memalign(&_ptr, 16, SIZE); \
-+  if (error || _ptr == NULL) {
 \
-   perror("realloc");  
 \
-   exit(4);
 \
-   }   
 \
-+  S = (TYPE *)_ptr;   
 \
-   /* If the ptr was null, then 
it's a malloc() */  \
-   if (!_p_) { 
 \
-

[gentoo-commits] repo/gentoo:master commit in: app-admin/sysstat/, app-admin/sysstat/files/

2017-05-05 Thread Mike Frysinger

commit: 76dafed4ccc9c99b6d30d8cba37e6ba13734645d
Author: Mike Frysinger  chromium  org>
AuthorDate: Fri May  5 19:47:12 2017 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Fri May  5 19:48:07 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76dafed4

app-admin/sysstat: fix from Chromium OS for unaligned memory errors

 .../sysstat/files/sysstat-11.4.3-memalign.patch| 40 ++
 ...stat-11.5.5.ebuild => sysstat-11.4.3-r1.ebuild} | 13 +--
 app-admin/sysstat/sysstat-11.5.5.ebuild|  1 +
 3 files changed, 51 insertions(+), 3 deletions(-)

diff --git a/app-admin/sysstat/files/sysstat-11.4.3-memalign.patch 
b/app-admin/sysstat/files/sysstat-11.4.3-memalign.patch
new file mode 100644
index 000..ab5fa7dbc95
--- /dev/null
+++ b/app-admin/sysstat/files/sysstat-11.4.3-memalign.patch
@@ -0,0 +1,40 @@
+sysstat declares 16 bytes alignment for many structs. But realloc does not
+guarantee 16 byte alignment (it maxes out at 8 bytes for most systems).
+Because of declared 16 byte alignement, the compiler is free to generate SIMD
+16 byte loads which require aligned addresses. Use posix_memalign instead to
+enforce 16 bytes data alignment to avoid crashes.
+
+https://github.com/sysstat/sysstat/issues/148
+
+Patch by Manoj Gupta 
+
+--- a/common.h
 b/common.h
+@@ -11,6 +11,7 @@
+ 
+ #include 
+ #include /* For __CPU_SETSIZE */
++#include 
+ #include 
+ 
+ #ifdef HAVE_SYS_SYSMACROS_H
+@@ -91,13 +92,18 @@
+   TYPE *_p_;  
 \
+   _p_ = S;
 \
+   if (SIZE) { 
 \
+-  if ((S = (TYPE *) realloc(S, 
(SIZE))) == NULL) { \
++  void *_ptr = NULL;  
 \
++  int error = 
posix_memalign(&_ptr, 16, SIZE); \
++  if (error || _ptr == NULL) {
 \
+   perror("realloc");  
 \
+   exit(4);
 \
+   }   
 \
++  S = (TYPE *)_ptr;   
 \
+   /* If the ptr was null, then 
it's a malloc() */  \
+   if (!_p_) { 
 \
+   memset(S, 0, (SIZE));   
 \
++  } else {
 \
++  memcpy(S, _p_, (SIZE)); 
 \
+   }   
 \
+   }   
 \
+   if (!S) {   
 \

diff --git a/app-admin/sysstat/sysstat-11.5.5.ebuild 
b/app-admin/sysstat/sysstat-11.4.3-r1.ebuild
similarity index 84%
copy from app-admin/sysstat/sysstat-11.5.5.ebuild
copy to app-admin/sysstat/sysstat-11.4.3-r1.ebuild
index c9bea3b2b27..74edb096177 100644
--- a/app-admin/sysstat/sysstat-11.5.5.ebuild
+++ b/app-admin/sysstat/sysstat-11.4.3-r1.ebuild
@@ -10,10 +10,15 @@ SRC_URI="${HOMEPAGE}${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
-IUSE="debug nls lm_sensors selinux static"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86"
+IUSE="debug isag nls lm_sensors selinux static"
 
 CDEPEND="
+   isag? (
+   dev-lang/tk:0
+   dev-vcs/rcs
+   sci-visualization/gnuplot
+   )
nls? ( virtual/libintl )
lm_sensors? ( sys-apps/lm_sensors )
 "
@@ -28,6 +33,7 @@ RDEPEND="
 PATCHES=(
"${FILESDIR}"/${PN}-10.0.4-flags.patch
"${FILESDIR}"/${PN}-11.0.4-cron.patch
+   "${FILESDIR}"/${PN}-11.4.3-memalign.patch
 )
 
 SYSSTAT_FAKE_RC_DIR=Gentoo-does-not-use-rc.d
@@ -57,6 +63,7 @@ src_configure() {
rcdir=${SYSSTAT_FAKE_RC_DIR} \
econf \
$(use_enable debug debuginfo) \
+   $(use_enable isag install-isag) \
$(use_enable lm_sensors sensors) \
$(use_enable nls) \
--enable-copy-only \
@@ -79,7 +86,7 @@ src_install() {
MANGRPARG='' \
install
 
-   dodoc -r

[gentoo-commits] repo/gentoo:master commit in: app-admin/sysstat/, app-admin/sysstat/files/

[gentoo-commits] repo/gentoo:master commit in: app-admin/sysstat/, app-admin/sysstat/files/

[gentoo-commits] repo/gentoo:master commit in: app-admin/sysstat/, app-admin/sysstat/files/

[gentoo-commits] repo/gentoo:master commit in: app-admin/sysstat/, app-admin/sysstat/files/

[gentoo-commits] repo/gentoo:master commit in: app-admin/sysstat/, app-admin/sysstat/files/

[gentoo-commits] repo/gentoo:master commit in: app-admin/sysstat/, app-admin/sysstat/files/

6 matches

Site Navigation

Mail list logo

Footer information