[gentoo-commits] repo/gentoo:master commit in: app-admin/collectd/, app-admin/collectd/files/
commit: 9a70b58bd58ff19395c55abbf0a2e620a5a56f3a
Author: Thomas Deutschmann gentoo org>
AuthorDate: Thu Jan 25 22:34:18 2018 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Thu Jan 25 22:34:34 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a70b58b
app-admin/collectd: bump, fixes CVE-2017-16820 & #628540
Ebuild changes:
===
- To address bug 628540, we no longer run collectd in
daemon mode, instead we will run collectd everywhere
in foreground and let the init system handle the PID
file.
- /run/collectd/ (default location for collectd's UNIX socket)
is now maintained using tmpfiles service.
Bug: https://bugs.gentoo.org/628540
Bug: https://bugs.gentoo.org/637538
Package-Manager: Portage-2.3.20, Repoman-2.3.6
app-admin/collectd/collectd-5.7.2-r1.ebuild| 541 +
.../files/collectd-5.7.2-CVE-2017-16820.patch | 39 ++
app-admin/collectd/files/collectd.confd-r2 | 49 ++
app-admin/collectd/files/collectd.initd-r2 | 70 +++
app-admin/collectd/files/collectd.tmpfile | 1 +
5 files changed, 700 insertions(+)
diff --git a/app-admin/collectd/collectd-5.7.2-r1.ebuild
b/app-admin/collectd/collectd-5.7.2-r1.ebuild
new file mode 100644
index 000..57b4bf62aef
--- /dev/null
+++ b/app-admin/collectd/collectd-5.7.2-r1.ebuild
@@ -0,0 +1,541 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+JAVA_PKG_OPT_USE="collectd_plugins_java"
+
+inherit autotools fcaps flag-o-matic java-pkg-opt-2 linux-info multilib
perl-functions python-single-r1 systemd tmpfiles user
+
+DESCRIPTION="Collects system statistics and provides mechanisms to store the
values"
+
+HOMEPAGE="https://collectd.org/;
+SRC_URI="${HOMEPAGE%/}/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="contrib debug java kernel_Darwin kernel_FreeBSD kernel_linux perl
selinux static-libs udev xfs"
+
+# The plugin lists have to follow here since they extend IUSE
+
+# Plugins that don't build (e.g. dependencies not in Gentoo)
+# apple_sensors: Requires libIOKit
+# aquaero: Requires aerotools-ng/libaquaero5
+# barometer: Requires libi2c (i2c_smbus_read_i2c_block_data)
+# dpdkstat: Requires dpdk
+# grpc: Requires libgrpc
+# intel_rdt Requires libpqos from intel-cmt-cat project
+# lpar: Requires libperfstat (AIX only)
+# mic: Requires Intel Many Integrated Core Architecture API
+#(part of Intel's Xeon Phi software)
+# netapp:Requires libnetapp
(http://communities.netapp.com/docs/DOC-1110)
+# pf:Requires BSD packet filter
+# pinba: Requires MySQL Pinba engine (http://pinba.org/)
+# tape: Requires libkstat (Solaris only)
+# write_mongodb: https://github.com/collectd/collectd/issues/492
+# write_riemann: Requires riemann-c-client
+# xmms: Requires libxmms (v1)
+# zone: Solaris only...
+COLLECTD_IMPOSSIBLE_PLUGINS="apple_sensors aquaero barometer dpdkstat grpc
+ intel_rdt lpar mic netapp pf pinba tape write_mongodb
+ write_riemann xmms zone"
+
+# Plugins that have been (compile) tested and can be enabled via
COLLECTD_PLUGINS
+COLLECTD_TESTED_PLUGINS="aggregation amqp apache apcups ascent battery bind
+ ceph cgroups chrony conntrack contextswitch cpu cpufreq cpusleep
+ csv curl curl_json curl_xml dbi df disk dns drbd email
+ entropy ethstat exec fhcount filecount fscache gmond gps hddtemp
+ hugepages interface ipc ipmi iptables ipvs irq java lua
+ load logfile log_logstash lvm madwifi match_empty_counter
+ match_hashed match_regex match_timediff match_value mbmon md
+ memcachec memcached memory modbus mqtt multimeter mysql netlink
+ network network nfs nginx notify_desktop notify_email notify_nagios
+ ntpd numa nut olsrd onewire openldap openvpn oracle perl ping
+ postgresql powerdns processes protocols python python redis
+ routeros rrdcached rrdtool sensors serial sigrok smart snmp statsd
+ swap syslog table tail tail_csv target_notification target_replace
+ target_scale target_set tcpconns teamspeak2 ted thermal threshold
+ tokyotyrant turbostat unixsock uptime users uuid varnish virt
+ vmem vserver wireless write_graphite write_http write_kafka
+ write_log write_prometheus write_redis write_sensu write_tsdb
+ xencpu zfs_arc zookeeper"
+
+COLLECTD_DISABLED_PLUGINS="${COLLECTD_IMPOSSIBLE_PLUGINS}"
+
+COLLECTD_ALL_PLUGINS=${COLLECTD_TESTED_PLUGINS}
+
+for plugin in ${COLLECTD_ALL_PLUGINS}; do
+ IUSE="${IUSE} collectd_plugins_${plugin}"
+done
+unset plugin
+
+# Now come the dependencies.
+
+COMMON_DEPEND="
+ dev-libs/libgcrypt:=
+ dev-libs/libltdl:0=
+ perl? ( dev-lang/perl:=[ithreads] )
+
[gentoo-commits] repo/gentoo:master commit in: app-admin/collectd/, app-admin/collectd/files/
commit: 2fe0d1872cde13f04c9edcfd900415e788e4e960
Author: Thomas Deutschmann gentoo org>
AuthorDate: Sat Sep 30 14:32:02 2017 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Sat Sep 30 15:15:31 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fe0d187
app-admin/collectd: Fix turbostat plugin build issue with >=linux-4.12
Package-Manager: Portage-2.3.10, Repoman-2.3.3
app-admin/collectd/collectd-5.7.2.ebuild | 1 +
.../collectd/files/collectd-5.7.2-issue-2443.patch | 160 +
2 files changed, 161 insertions(+)
diff --git a/app-admin/collectd/collectd-5.7.2.ebuild
b/app-admin/collectd/collectd-5.7.2.ebuild
index f062bc9c363..199a7948bb2 100644
--- a/app-admin/collectd/collectd-5.7.2.ebuild
+++ b/app-admin/collectd/collectd-5.7.2.ebuild
@@ -156,6 +156,7 @@ REQUIRED_USE="
PATCHES=(
"${FILESDIR}"/${PN}-5.6.0-gentoo.patch
+ "${FILESDIR}"/${PN}-5.7.2-issue-2443.patch
)
# @FUNCTION: collectd_plugin_kernel_linux
diff --git a/app-admin/collectd/files/collectd-5.7.2-issue-2443.patch
b/app-admin/collectd/files/collectd-5.7.2-issue-2443.patch
new file mode 100644
index 000..19410c139b0
--- /dev/null
+++ b/app-admin/collectd/files/collectd-5.7.2-issue-2443.patch
@@ -0,0 +1,160 @@
+turbostat: import msr-index header from linux to allow building against
+>=linux-4.12
+
+Backport of https://github.com/collectd/collectd/pull/2446
+
+--- a/configure.ac
b/configure.ac
+@@ -805,28 +805,6 @@ AC_CACHE_CHECK([whether clock_boottime and
clock_monotonic are supported],
+
+
+ # For the turbostat plugin
+-have_asm_msrindex_h="no"
+-AC_CHECK_HEADERS(asm/msr-index.h, [have_asm_msrindex_h="yes"])
+-
+-if test "x$have_asm_msrindex_h" = "xyes"
+-then
+- AC_CACHE_CHECK([whether asm/msr-index.h has MSR_PKG_C10_RESIDENCY],
+- [c_cv_have_usable_asm_msrindex_h],
+- AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
+-[[[
+-#include
+-]]],
+-[[[
+-int y = MSR_PKG_C10_RESIDENCY;
+-return(y);
+-]]]
+- )],
+- [c_cv_have_usable_asm_msrindex_h="yes"],
+- [c_cv_have_usable_asm_msrindex_h="no"],
+- )
+- )
+-fi
+-
+ have_cpuid_h="no"
+ AC_CHECK_HEADERS(cpuid.h, [have_cpuid_h="yes"])
+
+@@ -6108,7 +6086,7 @@ then
+ then
+ plugin_ipvs="yes"
+ fi
+- if test "x$c_cv_have_usable_asm_msrindex_h" = "xyes" && test
"x$have_cpuid_h" = "xyes"
++ if test "x$have_cpuid_h" = "xyes"
+ then
+ plugin_turbostat="yes"
+ fi
+--- a/src/Makefile.am
b/src/Makefile.am
+@@ -1212,7 +1212,9 @@ endif
+
+ if BUILD_PLUGIN_TURBOSTAT
+ pkglib_LTLIBRARIES += turbostat.la
+-turbostat_la_SOURCES = turbostat.c
++turbostat_la_SOURCES = \
++ turbostat.c \
++ msr-index.h
+ turbostat_la_LDFLAGS = $(PLUGIN_LDFLAGS)
+ endif
+
+--- /dev/null
b/src/msr-index.h
+@@ -0,0 +1,88 @@
++/*
++ * Partial header file imported from the linux kernel
++ * (arch/x86/include/asm/msr-index.h)
++ * as it is not provided by the kernel sources anymore
++ *
++ * Only the minimal blocks of macro have been included
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms and conditions of the GNU General Public License,
++ * version 2, as published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
++ * more details.
++ *
++ * You should have received a copy of the GNU General Public License along
with
++ * this program; if not, write to the Free Software Foundation, Inc.,
++ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ */
++
++#ifndef _ASM_X86_MSR_INDEX_H
++#define _ASM_X86_MSR_INDEX_H
++
++/*
++ * CPU model specific register (MSR) numbers.
++ *
++ * Do not add new entries to this file unless the definitions are shared
++ * between multiple compilation units.
++ */
++
++/* Intel MSRs. Some also available on other CPUs */
++
++/* C-state Residency Counters */
++#define MSR_PKG_C3_RESIDENCY 0x03f8
++#define MSR_PKG_C6_RESIDENCY 0x03f9
++#define MSR_ATOM_PKG_C6_RESIDENCY 0x03fa
++#define MSR_PKG_C7_RESIDENCY 0x03fa
++#define MSR_CORE_C3_RESIDENCY 0x03fc
++#define MSR_CORE_C6_RESIDENCY 0x03fd
++#define MSR_CORE_C7_RESIDENCY 0x03fe
++#define MSR_KNL_CORE_C6_RESIDENCY 0x03ff
++#define MSR_PKG_C2_RESIDENCY 0x060d
++#define MSR_PKG_C8_RESIDENCY 0x0630
++#define MSR_PKG_C9_RESIDENCY 0x0631
++#define MSR_PKG_C10_RESIDENCY 0x0632
++
++/* Run Time Average Power Limiting (RAPL) Interface */
++
++#define MSR_RAPL_POWER_UNIT 0x0606
++
++#define MSR_PKG_POWER_LIMIT
[gentoo-commits] repo/gentoo:master commit in: app-admin/collectd/, app-admin/collectd/files/
commit: d7dcb46c7a5186ef22a1373f7b99dbf46382d2d6
Author: Thomas Deutschmann gentoo org>
AuthorDate: Thu Jun 1 18:49:20 2017 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Thu Jun 1 18:49:35 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7dcb46c
app-admin/collectd: Rev bump to fix a memory leak in bind plugin
See https://github.com/collectd/collectd/issues/2303
Package-Manager: Portage-2.3.5, Repoman-2.3.2
...td-5.6.2-r3.ebuild => collectd-5.6.2-r4.ebuild} | 1 +
.../collectd/files/collectd-5.6.2-issue2303.patch | 44 ++
2 files changed, 45 insertions(+)
diff --git a/app-admin/collectd/collectd-5.6.2-r3.ebuild
b/app-admin/collectd/collectd-5.6.2-r4.ebuild
similarity index 99%
rename from app-admin/collectd/collectd-5.6.2-r3.ebuild
rename to app-admin/collectd/collectd-5.6.2-r4.ebuild
index 950afe301fc..08fcec3a65a 100644
--- a/app-admin/collectd/collectd-5.6.2-r3.ebuild
+++ b/app-admin/collectd/collectd-5.6.2-r4.ebuild
@@ -153,6 +153,7 @@ REQUIRED_USE="
PATCHES=(
"${FILESDIR}"/${PN}-5.6.0-gentoo.patch
"${FILESDIR}"/${PN}-5.6.2-CVE-2017-7401.patch
+ "${FILESDIR}"/${PN}-5.6.2-issue2303.patch
)
# @FUNCTION: collectd_plugin_kernel_linux
diff --git a/app-admin/collectd/files/collectd-5.6.2-issue2303.patch
b/app-admin/collectd/files/collectd-5.6.2-issue2303.patch
new file mode 100644
index 000..0fffcd6b922
--- /dev/null
+++ b/app-admin/collectd/files/collectd-5.6.2-issue2303.patch
@@ -0,0 +1,44 @@
+From fd01cdd0546ccbbda7f4cf5db2d0ae28e1e770cd Mon Sep 17 00:00:00 2001
+From: Ruben Kerkhof
+Date: Tue, 30 May 2017 17:25:17 +0200
+Subject: [PATCH] Bind plugin: plug a few leaks
+
+Fixes: #2303
+---
+ src/bind.c | 10 --
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/src/bind.c b/src/bind.c
+index 4860f1b604..853b9c26a3 100644
+--- a/src/bind.c
b/src/bind.c
+@@ -526,8 +526,10 @@ static int bind_parse_generic_name_value(const char
*xpath_expression, /* {{{ */
+ status = bind_xml_read_gauge(doc, counter, );
+ else
+ status = bind_xml_read_derive(doc, counter, );
+- if (status != 0)
++ if (status != 0) {
++xmlFree(name);
+ continue;
++ }
+
+ status = (*list_callback)(name, value, current_time, user_data);
+ if (status == 0)
+@@ -659,12 +661,16 @@ static int bind_parse_generic_name_attr_value_list(
+ status = bind_xml_read_gauge(doc, child, );
+ else
+ status = bind_xml_read_derive(doc, child, );
+- if (status != 0)
++ if (status != 0) {
++xmlFree(attr_name);
+ continue;
++ }
+
+ status = (*list_callback)(attr_name, value, current_time, user_data);
+ if (status == 0)
+ num_entries++;
++
++ xmlFree(attr_name);
+ }
+ }
+
[gentoo-commits] repo/gentoo:master commit in: app-admin/collectd/, app-admin/collectd/files/
commit: 40cd8316a2dd6fb07907f2f1b38d5828444daefe
Author: Thomas Deutschmann gentoo org>
AuthorDate: Thu Apr 6 15:49:15 2017 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Thu Apr 6 15:49:15 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40cd8316
app-admin/collectd: Security cleanup (bug #614848)
Package-Manager: Portage-2.3.5, Repoman-2.3.2
app-admin/collectd/Manifest| 2 -
app-admin/collectd/collectd-5.5.2.ebuild | 485 ---
app-admin/collectd/collectd-5.6.1-r1.ebuild| 519
app-admin/collectd/collectd-5.6.2-r1.ebuild| 530 -
app-admin/collectd/collectd-5.6.2.ebuild | 518
.../collectd/files/collectd-4.10.3-werror.patch| 24 -
.../collectd/files/collectd-5.5.1-libocci.patch| 33 --
app-admin/collectd/files/collectd-5.5.1-lt.patch | 60 ---
.../collectd/files/collectd-5.5.1-nohal.patch | 35 --
.../collectd/files/collectd-5.5.2-issue-1870.patch | 127 -
.../collectd/files/collectd-5.5.2-issue-1877.patch | 37 --
...ctd-5.6.0-use-_LINUX_CAPABILITY_VERSION_3.patch | 37 --
12 files changed, 2407 deletions(-)
diff --git a/app-admin/collectd/Manifest b/app-admin/collectd/Manifest
index 9dd5ed06455..9a8a53363ca 100644
--- a/app-admin/collectd/Manifest
+++ b/app-admin/collectd/Manifest
@@ -1,3 +1 @@
-DIST collectd-5.5.2.tar.bz2 1800476 SHA256
017f3a4062187e594d8ab6af685655fb82a8a942dc574668e68242bdb8ba820f SHA512
9d311db4f3677b95e3a47c03af01bdf1127957f6fccb6c601455632d0ea3b39e3f4cd9a6f8f510083e208714bbb0da2e04aaa574a90b0ad6fe984506675475b3
WHIRLPOOL
98ed4fb29eec0ae660d3e1651380a3f17f7bf7f22e687633c4a44974bc84e49cf8de11fd6fea349bfe24809ac3c29a407459a1203b72bcf741e1587c6c0b1773
-DIST collectd-5.6.1.tar.bz2 1903962 SHA256
c30ff644f91407b4dc2d99787b99cc45ec00e538bd1cc269429d3c5e8a4aee2c SHA512
da25f1a9cbaf47533f5a4d2f5f78b966317d4f21865c5a714954ad9d7d02b4798a3e0471ce52199dc80e01dc2808376cb10a7e19c402aafc984bf595f09951a6
WHIRLPOOL
68ed2b27bbd48f5af5e29743dcd2871ab4c2904d5593bbb6f3e68129f318389e32e13b256d489ea7842b90c406974511c8f324383253c7b438e7b6a9d36d299d
DIST collectd-5.6.2.tar.bz2 1806969 SHA256
cc0b4118a91e5369409ced22d1d8a85c1a400098419414160c1839268ecad0c6 SHA512
81438e2e653649cf8a447f475b41844b7adb8ec436b43fb395ba9cf8b09b56a068633fe4b6c802d5cde3909d85a3af2542f5804005b3843f7936a37553911d61
WHIRLPOOL
ab3a1d160418cf1a826ae7c3b8999b239d15f2f16d70e1305d185ddc79c307071cfd529214c9406fc9c85435a94775abbf2cdb807a2e2b6da8f666cc0550886a
diff --git a/app-admin/collectd/collectd-5.5.2.ebuild
b/app-admin/collectd/collectd-5.5.2.ebuild
deleted file mode 100644
index 0d4f633af23..000
--- a/app-admin/collectd/collectd-5.5.2.ebuild
+++ /dev/null
@@ -1,485 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit autotools fcaps flag-o-matic java-pkg-opt-2 linux-info multilib
perl-functions python-single-r1 systemd user
-
-DESCRIPTION="Collects system statistics and provides mechanisms to store the
values"
-
-HOMEPAGE="http://collectd.org/;
-SRC_URI="${HOMEPAGE}/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="contrib debug java kernel_Darwin kernel_FreeBSD kernel_linux perl
selinux static-libs udev xfs"
-
-# The plugin lists have to follow here since they extend IUSE
-
-# Plugins that don't build (e.g. dependencies not in Gentoo)
-# apple_sensors: Requires libIOKit
-# aquaero: Requires aerotools-ng/libaquaero5
-# barometer: Requires libi2c (i2c_smbus_read_i2c_block_data)
-# lpar: Requires libperfstat (AIX only)
-# mic: Requires Intel Many Integrated Core Architecture API
-#(part of Intel's Xeon Phi software)
-# netapp:Requires libnetapp
(http://communities.netapp.com/docs/DOC-1110)
-# pf:Requires BSD packet filter
-# pinba: Requires MySQL Pinba engine (http://pinba.org/)
-# tape: Requires libkstat (Solaris only)
-# write_mongodb: https://github.com/collectd/collectd/issues/492
-# xmms: Requires libxmms (v1)
-COLLECTD_IMPOSSIBLE_PLUGINS="apple_sensors aquaero mic netapp pf pinba tape
write_kafka write_mongodb xmms"
-
-# Plugins that have been (compile) tested and can be enabled via
COLLECTD_PLUGINS
-COLLECTD_TESTED_PLUGINS="amqp aggregation apache apcups ascent battery bind
ceph
- cgroups conntrack contextswitch cpu cpufreq csv curl curl_json curl_xml
dbi df
- disk dns drbd email entropy ethstat exec fhcount filecount fscache
genericjmx
- gmond hddtemp interface ipc ipmi iptables ipvs irq java load logfile
log_logstash
- lvm madwifi match_empty_counter match_hashed match_regex match_timediff
match_value
- mbmon md memcachec memcached memory modbus multimeter mysql netlink
network network
-
[gentoo-commits] repo/gentoo:master commit in: app-admin/collectd/, app-admin/collectd/files/
commit: 51ddf1381bb577a44651f74f4b653d05094e9cb0
Author: Thomas Deutschmann gentoo org>
AuthorDate: Thu Aug 11 16:30:37 2016 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Thu Aug 11 16:32:46 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51ddf138
app-admin/collectd: Drop old security vulnerable version
Package-Manager: portage-2.3.0
app-admin/collectd/Manifest| 1 -
app-admin/collectd/collectd-5.5.1-r4.ebuild| 473 -
.../collectd/files/collectd-5.5.1-issue-1637.patch | 68 ---
3 files changed, 542 deletions(-)
diff --git a/app-admin/collectd/Manifest b/app-admin/collectd/Manifest
index bd7c879..c5865d3 100644
--- a/app-admin/collectd/Manifest
+++ b/app-admin/collectd/Manifest
@@ -1,2 +1 @@
-DIST collectd-5.5.1.tar.bz2 1797852 SHA256
f9c5d526e1f0429a7db1ccd90bdf9e23923a2fd43b7285cfda8f0341e5c0bc3f SHA512
1935809571b8f0e0870399385312a5687f441d11e08a0c7d1337384b3790c3436ba84f89226aad979584045cc13bdf88f1350a0f49c94bcd0dbcf12ae4704dae
WHIRLPOOL
3efeeb9262344a8a1c0aa068e64f5d45ff536d1fc1399b4599143a6e47740d5a33aedf482dbf9110cc5f0345d624fbe71ff00fc6f7afeee891326617f7979e41
DIST collectd-5.5.2.tar.bz2 1800476 SHA256
017f3a4062187e594d8ab6af685655fb82a8a942dc574668e68242bdb8ba820f SHA512
9d311db4f3677b95e3a47c03af01bdf1127957f6fccb6c601455632d0ea3b39e3f4cd9a6f8f510083e208714bbb0da2e04aaa574a90b0ad6fe984506675475b3
WHIRLPOOL
98ed4fb29eec0ae660d3e1651380a3f17f7bf7f22e687633c4a44974bc84e49cf8de11fd6fea349bfe24809ac3c29a407459a1203b72bcf741e1587c6c0b1773
diff --git a/app-admin/collectd/collectd-5.5.1-r4.ebuild
b/app-admin/collectd/collectd-5.5.1-r4.ebuild
deleted file mode 100644
index 630d169..000
--- a/app-admin/collectd/collectd-5.5.1-r4.ebuild
+++ /dev/null
@@ -1,473 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="6"
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit autotools fcaps java-pkg-opt-2 linux-info multilib perl-functions
python-single-r1 systemd user
-
-DESCRIPTION="Collects system statistics and provides mechanisms to store the
values"
-
-HOMEPAGE="http://collectd.org/;
-SRC_URI="${HOMEPAGE}/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="contrib debug java kernel_Darwin kernel_FreeBSD kernel_linux perl
selinux static-libs udev"
-
-# The plugin lists have to follow here since they extend IUSE
-
-# Plugins that don't build (e.g. dependencies not in Gentoo)
-# apple_sensors: Requires libIOKit
-# aquaero: Requires aerotools-ng/libaquaero5
-# barometer: Requires libi2c (i2c_smbus_read_i2c_block_data)
-# lpar: Requires libperfstat (AIX only)
-# mic: Requires Intel Many Integrated Core Architecture API
-#(part of Intel's Xeon Phi software)
-# netapp:Requires libnetapp
(http://communities.netapp.com/docs/DOC-1110)
-# pf:Requires BSD packet filter
-# pinba: Requires MySQL Pinba engine (http://pinba.org/)
-# tape: Requires libkstat (Solaris only)
-# write_mongodb: https://github.com/collectd/collectd/issues/492
-# xmms: Requires libxmms (v1)
-COLLECTD_IMPOSSIBLE_PLUGINS="apple_sensors aquaero mic netapp pf pinba tape
write_kafka write_mongodb xmms"
-
-# Plugins that have been (compile) tested and can be enabled via
COLLECTD_PLUGINS
-COLLECTD_TESTED_PLUGINS="amqp aggregation apache apcups ascent battery bind
ceph
- cgroups conntrack contextswitch cpu cpufreq csv curl curl_json curl_xml
dbi df
- disk dns drbd email entropy ethstat exec fhcount filecount fscache
genericjmx
- gmond hddtemp interface ipc ipmi iptables ipvs irq java load logfile
log_logstash
- lvm madwifi match_empty_counter match_hashed match_regex match_timediff
match_value
- mbmon md memcachec memcached memory modbus multimeter mysql netlink
network network
- nfs nginx notify_desktop notify_email ntpd numa nut olsrd onewire
openldap openvpn
- oracle perl ping postgresql powerdns processes protocols python python
redis
- routeros rrdcached rrdtool sensors serial sigrok smart snmp statsd swap
syslog
- table tail tail_csv target_notification target_replace target_scale
target_set
- tcpconns teamspeak2 ted thermal threshold tokyotyrant turbostat
unixsock uptime
- users uuid varnish virt vmem vserver wireless write_graphite write_http
write_kafka
- write_log write_redis write_riemann write_sensu write_tsdb zfs_arc
zookeeper"
-
-COLLECTD_DISABLED_PLUGINS="${COLLECTD_IMPOSSIBLE_PLUGINS}"
-
-COLLECTD_ALL_PLUGINS=${COLLECTD_TESTED_PLUGINS}
-
-for plugin in ${COLLECTD_ALL_PLUGINS}; do
- IUSE="${IUSE} collectd_plugins_${plugin}"
-done
-unset plugin
-
-# Now come the dependencies.
-
-COMMON_DEPEND="
- dev-libs/libgcrypt:=
- dev-libs/libltdl:0=
- perl? (
