commit: e4a78db8fc03360234ca1bd7845087a3ed7d36cb Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> AuthorDate: Thu Jul 6 19:41:19 2017 +0000 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> CommitDate: Thu Jul 6 19:41:31 2017 +0000 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..00000000000 --- 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 <[email protected]> - ---- a/common.h -+++ b/common.h -@@ -11,6 +11,7 @@ - - #include <time.h> - #include <sched.h> /* For __CPU_SETSIZE */ -+#include <stdlib.h> - #include <limits.h> - - #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.4.3-r1.ebuild b/app-admin/sysstat/sysstat-11.4.3-r1.ebuild deleted file mode 100644 index 74edb096177..00000000000 --- a/app-admin/sysstat/sysstat-11.4.3-r1.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2017 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 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 ) -" -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 - "${FILESDIR}"/${PN}-11.4.3-memalign.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 ! has ${lingua} ${LINGUAS}; then - rm "nls/${lingua}.po" || die - fi - done - fi - - default -} - -src_configure() { - tc-export AR - use static && append-ldflags -static - - sa_lib_dir=/usr/$(get_libdir)/sa \ - conf_dir=/etc \ - 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 \ - --enable-documentation \ - --enable-install-cron \ - --with-systemdsystemunitdir=$(systemd_get_systemunitdir) -} - -src_compile() { - emake LFLAGS="${LDFLAGS}" -} - -src_install() { - keepdir /var/log/sa - - emake \ - CHOWN=true \ - DESTDIR="${D}" \ - DOC_DIR=/usr/share/doc/${PF} \ - MANGRPARG='' \ - install - - dodoc contrib/sargraph/sargraph - - rm -r "${D}/${SYSSTAT_FAKE_RC_DIR}" || die - newinitd "${FILESDIR}"/${PN}.init.d ${PN} - systemd_dounit ${PN}.service - - rm -f "${D}"usr/share/doc/${PF}/COPYING -}
