[gentoo-commits] repo/gentoo:master commit in: app-admin/collectd/

2018-04-03 Thread Thomas Deutschmann
commit: 377cfc77671fa62e81d3be56e7b1a686dd2f1ec7
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Apr  4 01:23:23 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Apr  4 01:50:29 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=377cfc77

app-admin/collectd: Move from virtual/mysql to virtual/libmysqlclient

Package-Manager: Portage-2.3.26, Repoman-2.3.7
RepoMan-Options: --force

 .../collectd/{collectd-5.7.2-r2.ebuild => collectd-5.7.2-r3.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/collectd/collectd-5.7.2-r2.ebuild 
b/app-admin/collectd/collectd-5.7.2-r3.ebuild
similarity index 99%
rename from app-admin/collectd/collectd-5.7.2-r2.ebuild
rename to app-admin/collectd/collectd-5.7.2-r3.ebuild
index 9adfa6322e1..090a6bb64c9 100644
--- a/app-admin/collectd/collectd-5.7.2-r2.ebuild
+++ b/app-admin/collectd/collectd-5.7.2-r3.ebuild
@@ -99,7 +99,7 @@ COMMON_DEPEND="
collectd_plugins_memcachec? ( dev-libs/libmemcached )
collectd_plugins_modbus?( dev-libs/libmodbus )
collectd_plugins_mqtt?  ( app-misc/mosquitto )
-   collectd_plugins_mysql? ( >=virtual/mysql-5.0 )
+   collectd_plugins_mysql? ( virtual/libmysqlclient:= )
collectd_plugins_netlink?   ( net-libs/libmnl )
collectd_plugins_nginx? ( net-misc/curl:0= )
collectd_plugins_notify_desktop?( x11-libs/libnotify )



[gentoo-commits] repo/gentoo:master commit in: app-admin/collectd/

2018-03-30 Thread Thomas Deutschmann
commit: a31f6aab2671f7cea5d96ff7ca0410bc82df27f4
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Fri Mar 30 23:26:49 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Fri Mar 30 23:27:22 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a31f6aab

app-admin/collectd: Fix pkg_postinst...

...to support systemd's new rootprefix.

Closes: https://bugs.gentoo.org/596852
Package-Manager: Portage-2.3.26, Repoman-2.3.7
RepoMan-Options: --force

 .../{collectd-5.7.2-r1.ebuild => collectd-5.7.2-r2.ebuild}| 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app-admin/collectd/collectd-5.7.2-r1.ebuild 
b/app-admin/collectd/collectd-5.7.2-r2.ebuild
similarity index 98%
rename from app-admin/collectd/collectd-5.7.2-r1.ebuild
rename to app-admin/collectd/collectd-5.7.2-r2.ebuild
index aa1d4469965..9adfa6322e1 100644
--- a/app-admin/collectd/collectd-5.7.2-r1.ebuild
+++ b/app-admin/collectd/collectd-5.7.2-r2.ebuild
@@ -500,7 +500,7 @@ pkg_postinst() {
elog "  ${caps_str}+EP"
elog
 
-   local 
systemd_unit="${EROOT}usr/lib/systemd/system/collectd.service"
+   local 
systemd_unit="$(systemd_get_systemunitdir)/collectd.service"
if [[ -e "${systemd_unit}" ]]; then
caps_str="${caps[*]}"
sed -i -e 
"s:^CapabilityBoundingSet=.*:CapabilityBoundingSet=${caps_str}:" 
"${systemd_unit}" || \
@@ -509,6 +509,12 @@ pkg_postinst() {
elog "CapabilityBoundingSet in 
'${systemd_unit}'"
elog "updated to match capabilities set above."
elog
+   else
+   if has_version "sys-apps/systemd"; then
+   # Bug 596852
+   ewarn "Failed to update 
CapabilityBondingSet in '${systemd_unit}'"
+   ewarn "because unit was not found. 
Please file a bug about this."
+   fi
fi
fi
fi



[gentoo-commits] repo/gentoo:master commit in: app-admin/collectd/

2018-03-22 Thread Tobias Klausmann
commit: 419506835a0db37cde1e3b4c7638fc8fbf60dce1
Author: Tobias Klausmann  gentoo  org>
AuthorDate: Thu Mar 22 11:56:21 2018 +
Commit: Tobias Klausmann  gentoo  org>
CommitDate: Thu Mar 22 11:56:34 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41950683

app-admin/collectd: Add alpha stable keyword

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 app-admin/collectd/collectd-5.7.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/collectd/collectd-5.7.2-r1.ebuild 
b/app-admin/collectd/collectd-5.7.2-r1.ebuild
index c2cd8a8283e..aa1d4469965 100644
--- a/app-admin/collectd/collectd-5.7.2-r1.ebuild
+++ b/app-admin/collectd/collectd-5.7.2-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="${HOMEPAGE%/}/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm x86"
+KEYWORDS="alpha 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



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

2018-03-03 Thread Thomas Deutschmann
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/

2018-03-03 Thread Thomas Deutschmann
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/

2018-02-05 Thread Markus Meier
commit: 46bc29483ea802f47fbea4792cf978d15085d8ea
Author: Markus Meier  gentoo  org>
AuthorDate: Mon Feb  5 21:18:27 2018 +
Commit: Markus Meier  gentoo  org>
CommitDate: Mon Feb  5 21:18:27 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46bc2948

app-admin/collectd: arm stable, bug #628540

Package-Manager: Portage-2.3.19, Repoman-2.3.6
RepoMan-Options: --include-arches="arm"

 app-admin/collectd/collectd-5.7.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/collectd/collectd-5.7.2-r1.ebuild 
b/app-admin/collectd/collectd-5.7.2-r1.ebuild
index 43537509b26..a040f5e72fc 100644
--- a/app-admin/collectd/collectd-5.7.2-r1.ebuild
+++ b/app-admin/collectd/collectd-5.7.2-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="${HOMEPAGE%/}/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+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



[gentoo-commits] repo/gentoo:master commit in: app-admin/collectd/

2018-01-30 Thread Agostino Sarubbo
commit: 06b84384f23362128edda527f7b9c51f1c3e7626
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Jan 31 07:59:09 2018 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Jan 31 07:59:09 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06b84384

app-admin/collectd: amd64 stable wrt bug #628540

Package-Manager: Portage-2.3.13, Repoman-2.3.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-admin/collectd/collectd-5.7.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/collectd/collectd-5.7.2-r1.ebuild 
b/app-admin/collectd/collectd-5.7.2-r1.ebuild
index 24b2f9f7c0a..43537509b26 100644
--- a/app-admin/collectd/collectd-5.7.2-r1.ebuild
+++ b/app-admin/collectd/collectd-5.7.2-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="${HOMEPAGE%/}/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm x86"
+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



[gentoo-commits] repo/gentoo:master commit in: app-admin/collectd/

2018-01-28 Thread Thomas Deutschmann
commit: eb3b19dc60118b385e9bec8a02b483a0e18c0188
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Jan 28 16:36:32 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun Jan 28 16:36:51 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb3b19dc

app-admin/collectd: x86 stable (bug #628540)

Package-Manager: Portage-2.3.20, Repoman-2.3.6

 app-admin/collectd/collectd-5.7.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/collectd/collectd-5.7.2-r1.ebuild 
b/app-admin/collectd/collectd-5.7.2-r1.ebuild
index 57b4bf62aef..24b2f9f7c0a 100644
--- a/app-admin/collectd/collectd-5.7.2-r1.ebuild
+++ b/app-admin/collectd/collectd-5.7.2-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="${HOMEPAGE%/}/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+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



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

2018-01-25 Thread Thomas Deutschmann
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] )
+   u

[gentoo-commits] repo/gentoo:master commit in: app-admin/collectd/

2017-11-07 Thread Sven Wegener
commit: 1a72ff34671348a4b91ae3b34065bf8ccc3fc6c4
Author: Sven Wegener  gentoo  org>
AuthorDate: Tue Nov  7 21:25:52 2017 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Tue Nov  7 21:36:09 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a72ff34

app-admin/collectd: Add libsigrok sub-slot dependency

Package-Manager: Portage-2.3.8, Repoman-2.3.4

 app-admin/collectd/collectd-5.6.2-r4.ebuild | 2 +-
 app-admin/collectd/collectd-5.7.1.ebuild| 2 +-
 app-admin/collectd/collectd-5.7.2.ebuild| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-admin/collectd/collectd-5.6.2-r4.ebuild 
b/app-admin/collectd/collectd-5.6.2-r4.ebuild
index 58308c78b1d..af56c138d93 100644
--- a/app-admin/collectd/collectd-5.6.2-r4.ebuild
+++ b/app-admin/collectd/collectd-5.6.2-r4.ebuild
@@ -114,7 +114,7 @@ COMMON_DEPEND="
collectd_plugins_rrdcached? ( net-analyzer/rrdtool:= )
collectd_plugins_rrdtool?   ( net-analyzer/rrdtool:= )
collectd_plugins_sensors?   ( sys-apps/lm_sensors )
-   collectd_plugins_sigrok?( 

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

2017-09-30 Thread Thomas Deutschmann
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   0x0

[gentoo-commits] repo/gentoo:master commit in: app-admin/collectd/

2017-09-24 Thread Thomas Deutschmann
commit: 8f31d098229a3c426708f8377b05042f6786bbcc
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Sep 24 15:10:01 2017 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun Sep 24 15:10:01 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f31d098

app-admin/collectd: Add subslot operator on sci-geosciences/gpsd atom

Package-Manager: Portage-2.3.10, Repoman-2.3.3

 app-admin/collectd/collectd-5.6.2-r4.ebuild | 2 +-
 app-admin/collectd/collectd-5.7.1.ebuild| 2 +-
 app-admin/collectd/collectd-5.7.2.ebuild| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-admin/collectd/collectd-5.6.2-r4.ebuild 
b/app-admin/collectd/collectd-5.6.2-r4.ebuild
index 598b6d4c9ea..58308c78b1d 100644
--- a/app-admin/collectd/collectd-5.6.2-r4.ebuild
+++ b/app-admin/collectd/collectd-5.6.2-r4.ebuild
@@ -87,7 +87,7 @@ COMMON_DEPEND="
collectd_plugins_dbi?   ( dev-db/libdbi )
collectd_plugins_dns?   ( net-libs/libpcap )
collectd_plugins_gmond? ( sys-cluster/ganglia )
-   collectd_plugins_gps?   ( sci-geosciences/gpsd )
+   collectd_plugins_gps?   ( sci-geosciences/gpsd:= )
collectd_plugins_ipmi?  ( >=sys-libs/openipmi-2.0.16-r1 
)
collectd_plugins_iptables?  ( 
>=net-firewall/iptables-1.4.13:0= )
collectd_plugins_log_logstash?  ( dev-libs/yajl:= )

diff --git a/app-admin/collectd/collectd-5.7.1.ebuild 
b/app-admin/collectd/collectd-5.7.1.ebuild
index 28d98616e03..8919c74 100644
--- a/app-admin/collectd/collectd-5.7.1.ebuild
+++ b/app-admin/collectd/collectd-5.7.1.ebuild
@@ -90,7 +90,7 @@ COMMON_DEPEND="
collectd_plugins_dbi?   ( dev-db/libdbi )
collectd_plugins_dns?   ( net-libs/libpcap )
collectd_plugins_gmond? ( sys-cluster/ganglia )
-   collectd_plugins_gps?   ( sci-geosciences/gpsd )
+   collectd_plugins_gps?   ( sci-geosciences/gpsd:= )
collectd_plugins_ipmi?  ( >=sys-libs/openipmi-2.0.16-r1 
)
collectd_plugins_iptables?  ( 
>=net-firewall/iptables-1.4.13:0= )
collectd_plugins_log_logstash?  ( dev-libs/yajl:= )

diff --git a/app-admin/collectd/collectd-5.7.2.ebuild 
b/app-admin/collectd/collectd-5.7.2.ebuild
index 95c6b9e022a..f062bc9c363 100644
--- a/app-admin/collectd/collectd-5.7.2.ebuild
+++ b/app-admin/collectd/collectd-5.7.2.ebuild
@@ -90,7 +90,7 @@ COMMON_DEPEND="
collectd_plugins_dbi?   ( dev-db/libdbi )
collectd_plugins_dns?   ( net-libs/libpcap )
collectd_plugins_gmond? ( sys-cluster/ganglia )
-   collectd_plugins_gps?   ( sci-geosciences/gpsd )
+   collectd_plugins_gps?   ( sci-geosciences/gpsd:= )
collectd_plugins_ipmi?  ( >=sys-libs/openipmi-2.0.16-r1 
)
collectd_plugins_iptables?  ( 
>=net-firewall/iptables-1.4.13:0= )
collectd_plugins_log_logstash?  ( dev-libs/yajl:= )



[gentoo-commits] repo/gentoo:master commit in: app-admin/collectd/

2017-08-03 Thread Markus Meier
commit: ec865be772f62099c29ac3579d4966c4608e16d4
Author: Markus Meier  gentoo  org>
AuthorDate: Fri Aug  4 04:29:07 2017 +
Commit: Markus Meier  gentoo  org>
CommitDate: Fri Aug  4 04:29:07 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec865be7

app-admin/collectd: arm stable, bug #601146

Package-Manager: Portage-2.3.6, Repoman-2.3.1
RepoMan-Options: --include-arches="arm"

 app-admin/collectd/collectd-5.6.2-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/collectd/collectd-5.6.2-r4.ebuild 
b/app-admin/collectd/collectd-5.6.2-r4.ebuild
index 42712307792..598b6d4c9ea 100644
--- a/app-admin/collectd/collectd-5.6.2-r4.ebuild
+++ b/app-admin/collectd/collectd-5.6.2-r4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="${HOMEPAGE%/}/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+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



[gentoo-commits] repo/gentoo:master commit in: app-admin/collectd/

2017-06-07 Thread Thomas Deutschmann
commit: da58e22053d35eb3f61b37f6e5ae8fb5c61d9eef
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Jun  7 20:16:19 2017 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Jun  7 20:16:19 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da58e220

app-admin/collectd: Bump to v5.7.2

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 app-admin/collectd/Manifest  |   1 +
 app-admin/collectd/collectd-5.7.2.ebuild | 535 +++
 2 files changed, 536 insertions(+)

diff --git a/app-admin/collectd/Manifest b/app-admin/collectd/Manifest
index 56022bdca32..59486608372 100644
--- a/app-admin/collectd/Manifest
+++ b/app-admin/collectd/Manifest
@@ -1,2 +1,3 @@
 DIST collectd-5.6.2.tar.bz2 1806969 SHA256 
cc0b4118a91e5369409ced22d1d8a85c1a400098419414160c1839268ecad0c6 SHA512 
81438e2e653649cf8a447f475b41844b7adb8ec436b43fb395ba9cf8b09b56a068633fe4b6c802d5cde3909d85a3af2542f5804005b3843f7936a37553911d61
 WHIRLPOOL 
ab3a1d160418cf1a826ae7c3b8999b239d15f2f16d70e1305d185ddc79c307071cfd529214c9406fc9c85435a94775abbf2cdb807a2e2b6da8f666cc0550886a
 DIST collectd-5.7.1.tar.bz2 1797725 SHA256 
7edd3643c0842215553b2421d5456f4e9a8a58b07e216b40a7e8e91026d8e501 SHA512 
f2edf4ecf3bbf5f4e10c797614a7ae39c18678601038574cec4f2ea6a8773444af4592e2872ed75a5afe5f746adaff2449df51443d98d2560a23722e46bef164
 WHIRLPOOL 
fffb1371ec269f7683e160535f973758482a4eb65426748a4ef4c3bbe839608753aa5249d52a6c141e5d6a7042a68a56833be057051d7361b1ffb98c005744ef
+DIST collectd-5.7.2.tar.bz2 1798777 SHA256 
9d20a0221569a8d6b80bbc52b86e5e84965f5bafdbf5dfc3790e0fed0763e592 SHA512 
8844b67159f8da2203b5ac57ef19fce0a01050a016174d196b48b5fb24925ad2935af9bdd9af06097ff663499abc496cdcc2d9e9a10f403f8d707c465c1a88f3
 WHIRLPOOL 
438516cdd4440ff752fa7bd94c5edf4d469248d81ff43089c801fc31ac7983e8e47091fd3e1f2f554ff1d5e4bb11201ac03ba1f76d92123676c677626f68ffad

diff --git a/app-admin/collectd/collectd-5.7.2.ebuild 
b/app-admin/collectd/collectd-5.7.2.ebuild
new file mode 100644
index 000..95c6b9e022a
--- /dev/null
+++ b/app-admin/collectd/collectd-5.7.2.ebuild
@@ -0,0 +1,535 @@
+# 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)
+# 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
+

[gentoo-commits] repo/gentoo:master commit in: app-admin/collectd/, profiles/desc/

2017-06-05 Thread Thomas Deutschmann
commit: 5ddaf02c5ef88e471f914993365a177c9688c1a4
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Mon Jun  5 23:27:53 2017 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon Jun  5 23:30:00 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ddaf02c

app-admin/collectd: Bump to v5.7.1

New plugins:
 - hugepages
 - write_prometheus

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 app-admin/collectd/Manifest  |   1 +
 app-admin/collectd/collectd-5.7.1.ebuild | 537 +++
 profiles/desc/collectd_plugins.desc  |   2 +
 3 files changed, 540 insertions(+)

diff --git a/app-admin/collectd/Manifest b/app-admin/collectd/Manifest
index 9a8a53363ca..56022bdca32 100644
--- a/app-admin/collectd/Manifest
+++ b/app-admin/collectd/Manifest
@@ -1 +1,2 @@
 DIST collectd-5.6.2.tar.bz2 1806969 SHA256 
cc0b4118a91e5369409ced22d1d8a85c1a400098419414160c1839268ecad0c6 SHA512 
81438e2e653649cf8a447f475b41844b7adb8ec436b43fb395ba9cf8b09b56a068633fe4b6c802d5cde3909d85a3af2542f5804005b3843f7936a37553911d61
 WHIRLPOOL 
ab3a1d160418cf1a826ae7c3b8999b239d15f2f16d70e1305d185ddc79c307071cfd529214c9406fc9c85435a94775abbf2cdb807a2e2b6da8f666cc0550886a
+DIST collectd-5.7.1.tar.bz2 1797725 SHA256 
7edd3643c0842215553b2421d5456f4e9a8a58b07e216b40a7e8e91026d8e501 SHA512 
f2edf4ecf3bbf5f4e10c797614a7ae39c18678601038574cec4f2ea6a8773444af4592e2872ed75a5afe5f746adaff2449df51443d98d2560a23722e46bef164
 WHIRLPOOL 
fffb1371ec269f7683e160535f973758482a4eb65426748a4ef4c3bbe839608753aa5249d52a6c141e5d6a7042a68a56833be057051d7361b1ffb98c005744ef

diff --git a/app-admin/collectd/collectd-5.7.1.ebuild 
b/app-admin/collectd/collectd-5.7.1.ebuild
new file mode 100644
index 000..28d98616e03
--- /dev/null
+++ b/app-admin/collectd/collectd-5.7.1.ebuild
@@ -0,0 +1,537 @@
+# 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)
+# 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
+   xenc

[gentoo-commits] repo/gentoo:master commit in: app-admin/collectd/

2017-06-05 Thread Thomas Deutschmann
commit: 9e5001df158205edbdcb5059d7e811f3dc03e2df
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Mon Jun  5 21:51:48 2017 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon Jun  5 21:54:28 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e5001df

app-admin/collectd: x86 stable wrt bug #601146

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 app-admin/collectd/collectd-5.6.2-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/collectd/collectd-5.6.2-r4.ebuild 
b/app-admin/collectd/collectd-5.6.2-r4.ebuild
index 08fcec3a65a..15992819e43 100644
--- a/app-admin/collectd/collectd-5.6.2-r4.ebuild
+++ b/app-admin/collectd/collectd-5.6.2-r4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="${HOMEPAGE%/}/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+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



[gentoo-commits] repo/gentoo:master commit in: app-admin/collectd/

2017-06-05 Thread Thomas Deutschmann
commit: 1896babcf77bcb82dbd2ccc3922bc964fb560b04
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Mon Jun  5 21:54:12 2017 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon Jun  5 21:54:31 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1896babc

app-admin/collectd: Cleanup old

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 app-admin/collectd/collectd-5.6.2-r2.ebuild | 531 
 1 file changed, 531 deletions(-)

diff --git a/app-admin/collectd/collectd-5.6.2-r2.ebuild 
b/app-admin/collectd/collectd-5.6.2-r2.ebuild
deleted file mode 100644
index 86d127d423f..000
--- a/app-admin/collectd/collectd-5.6.2-r2.ebuild
+++ /dev/null
@@ -1,531 +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} )
-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_xml?  ( net-misc/curl:0= 
dev-libs/libxml2:2= )
-   collectd_plugins_dbi? 

[gentoo-commits] repo/gentoo:master commit in: app-admin/collectd/

2017-06-05 Thread Thomas Deutschmann
commit: 8d234919bd5ae3b2de99032df784a7eb1d6dfd25
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Mon Jun  5 21:52:22 2017 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon Jun  5 21:54:30 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d234919

app-admin/collectd: amd64 stable wrt bug #601146

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 app-admin/collectd/collectd-5.6.2-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/collectd/collectd-5.6.2-r4.ebuild 
b/app-admin/collectd/collectd-5.6.2-r4.ebuild
index 15992819e43..42712307792 100644
--- a/app-admin/collectd/collectd-5.6.2-r4.ebuild
+++ b/app-admin/collectd/collectd-5.6.2-r4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="${HOMEPAGE%/}/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm x86"
+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



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

2017-06-01 Thread Thomas Deutschmann
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, &value.gauge);
+   else
+ status = bind_xml_read_derive(doc, counter, &value.derive);
+-  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, &value.gauge);
+   else
+ status = bind_xml_read_derive(doc, child, &value.derive);
+-  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/

2017-05-09 Thread Thomas Deutschmann
commit: 05af73379050733e8954653d02145b5c7abfe38b
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Tue May  9 13:37:44 2017 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Tue May  9 13:38:12 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05af7337

app-admin/collectd: Rev bump to add Python 3.6 support and to address bug 
#577846

Ebuild changes:
===
  - Added support for Python 3.6

  - The problem with linux-headers-4.5 are resolved in newer versions.
Therefore depedencies were adjusted (bug #577846).

Gentoo-Bug: https://bugs.gentoo.org/577846
Package-Manager: Portage-2.3.5, Repoman-2.3.2

 app-admin/collectd/collectd-5.6.2-r3.ebuild | 531 
 1 file changed, 531 insertions(+)

diff --git a/app-admin/collectd/collectd-5.6.2-r3.ebuild 
b/app-admin/collectd/collectd-5.6.2-r3.ebuild
new file mode 100644
index 000..950afe301fc
--- /dev/null
+++ b/app-admin/collectd/collectd-5.6.2-r3.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,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 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:= )
+

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

2017-04-06 Thread Thomas Deutschmann
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
-   n

[gentoo-commits] repo/gentoo:master commit in: app-admin/collectd/

2017-04-06 Thread Thomas Deutschmann
commit: e3c62ade04937c479cadc21cdc20878b71ad05b3
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Thu Apr  6 15:44:46 2017 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Thu Apr  6 15:44:46 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3c62ade

app-admin/collectd: stable on amd64 and x86

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 app-admin/collectd/collectd-5.6.2-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/collectd/collectd-5.6.2-r2.ebuild 
b/app-admin/collectd/collectd-5.6.2-r2.ebuild
index 885fbf1a446..86d127d423f 100644
--- a/app-admin/collectd/collectd-5.6.2-r2.ebuild
+++ b/app-admin/collectd/collectd-5.6.2-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="${HOMEPAGE%/}/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+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



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

2017-04-06 Thread Thomas Deutschmann
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/

2017-04-01 Thread Agostino Sarubbo
commit: fcb4d3431cc364300d11743a2a959408b3ffea46
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sat Apr  1 16:05:10 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sat Apr  1 16:05:10 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fcb4d343

app-admin/collectd: x86 stable wrt bug #601146

Package-Manager: Portage-2.3.3, Repoman-2.3.1
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-admin/collectd/collectd-5.6.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/collectd/collectd-5.6.2-r1.ebuild 
b/app-admin/collectd/collectd-5.6.2-r1.ebuild
index f9c49551772..b082b363fb2 100644
--- a/app-admin/collectd/collectd-5.6.2-r1.ebuild
+++ b/app-admin/collectd/collectd-5.6.2-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="${HOMEPAGE%/}/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+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



[gentoo-commits] repo/gentoo:master commit in: app-admin/collectd/

2017-03-20 Thread Agostino Sarubbo
commit: 1e484e4f7d717819b3324f1429ae2dbdbef5
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Mar 20 16:45:10 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Mar 20 16:45:31 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e484e4f

app-admin/collectd: amd64 stable wrt bug #601146

Package-Manager: Portage-2.3.3, Repoman-2.3.1
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-admin/collectd/collectd-5.6.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/collectd/collectd-5.6.2-r1.ebuild 
b/app-admin/collectd/collectd-5.6.2-r1.ebuild
index 69e3d41d7be..f9c49551772 100644
--- a/app-admin/collectd/collectd-5.6.2-r1.ebuild
+++ b/app-admin/collectd/collectd-5.6.2-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="${HOMEPAGE%/}/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+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



[gentoo-commits] repo/gentoo:master commit in: app-admin/collectd/

2017-03-19 Thread Thomas Deutschmann
commit: 179965f9f272332d4aebd8193a112a51004a10bc
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Mar 19 21:12:12 2017 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun Mar 19 21:12:12 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=179965f9

app-admin/collectd: Add required capabilities for smart plugin (bug #612822)

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 app-admin/collectd/collectd-5.6.2-r1.ebuild | 530 
 1 file changed, 530 insertions(+)

diff --git a/app-admin/collectd/collectd-5.6.2-r1.ebuild 
b/app-admin/collectd/collectd-5.6.2-r1.ebuild
new file mode 100644
index 000..69e3d41d7be
--- /dev/null
+++ b/app-admin/collectd/collectd-5.6.2-r1.ebuild
@@ -0,0 +1,530 @@
+# 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_xml?  ( net-misc/curl:0= 
dev-libs/libxml2:2= )
+ 

[gentoo-commits] repo/gentoo:master commit in: app-admin/collectd/

2017-01-29 Thread Thomas Deutschmann
commit: e13449ed7ee3dc75312d3ed44c7d507a68312a0c
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Jan 29 14:11:51 2017 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun Jan 29 14:11:51 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e13449ed

app-admin/collectd: Block too old sys-apps/openrc version (bug #607476)

collctd runscript makes use of required_files which had a bug in previous
OpenRC versions (bug #562320). Because we still have affected stable
OpenRC versions in repository we need to block those versions to enforce
an OpenRC update on these systems.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 app-admin/collectd/collectd-5.5.2.ebuild| 5 +++--
 app-admin/collectd/collectd-5.6.1-r1.ebuild | 5 +++--
 app-admin/collectd/collectd-5.6.2.ebuild| 5 +++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/app-admin/collectd/collectd-5.5.2.ebuild 
b/app-admin/collectd/collectd-5.5.2.ebuild
index a20f83a..f911561 100644
--- a/app-admin/collectd/collectd-5.5.2.ebuild
+++ b/app-admin/collectd/collectd-5.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -133,7 +133,8 @@ RDEPEND="${COMMON_DEPEND}
collectd_plugins_genericjmx?( >=virtual/jre-1.6 )
collectd_plugins_java?  ( >=virtual/jre-1.6 )
collectd_plugins_syslog?( virtual/logger )
-   selinux?( sec-policy/selinux-collectd )"
+   selinux?( sec-policy/selinux-collectd )
+   !

[gentoo-commits] repo/gentoo:master commit in: app-admin/collectd/

2016-12-08 Thread Thomas Deutschmann
commit: a10385c92a813d89cfa305e2f38c84e8600c01ed
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Thu Dec  8 16:48:24 2016 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Thu Dec  8 16:48:54 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a10385c9

app-admin/collectd: Add sub slot operator on app-emulation/xen-tools atom

Package-Manager: portage-2.3.2

 app-admin/collectd/collectd-5.6.1-r1.ebuild | 2 +-
 app-admin/collectd/collectd-5.6.2.ebuild| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-admin/collectd/collectd-5.6.1-r1.ebuild 
b/app-admin/collectd/collectd-5.6.1-r1.ebuild
index d4d794e..957c9a0 100644
--- a/app-admin/collectd/collectd-5.6.1-r1.ebuild
+++ b/app-admin/collectd/collectd-5.6.1-r1.ebuild
@@ -124,7 +124,7 @@ COMMON_DEPEND="
collectd_plugins_write_http?( net-misc/curl:0= 
dev-libs/yajl:= )
collectd_plugins_write_kafka?   ( 
>=dev-libs/librdkafka-0.9.0.99:= dev-libs/yajl:= )
collectd_plugins_write_redis?   ( dev-libs/hiredis:= )
-   collectd_plugins_xencpu?( app-emulation/xen-tools )
+   collectd_plugins_xencpu?( app-emulation/xen-tools:= )
 
kernel_FreeBSD? (
collectd_plugins_disk?  ( sys-libs/libstatgrab:= )

diff --git a/app-admin/collectd/collectd-5.6.2.ebuild 
b/app-admin/collectd/collectd-5.6.2.ebuild
index 859cea3..d90c756 100644
--- a/app-admin/collectd/collectd-5.6.2.ebuild
+++ b/app-admin/collectd/collectd-5.6.2.ebuild
@@ -124,7 +124,7 @@ COMMON_DEPEND="
collectd_plugins_write_http?( net-misc/curl:0= 
dev-libs/yajl:= )
collectd_plugins_write_kafka?   ( 
>=dev-libs/librdkafka-0.9.0.99:= dev-libs/yajl:= )
collectd_plugins_write_redis?   ( dev-libs/hiredis:= )
-   collectd_plugins_xencpu?( app-emulation/xen-tools )
+   collectd_plugins_xencpu?( app-emulation/xen-tools:= )
 
kernel_FreeBSD? (
collectd_plugins_disk?  ( sys-libs/libstatgrab:= )



[gentoo-commits] repo/gentoo:master commit in: app-admin/collectd/

2016-11-30 Thread Thomas Deutschmann
commit: f218b008230c9ffab2eedd109a30c46fcf0356de
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Nov 30 15:16:58 2016 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Nov 30 15:17:25 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f218b008

app-admin/collectd: Bump to v5.6.2

Package-Manager: portage-2.3.2

 app-admin/collectd/Manifest  |   1 +
 app-admin/collectd/collectd-5.6.2.ebuild | 518 +++
 2 files changed, 519 insertions(+)

diff --git a/app-admin/collectd/Manifest b/app-admin/collectd/Manifest
index ad706b1..9dd5ed0 100644
--- a/app-admin/collectd/Manifest
+++ b/app-admin/collectd/Manifest
@@ -1,2 +1,3 @@
 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.6.2.ebuild 
b/app-admin/collectd/collectd-5.6.2.ebuild
new file mode 100644
index ..859cea3
--- /dev/null
+++ b/app-admin/collectd/collectd-5.6.2.ebuild
@@ -0,0 +1,518 @@
+# 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 target_scale target_set tcpconns
+   teamspeak2 ted thermal threshold tokyotyrant turbostat unixsock
+   uptime users uuid varnish

[gentoo-commits] repo/gentoo:master commit in: app-admin/collectd/

2016-11-03 Thread Göktürk Yüksek
commit: 00c1064d51791213806edf7168e44bcbb36ca1e6
Author: Göktürk Yüksek  gentoo  org>
AuthorDate: Thu Nov  3 16:09:12 2016 +
Commit: Göktürk Yüksek  gentoo  org>
CommitDate: Thu Nov  3 16:16:57 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00c1064d

app-admin/collectd: remove proxied maintainer per his request

Package-Manager: portage-2.2.28

 app-admin/collectd/metadata.xml | 6 --
 1 file changed, 6 deletions(-)

diff --git a/app-admin/collectd/metadata.xml b/app-admin/collectd/metadata.xml
index 565ba3c..5f02742 100644
--- a/app-admin/collectd/metadata.xml
+++ b/app-admin/collectd/metadata.xml
@@ -4,12 +4,6 @@

whi...@gentoo.org
Thomas Deutschmann
-   Primary maintainer
-   
-   
-   b...@bergstroem.nu
-   Johan Bergström
-   Proxy maintainer; CC him on bugs


Collectd gathers statistics about the system it is running on 
and stores this



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

2016-10-13 Thread Thomas Deutschmann
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/

2016-10-11 Thread Thomas Deutschmann
commit: 22fb31f2d88999b598f2446b05afec3620babaee
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Tue Oct 11 10:31:01 2016 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Tue Oct 11 10:31:01 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22fb31f2

app-admin/collectd: Update file capabilities

Add missing capabilities for ceph, dns, exec and turbostat plugin when
"filecaps" USE flag is used.

Package-Manager: portage-2.3.1

 app-admin/collectd/collectd-5.5.2.ebuild | 8 +++-
 app-admin/collectd/collectd-5.6.0.ebuild | 8 +++-
 app-admin/collectd/collectd-5.6.1.ebuild | 8 +++-
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/app-admin/collectd/collectd-5.5.2.ebuild 
b/app-admin/collectd/collectd-5.5.2.ebuild
index cfb74e9..a20f83a 100644
--- a/app-admin/collectd/collectd-5.5.2.ebuild
+++ b/app-admin/collectd/collectd-5.5.2.ebuild
@@ -447,9 +447,15 @@ src_install() {
 
 pkg_postinst() {
local caps=()
-   use collectd_plugins_ping  && caps+=('cap_net_raw')
+   use collectd_plugins_ceph  && caps+=('cap_dac_override')
+   use collectd_plugins_exec  && caps+=('cap_setuid' 'cap_setgid')
use collectd_plugins_iptables  && caps+=('cap_net_admin')
use collectd_plugins_filecount && caps+=('cap_dac_read_search')
+   use collectd_plugins_turbostat && caps+=('cap_sys_rawio')
+
+   if use collectd_plugins_dns || use collectd_plugins_ping; then
+   caps+=('cap_net_raw')
+   fi
 
if [ ${#caps[@]} -gt 0 ]; then
local caps_str=$(IFS=","; echo "${caps[*]}")

diff --git a/app-admin/collectd/collectd-5.6.0.ebuild 
b/app-admin/collectd/collectd-5.6.0.ebuild
index 8bd0762..9233874 100644
--- a/app-admin/collectd/collectd-5.6.0.ebuild
+++ b/app-admin/collectd/collectd-5.6.0.ebuild
@@ -461,9 +461,15 @@ src_install() {
 
 pkg_postinst() {
local caps=()
-   use collectd_plugins_ping  && caps+=('cap_net_raw')
+   use collectd_plugins_ceph  && caps+=('cap_dac_override')
+   use collectd_plugins_exec  && caps+=('cap_setuid' 'cap_setgid')
use collectd_plugins_iptables  && caps+=('cap_net_admin')
use collectd_plugins_filecount && caps+=('cap_dac_read_search')
+   use collectd_plugins_turbostat && caps+=('cap_sys_rawio')
+
+   if use collectd_plugins_dns || use collectd_plugins_ping; then
+   caps+=('cap_net_raw')
+   fi
 
if [ ${#caps[@]} -gt 0 ]; then
local caps_str=$(IFS=","; echo "${caps[*]}")

diff --git a/app-admin/collectd/collectd-5.6.1.ebuild 
b/app-admin/collectd/collectd-5.6.1.ebuild
index 29cb16f..fc4601c 100644
--- a/app-admin/collectd/collectd-5.6.1.ebuild
+++ b/app-admin/collectd/collectd-5.6.1.ebuild
@@ -459,9 +459,15 @@ src_install() {
 
 pkg_postinst() {
local caps=()
-   use collectd_plugins_ping  && caps+=('cap_net_raw')
+   use collectd_plugins_ceph  && caps+=('cap_dac_override')
+   use collectd_plugins_exec  && caps+=('cap_setuid' 'cap_setgid')
use collectd_plugins_iptables  && caps+=('cap_net_admin')
use collectd_plugins_filecount && caps+=('cap_dac_read_search')
+   use collectd_plugins_turbostat && caps+=('cap_sys_rawio')
+
+   if use collectd_plugins_dns || use collectd_plugins_ping; then
+   caps+=('cap_net_raw')
+   fi
 
if [ ${#caps[@]} -gt 0 ]; then
local caps_str=$(IFS=","; echo "${caps[*]}")



[gentoo-commits] repo/gentoo:master commit in: app-admin/collectd/

2016-10-07 Thread Thomas Deutschmann
commit: a888bf0135c2b6b318fbe3ac91bf3fff0a215b37
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Fri Oct  7 15:16:55 2016 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Fri Oct  7 15:17:15 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a888bf01

app-admin/collectd: Bump to v5.6.1

Package-Manager: portage-2.3.1

 app-admin/collectd/Manifest  |   1 +
 app-admin/collectd/collectd-5.6.1.ebuild | 491 +++
 2 files changed, 492 insertions(+)

diff --git a/app-admin/collectd/Manifest b/app-admin/collectd/Manifest
index 31a5a53..2485930 100644
--- a/app-admin/collectd/Manifest
+++ b/app-admin/collectd/Manifest
@@ -1,2 +1,3 @@
 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.1.ebuild 
b/app-admin/collectd/collectd-5.6.1.ebuild
new file mode 100644
index ..29cb16f
--- /dev/null
+++ b/app-admin/collectd/collectd-5.6.1.ebuild
@@ -0,0 +1,491 @@
+# 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 target_scale target_set tcpconns
+   teamspeak2 ted thermal threshold tokyotyrant turbostat unixsock
+   uptime users uuid varnish v

[gentoo-commits] repo/gentoo:master commit in: app-admin/collectd/, profiles/desc/

2016-09-25 Thread Thomas Deutschmann
commit: 91273049a72fe478a8207be6cfda8e1638ab95aa
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Sep 25 22:31:50 2016 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun Sep 25 22:34:34 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91273049

app-admin/collectd: Move collectd_plugins_* flags from metadata.xml to 
collectd_plugins.desc

Gentoo-Bug: https://bugs.gentoo.org/588250

Package-Manager: portage-2.3.1

 app-admin/collectd/metadata.xml | 130 --
 profiles/desc/collectd_plugins.desc | 137 
 2 files changed, 137 insertions(+), 130 deletions(-)

diff --git a/app-admin/collectd/metadata.xml b/app-admin/collectd/metadata.xml
index 250736f..565ba3c 100644
--- a/app-admin/collectd/metadata.xml
+++ b/app-admin/collectd/metadata.xml
@@ -24,136 +24,6 @@
collectd/collectd


-   Build the aggregation 
plugin (aggregates multiplte values into a single value)
-   Build the AMQP output plugin 
(transmits or receives values collected by collectd via the Advanced Message 
Queuing Protocol (AMQP))
-   Build the apache input 
plugin (collects statistics from Apache's mod_status module)
-   Build the apcups input 
plugin (reads various statistics about a connected uninterruptible power supply 
(UPS))
-   Build the ascent input 
plugin (reads and parses the statistics page of Ascent)
-   Build the battery input 
plugin (collects the battery's charge, the drawn current and the battery's 
voltage)
-   Build the bind input plugin 
(collects statistics from bind instances)
-   Build the Ceph input plugin 
(collects statistics from the Ceph distributed storage system)
-   Build the cgroups input 
plugin (collects CPU accounting information for processes in a cgroup)
-   Build the chrony input 
plugin (collects statistics from a chrony NTP server)
-   Build the conntrack 
input plugin (tracks the number of entries in Linux's connection tracking 
table)
-   Build the 
contextswitch input plugin (collects the number of context switches done by the 
operating system)
-   Build the cpu input plugin 
(collects the amount of time spent by the CPU in various states)
-   Build the cpufreq input 
plugin (collects the current CPU's frequency)
-   Build the cpusleep input 
plugin (measures time spent by CPU in deep sleep mode)
-   Build the csv output plugin 
(writes to comma separated values (CSV) files)
-   Build the curl input plugin 
(reads streams using net-misc/curl and then parses them according to 
the configuration)
-   Build the curl_json 
input plugin (queries JavaScript Object Notation (JSON) data using 
net-misc/curl and parses it according to the user's configuration 
using dev-libs/yajl)
-   Build the curl_xml input 
plugin (reads files using net-misc/curl and parses it as Extensible 
Markup Language (XML))
-   Build the dbi input plugin 
(executes SQL statements on databases and reads back the result)
-   Build the df input plugin 
(collects file system usage information, i. e. basically how much space on a 
mounted partition is used and how much is available)
-   Build the disk input plugin 
(collects performance statistics of disks and, where supported, 
partitions)
-   Build the dns input plugin 
(collects statistics of your DNS traffic on port udp/53 using 
net-libs/libpcap)
-   Build the Linux's 
Distributed Replicated Block Device (DRBD) input plugin (reads Linux's DRBD 
statistics)
-   Build the email input 
plugin (opens a UNIX domain socket and starts accepting connections on that 
socket)
-   Build the entropy input 
plugin (collects the available entropy on a system)
-   Build the ethstat input 
plugin (reads performance statistics directly from ethernet cards)
-   Build the exec input/output 
plugin (executes scripts / applications and reads values back)
-   Build the file handles 
input plugin (reports the number of used file handles)
-   Build the filecount 
input plugin (counts the number of files in a directory and all its 
subdirectories)
-   Build the fscache input 
plugin (collects information about the file-system based caching infrastructure 
for network file-systems and other slow media)
-   Build the GenericJMX 
input plugin (reads Managed Beans (MBeans) from an MBeanServer using JMX input 
plugin; Requires JAVA)
-   Build the gmond input 
plugin (receives data from gmond, the client daemon of the Ganglia 
project)
-   Build the gps input plugin 
(collects number of satellites seen by a GPS receiver using 
sci-geosciences/gpsd)
-

[gentoo-commits] repo/gentoo:master commit in: app-admin/collectd/

2016-09-21 Thread Thomas Deutschmann
commit: a7eab628e51515fc91489b4084813714704d2bdf
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Thu Sep 22 00:09:44 2016 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Thu Sep 22 00:09:44 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7eab628

app-admin/collectd: Fix systemd unit name

Package-Manager: portage-2.3.1

 app-admin/collectd/collectd-5.6.0.ebuild | 8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/app-admin/collectd/collectd-5.6.0.ebuild 
b/app-admin/collectd/collectd-5.6.0.ebuild
index e64baa9..8bd0762 100644
--- a/app-admin/collectd/collectd-5.6.0.ebuild
+++ b/app-admin/collectd/collectd-5.6.0.ebuild
@@ -280,12 +280,10 @@ src_prepare() {
 
# There's some strange prefix handling in the default config file, 
resulting in
# paths like "/usr/var/..."
-   #sed -i -e "s:@prefix@/var:/var:g" src/collectd.conf.in || die
-
-   #sed -i -e "s:/etc/collectd/collectd.conf:/etc/collectd.conf:g" 
contrib/collectd.service || die
+   sed -i -e "s:@prefix@/var:/var:g" src/collectd.conf.in || die
 
# fix installdirs for perl, bug 444360
-   #sed -i -e 's/INSTALL_BASE=$(DESTDIR)$(prefix) //' bindings/Makefile.am 
|| die
+   sed -i -e 's/INSTALL_BASE=$(DESTDIR)$(prefix) //' bindings/Makefile.am 
|| die
 
if use collectd_plugins_java; then
# Set javac -source and -target flags according to (R)DEPEND.
@@ -450,7 +448,7 @@ src_install() {
 
newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
-   systemd_dounit "contrib/systemd.${PN}.service"
+   systemd_newunit "contrib/systemd.${PN}.service" ${PN}.service
 
insinto /etc/logrotate.d
newins "${FILESDIR}/${PN}.logrotate" ${PN}



[gentoo-commits] repo/gentoo:master commit in: app-admin/collectd/files/, app-admin/collectd/, profiles/arch/amd64/, ...

2016-09-21 Thread Thomas Deutschmann
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/

2016-08-11 Thread Thomas Deutschmann
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/, app-admin/collectd/files/

2016-08-11 Thread Thomas Deutschmann
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?   ( dev-lang/perl:=[ith

[gentoo-commits] repo/gentoo:master commit in: app-admin/collectd/

2016-08-10 Thread Thomas Deutschmann
commit: f2526ec53782f0048e861bae4af6a52332733246
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Aug 10 22:39:47 2016 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Aug 10 22:39:47 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2526ec5

app-admin/collectd: Adjust depedency on sci-libs/libsigrok

Requiring https://github.com/collectd/collectd/issues/1574

Package-Manager: portage-2.3.0

 app-admin/collectd/collectd-5.5.1-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/collectd/collectd-5.5.1-r4.ebuild 
b/app-admin/collectd/collectd-5.5.1-r4.ebuild
index 6f4e52a..630d169 100644
--- a/app-admin/collectd/collectd-5.5.1-r4.ebuild
+++ b/app-admin/collectd/collectd-5.5.1-r4.ebuild
@@ -101,7 +101,7 @@ COMMON_DEPEND="
collectd_plugins_rrdcached? ( net-analyzer/rrdtool:= )
collectd_plugins_rrdtool?   ( net-analyzer/rrdtool:= )
collectd_plugins_sensors?   ( sys-apps/lm_sensors )
-   collectd_plugins_sigrok?( sci-libs/libsigrok )
+   collectd_plugins_sigrok?( 

[gentoo-commits] repo/gentoo:master commit in: app-admin/collectd/

2016-08-10 Thread Thomas Deutschmann
commit: efed12795891953150baa99aedca410953b304d6
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Aug 10 20:09:42 2016 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Aug 10 20:44:26 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efed1279

app-admin/collectd: Removing proxy-maintainer

Now that I am a Gentoo developer this package is no longer maintained
through proxy-maintainer project.

Package-Manager: portage-2.3.0

 app-admin/collectd/metadata.xml | 4 
 1 file changed, 4 deletions(-)

diff --git a/app-admin/collectd/metadata.xml b/app-admin/collectd/metadata.xml
index e611f79..95f0467 100644
--- a/app-admin/collectd/metadata.xml
+++ b/app-admin/collectd/metadata.xml
@@ -11,10 +11,6 @@
Johan Bergström
Proxy maintainer; CC him on bugs

-   
-   proxy-ma...@gentoo.org
-   Proxy Maintainers Project
-   

Collectd gathers statistics about the system it is running on 
and stores this
information. Those statistics can then be used to find current 
performance



[gentoo-commits] repo/gentoo:master commit in: app-admin/collectd/

2016-08-10 Thread Thomas Deutschmann
commit: f61b4ec7ae3ffa023d48b49d79026275cc25d0c5
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Aug 10 20:08:16 2016 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Aug 10 20:44:24 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f61b4ec7

app-admin/collectd: Updating maintainer details

Updating my own maintainer details to reflect that I am now a Gentoo
developer.

Gentoo-Bug: 581174

Package-Manager: portage-2.3.0

 app-admin/collectd/metadata.xml | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app-admin/collectd/metadata.xml b/app-admin/collectd/metadata.xml
index 359cb79..e611f79 100644
--- a/app-admin/collectd/metadata.xml
+++ b/app-admin/collectd/metadata.xml
@@ -2,14 +2,14 @@
 http://www.gentoo.org/dtd/metadata.dtd";>
 

-   b...@bergstroem.nu
-   Johan Bergström
-   Primary proxied maintainer; set to assignee in all 
bugs
+   whi...@gentoo.org
+   Thomas Deutschmann
+   Primary maintainer


-   whi...@whissi.de
-   Thomas D.
-   Proxied co-maintainer
+   b...@bergstroem.nu
+   Johan Bergström
+   Proxy maintainer; CC him on bugs


proxy-ma...@gentoo.org



[gentoo-commits] repo/gentoo:master commit in: app-admin/collectd/

2016-06-11 Thread Mikle Kolyada
commit: 1d49cb91c8193f602dce40ddc5ab265952848cad
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sat Jun 11 23:38:23 2016 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sat Jun 11 23:38:23 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d49cb91

app-admin/collectd: Add ~arm keyword

Package-Manager: portage-2.2.28

 app-admin/collectd/collectd-5.5.1-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/collectd/collectd-5.5.1-r4.ebuild 
b/app-admin/collectd/collectd-5.5.1-r4.ebuild
index ea01927..6f4e52a 100644
--- a/app-admin/collectd/collectd-5.5.1-r4.ebuild
+++ b/app-admin/collectd/collectd-5.5.1-r4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="${HOMEPAGE}/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+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



[gentoo-commits] repo/gentoo:master commit in: app-admin/collectd/

2016-04-26 Thread Patrice Clement
commit: 094aa2d3b0bff3094fe9489b771217840bc3ca55
Author: Thomas D  whissi  de>
AuthorDate: Mon Apr 25 16:48:39 2016 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Tue Apr 26 07:10:30 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=094aa2d3

app-admin/collectd: Multiple sub slot operators (deps) set

Package-Manager: portage-2.2.28
Closes: https://github.com/gentoo/gentoo/pull/1349

Signed-off-by: Patrice Clement  gentoo.org>

 ...td-5.5.1-r3.ebuild => collectd-5.5.1-r4.ebuild} | 32 +++---
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/app-admin/collectd/collectd-5.5.1-r3.ebuild 
b/app-admin/collectd/collectd-5.5.1-r4.ebuild
similarity index 94%
rename from app-admin/collectd/collectd-5.5.1-r3.ebuild
rename to app-admin/collectd/collectd-5.5.1-r4.ebuild
index 81bf0c2..ea01927 100644
--- a/app-admin/collectd/collectd-5.5.1-r3.ebuild
+++ b/app-admin/collectd/collectd-5.5.1-r4.ebuild
@@ -67,30 +67,30 @@ COMMON_DEPEND="
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 )
-   collectd_plugins_bind?  ( dev-libs/libxml2:= )
-   collectd_plugins_ceph?  ( dev-libs/yajl )
-   collectd_plugins_curl?  ( net-misc/curl )
-   collectd_plugins_curl_json? ( net-misc/curl dev-libs/yajl )
-   collectd_plugins_curl_xml?  ( net-misc/curl 
dev-libs/libxml2:= )
+   collectd_plugins_apache?( net-misc/curl:0= )
+   collectd_plugins_ascent?( net-misc/curl:0= 
dev-libs/libxml2:2= )
+   collectd_plugins_bind?  ( 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_xml?  ( net-misc/curl:0= 
dev-libs/libxml2:2= )
collectd_plugins_dbi?   ( dev-db/libdbi )
collectd_plugins_dns?   ( net-libs/libpcap )
collectd_plugins_gmond? ( sys-cluster/ganglia )
collectd_plugins_ipmi?  ( >=sys-libs/openipmi-2.0.16-r1 
)
-   collectd_plugins_iptables?  ( 
>=net-firewall/iptables-1.4.13:= )
-   collectd_plugins_log_logstash?  ( dev-libs/yajl )
+   collectd_plugins_iptables?  ( 
>=net-firewall/iptables-1.4.13:0= )
+   collectd_plugins_log_logstash?  ( dev-libs/yajl:= )
collectd_plugins_lvm?   ( sys-fs/lvm2 )
collectd_plugins_memcachec? ( dev-libs/libmemcached )
collectd_plugins_modbus?( dev-libs/libmodbus )
collectd_plugins_mysql? ( >=virtual/mysql-5.0 )
collectd_plugins_netlink?   ( net-libs/libmnl )
-   collectd_plugins_nginx? ( net-misc/curl )
+   collectd_plugins_nginx? ( net-misc/curl:0= )
collectd_plugins_notify_desktop?( x11-libs/libnotify )
collectd_plugins_notify_email?  ( net-libs/libesmtp )
collectd_plugins_nut?   ( >=sys-power/nut-2.7.2-r2 )
collectd_plugins_openldap?  ( net-nds/openldap )
-   collectd_plugins_onewire?   ( >=sys-fs/owfs-3.1 )
+   collectd_plugins_onewire?   ( >=sys-fs/owfs-3.1:= )
collectd_plugins_oracle?( 
dev-db/oracle-instantclient-basic )
collectd_plugins_perl?  ( dev-lang/perl:=[ithreads] )
collectd_plugins_ping?  ( net-libs/liboping )
@@ -98,19 +98,19 @@ COMMON_DEPEND="
collectd_plugins_python?( ${PYTHON_DEPS} )
collectd_plugins_redis? ( dev-libs/hiredis:= )
collectd_plugins_routeros?  ( net-libs/librouteros )
-   collectd_plugins_rrdcached? ( net-analyzer/rrdtool )
-   collectd_plugins_rrdtool?   ( net-analyzer/rrdtool )
+   collectd_plugins_rrdcached? ( net-analyzer/rrdtool:= )
+   collectd_plugins_rrdtool?   ( net-analyzer/rrdtool:= )
collectd_plugins_sensors?   ( sys-apps/lm_sensors )
collectd_plugins_sigrok?( sci-libs/libsigrok )
collectd_plugins_smart? ( dev-libs/libatasmart )
collectd_plugins_snmp?  ( net-analyzer/net-snmp )
collectd_plugins_tokyotyrant?   ( net-misc/tokyotyrant )
collectd_plugins_varnish?   ( www-serv

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

2016-04-04 Thread Alexis Ballier
commit: 8da22949f86a3d3f06b71be7e21187b88fae769a
Author: Alexis Ballier  gentoo  org>
AuthorDate: Mon Apr  4 17:33:38 2016 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Mon Apr  4 17:33:38 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8da22949

app-admin/collectd: Fix oracle configuration check in init script _checkconfig.

Do not match if oracle plugin is not enabled, simplify a bit the expression and 
use wc -l instead of grep --count so that it works with busybox too.

Package-Manager: portage-2.2.28
Signed-off-by: Alexis Ballier  gentoo.org>

 app-admin/collectd/files/collectd.initd-r1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/collectd/files/collectd.initd-r1 
b/app-admin/collectd/files/collectd.initd-r1
index a90ec50..32510ff 100644
--- a/app-admin/collectd/files/collectd.initd-r1
+++ b/app-admin/collectd/files/collectd.initd-r1
@@ -28,7 +28,7 @@ depend() {
 }
 
 _checkconfig() {
-   if [ $(eval sed '/^$\|^#/d' \"${COLLECTD_CONFIGFILE}\" | grep --count 
'LoadPlugin[[:space:]]\+oracle') -ge 1 ] ; then
+   if [ $(sed '/^$\|^#/d' "${COLLECTD_CONFIGFILE}" | grep 
'LoadPlugin[[:space:]]\+oracle' | wc -l) -ge 1 ] ; then
if [ -e /etc/env.d/50oracle-instantclient-basic ] ; then
. /etc/env.d/50oracle-instantclient-basic
export ORACLE_HOME



[gentoo-commits] repo/gentoo:master commit in: app-admin/collectd/

2016-04-04 Thread Ian Delaney
commit: f9fd2de25974af4d4f12670b64aa3343ac265483
Author: Ian Delaney  gentoo  org>
AuthorDate: Mon Apr  4 03:40:59 2016 +
Commit: Ian Delaney  gentoo  org>
CommitDate: Mon Apr  4 09:00:30 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9fd2de2

app-admin/collectd: reset description for user in metadata.xml with a general 
update

Package-Manager: portage-2.2.28

 app-admin/collectd/metadata.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-admin/collectd/metadata.xml b/app-admin/collectd/metadata.xml
index 426b419..359cb79 100644
--- a/app-admin/collectd/metadata.xml
+++ b/app-admin/collectd/metadata.xml
@@ -4,16 +4,16 @@

b...@bergstroem.nu
Johan Bergström
-   Proxied Maintainer
+   Primary proxied maintainer; set to assignee in all 
bugs


whi...@whissi.de
Thomas D.
-   Proxied Maintainer
+   Proxied co-maintainer


proxy-ma...@gentoo.org
-   Proxy Maintainers
+   Proxy Maintainers Project


Collectd gathers statistics about the system it is running on 
and stores this



[gentoo-commits] repo/gentoo:master commit in: app-admin/collectd/

2016-04-03 Thread James Le Cuirot
commit: f39f8f41fffd09a995d6551a17203e8436f98e18
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun Apr  3 22:26:14 2016 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Apr  3 22:34:29 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f39f8f41

app-admin/collectd: Remove java-config-wrapper dependency (again)

I made this change for a reason and asked for feedback (bug #558310)
before I did so. Please do me the same courtesy by at least asking
before you undo my changes. java-config-wrapper is being masked so
this has to change now.

Package-Manager: portage-2.2.28

 .../collectd/{collectd-5.5.1-r2.ebuild => collectd-5.5.1-r3.ebuild}   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-admin/collectd/collectd-5.5.1-r2.ebuild 
b/app-admin/collectd/collectd-5.5.1-r3.ebuild
similarity index 99%
rename from app-admin/collectd/collectd-5.5.1-r2.ebuild
rename to app-admin/collectd/collectd-5.5.1-r3.ebuild
index 69290da..81bf0c2 100644
--- a/app-admin/collectd/collectd-5.5.1-r2.ebuild
+++ b/app-admin/collectd/collectd-5.5.1-r3.ebuild
@@ -76,11 +76,9 @@ COMMON_DEPEND="
collectd_plugins_curl_xml?  ( net-misc/curl 
dev-libs/libxml2:= )
collectd_plugins_dbi?   ( dev-db/libdbi )
collectd_plugins_dns?   ( net-libs/libpcap )
-   collectd_plugins_genericjmx?( virtual/jre:= 
dev-java/java-config-wrapper )
collectd_plugins_gmond? ( sys-cluster/ganglia )
collectd_plugins_ipmi?  ( >=sys-libs/openipmi-2.0.16-r1 
)
collectd_plugins_iptables?  ( 
>=net-firewall/iptables-1.4.13:= )
-   collectd_plugins_java?  ( virtual/jre:= 
dev-java/java-config-wrapper )
collectd_plugins_log_logstash?  ( dev-libs/yajl )
collectd_plugins_lvm?   ( sys-fs/lvm2 )
collectd_plugins_memcachec? ( dev-libs/libmemcached )
@@ -133,6 +131,8 @@ DEPEND="${COMMON_DEPEND}
virtual/pkgconfig"
 
 RDEPEND="${COMMON_DEPEND}
+   collectd_plugins_genericjmx?( >=virtual/jre-1.6 )
+   collectd_plugins_java?  ( >=virtual/jre-1.6 )
collectd_plugins_syslog?( virtual/logger )
selinux?( sec-policy/selinux-collectd )"
 



[gentoo-commits] repo/gentoo:master commit in: app-admin/collectd/

2016-04-03 Thread Michael Palimaka
commit: 53fc0fa4f22e1d13a2df6642b6cb7d7876ef0cb3
Author: Thomas D  whissi  de>
AuthorDate: Sat Apr  2 13:14:39 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun Apr  3 18:20:03 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53fc0fa4

app-admin/collectd: Fix CGROUP kernel config check

Package-Manager: portage-2.2.28

 app-admin/collectd/collectd-5.5.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/collectd/collectd-5.5.1-r2.ebuild 
b/app-admin/collectd/collectd-5.5.1-r2.ebuild
index 971532e..69290da 100644
--- a/app-admin/collectd/collectd-5.5.1-r2.ebuild
+++ b/app-admin/collectd/collectd-5.5.1-r2.ebuild
@@ -195,7 +195,7 @@ collectd_linux_kernel_checks() {
collectd_plugin_kernel_linux battery ACPI_BATTERY warn
 
# cgroups.c: /sys/fs/cgroup/
-   collectd_plugin_kernel_linux cgroups CONFIG_CGROUPS warn
+   collectd_plugin_kernel_linux cgroups CGROUPS warn
 
# cpufreq.c: /sys/devices/system/cpu/cpu%d/cpufreq/
collectd_plugin_kernel_linux cpufreq SYSFS warn



[gentoo-commits] repo/gentoo:master commit in: app-admin/collectd/

2016-04-02 Thread Alexis Ballier
commit: fd3aca8de707c27004658037f44b11bd9b3b1a75
Author: Alexis Ballier  gentoo  org>
AuthorDate: Sat Apr  2 15:47:27 2016 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Sat Apr  2 15:47:36 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd3aca8d

app-admin/collectd: do not RDEPEND on libtool but rather on libltdl.

Package-Manager: portage-2.2.28
Signed-off-by: Alexis Ballier  gentoo.org>

 app-admin/collectd/collectd-5.5.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/collectd/collectd-5.5.1-r2.ebuild 
b/app-admin/collectd/collectd-5.5.1-r2.ebuild
index 0d31810..971532e 100644
--- a/app-admin/collectd/collectd-5.5.1-r2.ebuild
+++ b/app-admin/collectd/collectd-5.5.1-r2.ebuild
@@ -63,7 +63,7 @@ unset plugin
 
 COMMON_DEPEND="
dev-libs/libgcrypt:=
-   sys-devel/libtool
+   dev-libs/libltdl:0=
perl?   ( dev-lang/perl:=[ithreads] )
udev?   ( virtual/udev )
collectd_plugins_amqp?  ( net-libs/rabbitmq-c )



[gentoo-commits] repo/gentoo:master commit in: app-admin/collectd/

2016-03-31 Thread Sam Jorna
commit: 6be31c5ac3704fdf57a3ec5a4f746bebd2f0f346
Author: Thomas D  whissi  de>
AuthorDate: Thu Mar 31 11:03:38 2016 +
Commit: Sam Jorna  gentoo  org>
CommitDate: Thu Mar 31 11:30:17 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6be31c5a

app-admin/collectd: Fix REQUIRED_USE

REQUIRED_USE of "udev" is only required when smart plugin was selected by
the user (forgotten "?").

Closes: https://github.com/gentoo/gentoo/pull/1171
Package-Manager: portage-2.2.28
Signed-off-by: Sam Jorna  gentoo.org>

 app-admin/collectd/collectd-5.5.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/collectd/collectd-5.5.1-r2.ebuild 
b/app-admin/collectd/collectd-5.5.1-r2.ebuild
index 13b5778..0d31810 100644
--- a/app-admin/collectd/collectd-5.5.1-r2.ebuild
+++ b/app-admin/collectd/collectd-5.5.1-r2.ebuild
@@ -140,7 +140,7 @@ REQUIRED_USE="
collectd_plugins_genericjmx?( java )
collectd_plugins_java?  ( java )
collectd_plugins_python?( ${PYTHON_REQUIRED_USE} )
-   collectd_plugins_smart  ( udev )"
+   collectd_plugins_smart? ( udev )"
 
 PATCHES=(
"${FILESDIR}"/${PN}-4.10.3-werror.patch



[gentoo-commits] repo/gentoo:master commit in: app-admin/collectd/

2016-03-29 Thread Patrick Lauer
commit: 7bb72cccf8435f704fab796ee931053d0f2ba229
Author: Patrick Lauer  gentoo  org>
AuthorDate: Tue Mar 29 19:17:26 2016 +
Commit: Patrick Lauer  gentoo  org>
CommitDate: Tue Mar 29 19:17:40 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bb72ccc

app-admin/collectd: Remove unneeded useflag descriptions from metadata.xml

Package-Manager: portage-2.2.28

 app-admin/collectd/metadata.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app-admin/collectd/metadata.xml b/app-admin/collectd/metadata.xml
index b3df3aa..426b419 100644
--- a/app-admin/collectd/metadata.xml
+++ b/app-admin/collectd/metadata.xml
@@ -33,7 +33,6 @@
Build the apache input 
plugin (collects statistics from Apache's mod_status module)
Build the apcups input 
plugin (reads various statistics about a connected uninterruptible power supply 
(UPS))
Build the ascent input 
plugin (reads and parses the statistics page of Ascent)
-   Build the barometer 
input plugin (reads sensor data from various Freescale and Bosch digital 
barometers)
Build the battery input 
plugin (collects the battery's charge, the drawn current and the battery's 
voltage)
Build the bind input plugin 
(collects statistics from bind instances)
Build the Ceph input plugin 
(collects statistics from the Ceph distributed storage system)
@@ -146,7 +145,6 @@
Build the write_http 
output plugin (sends metrics to a web-server using HTTP POST requests)
Build the Kafka 
output plugin (sends metrics to Apache Kafka)
Build the write_log 
output plugin (writes metrics to a file)
-   Build the MongoDB 
output plugin (writes metrics to a MongoDB)
Build the Redis 
output plugin (stores values in Redis)
Build the Riemann 
output plugin (stores values in Riemann, a stream processing and monitoring 
system)
Build the Sensu 
output plugin (sends metrics to Sensu Core, an open-source monitoring 
project)



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

2016-03-29 Thread Ian Delaney
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/

2016-03-24 Thread Patrick Lauer
commit: 6dd6615257c26ccc1ca5778d2f927e0cc1f8ea7a
Author: Patrick Lauer  gentoo  org>
AuthorDate: Thu Mar 24 08:32:04 2016 +
Commit: Patrick Lauer  gentoo  org>
CommitDate: Thu Mar 24 08:32:04 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6dd66152

app-admin/collectd: Remove unneeded useflag description from metadata.xml

Package-Manager: portage-2.2.28

 app-admin/collectd/metadata.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app-admin/collectd/metadata.xml b/app-admin/collectd/metadata.xml
index 92f5d3c..7b80d9c 100644
--- a/app-admin/collectd/metadata.xml
+++ b/app-admin/collectd/metadata.xml
@@ -145,7 +145,6 @@
Build the write_http 
output plugin (sends metrics to a web-server using HTTP POST requests)
Build the Kafka 
output plugin (sends metrics to Apache Kafka)
Build the write_log 
output plugin (writes metrics to a file)
-   Build the MongoDB 
output plugin (writes metrics to a MongoDB)
Build the Redis 
output plugin (stores values in Redis)
Build the Riemann 
output plugin (stores values in Riemann, a stream processing and monitoring 
system)
Build the Sensu 
output plugin (sends metrics to Sensu Core, an open-source monitoring 
project)



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

2016-03-23 Thread Ian Delaney
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/

2016-03-23 Thread Ian Delaney
commit: 97a9704b266d34966791eaecbeccc182636f76f3
Author: Thomas D  whissi  de>
AuthorDate: Mon Mar 21 00:16:34 2016 +
Commit: Ian Delaney  gentoo  org>
CommitDate: Wed Mar 23 23:41:25 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97a9704b

app-admin/collectd: Revbump to vn. 5.5.1-r1

add write_kafka plugin
Package-Manager: portage-2.2.28
Closes: https://github.com/gentoo/gentoo/pull/1101

 .../collectd/{collectd-5.5.1.ebuild => collectd-5.5.1-r1.ebuild}  | 8 
 app-admin/collectd/metadata.xml   | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app-admin/collectd/collectd-5.5.1.ebuild 
b/app-admin/collectd/collectd-5.5.1-r1.ebuild
similarity index 98%
rename from app-admin/collectd/collectd-5.5.1.ebuild
rename to app-admin/collectd/collectd-5.5.1-r1.ebuild
index 2f0983f..441d156 100644
--- a/app-admin/collectd/collectd-5.5.1.ebuild
+++ b/app-admin/collectd/collectd-5.5.1-r1.ebuild
@@ -31,7 +31,6 @@ IUSE="contrib debug java kernel_Darwin kernel_FreeBSD 
kernel_linux perl selinux
 # 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"
@@ -48,7 +47,7 @@ COLLECTD_TESTED_PLUGINS="amqp aggregation apache apcups 
ascent battery bind ceph
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
+   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}"
@@ -111,6 +110,7 @@ COMMON_DEPEND="
collectd_plugins_varnish?   ( www-servers/varnish )
collectd_plugins_virt?  ( app-emulation/libvirt 
dev-libs/libxml2:= )
collectd_plugins_write_http?( net-misc/curl )
+   collectd_plugins_write_kafka?   ( 
>=dev-libs/librdkafka-0.9.0.99:= )
collectd_plugins_write_redis?   ( dev-libs/hiredis:= )
collectd_plugins_write_riemann? ( dev-libs/protobuf-c )
 
@@ -138,8 +138,8 @@ REQUIRED_USE="
collectd_plugins_python?( ${PYTHON_REQUIRED_USE} )"
 
 PATCHES=(
-   "${FILESDIR}/${PN}-4.10.3"-werror.patch
-   "${FILESDIR}/${PN}-5.5.1"-{libocci,lt,nohal}.patch
+   "${FILESDIR}"/${PN}-4.10.3-werror.patch
+   "${FILESDIR}"/${PN}-5.5.1-{libocci,lt,nohal}.patch
 )
 
 # @FUNCTION: collectd_plugin_kernel_linux

diff --git a/app-admin/collectd/metadata.xml b/app-admin/collectd/metadata.xml
index cbf3a3e..92f5d3c 100644
--- a/app-admin/collectd/metadata.xml
+++ b/app-admin/collectd/metadata.xml
@@ -143,6 +143,7 @@
Build the wireless input 
plugin (collects signal quality, signal power and signal-to-noise ratio for 
wireless LAN cards)
Build the 
write_graphite output plugin (stores values in Carbon, the storage layer of 
Graphite)
Build the write_http 
output plugin (sends metrics to a web-server using HTTP POST requests)
+   Build the Kafka 
output plugin (sends metrics to Apache Kafka)
Build the write_log 
output plugin (writes metrics to a file)
Build the MongoDB 
output plugin (writes metrics to a MongoDB)
Build the Redis 
output plugin (stores values in Redis)



[gentoo-commits] repo/gentoo:master commit in: app-admin/collectd/

2016-03-01 Thread Ian Delaney
commit: 941399e79779a7d7187af1cc4e17b29bc5988b4c
Author: Thomas D  whissi  de>
AuthorDate: Tue Mar  1 23:50:19 2016 +
Commit: Ian Delaney  gentoo  org>
CommitDate: Tue Mar  1 23:50:19 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=941399e7

app-admin/collectd: Adjust dependency on sys-power/nut (#540750)

Bug: https://bugs.gentoo.org/show_bug.cgi?id=540750

Package-Manager: portage-2.2.27

 app-admin/collectd/collectd-5.4.1-r2.ebuild | 10 +-
 app-admin/collectd/collectd-5.5.0.ebuild|  2 +-
 app-admin/collectd/collectd-5.5.1.ebuild|  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app-admin/collectd/collectd-5.4.1-r2.ebuild 
b/app-admin/collectd/collectd-5.4.1-r2.ebuild
index a7fc037..feea5d7 100644
--- a/app-admin/collectd/collectd-5.4.1-r2.ebuild
+++ b/app-admin/collectd/collectd-5.4.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -11,7 +11,7 @@ PYTHON_COMPAT=( python2_7 )
 
 inherit autotools base eutils java-pkg-opt-2 linux-info multilib perl-app 
python-single-r1 systemd user
 
-DESCRIPTION="A a daemon which collects system statistic and provides 
mechanisms to store the values"
+DESCRIPTION="Collects system statistics and provides mechanisms to store the 
values"
 
 HOMEPAGE="http://collectd.org";
 SRC_URI="${HOMEPAGE}/files/${P}.tar.bz2"
@@ -77,13 +77,13 @@ COMMON_DEPEND="
collectd_plugins_netlink?   ( net-libs/libmnl )
collectd_plugins_nginx? ( net-misc/curl )
collectd_plugins_notify_desktop?( x11-libs/libnotify )
-   collectd_plugins_notify_email?  ( net-libs/libesmtp 
dev-libs/openssl )
-   collectd_plugins_nut?   ( sys-power/nut )
+   collectd_plugins_notify_email?  ( net-libs/libesmtp 
dev-libs/openssl:= )
+   collectd_plugins_nut?   ( >=sys-power/nut-2.7.2-r2 )
collectd_plugins_onewire?   ( sys-fs/owfs )
collectd_plugins_oracle?( 
dev-db/oracle-instantclient-basic )
collectd_plugins_perl?  ( dev-lang/perl:=[ithreads] )
collectd_plugins_ping?  ( net-libs/liboping )
-   collectd_plugins_postgresql?( dev-db/postgresql )
+   collectd_plugins_postgresql?( dev-db/postgresql:= )
collectd_plugins_python?( ${PYTHON_DEPS} )
collectd_plugins_routeros?  ( net-libs/librouteros )
collectd_plugins_rrdcached? ( net-analyzer/rrdtool )

diff --git a/app-admin/collectd/collectd-5.5.0.ebuild 
b/app-admin/collectd/collectd-5.5.0.ebuild
index d32eaf8..a06c442 100644
--- a/app-admin/collectd/collectd-5.5.0.ebuild
+++ b/app-admin/collectd/collectd-5.5.0.ebuild
@@ -79,7 +79,7 @@ COMMON_DEPEND="
collectd_plugins_nginx? ( net-misc/curl )
collectd_plugins_notify_desktop?( x11-libs/libnotify:= )
collectd_plugins_notify_email?  ( net-libs/libesmtp dev-libs/openssl:0= 
)
-   collectd_plugins_nut?   ( sys-power/nut )
+   collectd_plugins_nut?   ( >=sys-power/nut-2.7.2-r2 )
collectd_plugins_onewire?   ( sys-fs/owfs )
collectd_plugins_oracle?( 
dev-db/oracle-instantclient-basic )
collectd_plugins_openldap?  ( net-nds/openldap )

diff --git a/app-admin/collectd/collectd-5.5.1.ebuild 
b/app-admin/collectd/collectd-5.5.1.ebuild
index 63ded29..5d65a4a 100644
--- a/app-admin/collectd/collectd-5.5.1.ebuild
+++ b/app-admin/collectd/collectd-5.5.1.ebuild
@@ -91,7 +91,7 @@ COMMON_DEPEND="
collectd_plugins_nginx? ( net-misc/curl )
collectd_plugins_notify_desktop?( x11-libs/libnotify )
collectd_plugins_notify_email?  ( net-libs/libesmtp )
-   collectd_plugins_nut?   ( sys-power/nut )
+   collectd_plugins_nut?   ( >=sys-power/nut-2.7.2-r2 )
collectd_plugins_openldap?  ( net-nds/openldap )
collectd_plugins_onewire?   ( >=sys-fs/owfs-3.1 )
collectd_plugins_oracle?( 
dev-db/oracle-instantclient-basic )



[gentoo-commits] repo/gentoo:master commit in: app-admin/collectd/

2016-02-29 Thread Patrick Lauer
commit: 1d285a27559c30c2567232ddcc030fa6db0fd677
Author: Patrick Lauer  gentoo  org>
AuthorDate: Mon Feb 29 21:41:23 2016 +
Commit: Patrick Lauer  gentoo  org>
CommitDate: Mon Feb 29 21:41:23 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d285a27

app-admin/collectd: Remove unneeded useflag descriptions from metadata.xml

Package-Manager: portage-2.2.27

 app-admin/collectd/metadata.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app-admin/collectd/metadata.xml b/app-admin/collectd/metadata.xml
index 91a0680..2576b59 100644
--- a/app-admin/collectd/metadata.xml
+++ b/app-admin/collectd/metadata.xml
@@ -33,7 +33,6 @@
Build the apache input 
plugin (collects statistics from Apache's mod_status module)
Build the apcups input 
plugin (reads various statistics about a connected uninterruptible power supply 
(UPS))
Build the ascent input 
plugin (reads and parses the statistics page of Ascent)
-   Build the barometer 
input plugin (reads sensor data from various Freescale and Bosch digital 
barometers)
Build the battery input 
plugin (collects the battery's charge, the drawn current and the battery's 
voltage)
Build the bind input plugin 
(collects statistics from bind instances)
Build the Ceph input plugin 
(collects statistics from the Ceph distributed storage system)
@@ -145,7 +144,6 @@
Build the wireless input 
plugin (collects signal quality, signal power and signal-to-noise ratio for 
wireless LAN cards)
Build the 
write_graphite output plugin (stores values in Carbon, the storage layer of 
Graphite)
Build the write_http 
output plugin (sends metrics to a web-server using HTTP POST requests)
-   Build the Kafka 
output plugin (sends metrics to Apache Kafka)
Build the write_log 
output plugin (writes metrics to a file)
Build the MongoDB 
output plugin (writes metrics to a MongoDB)
Build the Redis 
output plugin (stores values in Redis)



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

2016-02-29 Thread Patrice Clement
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/

2016-01-05 Thread Pacho Ramos
commit: 04b768013cca29ba65e9e03ec190d58bf8b8b914
Author: Pacho Ramos  gentoo  org>
AuthorDate: Tue Jan  5 11:09:10 2016 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Tue Jan  5 11:45:09 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04b76801

app-admin/collectd: Drop vserver support (#472170)

Package-Manager: portage-2.2.26

 app-admin/collectd/collectd-5.4.1-r2.ebuild | 8 +++-
 app-admin/collectd/collectd-5.5.0.ebuild| 8 +++-
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/app-admin/collectd/collectd-5.4.1-r2.ebuild 
b/app-admin/collectd/collectd-5.4.1-r2.ebuild
index 5b6a955..a7fc037 100644
--- a/app-admin/collectd/collectd-5.4.1-r2.ebuild
+++ b/app-admin/collectd/collectd-5.4.1-r2.ebuild
@@ -41,7 +41,7 @@ COLLECTD_TESTED_PLUGINS="aggregation apache apcups ascent 
battery bind cgroups
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
+   tokyotyrant unixsock uptime users uuid varnish vmem wireless
write_graphite write_http write_mongodb"
 
 COLLECTD_DISABLED_PLUGINS="${COLLECTD_IMPOSSIBLE_PLUGINS} 
${COLLECTD_UNTESTED_PLUGINS}"
@@ -107,9 +107,7 @@ COMMON_DEPEND="
 DEPEND="${COMMON_DEPEND}
virtual/pkgconfig
collectd_plugins_java?  ( >=virtual/jdk-1.6 )
-   kernel_linux? (
-   collectd_plugins_vserver?   ( sys-kernel/vserver-sources )
-   )"
+"
 
 RDEPEND="${COMMON_DEPEND}
collectd_plugins_java?  ( >=virtual/jre-1.6 )
@@ -240,7 +238,7 @@ src_configure() {
# should work independent of the operating system.
 
local linux_plugins="battery cpu cpufreq disk entropy ethstat interface 
iptables ipvs irq load
-   memory md netlink nfs numa processes serial swap tcpconns 
thermal users vmem vserver
+   memory md netlink nfs numa processes serial swap tcpconns 
thermal users vmem
wireless"
 
local libstatgrab_plugins="cpu disk interface load memory swap users"

diff --git a/app-admin/collectd/collectd-5.5.0.ebuild 
b/app-admin/collectd/collectd-5.5.0.ebuild
index 64af3dd..d32eaf8 100644
--- a/app-admin/collectd/collectd-5.5.0.ebuild
+++ b/app-admin/collectd/collectd-5.5.0.ebuild
@@ -41,7 +41,7 @@ COLLECTD_TESTED_PLUGINS="aggregation apache apcups ascent 
battery bind ceph
rrdcached rrdtool sensors serial smart snmp statsd swap syslog table 
tail
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_log 
write_mongodb
+   virt vmem wireless write_graphite write_http write_log write_mongodb
write_redis write_sensu write_tsdb zfs_arc zookeeper"
 
 COLLECTD_DISABLED_PLUGINS="${COLLECTD_IMPOSSIBLE_PLUGINS} 
${COLLECTD_UNTESTED_PLUGINS}"
@@ -113,9 +113,7 @@ COMMON_DEPEND="
 DEPEND="${COMMON_DEPEND}
virtual/pkgconfig
collectd_plugins_java?  ( >=virtual/jdk-1.6 )
-   kernel_linux? (
-   collectd_plugins_vserver?   ( sys-kernel/vserver-sources )
-   )"
+"
 
 RDEPEND="${COMMON_DEPEND}
collectd_plugins_java?  ( >=virtual/jre-1.6 )
@@ -250,7 +248,7 @@ src_configure() {
local linux_plugins="barometer battery cpu cpufreq disk drbd entropy
ethstat interface iptables ipvs irq ipc load memory md netlink 
nfs
numa processes serial swap tcpconns thermal turbostat users vmem
-   vserver wireless zfs_arc"
+   wireless zfs_arc"
 
local libstatgrab_plugins="cpu disk interface load memory swap users"
local bsd_plugins="cpu tcpconns ${libstatgrab_plugins} zfs_arc"



[gentoo-commits] repo/gentoo:master commit in: app-admin/collectd/

2016-01-05 Thread Pacho Ramos
commit: 44c8b638668d6af1c70b76b9489e12fac4bd0a2b
Author: Pacho Ramos  gentoo  org>
AuthorDate: Tue Jan  5 11:09:33 2016 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Tue Jan  5 11:45:11 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44c8b638

app-admin/collectd: Drop vserver support (#472170)

Package-Manager: portage-2.2.26

 app-admin/collectd/metadata.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app-admin/collectd/metadata.xml b/app-admin/collectd/metadata.xml
index 1f920dd..268c9ab 100644
--- a/app-admin/collectd/metadata.xml
+++ b/app-admin/collectd/metadata.xml
@@ -115,7 +115,6 @@
Build the varnish input 
plugin
Build the libvirt input 
plugin (statistics about virtualized guests on a system)
Build the vmem input plugin 
(information about the virtual memory subsystem)
-   Build the vserver input 
plugin (virtual servers running on a system)
Build the wireless input 
plugin (signal quality, signal power and signal-to-noise ratio for wireless LAN 
cards)
Build the 
write_graphite output plugin (sends the values collected by collectd to Carbon, 
the storage layer of the Graphite time-series database)
Build the write_http 
output plugin (sends the values collected by collectd to a web-server)



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

2016-01-04 Thread Jason Zaman
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/

2016-01-01 Thread Jason Zaman
commit: 7eb7107cf02c65a8bb2947c9379002e067b957af
Author: Jason Zaman  gentoo  org>
AuthorDate: Sat Jan  2 06:53:34 2016 +
Commit: Jason Zaman  gentoo  org>
CommitDate: Sat Jan  2 06:54:21 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7eb7107c

app-admin/collectd: version bump to 5.5

Package-Manager: portage-2.2.24

 app-admin/collectd/Manifest  |   1 +
 app-admin/collectd/collectd-5.5.0.ebuild | 399 +++
 app-admin/collectd/metadata.xml  | 112 +
 3 files changed, 464 insertions(+), 48 deletions(-)

diff --git a/app-admin/collectd/Manifest b/app-admin/collectd/Manifest
index 3bb23b2..81e7cd7 100644
--- a/app-admin/collectd/Manifest
+++ b/app-admin/collectd/Manifest
@@ -1 +1,2 @@
 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

diff --git a/app-admin/collectd/collectd-5.5.0.ebuild 
b/app-admin/collectd/collectd-5.5.0.ebuild
new file mode 100644
index 000..012278f
--- /dev/null
+++ b/app-admin/collectd/collectd-5.5.0.ebuild
@@ -0,0 +1,399 @@
+# 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 eutils fcaps 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 write_kafka xmms"
+
+# Plugins that still need some work
+COLLECTD_UNTESTED_PLUGINS="amqp apple_sensors genericjmx ipvs lpar modbus tape"
+
+# Plugins that have been (compile) tested and can be enabled via 
COLLECTD_PLUGINS
+COLLECTD_TESTED_PLUGINS="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 gmond
+   hddtemp interface ipc ipmi iptables irq java load log_logstash logfile 
lvm
+   madwifi match_empty_counter match_hashed match_regex match_timediff 
match_value
+   mbmon md memcachec memcached memory multimeter mysql netlink network 
nfs nginx
+   notify_desktop notify_email ntpd numa nut olsrd onewire openldap 
openvpn oracle
+   perl ping postgresql powerdns processes protocols python redis routeros
+   rrdcached rrdtool sensors serial smart snmp statsd swap syslog table 
tail
+   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_log 
write_mongodb
+   write_redis write_sensu write_tsdb zfs_arc zookeeper"
+
+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_ceph?  ( dev-libs/yajl:= )
+   collectd_plugins_curl?  ( net-misc/curl )
+   collectd_plugins_curl_json? ( net-misc/curl dev-libs/yajl:= 
)
+   collectd_plugins_curl_xml?  ( net-misc/curl 
dev-libs/libxml2:= )
+

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

2015-10-04 Thread Ian Delaney
commit: 11ee51482ad3c58c58da2be036bc6ee6440c43e4
Author: Ian Delaney  gentoo  org>
AuthorDate: Sun Oct  4 08:22:32 2015 +
Commit: Ian Delaney  gentoo  org>
CommitDate: Sun Oct  4 08:23:19 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11ee5148

app-admin/collectd: set required env var in file collectd.initd

fix thanks to Marcin Mirosław sourced from the gentoo bug.

Gentoo bug: #539262

Package-Manager: portage-2.2.20.1

 app-admin/collectd/files/collectd.initd | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app-admin/collectd/files/collectd.initd 
b/app-admin/collectd/files/collectd.initd
index 4f48a11..10d2952 100644
--- a/app-admin/collectd/files/collectd.initd
+++ b/app-admin/collectd/files/collectd.initd
@@ -47,6 +47,7 @@ start() {
 
ebegin "Starting collectd"
start-stop-daemon --start --user "${COLLECTD_USER}:collectd" \
+   --env LC_NUMERIC=C \
--nicelevel "${COLLECTD_NICELVL}" --exec /usr/sbin/collectd -- \
-P "${COLLECTD_PIDFILE}" -C "${COLLECTD_CFGFILE}"
eend $? "Failed to start collectd"
@@ -55,6 +56,7 @@ start() {
 stop() {
ebegin "Stopping collectd"
start-stop-daemon --stop \
+   --env LC_NUMERIC=C \
--pidfile "${COLLECTD_PIDFILE}"
eend $? "Failed to stop collectd"
 }



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

2015-09-03 Thread James Le Cuirot
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

[gentoo-commits] repo/gentoo:master commit in: app-admin/collectd/

2015-09-03 Thread James Le Cuirot
commit: df55bfe44b585e517e5ee6d0573c24ae7ac8baba
Author: James Le Cuirot  gentoo  org>
AuthorDate: Thu Sep  3 08:57:21 2015 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Thu Sep  3 08:57:21 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df55bfe4

app-admin/collectd: Use the Java eclasses wrt but #558310

Java team needs to remove java-config-wrapper, which this erroneously
depends on. The existing ebuild does not make use of the Java
eclasses, which can lead to problems. I have:

 * Made use of java-pkg-opt-2.
 * Added a DEPEND on virtual/jdk.
 * Used sed against the Java Makefile.am to set proper javac flags.
 * Used the eclasses to properly set JAVA_HOME.
 * Registered the installed jars so that Gentoo metadata is created.

Package-Manager: portage-2.2.20.1

 app-admin/collectd/collectd-5.4.1-r2.ebuild | 388 
 1 file changed, 388 insertions(+)

diff --git a/app-admin/collectd/collectd-5.4.1-r2.ebuild 
b/app-admin/collectd/collectd-5.4.1-r2.ebuild
new file mode 100644
index 000..5b6a955
--- /dev/null
+++ b/app-admin/collectd/collectd-5.4.1-r2.ebuild
@@ -0,0 +1,388 @@
+# Copyright 1999-2015 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="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 
dev-libs/libxml2 )
+   collectd_plugins_dbi?   ( dev-db/libdbi )
+   collectd_plugins_dns?   ( net-libs/libpcap )
+   collectd_plugins_gmond? ( sys-cluster/ganglia )
+   collectd_plugins_ipmi?  ( >=sys-libs/openipmi-2.0.16-r1 
)
+   collectd_plugins_iptables?  ( 
>=net-firewall/iptables-1.4.13 )
+   collectd_plugins_libvirt?   ( app-emulation/libvirt 
dev-libs/libxml2 )
+   collectd_plugins_lvm?   ( sys-fs/lvm2 )
+   collectd_plugins_memcachec? ( dev-libs/libmemcached )
+   collectd_plugins_mysql? ( >=virtual/mysql-5.0 )
+   collectd_plugins_netlink?   ( net-libs/libmnl )
+   collectd_plugins_nginx?