1 |
commit: 5fb0a46e73890b4189cdeb73523e1dde0cea9429 |
2 |
Author: Thomas D <whissi <AT> whissi <DOT> de> |
3 |
AuthorDate: Mon Mar 28 17:28:15 2016 +0000 |
4 |
Commit: Ian Delaney <idella4 <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Mar 29 13:42:09 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fb0a46e |
7 |
|
8 |
app-admin/collectd: Revbump to fix multiple issues |
9 |
|
10 |
- Fix building with sys-fs/xfsprogs-4.5.0 (upstream issues #1637) |
11 |
|
12 |
- Workaround for bug #577846 applied |
13 |
|
14 |
We are now enforcing <=sys-kernel/linux-headers-4.4 when building |
15 |
collectd_plugins_iptables until the problem gets fixed in |
16 |
non-collectd upstram. |
17 |
|
18 |
- virtual/udev dependency is now optional for disk plugin |
19 |
|
20 |
Package-Manager: portage-2.2.28 |
21 |
Closes: https://github.com/gentoo/gentoo/pull/1156 |
22 |
|
23 |
Signed-off-by: Ian Delaney <idella4 <AT> gentoo.org> |
24 |
|
25 |
...td-5.5.1-r1.ebuild => collectd-5.5.1-r2.ebuild} | 23 ++++++-- |
26 |
.../collectd/files/collectd-5.5.1-issue-1637.patch | 68 ++++++++++++++++++++++ |
27 |
app-admin/collectd/metadata.xml | 3 + |
28 |
3 files changed, 89 insertions(+), 5 deletions(-) |
29 |
|
30 |
diff --git a/app-admin/collectd/collectd-5.5.1-r1.ebuild b/app-admin/collectd/collectd-5.5.1-r2.ebuild |
31 |
similarity index 96% |
32 |
rename from app-admin/collectd/collectd-5.5.1-r1.ebuild |
33 |
rename to app-admin/collectd/collectd-5.5.1-r2.ebuild |
34 |
index 441d156..13b5778 100644 |
35 |
--- a/app-admin/collectd/collectd-5.5.1-r1.ebuild |
36 |
+++ b/app-admin/collectd/collectd-5.5.1-r2.ebuild |
37 |
@@ -16,7 +16,7 @@ SRC_URI="${HOMEPAGE}/files/${P}.tar.bz2" |
38 |
LICENSE="GPL-2" |
39 |
SLOT="0" |
40 |
KEYWORDS="~amd64 ~x86" |
41 |
-IUSE="contrib debug java kernel_Darwin kernel_FreeBSD kernel_linux perl selinux static-libs" |
42 |
+IUSE="contrib debug java kernel_Darwin kernel_FreeBSD kernel_linux perl selinux static-libs udev" |
43 |
|
44 |
# The plugin lists have to follow here since they extend IUSE |
45 |
|
46 |
@@ -65,6 +65,7 @@ COMMON_DEPEND=" |
47 |
dev-libs/libgcrypt:= |
48 |
sys-devel/libtool |
49 |
perl? ( dev-lang/perl:=[ithreads] ) |
50 |
+ udev? ( virtual/udev ) |
51 |
collectd_plugins_amqp? ( net-libs/rabbitmq-c ) |
52 |
collectd_plugins_apache? ( net-misc/curl ) |
53 |
collectd_plugins_ascent? ( net-misc/curl dev-libs/libxml2 ) |
54 |
@@ -74,7 +75,6 @@ COMMON_DEPEND=" |
55 |
collectd_plugins_curl_json? ( net-misc/curl dev-libs/yajl ) |
56 |
collectd_plugins_curl_xml? ( net-misc/curl dev-libs/libxml2:= ) |
57 |
collectd_plugins_dbi? ( dev-db/libdbi ) |
58 |
- collectd_plugins_disk? ( virtual/udev ) |
59 |
collectd_plugins_dns? ( net-libs/libpcap ) |
60 |
collectd_plugins_genericjmx? ( virtual/jre:= dev-java/java-config-wrapper ) |
61 |
collectd_plugins_gmond? ( sys-cluster/ganglia ) |
62 |
@@ -104,7 +104,7 @@ COMMON_DEPEND=" |
63 |
collectd_plugins_rrdtool? ( net-analyzer/rrdtool ) |
64 |
collectd_plugins_sensors? ( sys-apps/lm_sensors ) |
65 |
collectd_plugins_sigrok? ( sci-libs/libsigrok ) |
66 |
- collectd_plugins_smart? ( virtual/udev dev-libs/libatasmart ) |
67 |
+ collectd_plugins_smart? ( dev-libs/libatasmart ) |
68 |
collectd_plugins_snmp? ( net-analyzer/net-snmp ) |
69 |
collectd_plugins_tokyotyrant? ( net-misc/tokyotyrant ) |
70 |
collectd_plugins_varnish? ( www-servers/varnish ) |
71 |
@@ -123,8 +123,12 @@ COMMON_DEPEND=" |
72 |
collectd_plugins_users? ( sys-libs/libstatgrab:= ) |
73 |
)" |
74 |
|
75 |
+# Enforcing <=sys-kernel/linux-headers-4.4 due to #577846 |
76 |
DEPEND="${COMMON_DEPEND} |
77 |
+ collectd_plugins_cgroups? ( sys-fs/xfsprogs ) |
78 |
+ collectd_plugins_df? ( sys-fs/xfsprogs ) |
79 |
collectd_plugins_genericjmx? ( >=virtual/jdk-1.6 ) |
80 |
+ collectd_plugins_iptables? ( <=sys-kernel/linux-headers-4.4 ) |
81 |
collectd_plugins_java? ( >=virtual/jdk-1.6 ) |
82 |
virtual/pkgconfig" |
83 |
|
84 |
@@ -135,11 +139,12 @@ RDEPEND="${COMMON_DEPEND} |
85 |
REQUIRED_USE=" |
86 |
collectd_plugins_genericjmx? ( java ) |
87 |
collectd_plugins_java? ( java ) |
88 |
- collectd_plugins_python? ( ${PYTHON_REQUIRED_USE} )" |
89 |
+ collectd_plugins_python? ( ${PYTHON_REQUIRED_USE} ) |
90 |
+ collectd_plugins_smart ( udev )" |
91 |
|
92 |
PATCHES=( |
93 |
"${FILESDIR}"/${PN}-4.10.3-werror.patch |
94 |
- "${FILESDIR}"/${PN}-5.5.1-{libocci,lt,nohal}.patch |
95 |
+ "${FILESDIR}"/${PN}-5.5.1-{libocci,lt,nohal,issue-1637}.patch |
96 |
) |
97 |
|
98 |
# @FUNCTION: collectd_plugin_kernel_linux |
99 |
@@ -316,6 +321,14 @@ src_configure() { |
100 |
# Do we debug? |
101 |
local myconf="$(use_enable debug)" |
102 |
|
103 |
+ # udev support? |
104 |
+ # Required for smart plugin via REQUIRED_USE; Optional for disk plugin |
105 |
+ if use udev; then |
106 |
+ myconf+=" --with-libudev" |
107 |
+ else |
108 |
+ myconf+=" --without-libudev" |
109 |
+ fi |
110 |
+ |
111 |
local plugin |
112 |
|
113 |
# Disable what needs to be disabled. |
114 |
|
115 |
diff --git a/app-admin/collectd/files/collectd-5.5.1-issue-1637.patch b/app-admin/collectd/files/collectd-5.5.1-issue-1637.patch |
116 |
new file mode 100644 |
117 |
index 0000000..89baa12 |
118 |
--- /dev/null |
119 |
+++ b/app-admin/collectd/files/collectd-5.5.1-issue-1637.patch |
120 |
@@ -0,0 +1,68 @@ |
121 |
+From 7630585ca596af6334f89db26272d80f4ef02a8a Mon Sep 17 00:00:00 2001 |
122 |
+From: Ruben Kerkhof <ruben@××××××××××××.com> |
123 |
+Date: Sat, 26 Mar 2016 18:18:44 +0100 |
124 |
+Subject: [PATCH 4/4] Fix building with xfsprogs 4.5.0 |
125 |
+ |
126 |
+commit 865a6c83250e3d4381596a0d937df31d563f97c6 upstream. |
127 |
+ |
128 |
+xfsprogs 4.5.0 started to use off64_t in its headers, |
129 |
+which is hidden behind _GNU_SOURCE |
130 |
+ |
131 |
+Fixes #1637 |
132 |
+--- |
133 |
+ configure.ac | 7 ++++++- |
134 |
+ src/utils_mount.c | 13 ++++++++----- |
135 |
+ 2 files changed, 14 insertions(+), 6 deletions(-) |
136 |
+ |
137 |
+diff --git a/configure.ac b/configure.ac |
138 |
+index 129b9d4..a2058d0 100644 |
139 |
+--- a/configure.ac |
140 |
++++ b/configure.ac |
141 |
+@@ -593,7 +593,12 @@ AC_CHECK_HEADERS(linux/un.h, [], [], |
142 |
+ #endif |
143 |
+ ]) |
144 |
+ |
145 |
+-AC_CHECK_HEADERS(pwd.h grp.h sys/un.h ctype.h limits.h xfs/xqm.h fs_info.h fshelp.h paths.h mntent.h mnttab.h sys/fstyp.h sys/fs_types.h sys/mntent.h sys/mnttab.h sys/statfs.h sys/statvfs.h sys/vfs.h sys/vfstab.h sys/vmmeter.h kvm.h wordexp.h locale.h) |
146 |
++AC_CHECK_HEADERS(pwd.h grp.h sys/un.h ctype.h limits.h fs_info.h fshelp.h paths.h mntent.h mnttab.h sys/fstyp.h sys/fs_types.h sys/mntent.h sys/mnttab.h sys/statfs.h sys/statvfs.h sys/vfs.h sys/vfstab.h sys/vmmeter.h kvm.h wordexp.h locale.h) |
147 |
++ |
148 |
++AC_CHECK_HEADERS([xfs/xqm.h], [], [], |
149 |
++[ |
150 |
++#define _GNU_SOURCE |
151 |
++]) |
152 |
+ |
153 |
+ # For the dns plugin |
154 |
+ AC_CHECK_HEADERS(arpa/nameser.h) |
155 |
+diff --git a/src/utils_mount.c b/src/utils_mount.c |
156 |
+index f2b7943..cf5e97a 100644 |
157 |
+--- a/src/utils_mount.c |
158 |
++++ b/src/utils_mount.c |
159 |
+@@ -21,18 +21,21 @@ |
160 |
+ * Niki W. Waibel <niki.waibel@×××.net> |
161 |
+ **/ |
162 |
+ |
163 |
+-#include "collectd.h" |
164 |
+-#include "utils_mount.h" |
165 |
+- |
166 |
+-#include "common.h" /* sstrncpy() et alii */ |
167 |
+-#include "plugin.h" /* ERROR() macro */ |
168 |
++#if HAVE_CONFIG_H |
169 |
++# include "config.h" |
170 |
++#endif |
171 |
+ |
172 |
+ #if HAVE_XFS_XQM_H |
173 |
++# define _GNU_SOURCE |
174 |
+ # include <xfs/xqm.h> |
175 |
+ #define XFS_SUPER_MAGIC_STR "XFSB" |
176 |
+ #define XFS_SUPER_MAGIC2_STR "BSFX" |
177 |
+ #endif |
178 |
+ |
179 |
++#include "common.h" |
180 |
++#include "plugin.h" |
181 |
++#include "utils_mount.h" |
182 |
++ |
183 |
+ #if HAVE_GETVFSSTAT |
184 |
+ # if HAVE_SYS_TYPES_H |
185 |
+ # include <sys/types.h> |
186 |
+-- |
187 |
+2.7.4 |
188 |
+ |
189 |
|
190 |
diff --git a/app-admin/collectd/metadata.xml b/app-admin/collectd/metadata.xml |
191 |
index 7b80d9c..b3df3aa 100644 |
192 |
--- a/app-admin/collectd/metadata.xml |
193 |
+++ b/app-admin/collectd/metadata.xml |
194 |
@@ -33,6 +33,7 @@ |
195 |
<flag name="collectd_plugins_apache">Build the apache input plugin (collects statistics from Apache's mod_status module)</flag> |
196 |
<flag name="collectd_plugins_apcups">Build the apcups input plugin (reads various statistics about a connected uninterruptible power supply (UPS))</flag> |
197 |
<flag name="collectd_plugins_ascent">Build the ascent input plugin (reads and parses the statistics page of Ascent)</flag> |
198 |
+ <flag name="collectd_plugins_barometer">Build the barometer input plugin (reads sensor data from various Freescale and Bosch digital barometers)</flag> |
199 |
<flag name="collectd_plugins_battery">Build the battery input plugin (collects the battery's charge, the drawn current and the battery's voltage)</flag> |
200 |
<flag name="collectd_plugins_bind">Build the bind input plugin (collects statistics from bind instances)</flag> |
201 |
<flag name="collectd_plugins_ceph">Build the Ceph input plugin (collects statistics from the Ceph distributed storage system)</flag> |
202 |
@@ -145,6 +146,7 @@ |
203 |
<flag name="collectd_plugins_write_http">Build the write_http output plugin (sends metrics to a web-server using HTTP POST requests)</flag> |
204 |
<flag name="collectd_plugins_write_kafka">Build the Kafka output plugin (sends metrics to Apache Kafka)</flag> |
205 |
<flag name="collectd_plugins_write_log">Build the write_log output plugin (writes metrics to a file)</flag> |
206 |
+ <flag name="collectd_plugins_write_mongodb">Build the MongoDB output plugin (writes metrics to a MongoDB)</flag> |
207 |
<flag name="collectd_plugins_write_redis">Build the Redis output plugin (stores values in Redis)</flag> |
208 |
<flag name="collectd_plugins_write_riemann">Build the Riemann output plugin (stores values in Riemann, a stream processing and monitoring system)</flag> |
209 |
<flag name="collectd_plugins_write_sensu">Build the Sensu output plugin (sends metrics to Sensu Core, an open-source monitoring project)</flag> |
210 |
@@ -154,5 +156,6 @@ |
211 |
<flag name="contrib">Install user-contributed files in the doc directory</flag> |
212 |
<flag name="filecaps">When set collectd daemon will have set required capabilities to run most plugins even if run as unprivileged user</flag> |
213 |
<flag name="java">Must be set (workaround for java-pkg-opt-2 eclass limitation) when you want java or genericjmx plugin</flag> |
214 |
+ <flag name="udev">Enable optional udev usage in disk plugin; Required for smart plugin</flag> |
215 |
</use> |
216 |
</pkgmetadata> |