[gentoo-commits] repo/gentoo:master commit in: app-admin/collectd/files/, app-admin/collectd/
commit: e369f0a8f5cc98cb2ebced162e3327a1bf9b987d
Author: Thomas Deutschmann gentoo org>
AuthorDate: Sat Mar 3 16:39:09 2018 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Sat Mar 3 16:43:49 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e369f0a8
app-admin/collectd: Fix building against >=www-servers/varnish-5.2
Package-Manager: Portage-2.3.24, Repoman-2.3.6
app-admin/collectd/collectd-5.7.2-r1.ebuild|1 +
.../files/collectd-5.7.2-varnish-5.2+.patch| 1018
2 files changed, 1019 insertions(+)
diff --git a/app-admin/collectd/collectd-5.7.2-r1.ebuild
b/app-admin/collectd/collectd-5.7.2-r1.ebuild
index a040f5e72fc..c2cd8a8283e 100644
--- a/app-admin/collectd/collectd-5.7.2-r1.ebuild
+++ b/app-admin/collectd/collectd-5.7.2-r1.ebuild
@@ -158,6 +158,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-5.6.0-gentoo.patch
"${FILESDIR}"/${PN}-5.7.2-issue-2443.patch
"${FILESDIR}"/${PN}-5.7.2-CVE-2017-16820.patch
+ "${FILESDIR}"/${PN}-5.7.2-varnish-5.2+.patch
)
# @FUNCTION: collectd_plugin_kernel_linux
diff --git a/app-admin/collectd/files/collectd-5.7.2-varnish-5.2+.patch
b/app-admin/collectd/files/collectd-5.7.2-varnish-5.2+.patch
new file mode 100644
index 000..60830042fa6
--- /dev/null
+++ b/app-admin/collectd/files/collectd-5.7.2-varnish-5.2+.patch
@@ -0,0 +1,1018 @@
+Fix building against >=www-servers/varnish-5.2
+
+https://github.com/collectd/collectd/commit/3c42182e912e3d634fe8c4f6a636053959fcde49
+https://github.com/collectd/collectd/commit/3ab73ae8b23b9816fb69fde630c5ad667aa1e09f
+https://github.com/collectd/collectd/commit/7978b43670472a000831f7ff37a6a30771a6ee6f
+https://github.com/collectd/collectd/commit/68123637814ea09efff5bf56f3209eefbe41287a
+https://github.com/collectd/collectd/commit/8192bfcf975ff6275505c99193a23e2a066927d0
+https://github.com/collectd/collectd/commit/c1e2bf3d2bfa1a1da3a6b42186577f635795e7f8
+
+--- a/configure.ac
b/configure.ac
+@@ -5614,13 +5614,18 @@ then
+
+ CPPFLAGS="$CPPFLAGS $with_libvarnish_cflags"
+
+- AC_CHECK_HEADERS(vapi/vsc.h,
+- [AC_DEFINE([HAVE_VARNISH_V4], [1], [Varnish 4 API support])],
+- [AC_CHECK_HEADERS(vsc.h,
+- [AC_DEFINE([HAVE_VARNISH_V3], [1], [Varnish 3 API
support])],
+- [AC_CHECK_HEADERS(varnishapi.h,
+- [AC_DEFINE([HAVE_VARNISH_V2], [1], [Varnish 2
API support])],
+- [with_libvarnish="no (found none of the varnish
header files)"])])])
++ $PKG_CONFIG --atleast-version=5.2 'varnishapi' 2>/dev/null
++ if test $? -eq 0; then
++ AC_DEFINE([HAVE_VARNISH_V5], [1], [Varnish 5 API support])
++ else
++ AC_CHECK_HEADERS(vapi/vsc.h,
++ [AC_DEFINE([HAVE_VARNISH_V4], [1], [Varnish 4 API
support])],
++ [AC_CHECK_HEADERS(vsc.h,
++ [AC_DEFINE([HAVE_VARNISH_V3], [1], [Varnish 3
API support])],
++ [AC_CHECK_HEADERS(varnishapi.h,
++ [AC_DEFINE([HAVE_VARNISH_V2], [1],
[Varnish 2 API support])],
++ [with_libvarnish="no (found none of the
varnish header files)"])])])
++ fi
+
+ CPPFLAGS="$SAVE_CPPFLAGS"
+ fi
+--- a/src/varnish.c
b/src/varnish.c
+@@ -21,6 +21,7 @@
+ * Jérôme Renard
+ * Marc Fournier
+ * Florian octo Forster
++ * Denes Matetelki
+ **/
+
+ #include "collectd.h"
+@@ -28,7 +29,7 @@
+ #include "common.h"
+ #include "plugin.h"
+
+-#if HAVE_VARNISH_V4
++#if HAVE_VARNISH_V4 || HAVE_VARNISH_V5
+ #include
+ #include
+ typedef struct VSC_C_main c_varnish_stats_t;
+@@ -69,17 +70,25 @@ struct user_config_s {
+ _Bool collect_sms;
+ #if HAVE_VARNISH_V2
+ _Bool collect_sm;
++#endif
++#if HAVE_VARNISH_V2 || HAVE_VARNISH_V4 || HAVE_VARNISH_V5
+ _Bool collect_sma;
+ #endif
+ _Bool collect_struct;
+ _Bool collect_totals;
+-#if HAVE_VARNISH_V3 || HAVE_VARNISH_V4
++#if HAVE_VARNISH_V3 || HAVE_VARNISH_V4 || HAVE_VARNISH_V5
+ _Bool collect_uptime;
+ #endif
+ _Bool collect_vcl;
+ _Bool collect_workers;
+-#if HAVE_VARNISH_V4
++#if HAVE_VARNISH_V4 || HAVE_VARNISH_V5
+ _Bool collect_vsm;
++ _Bool collect_lck;
++ _Bool collect_mempool;
++ _Bool collect_mgt;
++ _Bool collect_smf;
++ _Bool collect_vbe;
++ _Bool collect_mse;
+ #endif
+ };
+ typedef struct user_config_s user_config_t; /* }}} */
+@@ -98,60 +107,70 @@ static int varnish_submit(const char *plugin_instance, /*
{{{ */
+
+ if (plugin_instance == NULL)
+ plugin_instance = "default";
+- ssnprintf(vl.plugin_instance, sizeof(vl.plugin_instance), "%s-%s",
+-plugin_instance, category);
++ snprintf(vl.plugin_instance, sizeof(vl.plugin_instance), "%s-%s",
++ plugin_instance, category);
+
+ sstrncpy(vl.type, type, sizeof(vl.type));
+
+ if (type_instance != NULL
[gentoo-commits] repo/gentoo:master commit in: app-admin/collectd/files/, app-admin/collectd/
commit: c148c069385caf68d0bc5609ce13db4ba9e71415
Author: Thomas Deutschmann gentoo org>
AuthorDate: Sat Mar 3 16:41:59 2018 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Sat Mar 3 16:43:51 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c148c069
app-admin/collectd: Security cleanup
Bug: https://bugs.gentoo.org/628540
Package-Manager: Portage-2.3.24, Repoman-2.3.6
app-admin/collectd/Manifest| 2 -
app-admin/collectd/collectd-5.6.2-r4.ebuild| 532
app-admin/collectd/collectd-5.7.1.ebuild | 537 -
app-admin/collectd/collectd-5.7.2.ebuild | 536
.../files/collectd-5.6.2-CVE-2017-7401.patch | 56 ---
.../collectd/files/collectd-5.6.2-issue2303.patch | 44 --
app-admin/collectd/files/collectd.confd-r1 | 45 --
app-admin/collectd/files/collectd.initd-r1 | 78 ---
8 files changed, 1830 deletions(-)
diff --git a/app-admin/collectd/Manifest b/app-admin/collectd/Manifest
index d53ee560fa0..bac7ff56a18 100644
--- a/app-admin/collectd/Manifest
+++ b/app-admin/collectd/Manifest
@@ -1,3 +1 @@
-DIST collectd-5.6.2.tar.bz2 1806969 BLAKE2B
2311b6cc51297264e1bfc705553c728ad2ae3355ce8b5fb25b8ac91aaef4b78921235c675ff26535e3388c1b1af37aec4d810b2e6c6b60fcc3d79e0149841989
SHA512
81438e2e653649cf8a447f475b41844b7adb8ec436b43fb395ba9cf8b09b56a068633fe4b6c802d5cde3909d85a3af2542f5804005b3843f7936a37553911d61
-DIST collectd-5.7.1.tar.bz2 1797725 BLAKE2B
5a24d74ff26ed8745d3b50d3b22db0a939aedc6048ff279880f892572d5e5799b1e3b4630250ebb9066325b2583f99b441a42d0bd0ab4a3c20b1aba82b9d16f2
SHA512
f2edf4ecf3bbf5f4e10c797614a7ae39c18678601038574cec4f2ea6a8773444af4592e2872ed75a5afe5f746adaff2449df51443d98d2560a23722e46bef164
DIST collectd-5.7.2.tar.bz2 1798777 BLAKE2B
4af359a773457bb9c05b6a301d7728eea7598c200f7ca534875b07d1d011b280ab138f680d9607723f14523dd71dcbec3a41e0d8d183848c8ef809cef86c2b8f
SHA512
8844b67159f8da2203b5ac57ef19fce0a01050a016174d196b48b5fb24925ad2935af9bdd9af06097ff663499abc496cdcc2d9e9a10f403f8d707c465c1a88f3
diff --git a/app-admin/collectd/collectd-5.6.2-r4.ebuild
b/app-admin/collectd/collectd-5.6.2-r4.ebuild
deleted file mode 100644
index af56c138d93..000
--- a/app-admin/collectd/collectd-5.6.2-r4.ebuild
+++ /dev/null
@@ -1,532 +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,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 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)
-# grpc: Requires libgrpc
-# 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 grpc lpar mic
- netapp pf pinba tape write_kafka 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 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
[gentoo-commits] repo/gentoo:master commit in: app-admin/collectd/files/, app-admin/collectd/
commit: 06fd84be0f99d0192caf0f4e4f5a713f85a49a7e
Author: Thomas Deutschmann gentoo org>
AuthorDate: Thu Apr 6 15:42:46 2017 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Thu Apr 6 15:42:46 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06fd84be
app-admin/collectd: Rev bump to add patch for CVE-2017-7401 (bug #614848)
Package-Manager: Portage-2.3.5, Repoman-2.3.2
app-admin/collectd/collectd-5.6.2-r2.ebuild| 531 +
.../files/collectd-5.6.2-CVE-2017-7401.patch | 56 +++
2 files changed, 587 insertions(+)
diff --git a/app-admin/collectd/collectd-5.6.2-r2.ebuild
b/app-admin/collectd/collectd-5.6.2-r2.ebuild
new file mode 100644
index 000..885fbf1a446
--- /dev/null
+++ b/app-admin/collectd/collectd-5.6.2-r2.ebuild
@@ -0,0 +1,531 @@
+# 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} )
+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 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)
+# grpc: Requires libgrpc
+# 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 grpc lpar mic
+ netapp pf pinba tape write_kafka 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 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_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] )
+ udev? ( virtual/udev )
+ xfs?( sys-fs/xfsprogs )
+ collectd_plugins_amqp? ( net-libs/rabbitmq-c )
+ collectd_plugins_apache?( net-misc/curl:0= )
+ collectd_plugins_ascent?( net-misc/curl:0=
dev-libs/libxml2:2= )
+ collectd_plugins_bind? ( net-misc/curl:0=
dev-libs/libxml2:2= )
+ collectd_plugins_ceph? ( dev-libs/yajl:= )
+ collectd_plugins_curl? ( net-misc/curl:0= )
+ collectd_plugins_curl_json? ( net-misc/curl:0=
dev-libs/yajl:= )
+ collectd_plugins_curl_xm
[gentoo-commits] repo/gentoo:master commit in: app-admin/collectd/files/, app-admin/collectd/
commit: 180eeb25679dbf994da5571521187938e8ec8354
Author: Thomas Deutschmann gentoo org>
AuthorDate: Thu Oct 13 20:48:26 2016 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Thu Oct 13 20:48:52 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=180eeb25
app-admin/collectd: Revision bump to address multiple issues
- When collectd was emerged with "filecaps" USE flag set and at least one
chosen plugin required special capabilities systemd was unable to start
collectd because CapabilityBoundingSet option in collectd's systemd unit
file did not match with the capabilities actual set for
"/usr/sbin/collectd". (bug #596852)
- Cherry picked upstream commit 5e4f2ae61d to get rid of
> capability: warning: `collectd' uses 32-bit capabilities (legacy support
in use)
message.
Gentoo-Bug: https://bugs.gentoo.org/596852
Package-Manager: portage-2.3.2
app-admin/collectd/Manifest| 1 -
app-admin/collectd/collectd-5.6.0.ebuild | 499 -
...lectd-5.6.1.ebuild => collectd-5.6.1-r1.ebuild} | 54 ++-
.../files/collectd-5.6.0-fix-apache-plugin.patch | 26 --
.../collectd/files/collectd-5.6.0-issue-1896.patch | 76
...ctd-5.6.0-use-_LINUX_CAPABILITY_VERSION_3.patch | 37 ++
6 files changed, 75 insertions(+), 618 deletions(-)
diff --git a/app-admin/collectd/Manifest b/app-admin/collectd/Manifest
index 2485930..ad706b1 100644
--- a/app-admin/collectd/Manifest
+++ b/app-admin/collectd/Manifest
@@ -1,3 +1,2 @@
DIST collectd-5.5.2.tar.bz2 1800476 SHA256
017f3a4062187e594d8ab6af685655fb82a8a942dc574668e68242bdb8ba820f SHA512
9d311db4f3677b95e3a47c03af01bdf1127957f6fccb6c601455632d0ea3b39e3f4cd9a6f8f510083e208714bbb0da2e04aaa574a90b0ad6fe984506675475b3
WHIRLPOOL
98ed4fb29eec0ae660d3e1651380a3f17f7bf7f22e687633c4a44974bc84e49cf8de11fd6fea349bfe24809ac3c29a407459a1203b72bcf741e1587c6c0b1773
-DIST collectd-5.6.0.tar.bz2 1818470 SHA256
f0ffbbd91fac3682bd324a74b9b4c9eabe781394b303b5cfd457c4cfbe748623 SHA512
5eecd7fe1619850b29e7853e0ab8f9eb7688d0fdf5687cf04930c75a94181c53d7dc0601a1dfa02417bdeb63cccf09b87acd7129e7f155b8d11147ec46982ed8
WHIRLPOOL
690e50f16318e9df39eac62010f8b0a57059356deeedd72505cc4a980876261a198edac095317f97b03913167dcfc49bf9f3b46986bbc3653628856e3a005111
DIST collectd-5.6.1.tar.bz2 1903962 SHA256
c30ff644f91407b4dc2d99787b99cc45ec00e538bd1cc269429d3c5e8a4aee2c SHA512
da25f1a9cbaf47533f5a4d2f5f78b966317d4f21865c5a714954ad9d7d02b4798a3e0471ce52199dc80e01dc2808376cb10a7e19c402aafc984bf595f09951a6
WHIRLPOOL
68ed2b27bbd48f5af5e29743dcd2871ab4c2904d5593bbb6f3e68129f318389e32e13b256d489ea7842b90c406974511c8f324383253c7b438e7b6a9d36d299d
diff --git a/app-admin/collectd/collectd-5.6.0.ebuild
b/app-admin/collectd/collectd-5.6.0.ebuild
deleted file mode 100644
index 9233874..
--- a/app-admin/collectd/collectd-5.6.0.ebuild
+++ /dev/null
@@ -1,499 +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} )
-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 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)
-# grpc: Requires libgrpc
-# 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 grpc lpar mic
- netapp pf pinba tape write_kafka 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 ent
[gentoo-commits] repo/gentoo:master commit in: app-admin/collectd/files/, app-admin/collectd/, profiles/arch/amd64/, ...
commit: 26b428cbf35e52dde7e530fc81ae3652e3fe8d48
Author: Thomas Deutschmann gentoo org>
AuthorDate: Wed Sep 21 23:55:38 2016 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Wed Sep 21 23:58:29 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26b428cb
app-admin/collectd: Bump to v5.6.0
New plugins:
- chrony
- cpusleep
- gps
- lua
- mqtt
- notify_nagios
- xencpu
Package-Manager: portage-2.3.1
app-admin/collectd/Manifest| 1 +
app-admin/collectd/collectd-5.6.0.ebuild | 495 +
.../files/collectd-5.6.0-fix-apache-plugin.patch | 26 ++
.../collectd/files/collectd-5.6.0-gentoo.patch | 153 +++
.../collectd/files/collectd-5.6.0-issue-1896.patch | 76
app-admin/collectd/metadata.xml| 7 +
profiles/arch/amd64/package.use.mask | 4 +
profiles/arch/x86/package.use.mask | 4 +
profiles/base/package.use.mask | 4 +
9 files changed, 770 insertions(+)
diff --git a/app-admin/collectd/Manifest b/app-admin/collectd/Manifest
index c5865d3..31a5a53 100644
--- a/app-admin/collectd/Manifest
+++ b/app-admin/collectd/Manifest
@@ -1 +1,2 @@
DIST collectd-5.5.2.tar.bz2 1800476 SHA256
017f3a4062187e594d8ab6af685655fb82a8a942dc574668e68242bdb8ba820f SHA512
9d311db4f3677b95e3a47c03af01bdf1127957f6fccb6c601455632d0ea3b39e3f4cd9a6f8f510083e208714bbb0da2e04aaa574a90b0ad6fe984506675475b3
WHIRLPOOL
98ed4fb29eec0ae660d3e1651380a3f17f7bf7f22e687633c4a44974bc84e49cf8de11fd6fea349bfe24809ac3c29a407459a1203b72bcf741e1587c6c0b1773
+DIST collectd-5.6.0.tar.bz2 1818470 SHA256
f0ffbbd91fac3682bd324a74b9b4c9eabe781394b303b5cfd457c4cfbe748623 SHA512
5eecd7fe1619850b29e7853e0ab8f9eb7688d0fdf5687cf04930c75a94181c53d7dc0601a1dfa02417bdeb63cccf09b87acd7129e7f155b8d11147ec46982ed8
WHIRLPOOL
690e50f16318e9df39eac62010f8b0a57059356deeedd72505cc4a980876261a198edac095317f97b03913167dcfc49bf9f3b46986bbc3653628856e3a005111
diff --git a/app-admin/collectd/collectd-5.6.0.ebuild
b/app-admin/collectd/collectd-5.6.0.ebuild
new file mode 100644
index ..e64baa9
--- /dev/null
+++ b/app-admin/collectd/collectd-5.6.0.ebuild
@@ -0,0 +1,495 @@
+# 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} )
+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 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)
+# grpc: Requires libgrpc
+# 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 grpc lpar mic
+ netapp pf pinba tape write_kafka 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 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 targe
[gentoo-commits] repo/gentoo:master commit in: app-admin/collectd/files/, app-admin/collectd/
commit: 9d5c0697e68fde681d07d283a2a8a3c67d5a7823
Author: Thomas Deutschmann gentoo org>
AuthorDate: Thu Aug 11 16:26:01 2016 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Thu Aug 11 16:32:44 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d5c0697
app-admin/collectd: Bump to v5.5.2
- New upstream release (Fixes CVE-2016-6254)
- Dependency on sys-fs/xfsprogs atom can now be controlled using the
new "xfs" USE flag.
If you don't enable "xfs" USE flag the df plugin will be unable to
filter on XFS partitions.
- Fixes build issues with sys-fs/xfsprogs-4.7.0 (#590998)
- Cherry-picked patches for upstream issue "network plugin causes core
dumps" (#1870)
Gentoo-Bug: https://bugs.gentoo.org/590998
Package-Manager: portage-2.3.0
app-admin/collectd/Manifest| 1 +
app-admin/collectd/collectd-5.5.2.ebuild | 479 +
.../collectd/files/collectd-5.5.2-issue-1870.patch | 127 ++
.../collectd/files/collectd-5.5.2-issue-1877.patch | 37 ++
app-admin/collectd/metadata.xml| 1 +
5 files changed, 645 insertions(+)
diff --git a/app-admin/collectd/Manifest b/app-admin/collectd/Manifest
index fd5ba08..bd7c879 100644
--- a/app-admin/collectd/Manifest
+++ b/app-admin/collectd/Manifest
@@ -1 +1,2 @@
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.2.ebuild
b/app-admin/collectd/collectd-5.5.2.ebuild
new file mode 100644
index 000..cfb74e9
--- /dev/null
+++ b/app-admin/collectd/collectd-5.5.2.ebuild
@@ -0,0 +1,479 @@
+# 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 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
+ 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 vme
[gentoo-commits] repo/gentoo:master commit in: app-admin/collectd/files/, app-admin/collectd/
commit: 5fb0a46e73890b4189cdeb73523e1dde0cea9429
Author: Thomas D whissi de>
AuthorDate: Mon Mar 28 17:28:15 2016 +
Commit: Ian Delaney gentoo org>
CommitDate: Tue Mar 29 13:42:09 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fb0a46e
app-admin/collectd: Revbump to fix multiple issues
- Fix building with sys-fs/xfsprogs-4.5.0 (upstream issues #1637)
- Workaround for bug #577846 applied
We are now enforcing <=sys-kernel/linux-headers-4.4 when building
collectd_plugins_iptables until the problem gets fixed in
non-collectd upstram.
- virtual/udev dependency is now optional for disk plugin
Package-Manager: portage-2.2.28
Closes: https://github.com/gentoo/gentoo/pull/1156
Signed-off-by: Ian Delaney gentoo.org>
...td-5.5.1-r1.ebuild => collectd-5.5.1-r2.ebuild} | 23 ++--
.../collectd/files/collectd-5.5.1-issue-1637.patch | 68 ++
app-admin/collectd/metadata.xml| 3 +
3 files changed, 89 insertions(+), 5 deletions(-)
diff --git a/app-admin/collectd/collectd-5.5.1-r1.ebuild
b/app-admin/collectd/collectd-5.5.1-r2.ebuild
similarity index 96%
rename from app-admin/collectd/collectd-5.5.1-r1.ebuild
rename to app-admin/collectd/collectd-5.5.1-r2.ebuild
index 441d156..13b5778 100644
--- a/app-admin/collectd/collectd-5.5.1-r1.ebuild
+++ b/app-admin/collectd/collectd-5.5.1-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="${HOMEPAGE}/files/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="contrib debug java kernel_Darwin kernel_FreeBSD kernel_linux perl
selinux static-libs"
+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
@@ -65,6 +65,7 @@ COMMON_DEPEND="
dev-libs/libgcrypt:=
sys-devel/libtool
perl? ( dev-lang/perl:=[ithreads] )
+ udev? ( virtual/udev )
collectd_plugins_amqp? ( net-libs/rabbitmq-c )
collectd_plugins_apache?( net-misc/curl )
collectd_plugins_ascent?( net-misc/curl
dev-libs/libxml2 )
@@ -74,7 +75,6 @@ COMMON_DEPEND="
collectd_plugins_curl_json? ( net-misc/curl dev-libs/yajl )
collectd_plugins_curl_xml? ( net-misc/curl
dev-libs/libxml2:= )
collectd_plugins_dbi? ( dev-db/libdbi )
- collectd_plugins_disk? ( virtual/udev )
collectd_plugins_dns? ( net-libs/libpcap )
collectd_plugins_genericjmx?( virtual/jre:=
dev-java/java-config-wrapper )
collectd_plugins_gmond? ( sys-cluster/ganglia )
@@ -104,7 +104,7 @@ COMMON_DEPEND="
collectd_plugins_rrdtool? ( net-analyzer/rrdtool )
collectd_plugins_sensors? ( sys-apps/lm_sensors )
collectd_plugins_sigrok?( sci-libs/libsigrok )
- collectd_plugins_smart? ( virtual/udev
dev-libs/libatasmart )
+ collectd_plugins_smart? ( dev-libs/libatasmart )
collectd_plugins_snmp? ( net-analyzer/net-snmp )
collectd_plugins_tokyotyrant? ( net-misc/tokyotyrant )
collectd_plugins_varnish? ( www-servers/varnish )
@@ -123,8 +123,12 @@ COMMON_DEPEND="
collectd_plugins_users? ( sys-libs/libstatgrab:= )
)"
+# Enforcing <=sys-kernel/linux-headers-4.4 due to #577846
DEPEND="${COMMON_DEPEND}
+ collectd_plugins_cgroups? ( sys-fs/xfsprogs )
+ collectd_plugins_df?( sys-fs/xfsprogs )
collectd_plugins_genericjmx?( >=virtual/jdk-1.6 )
+ collectd_plugins_iptables? (
<=sys-kernel/linux-headers-4.4 )
collectd_plugins_java? ( >=virtual/jdk-1.6 )
virtual/pkgconfig"
@@ -135,11 +139,12 @@ RDEPEND="${COMMON_DEPEND}
REQUIRED_USE="
collectd_plugins_genericjmx?( java )
collectd_plugins_java? ( java )
- collectd_plugins_python?( ${PYTHON_REQUIRED_USE} )"
+ collectd_plugins_python?( ${PYTHON_REQUIRED_USE} )
+ collectd_plugins_smart ( udev )"
PATCHES=(
"${FILESDIR}"/${PN}-4.10.3-werror.patch
- "${FILESDIR}"/${PN}-5.5.1-{libocci,lt,nohal}.patch
+ "${FILESDIR}"/${PN}-5.5.1-{libocci,lt,nohal,issue-1637}.patch
)
# @FUNCTION: collectd_plugin_kernel_linux
@@ -316,6 +321,14 @@ src_configure() {
# Do we debug?
local myconf="$(use_enable debug)"
+ # udev support?
+ # Required for smart plugin via REQUIRED_USE; Optional for disk plugin
+ if use udev; then
+ myconf+=" --with-libudev"
+ else
+ myconf+=" --without-libudev"
+ fi
+
[gentoo-commits] repo/gentoo:master commit in: app-admin/collectd/files/, app-admin/collectd/
commit: cf1113f83d2502056f28f2daa9e8bae796f11576
Author: Thomas D whissi de>
AuthorDate: Mon Mar 21 00:10:49 2016 +
Commit: Ian Delaney gentoo org>
CommitDate: Wed Mar 23 23:41:25 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf1113f8
app-admin/collectd: Dropped old
Package-Manager: portage-2.2.28
Closes: https://github.com/gentoo/gentoo/pull/1101
app-admin/collectd/Manifest| 2 -
app-admin/collectd/collectd-5.4.1-r2.ebuild| 386
app-admin/collectd/collectd-5.5.0.ebuild | 398 -
app-admin/collectd/collectd-5.5.1.ebuild | 2 +-
.../collectd/files/collectd-5.4.1-libocci.patch| 21 --
.../collectd/files/collectd-5.4.1-libperl.patch| 29 --
app-admin/collectd/files/collectd-5.4.1-lt.patch | 32 --
.../collectd/files/collectd-5.4.1-nohal.patch | 24 --
app-admin/collectd/files/collectd-5.5.0-lt.patch | 35 --
app-admin/collectd/files/collectd.confd| 22 --
app-admin/collectd/files/collectd.initd| 62
.../files/{logrotate => collectd.logrotate}| 0
app-admin/collectd/metadata.xml| 1 -
13 files changed, 1 insertion(+), 1013 deletions(-)
diff --git a/app-admin/collectd/Manifest b/app-admin/collectd/Manifest
index c44ebaf..fd5ba08 100644
--- a/app-admin/collectd/Manifest
+++ b/app-admin/collectd/Manifest
@@ -1,3 +1 @@
-DIST collectd-5.4.1.tar.bz2 1521907 SHA256
75452129f271cb0aad28e57f12a49070618bbb7b6a9d64cf869e8766fa2f66e0 SHA512
96289f52d3d1da55c862ae9ee2f57972682d7eab87387e97efa41fb5197599e097abd71aed2fe014e26af37c9ae98471e06dd181c725849976242642ce5c9492
WHIRLPOOL
2ed85b9d6d00c4e7dc6af236b637e282f17c6c0b20c1ba3da9c12ea85c5fdea1add2e29165874c7e9620852e422282d489436a4e245b161902f8926185edec16
-DIST collectd-5.5.0.tar.bz2 1824495 SHA256
847684cf5c10de1dc34145078af3fcf6e0d168ba98c14f1343b1062a4b569e88 SHA512
d2c2840f681c10345e02ad8df0f7c581dcb45bee276589fcd96b3dadd281a79ebb3b9a34a186242ef41285dde7fc505432376138ff4f72c4f60f1b840e640017
WHIRLPOOL
6223ca363984ab3777ca89e2cd5011f059b6ca7f5c66c5e7325d3155ce38ef2829caced3ad27e4d5016c5fdba59bb21b9b47d840ea0c4d164c3674b6ee5062ac
DIST collectd-5.5.1.tar.bz2 1797852 SHA256
f9c5d526e1f0429a7db1ccd90bdf9e23923a2fd43b7285cfda8f0341e5c0bc3f SHA512
1935809571b8f0e0870399385312a5687f441d11e08a0c7d1337384b3790c3436ba84f89226aad979584045cc13bdf88f1350a0f49c94bcd0dbcf12ae4704dae
WHIRLPOOL
3efeeb9262344a8a1c0aa068e64f5d45ff536d1fc1399b4599143a6e47740d5a33aedf482dbf9110cc5f0345d624fbe71ff00fc6f7afeee891326617f7979e41
diff --git a/app-admin/collectd/collectd-5.4.1-r2.ebuild
b/app-admin/collectd/collectd-5.4.1-r2.ebuild
deleted file mode 100644
index feea5d7..000
--- a/app-admin/collectd/collectd-5.4.1-r2.ebuild
+++ /dev/null
@@ -1,386 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-GENTOO_DEPEND_ON_PERL="no"
-JAVA_PKG_OPT_USE="collectd_plugins_java"
-# XXX: 5.4.1-r0 stated 2* but it builds fine against 3.4
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools base eutils java-pkg-opt-2 linux-info multilib perl-app
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 ~x86"
-IUSE="contrib debug kernel_linux kernel_FreeBSD kernel_Darwin perl selinux
static-libs"
-
-# The plugin lists have to follow here since they extend IUSE
-
-# Plugins that to my knowledge cannot be supported (eg. dependencies not in
gentoo)
-COLLECTD_IMPOSSIBLE_PLUGINS="aquaero mic netapp pinba sigrok xmms"
-
-# Plugins that still need some work
-COLLECTD_UNTESTED_PLUGINS="amqp apple_sensors genericjmx ipvs lpar modbus redis
- tape write_redis zfs_arc"
-
-# Plugins that have been (compile) tested and can be enabled via
COLLECTD_PLUGINS
-COLLECTD_TESTED_PLUGINS="aggregation apache apcups ascent battery bind cgroups
- conntrack contextswitch cpu cpufreq csv curl curl_json curl_xml dbi df
disk dns
- email entropy ethstat exec filecount fscache gmond hddtemp interface
ipmi
- iptables irq java libvirt load logfile lvm madwifi match_empty_counter
- match_hashed match_regex match_timediff match_value mbmon md memcachec
memcached
- memory multimeter mysql netlink network network nfs nginx notify_desktop
- notify_email ntpd numa nut olsrd onewire openvpn oracle perl perl ping
postgresql
- powerdns processes protocols python python routeros rrdcached rrdcached
rrdtool
- sensors serial snmp statsd swap syslog table tail target_notification
- target_replace target_scale target_set tcpconns teamspeak2 ted thermal
threshold
- tokyotyrant unixsock uptime users uuid varnish vmem wireless
- write_graphite write_http write_mongodb"
[gentoo-commits] repo/gentoo:master commit in: app-admin/collectd/files/, app-admin/collectd/
commit: 3b459b6d37f22f9da2c070173756bf12de2591f0
Author: Thomas D whissi de>
AuthorDate: Fri Feb 19 23:11:26 2016 +
Commit: Patrice Clement gentoo org>
CommitDate: Tue Feb 23 10:04:16 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b459b6d
app-admin/collectd: Bumped to v5.5.1
- New upstream version (Closes #570766, #517060)
- Bumped to EAPI=6
- Non-functional mongodb plugin disabled in ebuild (see upstream
issue #492, closes #524400)
- Multiple dependency problems fixed
- linux-info eclass usage fixed (Closes #570778)
- Support for new plugins added (amqp, genericjmx, ipvs, modbus, sigrok,
tail_csv, vserver, write_riemann)
- PYTHON_SINGLE_TARGET support for Python 3.4 and 3.5 enabled
- Documentation improved (USE flag description, elogs)
- Linux capabilities usage expanded to improve running collectd as
unprivileged user (disable via filecaps USE flag)
- Runscript rewritten
- Runscript now supports OpenRC's default status function
- Runscript now guarantees service shutdown
- Validating configuration before (re)starting daemon
app-admin/collectd/Manifest| 1 +
app-admin/collectd/collectd-5.5.1.ebuild | 460 +
.../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 ++
app-admin/collectd/files/collectd.confd-r1 | 46 +++
app-admin/collectd/files/collectd.initd-r1 | 79
app-admin/collectd/metadata.xml| 204 +
8 files changed, 830 insertions(+), 88 deletions(-)
diff --git a/app-admin/collectd/Manifest b/app-admin/collectd/Manifest
index 81e7cd7..c44ebaf 100644
--- a/app-admin/collectd/Manifest
+++ b/app-admin/collectd/Manifest
@@ -1,2 +1,3 @@
DIST collectd-5.4.1.tar.bz2 1521907 SHA256
75452129f271cb0aad28e57f12a49070618bbb7b6a9d64cf869e8766fa2f66e0 SHA512
96289f52d3d1da55c862ae9ee2f57972682d7eab87387e97efa41fb5197599e097abd71aed2fe014e26af37c9ae98471e06dd181c725849976242642ce5c9492
WHIRLPOOL
2ed85b9d6d00c4e7dc6af236b637e282f17c6c0b20c1ba3da9c12ea85c5fdea1add2e29165874c7e9620852e422282d489436a4e245b161902f8926185edec16
DIST collectd-5.5.0.tar.bz2 1824495 SHA256
847684cf5c10de1dc34145078af3fcf6e0d168ba98c14f1343b1062a4b569e88 SHA512
d2c2840f681c10345e02ad8df0f7c581dcb45bee276589fcd96b3dadd281a79ebb3b9a34a186242ef41285dde7fc505432376138ff4f72c4f60f1b840e640017
WHIRLPOOL
6223ca363984ab3777ca89e2cd5011f059b6ca7f5c66c5e7325d3155ce38ef2829caced3ad27e4d5016c5fdba59bb21b9b47d840ea0c4d164c3674b6ee5062ac
+DIST collectd-5.5.1.tar.bz2 1797852 SHA256
f9c5d526e1f0429a7db1ccd90bdf9e23923a2fd43b7285cfda8f0341e5c0bc3f SHA512
1935809571b8f0e0870399385312a5687f441d11e08a0c7d1337384b3790c3436ba84f89226aad979584045cc13bdf88f1350a0f49c94bcd0dbcf12ae4704dae
WHIRLPOOL
3efeeb9262344a8a1c0aa068e64f5d45ff536d1fc1399b4599143a6e47740d5a33aedf482dbf9110cc5f0345d624fbe71ff00fc6f7afeee891326617f7979e41
diff --git a/app-admin/collectd/collectd-5.5.1.ebuild
b/app-admin/collectd/collectd-5.5.1.ebuild
new file mode 100644
index 000..63ded29
--- /dev/null
+++ b/app-admin/collectd/collectd-5.5.1.ebuild
@@ -0,0 +1,460 @@
+# 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 ~x86"
+IUSE="contrib debug java kernel_Darwin kernel_FreeBSD kernel_linux perl
selinux static-libs"
+
+# 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_kafka: Requires librdkafka
+# 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 c
[gentoo-commits] repo/gentoo:master commit in: app-admin/collectd/files/, app-admin/collectd/
commit: 255bbef4ec73371480d70ddcf331e1a1c9db1574
Author: Jason Zaman gentoo org>
AuthorDate: Mon Jan 4 10:03:02 2016 +
Commit: Jason Zaman gentoo org>
CommitDate: Mon Jan 4 10:04:35 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=255bbef4
app-admin/collectd: update patch to unbundle libltdl
Package-Manager: portage-2.2.26
app-admin/collectd/collectd-5.5.0.ebuild | 7 +++--
app-admin/collectd/files/collectd-5.5.0-lt.patch | 35
2 files changed, 39 insertions(+), 3 deletions(-)
diff --git a/app-admin/collectd/collectd-5.5.0.ebuild
b/app-admin/collectd/collectd-5.5.0.ebuild
index 012278f..64af3dd 100644
--- a/app-admin/collectd/collectd-5.5.0.ebuild
+++ b/app-admin/collectd/collectd-5.5.0.ebuild
@@ -126,8 +126,9 @@ REQUIRED_USE="
collectd_plugins_python?( ${PYTHON_REQUIRED_USE} )"
PATCHES=(
- "${FILESDIR}/${PN}-5.4.1"-{libocci,lt}.patch
- "${FILESDIR}/${PN}-4.10.3"-werror.patch
+ "${FILESDIR}/${PN}-5.4.1-libocci.patch"
+ "${FILESDIR}/${PN}-5.5.0-lt.patch"
+ "${FILESDIR}/${PN}-4.10.3-werror.patch"
)
# @FUNCTION: collectd_plugin_kernel_linux
@@ -220,7 +221,7 @@ pkg_setup() {
}
src_prepare() {
- default
+ epatch ${PATCHES[@]}
epatch_user
# There's some strange prefix handling in the default config file,
resulting in
diff --git a/app-admin/collectd/files/collectd-5.5.0-lt.patch
b/app-admin/collectd/files/collectd-5.5.0-lt.patch
new file mode 100644
index 000..b14736b
--- /dev/null
+++ b/app-admin/collectd/files/collectd-5.5.0-lt.patch
@@ -0,0 +1,35 @@
+diff --git Makefile.am Makefile.am
+index 5267123..a7e0d0c 100644
+--- Makefile.am
Makefile.am
+@@ -1,6 +1,4 @@
+-ACLOCAL_AMFLAGS = -I libltdl/m4
+-
+-SUBDIRS = libltdl src bindings .
++SUBDIRS = src bindings .
+
+ INCLUDES = $(LTDLINCL)
+
+--- configure.ac.old 2016-01-04 13:55:39.286846436 +0400
configure.ac 2016-01-04 13:56:07.905362298 +0400
+@@ -2,12 +2,10 @@
+ AC_INIT([collectd],[m4_esyscmd(./version-gen.sh)])
+ AC_CONFIG_SRCDIR(src/)
+ AC_CONFIG_HEADERS(src/config.h)
+-AC_CONFIG_AUX_DIR([libltdl/config])
+
+ m4_ifdef([LT_PACKAGE_VERSION],
+ # libtool >= 2.2
+ [
+- LT_CONFIG_LTDL_DIR([libltdl])
+LT_INIT([dlopen])
+LTDL_INIT([convenience])
+AC_DEFINE(LIBTOOL_VERSION, 2, [Define to used libtool version.])
+@@ -19,7 +17,6 @@
+AC_SUBST(LTDLINCL)
+AC_SUBST(LIBLTDL)
+AC_LIBTOOL_DLOPEN
+- AC_CONFIG_SUBDIRS(libltdl)
+AC_DEFINE(LIBTOOL_VERSION, 1, [Define to used libtool version.])
+ ]
+ )
[gentoo-commits] repo/gentoo:master commit in: app-admin/collectd/files/, app-admin/collectd/
commit: 07c66554e03e557e567120737131cc9dce8560c8
Author: James Le Cuirot gentoo org>
AuthorDate: Thu Sep 3 09:00:14 2015 +
Commit: James Le Cuirot gentoo org>
CommitDate: Thu Sep 3 09:00:14 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07c66554
app-admin/collectd: Remove old
Package-Manager: portage-2.2.20.1
app-admin/collectd/Manifest| 1 -
app-admin/collectd/collectd-5.4.0.ebuild | 374
app-admin/collectd/collectd-5.4.1-r1.ebuild| 379 -
app-admin/collectd/collectd-5.4.1.ebuild | 372
.../collectd/files/collectd-4.10.2-libocci.patch | 20 --
.../collectd/files/collectd-4.10.2-nohal.patch | 23 --
.../collectd/files/collectd-5.1.0-libperl.patch| 30 --
app-admin/collectd/files/collectd-5.1.1-lt.patch | 32 --
8 files changed, 1231 deletions(-)
diff --git a/app-admin/collectd/Manifest b/app-admin/collectd/Manifest
index 6698b99..3bb23b2 100644
--- a/app-admin/collectd/Manifest
+++ b/app-admin/collectd/Manifest
@@ -1,2 +1 @@
-DIST collectd-5.4.0.tar.bz2 1506520 SHA256
90973894a1f10775d409fe23ce7bc4d89c1b7c6f4d9918b305d160605871923e SHA512
10de94d082e6bf2e0a8e2f0b179868c0f25b223c61cb8a5fda641d01f90d6332062459410d54d74a4d666f7149bb429976e9542dabeda988ed6772df9001b222
WHIRLPOOL
19db89217dfaf38fd358a60a64155e01bd68d4c8ca4fad13b97667eb3e4e4d8dbe4e9cae8568e970d8d6fe5e8dde960b06159b3026d1a554fad7a455f973ff0a
DIST collectd-5.4.1.tar.bz2 1521907 SHA256
75452129f271cb0aad28e57f12a49070618bbb7b6a9d64cf869e8766fa2f66e0 SHA512
96289f52d3d1da55c862ae9ee2f57972682d7eab87387e97efa41fb5197599e097abd71aed2fe014e26af37c9ae98471e06dd181c725849976242642ce5c9492
WHIRLPOOL
2ed85b9d6d00c4e7dc6af236b637e282f17c6c0b20c1ba3da9c12ea85c5fdea1add2e29165874c7e9620852e422282d489436a4e245b161902f8926185edec16
diff --git a/app-admin/collectd/collectd-5.4.0.ebuild
b/app-admin/collectd/collectd-5.4.0.ebuild
deleted file mode 100644
index 6e56ffb..000
--- a/app-admin/collectd/collectd-5.4.0.ebuild
+++ /dev/null
@@ -1,374 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-GENTOO_DEPEND_ON_PERL="no"
-
-inherit autotools base eutils linux-info multilib perl-app systemd user
-
-DESCRIPTION="A a daemon which collects system statistic 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 ~x86"
-IUSE="contrib debug kernel_linux kernel_FreeBSD kernel_Darwin perl selinux
static-libs"
-
-# The plugin lists have to follow here since they extend IUSE
-
-# Plugins that to my knowledge cannot be supported (eg. dependencies not in
gentoo)
-COLLECTD_IMPOSSIBLE_PLUGINS="aquaero mic netapp pinba sigrok xmms"
-
-# Plugins that still need some work
-COLLECTD_UNTESTED_PLUGINS="amqp apple_sensors genericjmx ipvs lpar modbus redis
- tape write_redis zfs_arc"
-
-# Plugins that have been (compile) tested and can be enabled via
COLLECTD_PLUGINS
-COLLECTD_TESTED_PLUGINS="aggregation apache apcups ascent battery bind cgroups
- conntrack contextswitch cpu cpufreq csv curl curl_json curl_xml dbi df
disk dns
- email entropy ethstat exec filecount fscache gmond hddtemp interface
ipmi
- iptables irq java libvirt load logfile lvm madwifi match_empty_counter
- match_hashed match_regex match_timediff match_value mbmon md memcachec
memcached
- memory multimeter mysql netlink network network nfs nginx notify_desktop
- notify_email ntpd numa nut olsrd onewire openvpn oracle perl perl ping
postgresql
- powerdns processes protocols python python routeros rrdcached rrdcached
rrdtool
- sensors serial snmp statsd swap syslog table tail target_notification
- target_replace target_scale target_set tcpconns teamspeak2 ted thermal
threshold
- tokyotyrant unixsock uptime users uuid varnish vmem vserver wireless
- write_graphite write_http write_mongodb"
-
-COLLECTD_DISABLED_PLUGINS="${COLLECTD_IMPOSSIBLE_PLUGINS}
${COLLECTD_UNTESTED_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:0
- sys-devel/libtool
- perl? ( dev-lang/perl:=[ithreads] )
- collectd_plugins_apache?( net-misc/curl )
- collectd_plugins_ascent?( net-misc/curl
dev-libs/libxml2 )
- collectd_plugins_bind? ( dev-libs/libxml2 )
- collectd_plugins_curl? ( net-misc/curl )
- collectd_plugins_curl_json? ( net-misc/curl dev-libs/yajl )
- collectd_plugins_curl_xml? ( net-misc/curl
de
