summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Timo Gurr <tgurr@exherbo.org> 2020-10-26 14:49:55 +0100
committerAvatar Timo Gurr <tgurr@exherbo.org> 2020-10-26 14:51:41 +0100
commitccb98d1a6a30cfd119d484971b68f66f5cc1dc1c (patch)
tree37290ca080b6931990f243442f3d1485f5c34d8c
parent0b6d0890279c73cb00d9c56d769b13ee4b30afc9 (diff)
downloadarbor-ccb98d1a6a30cfd119d484971b68f66f5cc1dc1c.tar.gz
arbor-ccb98d1a6a30cfd119d484971b68f66f5cc1dc1c.tar.xz
sysstat: version bump to 12.4.0, CVE-2019-19725
-rw-r--r--metadata/repository_mask.conf7
-rw-r--r--packages/sys-apps/sysstat/sysstat-12.4.0.exheres-0 (renamed from packages/sys-apps/sysstat/sysstat-11.7.1.exheres-0)0
-rw-r--r--packages/sys-apps/sysstat/sysstat.exlib18
3 files changed, 22 insertions, 3 deletions
diff --git a/metadata/repository_mask.conf b/metadata/repository_mask.conf
index c739c254c..918e187d7 100644
--- a/metadata/repository_mask.conf
+++ b/metadata/repository_mask.conf
@@ -1151,3 +1151,10 @@ dev-lang/ruby:2.7[<2.7.2] [[
token = security
description = [ CVE-2020-25613 ]
]]
+
+sys-apps/sysstat[<12.4.0] [[
+ author = [ Timo Gurr <tgurr@exherbo.org> ]
+ date = [ 26 Oct 2020 ]
+ token = security
+ description = [ CVE-2019-19725 ]
+]]
diff --git a/packages/sys-apps/sysstat/sysstat-11.7.1.exheres-0 b/packages/sys-apps/sysstat/sysstat-12.4.0.exheres-0
index 3588d8a14..3588d8a14 100644
--- a/packages/sys-apps/sysstat/sysstat-11.7.1.exheres-0
+++ b/packages/sys-apps/sysstat/sysstat-12.4.0.exheres-0
diff --git a/packages/sys-apps/sysstat/sysstat.exlib b/packages/sys-apps/sysstat/sysstat.exlib
index 01a13b068..c832c9bbe 100644
--- a/packages/sys-apps/sysstat/sysstat.exlib
+++ b/packages/sys-apps/sysstat/sysstat.exlib
@@ -1,7 +1,7 @@
# Copyright 2010-2017 Wulf C. Krueger <philantrop@exherbo.org>
# Distributed under the terms of the GNU General Public License v2
-require systemd-service autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.15 ] ]
+require systemd-service autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.16 ] ]
export_exlib_phases src_prepare src_configure src_install
@@ -32,13 +32,19 @@ UPSTREAM_DOCUMENTATION="${HOMEPAGE}/documentation.html [[ lang = en ]]"
LICENCES="GPL-2"
SLOT="0"
MYOPTIONS="
- sensors [[ description = [ Enable sensors support. ] ]]
+ pcp [[ description = [ Support exporting to the PCP archive file format ] ]]
+ sensors [[ description = [ Enable sensors support ] ]]
"
+# TODO: add once tests are actually running:
+# build+test:
+# dev-libs/libxml2:2.0 [[ note = [ xmllint ] ]]
+# dev-libs/yajl [[ note = [ json_verify ] ]]
DEPENDENCIES="
build:
sys-devel/gettext
build+run:
+ pcp? ( monitor/pcp )
sensors? ( sys-apps/lm_sensors )
suggestion:
virtual/cron
@@ -48,14 +54,20 @@ DEFAULT_SRC_PREPARE_PATCHES=( "${FILES}"/${PN}-11.1.4-multiarch.patch )
DEFAULT_SRC_CONFIGURE_PARAMS=(
--enable-collect-all
+ --enable-compress-manpg
--enable-copy-only
--enable-install-cron
--enable-nls
--disable-stripping
+ --disable-use-crond
+ --with-systemdsleepdir=/usr/$(exhost --target)/lib/systemd/system-sleep
--with-systemdsystemunitdir="${SYSTEMDSYSTEMUNITDIR}"
)
-DEFAULT_SRC_CONFIGURE_OPTION_ENABLES=( sensors )
+DEFAULT_SRC_CONFIGURE_OPTION_ENABLES=(
+ pcp
+ sensors
+)
sysstat_src_prepare() {
# TODO: report upstream, respect datarootdir