1 |
commit: 25c3ca544bba611c5eaa180a746f6611b7a10e5e |
2 |
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Apr 29 14:13:13 2012 +0000 |
4 |
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Apr 29 14:13:13 2012 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/eva.git;a=commit;h=25c3ca54 |
7 |
|
8 |
app-admin/collectd: restore 4.10.3 |
9 |
|
10 |
Debian still does not ship collectd 5 and I am using it as collectd |
11 |
master. |
12 |
|
13 |
--- |
14 |
app-admin/collectd/Manifest | 11 + |
15 |
app-admin/collectd/collectd-4.10.3-r1.ebuild | 347 ++++++++++++++++++++ |
16 |
app-admin/collectd/files/collectd-4.10.3-lt.patch | 31 ++ |
17 |
.../collectd/files/collectd-4.10.3-werror.patch | 24 ++ |
18 |
app-admin/collectd/metadata.xml | 113 +++++++ |
19 |
5 files changed, 526 insertions(+), 0 deletions(-) |
20 |
|
21 |
diff --git a/app-admin/collectd/Manifest b/app-admin/collectd/Manifest |
22 |
new file mode 100644 |
23 |
index 0000000..a167775 |
24 |
--- /dev/null |
25 |
+++ b/app-admin/collectd/Manifest |
26 |
@@ -0,0 +1,11 @@ |
27 |
+-----BEGIN PGP SIGNED MESSAGE----- |
28 |
+Hash: SHA512 |
29 |
+ |
30 |
+DIST collectd-4.10.3.tar.bz2 1343806 RMD160 3c6257880de6385ee0ad891b5e8fff0916969be8 SHA1 fbeb672d9e1a32f9eb4a5df535519e2fdb8da636 SHA256 ffd1959273301b302c144057baf68128e62c42bcff156ba941336e7389439b65 |
31 |
+-----BEGIN PGP SIGNATURE----- |
32 |
+Version: GnuPG v2.0.19 (GNU/Linux) |
33 |
+ |
34 |
+iEYEAREKAAYFAk+dTHgACgkQ1fmVwcYIWAahowCeMD5p6AO+MzdEwIaTtHIqV7RB |
35 |
+gEgAoO3q/DwvpdjEFtnujur97+5/KQgM |
36 |
+=YbUC |
37 |
+-----END PGP SIGNATURE----- |
38 |
|
39 |
diff --git a/app-admin/collectd/collectd-4.10.3-r1.ebuild b/app-admin/collectd/collectd-4.10.3-r1.ebuild |
40 |
new file mode 100644 |
41 |
index 0000000..8814e00 |
42 |
--- /dev/null |
43 |
+++ b/app-admin/collectd/collectd-4.10.3-r1.ebuild |
44 |
@@ -0,0 +1,347 @@ |
45 |
+# Copyright 1999-2011 Gentoo Foundation |
46 |
+# Distributed under the terms of the GNU General Public License v2 |
47 |
+# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/Attic/collectd-4.10.3-r1.ebuild,v 1.4 2011/10/22 17:35:40 dilfridge dead $ |
48 |
+ |
49 |
+EAPI=4 |
50 |
+ |
51 |
+inherit eutils base linux-info perl-app autotools |
52 |
+ |
53 |
+DESCRIPTION="A small daemon which collects system performance statistics - with a near-infinite number of plugins" |
54 |
+HOMEPAGE="http://collectd.org" |
55 |
+SRC_URI="${HOMEPAGE}/files/${P}.tar.bz2" |
56 |
+ |
57 |
+LICENSE="GPL-2" |
58 |
+SLOT="0" |
59 |
+KEYWORDS="~amd64 ~x86" |
60 |
+IUSE="contrib debug kernel_linux kernel_FreeBSD kernel_Darwin perl static-libs" |
61 |
+ |
62 |
+# The plugin lists have to follow here since they extend IUSE |
63 |
+ |
64 |
+# Plugins that to my knowledge cannot be supported (eg. dependencies not in gentoo) |
65 |
+COLLECTD_IMPOSSIBLE_PLUGINS="netapp pinba xmms" |
66 |
+ |
67 |
+# Plugins that still need some work |
68 |
+COLLECTD_UNTESTED_PLUGINS="ipvs apple_sensors routeros tape zfs_arc modbus" |
69 |
+ |
70 |
+# Plugins that have been (compile) tested and can be enabled via COLLECTD_PLUGINS |
71 |
+COLLECTD_TESTED_PLUGINS="apache apcups ascent battery bind conntrack contextswitch |
72 |
+ cpu cpufreq curl curl_json curl_xml dbi df disk dns email entropy exec filecount fscache gmond |
73 |
+ hddtemp interface ipmi iptables irq java libvirt load madwifi mbmon memcachec |
74 |
+ memcached memory multimeter mysql netlink network nfs nginx ntpd nut olsrd |
75 |
+ onewire openvpn perl ping postgresql powerdns processes protocols python |
76 |
+ rrdcached sensors serial snmp swap table tail tcpconns teamspeak2 ted thermal |
77 |
+ tokyotyrant uptime users vmem vserver wireless csv exec logfile network |
78 |
+ notify_desktop notify_email oracle perl python rrdcached rrdtool syslog unixsock write_http |
79 |
+ match_empty_counter match_hashed match_regex match_timediff match_value |
80 |
+ target_notification target_replace target_scale target_set uuid" |
81 |
+ |
82 |
+COLLECTD_DISABLED_PLUGINS="${COLLECTD_IMPOSSIBLE_PLUGINS} ${COLLECTD_UNTESTED_PLUGINS}" |
83 |
+ |
84 |
+COLLECTD_ALL_PLUGINS=${COLLECTD_TESTED_PLUGINS} |
85 |
+ |
86 |
+for plugin in ${COLLECTD_ALL_PLUGINS}; do |
87 |
+ IUSE="${IUSE} collectd_plugins_${plugin}" |
88 |
+done |
89 |
+unset plugin |
90 |
+ |
91 |
+# Now come the dependencies. |
92 |
+ |
93 |
+COMMON_DEPEND=" |
94 |
+ sys-devel/libtool |
95 |
+ perl? ( dev-lang/perl[ithreads] ( || ( sys-devel/libperl[ithreads] >=sys-devel/libperl-5.10 ) ) ) |
96 |
+ collectd_plugins_apache? ( net-misc/curl ) |
97 |
+ collectd_plugins_ascent? ( net-misc/curl dev-libs/libxml2 ) |
98 |
+ collectd_plugins_bind? ( dev-libs/libxml2 ) |
99 |
+ collectd_plugins_curl? ( net-misc/curl ) |
100 |
+ collectd_plugins_curl_json? ( net-misc/curl dev-libs/yajl ) |
101 |
+ collectd_plugins_curl_xml? ( net-misc/curl dev-libs/libxml2 ) |
102 |
+ collectd_plugins_dbi? ( dev-db/libdbi ) |
103 |
+ collectd_plugins_dns? ( net-libs/libpcap ) |
104 |
+ collectd_plugins_gmond? ( sys-cluster/ganglia ) |
105 |
+ collectd_plugins_ipmi? ( >=sys-libs/openipmi-2.0.16-r1 ) |
106 |
+ collectd_plugins_iptables? ( >=net-firewall/iptables-1.4.9.1-r2 ) |
107 |
+ collectd_plugins_java? ( virtual/jre dev-java/java-config-wrapper ) |
108 |
+ collectd_plugins_libvirt? ( app-emulation/libvirt dev-libs/libxml2 ) |
109 |
+ collectd_plugins_memcachec? ( dev-libs/libmemcached ) |
110 |
+ collectd_plugins_mysql? ( >=virtual/mysql-5.0 ) |
111 |
+ collectd_plugins_netlink? ( >=sys-apps/iproute2-2.6.34 ) |
112 |
+ collectd_plugins_network? ( dev-libs/libgcrypt ) |
113 |
+ collectd_plugins_nginx? ( net-misc/curl ) |
114 |
+ collectd_plugins_notify_desktop? ( x11-libs/libnotify ) |
115 |
+ collectd_plugins_notify_email? ( >=net-libs/libesmtp-1.0.4 dev-libs/openssl ) |
116 |
+ collectd_plugins_nut? ( sys-power/nut ) |
117 |
+ collectd_plugins_onewire? ( sys-fs/owfs ) |
118 |
+ collectd_plugins_oracle? ( >=dev-db/oracle-instantclient-basic-11.2.0.1.0 ) |
119 |
+ collectd_plugins_perl? ( dev-lang/perl[ithreads] ( || ( sys-devel/libperl[ithreads] >=sys-devel/libperl-5.10 ) ) ) |
120 |
+ collectd_plugins_ping? ( net-libs/liboping ) |
121 |
+ collectd_plugins_postgresql? ( >=dev-db/postgresql-base-8.2 ) |
122 |
+ collectd_plugins_python? ( =dev-lang/python-2* ) |
123 |
+ collectd_plugins_rrdcached? ( >=net-analyzer/rrdtool-1.4 ) |
124 |
+ collectd_plugins_rrdtool? ( >=net-analyzer/rrdtool-1.2.27 ) |
125 |
+ collectd_plugins_sensors? ( sys-apps/lm_sensors ) |
126 |
+ collectd_plugins_snmp? ( net-analyzer/net-snmp ) |
127 |
+ collectd_plugins_tokyotyrant? ( net-misc/tokyotyrant ) |
128 |
+ collectd_plugins_write_http? ( net-misc/curl ) |
129 |
+ |
130 |
+ kernel_FreeBSD? ( |
131 |
+ collectd_plugins_disk? ( >=sys-libs/libstatgrab-0.16 ) |
132 |
+ collectd_plugins_interface? ( >=sys-libs/libstatgrab-0.16 ) |
133 |
+ collectd_plugins_load? ( >=sys-libs/libstatgrab-0.16 ) |
134 |
+ collectd_plugins_memory? ( >=sys-libs/libstatgrab-0.16 ) |
135 |
+ collectd_plugins_swap? ( >=sys-libs/libstatgrab-0.16 ) |
136 |
+ collectd_plugins_users? ( >=sys-libs/libstatgrab-0.16 ) |
137 |
+ )" |
138 |
+ |
139 |
+DEPEND="${COMMON_DEPEND} |
140 |
+ dev-util/pkgconfig |
141 |
+ kernel_linux? ( |
142 |
+ collectd_plugins_vserver? ( sys-kernel/vserver-sources ) |
143 |
+ )" |
144 |
+ |
145 |
+RDEPEND="${COMMON_DEPEND} |
146 |
+ collectd_plugins_syslog? ( virtual/logger )" |
147 |
+ |
148 |
+PATCHES=( |
149 |
+ "${FILESDIR}/${PN}-4.10.1"-{libperl,libiptc,noowniptc}.patch |
150 |
+ "${FILESDIR}/${PN}-4.10.2"-{libocci,libnotify-0.7,nohal}.patch |
151 |
+ "${FILESDIR}/${PN}-4.10.3"-{lt,werror}.patch |
152 |
+ ) |
153 |
+ |
154 |
+# @FUNCTION: collectd_plugin_kernel_linux |
155 |
+# @DESCRIPTION: |
156 |
+# USAGE: <plug-in name> <kernel_options> <severity> |
157 |
+# kernel_options is a list of kernel configurations options; the check tests whether at least |
158 |
+# one of them is enabled. If no, depending on the third argument an elog, ewarn, or eerror message |
159 |
+# is emitted. |
160 |
+collectd_plugin_kernel_linux() { |
161 |
+ local multi_opt opt |
162 |
+ if has ${1} ${COLLECTD_ALL_PLUGINS}; then |
163 |
+ if use collectd_plugins_${1}; then |
164 |
+ for opt in ${2}; do |
165 |
+ if linux_chkconfig_present ${opt}; then return 0; fi |
166 |
+ done |
167 |
+ multi_opt=${2//\ /\ or\ } |
168 |
+ case ${3} in |
169 |
+ (info) |
170 |
+ elog "The ${1} plug-in can use kernel features that are disabled now; enable ${multi_opt} in your kernel" |
171 |
+ ;; |
172 |
+ (warn) |
173 |
+ ewarn "The ${1} plug-in uses kernel features that are disabled now; enable ${multi_opt} in your kernel" |
174 |
+ ;; |
175 |
+ (error) |
176 |
+ eerror "The ${1} plug-in needs kernel features that are disabled now; enable ${multi_opt} in your kernel" |
177 |
+ ;; |
178 |
+ (*) |
179 |
+ die "function collectd_plugin_kernel_linux called with invalid third argument" |
180 |
+ ;; |
181 |
+ esac |
182 |
+ fi |
183 |
+ fi |
184 |
+} |
185 |
+ |
186 |
+collectd_linux_kernel_checks() { |
187 |
+ linux-info_pkg_setup |
188 |
+ |
189 |
+ # battery.c:/proc/pmu/battery_%i |
190 |
+ # battery.c:/proc/acpi/battery |
191 |
+ collectd_plugin_kernel_linux battery ACPI_BATTERY warn |
192 |
+ |
193 |
+ # cpufreq.c:/sys/devices/system/cpu/cpu%d/cpufreq/ |
194 |
+ collectd_plugin_kernel_linux cpufreq SYSFS warn |
195 |
+ collectd_plugin_kernel_linux cpufreq CPU_FREQ_STAT warn |
196 |
+ |
197 |
+ # nfs.c:/proc/net/rpc/nfs |
198 |
+ # nfs.c:/proc/net/rpc/nfsd |
199 |
+ collectd_plugin_kernel_linux nfs NFS_COMMON warn |
200 |
+ |
201 |
+ # serial.c:/proc/tty/driver/serial |
202 |
+ # serial.c:/proc/tty/driver/ttyS |
203 |
+ collectd_plugin_kernel_linux serial SERIAL_CORE warn |
204 |
+ |
205 |
+ # swap.c:/proc/meminfo |
206 |
+ collectd_plugin_kernel_linux swap SWAP warn |
207 |
+ |
208 |
+ # thermal.c:/proc/acpi/thermal_zone |
209 |
+ # thermal.c:/sys/class/thermal |
210 |
+ collectd_plugin_kernel_linux thermal "PROC_FS SYSFS" warn |
211 |
+ collectd_plugin_kernel_linux thermal ACPI_THERMAL warn |
212 |
+ |
213 |
+ # vmem.c:/proc/vmstat |
214 |
+ collectd_plugin_kernel_linux vmem VM_EVENT_COUNTERS warn |
215 |
+ |
216 |
+ # uuid.c:/sys/hypervisor/uuid |
217 |
+ collectd_plugin_kernel_linux uuid SYSFS info |
218 |
+ |
219 |
+ # wireless.c:/proc/net/wireless |
220 |
+ collectd_plugin_kernel_linux wireless "MAC80211 IEEE80211" warn |
221 |
+} |
222 |
+ |
223 |
+pkg_setup() { |
224 |
+ if use kernel_linux; then |
225 |
+ if linux_config_exists; then |
226 |
+ einfo "Checking your linux kernel configuration:" |
227 |
+ collectd_linux_kernel_checks |
228 |
+ else |
229 |
+ elog "Cannot find a linux kernel configuration. Continuing anyway." |
230 |
+ fi |
231 |
+ fi |
232 |
+ |
233 |
+ enewgroup collectd |
234 |
+ enewuser collectd -1 -1 /var/lib/collectd collectd |
235 |
+} |
236 |
+ |
237 |
+src_prepare() { |
238 |
+ base_src_prepare |
239 |
+ |
240 |
+ # There's some strange prefix handling in the default config file, resulting in |
241 |
+ # paths like "/usr/var/..." |
242 |
+ sed -i -e "s:@prefix@/var:/var:g" src/collectd.conf.in || die |
243 |
+ |
244 |
+ rm -r libltdl || die |
245 |
+ |
246 |
+ eautoreconf |
247 |
+} |
248 |
+ |
249 |
+src_configure() { |
250 |
+ # Now come the lists of os-dependent plugins. Any plugin that is not listed anywhere here |
251 |
+ # should work independent of the operating system. |
252 |
+ |
253 |
+ local linux_plugins="battery cpu cpufreq disk entropy interface iptables ipvs irq load |
254 |
+ memory netlink nfs processes serial swap tcpconns thermal users vmem vserver |
255 |
+ wireless" |
256 |
+ |
257 |
+ local libstatgrab_plugins="cpu disk interface load memory swap users" |
258 |
+ local bsd_plugins="cpu tcpconns ${libstatgrab_plugins}" |
259 |
+ |
260 |
+ local darwin_plugins="apple_sensors battery cpu disk interface memory processes tcpconns" |
261 |
+ |
262 |
+ local osdependent_plugins="${linux_plugins} ${bsd_plugins} ${darwin_plugins}" |
263 |
+ local myos_plugins="" |
264 |
+ if use kernel_linux; then |
265 |
+ einfo "Enabling Linux plugins." |
266 |
+ myos_plugins=${linux_plugins} |
267 |
+ elif use kernel_FreeBSD; then |
268 |
+ einfo "Enabling FreeBSD plugins." |
269 |
+ myos_plugins=${bsd_plugins} |
270 |
+ elif use kernel_Darwin; then |
271 |
+ einfo "Enabling Darwin plugins." |
272 |
+ myos_plugins=${darwin_plugins} |
273 |
+ fi |
274 |
+ |
275 |
+ # Do we debug? |
276 |
+ local myconf="$(use_enable debug)" |
277 |
+ |
278 |
+ local plugin |
279 |
+ |
280 |
+ # Disable what needs to be disabled. |
281 |
+ for plugin in ${COLLECTD_DISABLED_PLUGINS}; do |
282 |
+ myconf+=" --disable-${plugin}" |
283 |
+ done |
284 |
+ |
285 |
+ # Set enable/disable for each single plugin. |
286 |
+ for plugin in ${COLLECTD_ALL_PLUGINS}; do |
287 |
+ if has ${plugin} ${osdependent_plugins}; then |
288 |
+ # plugin is os-dependent ... |
289 |
+ if has ${plugin} ${myos_plugins}; then |
290 |
+ # ... and available in this os |
291 |
+ myconf+=" $(use_enable collectd_plugins_${plugin} ${plugin})" |
292 |
+ else |
293 |
+ # ... and NOT available in this os |
294 |
+ if use collectd_plugins_${plugin}; then |
295 |
+ ewarn "You try to enable the ${plugin} plugin, but it is not available for this" |
296 |
+ ewarn "kernel. Disabling it automatically." |
297 |
+ fi |
298 |
+ myconf+=" --disable-${plugin}" |
299 |
+ fi |
300 |
+ elif [[ "${plugin}" = "collectd_plugins_perl" ]]; then |
301 |
+ if use collectd_plugins_perl && ! use perl; then |
302 |
+ ewarn "Perl plugin disabled as perl bindings disabled by -perl use flag" |
303 |
+ myconf+= --disable-perl |
304 |
+ else |
305 |
+ myconf+=" $(use_enable collectd_plugins_${plugin} ${plugin})" |
306 |
+ fi |
307 |
+ else |
308 |
+ myconf+=" $(use_enable collectd_plugins_${plugin} ${plugin})" |
309 |
+ fi |
310 |
+ done |
311 |
+ |
312 |
+ # Need JAVA_HOME for java. |
313 |
+ if use collectd_plugins_java; then |
314 |
+ myconf+=" --with-java=$(java-config -g JAVA_HOME)" |
315 |
+ fi |
316 |
+ |
317 |
+ # Need libiptc ONLY for iptables. If we try to use it otherwise bug 340109 happens. |
318 |
+ if ! use collectd_plugins_iptables; then |
319 |
+ myconf+=" --with-libiptc=no" |
320 |
+ fi |
321 |
+ |
322 |
+ # The perl bindings |
323 |
+ myconf+=" $(use_with perl perl-bindings)" |
324 |
+ |
325 |
+ # Finally, run econf. |
326 |
+ KERNEL_DIR="${KERNEL_DIR}" econf --config-cache --without-included-ltdl $(use_enable static-libs static) --localstatedir=/var ${myconf} |
327 |
+} |
328 |
+ |
329 |
+src_install() { |
330 |
+ emake DESTDIR="${D}" install || die |
331 |
+ |
332 |
+ fixlocalpod |
333 |
+ |
334 |
+ find "${D}/usr/" -name "*.la" -exec rm -f {} + |
335 |
+ rm "${D}/usr/$(get_libdir)"/collectd/*.a |
336 |
+ |
337 |
+ # use collectd_plugins_ping && setcap cap_net_raw+ep ${D}/usr/sbin/collectd |
338 |
+ # we cannot do this yet |
339 |
+ |
340 |
+ fowners root:collectd /etc/collectd.conf |
341 |
+ fperms u=rw,g=r,o= /etc/collectd.conf |
342 |
+ |
343 |
+ dodoc AUTHORS ChangeLog NEWS README TODO |
344 |
+ |
345 |
+ if use contrib ; then |
346 |
+ insinto /usr/share/doc/${PF} |
347 |
+ doins -r contrib |
348 |
+ fi |
349 |
+ |
350 |
+ keepdir /var/lib/${PN} |
351 |
+ fowners collectd:collectd /var/lib/${PN} |
352 |
+ |
353 |
+ newinitd "${FILESDIR}/${PN}.initd" ${PN} |
354 |
+ newconfd "${FILESDIR}/${PN}.confd" ${PN} |
355 |
+ |
356 |
+ insinto /etc/logrotate.d |
357 |
+ newins "${FILESDIR}/logrotate" collectd |
358 |
+ |
359 |
+ sed -i -e 's:^.*PIDFile "/var/run/collectd.pid":PIDFile "/var/run/collectd/collectd.pid":' "${D}"/etc/collectd.conf || die |
360 |
+ sed -i -e 's:^# SocketFile "/var/run/collectd-unixsock":# SocketFile "/var/run/collectd/collectd-unixsock":' "${D}"/etc/collectd.conf || die |
361 |
+ sed -i -e 's:^.*LoadPlugin perl$:# The new, correct way to load the perl plugin -- \n# <LoadPlugin perl>\n# Globals true\n# </LoadPlugin>:' "${D}"/etc/collectd.conf || die |
362 |
+ sed -i -e 's:^.*LoadPlugin python$:# The new, correct way to load the python plugin -- \n# <LoadPlugin python>\n# Globals true\n# </LoadPlugin>:' "${D}"/etc/collectd.conf || die |
363 |
+} |
364 |
+ |
365 |
+collectd_rdeps() { |
366 |
+ if (use collectd_plugins_${1} && ! has_version "${2}"); then |
367 |
+ elog "The ${1} plug-in needs ${2} to be installed locally or remotely to work." |
368 |
+ fi |
369 |
+} |
370 |
+ |
371 |
+pkg_postinst() { |
372 |
+ collectd_rdeps apcups sys-power/apcupsd |
373 |
+ collectd_rdeps hddtemp app-admin/hddtemp |
374 |
+ collectd_rdeps mbmon sys-apps/xmbmon |
375 |
+ collectd_rdeps memcached ">=net-misc/memcached-1.2.2-r2" |
376 |
+ collectd_rdeps ntpd net-misc/ntp |
377 |
+ collectd_rdeps openvpn ">=net-misc/openvpn-2.0.9" |
378 |
+ |
379 |
+ echo |
380 |
+ elog "collectd is now started as unprivileged user by default." |
381 |
+ elog "You may want to recheck the configuration." |
382 |
+ elog |
383 |
+ |
384 |
+ if use collectd_plugins_email; then |
385 |
+ ewarn "The email plug-in is deprecated. To submit statistics please use the unixsock plugin." |
386 |
+ fi |
387 |
+ if use contrib; then |
388 |
+ elog "The scripts in /usr/share/doc/${PF}/collection3 for generating graphs need dev-perl/HTML-Parser," |
389 |
+ elog "dev-perl/config-general, dev-perl/regexp-common, and net-analyzer/rrdtool[perl] to be installed." |
390 |
+ fi |
391 |
+} |
392 |
|
393 |
diff --git a/app-admin/collectd/files/collectd-4.10.3-lt.patch b/app-admin/collectd/files/collectd-4.10.3-lt.patch |
394 |
new file mode 100644 |
395 |
index 0000000..68cba15 |
396 |
--- /dev/null |
397 |
+++ b/app-admin/collectd/files/collectd-4.10.3-lt.patch |
398 |
@@ -0,0 +1,31 @@ |
399 |
+diff -ruN collectd-4.10.3.orig/Makefile.am collectd-4.10.3/Makefile.am |
400 |
+--- collectd-4.10.3.orig/Makefile.am 2011-03-26 17:04:26.000000000 +0100 |
401 |
++++ collectd-4.10.3/Makefile.am 2011-04-24 17:48:18.013229944 +0200 |
402 |
+@@ -1,6 +1,6 @@ |
403 |
+-ACLOCAL_AMFLAGS = -I libltdl/m4 |
404 |
++# ACLOCAL_AMFLAGS = -I libltdl/m4 |
405 |
+ |
406 |
+-SUBDIRS = libltdl src bindings |
407 |
++SUBDIRS = src bindings |
408 |
+ |
409 |
+ INCLUDES = $(LTDLINCL) |
410 |
+ |
411 |
+diff -ruN collectd-4.10.3.orig/configure.in collectd-4.10.3/configure.in |
412 |
+--- collectd-4.10.3.orig/configure.in 2011-03-26 17:08:53.000000000 +0100 |
413 |
++++ collectd-4.10.3/configure.in 2011-04-24 17:50:06.001229943 +0200 |
414 |
+@@ -6,7 +6,6 @@ |
415 |
+ m4_ifdef([LT_PACKAGE_VERSION], |
416 |
+ # libtool >= 2.2 |
417 |
+ [ |
418 |
+- LT_CONFIG_LTDL_DIR([libltdl]) |
419 |
+ LT_INIT([dlopen]) |
420 |
+ LTDL_INIT([convenience]) |
421 |
+ AC_DEFINE(LIBTOOL_VERSION, 2, [Define to used libtool version.]) |
422 |
+@@ -18,7 +17,6 @@ |
423 |
+ AC_SUBST(LTDLINCL) |
424 |
+ AC_SUBST(LIBLTDL) |
425 |
+ AC_LIBTOOL_DLOPEN |
426 |
+- AC_CONFIG_SUBDIRS(libltdl) |
427 |
+ AC_DEFINE(LIBTOOL_VERSION, 1, [Define to used libtool version.]) |
428 |
+ ] |
429 |
+ ) |
430 |
|
431 |
diff --git a/app-admin/collectd/files/collectd-4.10.3-werror.patch b/app-admin/collectd/files/collectd-4.10.3-werror.patch |
432 |
new file mode 100644 |
433 |
index 0000000..6ddb508 |
434 |
--- /dev/null |
435 |
+++ b/app-admin/collectd/files/collectd-4.10.3-werror.patch |
436 |
@@ -0,0 +1,24 @@ |
437 |
+diff -ruN collectd-4.10.3.orig/src/Makefile.am collectd-4.10.3/src/Makefile.am |
438 |
+--- collectd-4.10.3.orig/src/Makefile.am 2011-03-26 17:08:53.000000000 +0100 |
439 |
++++ collectd-4.10.3/src/Makefile.am 2011-04-24 22:56:39.521229944 +0200 |
440 |
+@@ -7,7 +7,7 @@ |
441 |
+ endif |
442 |
+ |
443 |
+ if COMPILER_IS_GCC |
444 |
+-AM_CFLAGS = -Wall -Werror |
445 |
++AM_CFLAGS = -Wall |
446 |
+ endif |
447 |
+ |
448 |
+ AM_CPPFLAGS = -DPREFIX='"${prefix}"' |
449 |
+diff -ruN collectd-4.10.3.orig/src/libcollectdclient/Makefile.am collectd-4.10.3/src/libcollectdclient/Makefile.am |
450 |
+--- collectd-4.10.3.orig/src/libcollectdclient/Makefile.am 2011-03-26 17:04:26.000000000 +0100 |
451 |
++++ collectd-4.10.3/src/libcollectdclient/Makefile.am 2011-04-24 22:57:12.231229943 +0200 |
452 |
+@@ -1,7 +1,7 @@ |
453 |
+ AUTOMAKE_OPTIONS = foreign no-dependencies |
454 |
+ |
455 |
+ if COMPILER_IS_GCC |
456 |
+-AM_CFLAGS = -Wall -Werror |
457 |
++AM_CFLAGS = -Wall |
458 |
+ endif |
459 |
+ |
460 |
+ pkginclude_HEADERS = client.h lcc_features.h |
461 |
|
462 |
diff --git a/app-admin/collectd/metadata.xml b/app-admin/collectd/metadata.xml |
463 |
new file mode 100644 |
464 |
index 0000000..14bba86 |
465 |
--- /dev/null |
466 |
+++ b/app-admin/collectd/metadata.xml |
467 |
@@ -0,0 +1,113 @@ |
468 |
+<?xml version="1.0" encoding="UTF-8"?> |
469 |
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
470 |
+<pkgmetadata> |
471 |
+ <maintainer> |
472 |
+ <email>dilfridge@g.o</email> |
473 |
+ <name>Andreas K. Huettel</name> |
474 |
+ <description>Proxy Maintainer</description> |
475 |
+ </maintainer> |
476 |
+ <maintainer> |
477 |
+ <email>bugs@××××××××××.nu</email> |
478 |
+ <name>Johan Bergström</name> |
479 |
+ <description>Proxied Maintainer</description> |
480 |
+ </maintainer> |
481 |
+ <use> |
482 |
+ <flag name='collectd_plugins_apache'>Build the apache input plugin (transferred bytes, handled requests, detailed scoreboard statistics)</flag> |
483 |
+ <flag name='collectd_plugins_apcups'>Build the apcups input plugin (UPS charge, load, input/output/battery voltage, etc.)</flag> |
484 |
+ <flag name='collectd_plugins_ascent'>Build the ascent input plugin (statistics about a free server for World of Warcraft)</flag> |
485 |
+ <flag name='collectd_plugins_battery'>Build the battery input plugin (charge, current and voltage of ACPI and PMU based laptop batteries)</flag> |
486 |
+ <flag name='collectd_plugins_bind'>Build the bind input plugin (name server and resolver statistics)</flag> |
487 |
+ <flag name='collectd_plugins_conntrack'>Build the conntrack input plugin (number of nf_conntrack entries)</flag> |
488 |
+ <flag name='collectd_plugins_contextswitch'>Build the contextswitch input plugin (number of context switches done by the operating system)</flag> |
489 |
+ <flag name='collectd_plugins_cpu'>Build the cpu input plugin (time spent in the system, user, nice, idle, and related states)</flag> |
490 |
+ <flag name='collectd_plugins_cpufreq'>Build the cpufreq input plugin (CPU frequency, for laptops with speedstep or similar)</flag> |
491 |
+ <flag name='collectd_plugins_csv'>Build the csv output plugin (write to comma separated values (CSV) files)</flag> |
492 |
+ <flag name='collectd_plugins_curl'>Build the curl input plugin (parse statistics from websites using regular expressions)</flag> |
493 |
+ <flag name='collectd_plugins_curl_json'>Build the curl_json input plugin (get json data via curl and parse it)</flag> |
494 |
+ <flag name='collectd_plugins_curl_xml'>Build the curl_xml input plugin (get xml data via curl and parse it)</flag> |
495 |
+ <flag name='collectd_plugins_dbi'>Build the dbi input plugin (execute SQL statements on databases and interpret the reply)</flag> |
496 |
+ <flag name='collectd_plugins_df'>Build the df input plugin (mountpoint usage)</flag> |
497 |
+ <flag name='collectd_plugins_disk'>Build the disk input plugin (sectors read/written, number of read/write actions, average completion time of IO-operations)</flag> |
498 |
+ <flag name='collectd_plugins_dns'>Build the dns input plugin (collects statistics of your DNS traffic on port udp/53)</flag> |
499 |
+ <flag name='collectd_plugins_email'>Build the email input plugin (opens a UNIX domain socket and starts accepting connections on that socket)</flag> |
500 |
+ <flag name='collectd_plugins_entropy'>Build the entropy input plugin (available entropy on a system)</flag> |
501 |
+ <flag name='collectd_plugins_ethstat'>Build the ethstat input plugin (performance statistics of Linux ethernet cards)</flag> |
502 |
+ <flag name='collectd_plugins_exec'>Build the exec input/output plugin (executes scripts / applications and reads values back)</flag> |
503 |
+ <flag name='collectd_plugins_filecount'>Build the filecount input plugin (countd the number of files in a directory and all its subdirectories)</flag> |
504 |
+ <flag name='collectd_plugins_fscache'>Build the fscache input plugin (information about the caching infrastructure for network file-systems etc)</flag> |
505 |
+ <flag name='collectd_plugins_gmond'>Build the gmond input plugin (receive data from gmond, the client daemon of the Ganglia project)</flag> |
506 |
+ <flag name='collectd_plugins_hddtemp'>Build the hddtemp input plugin (temperature of hard disks)</flag> |
507 |
+ <flag name='collectd_plugins_interface'>Build the interface input plugin (information about traffic, packets and errors of interfaces)</flag> |
508 |
+ <flag name='collectd_plugins_ipmi'>Build the ipmi input plugin (read hardware sensors from servers using the Intelligent Platform Management Interface (IPMI))</flag> |
509 |
+ <flag name='collectd_plugins_iptables'>Build the iptables input plugin (statistics from a ip_tables based packet filter)</flag> |
510 |
+ <flag name='collectd_plugins_irq'>Build the irq input plugin (number of times each interrupt has been handled by the os)</flag> |
511 |
+ <flag name='collectd_plugins_java'>Build the java input plugin (embeds a JVM into collectd for writing plugins)</flag> |
512 |
+ <flag name='collectd_plugins_libvirt'>Build the libvirt input plugin (statistics about virtualized guests on a system)</flag> |
513 |
+ <flag name='collectd_plugins_load'>Build the load input plugin (system load)</flag> |
514 |
+ <flag name='collectd_plugins_logfile'>Build the logfile output plugin (writes log messages to a text file)</flag> |
515 |
+ <flag name='collectd_plugins_madwifi'>Build the madwifi input plugin (information about Atheros wireless LAN chipsets)</flag> |
516 |
+ <flag name='collectd_plugins_match_empty_counter'>Build the match_empty_counter filter plugin</flag> |
517 |
+ <flag name='collectd_plugins_match_hashed'>Build the match_hashed filter plugin</flag> |
518 |
+ <flag name='collectd_plugins_match_regex'>Build the match_regex filter plugin</flag> |
519 |
+ <flag name='collectd_plugins_match_timediff'>Build the match_timediff filter plugin</flag> |
520 |
+ <flag name='collectd_plugins_match_value'>Build the match_value filter plugin</flag> |
521 |
+ <flag name='collectd_plugins_mbmon'>Build the mbmon input plugin (information from mainboard sensors)</flag> |
522 |
+ <flag name='collectd_plugins_md'>Build the md input plugin (disk states in Linux md devices)</flag> |
523 |
+ <flag name='collectd_plugins_memcachec'>Build the memcachec input plugin (connects to a memcached server)</flag> |
524 |
+ <flag name='collectd_plugins_memcached'>Build the memcached input plugin (connects to a memcached daemon)</flag> |
525 |
+ <flag name='collectd_plugins_memory'>Build the memory input plugin (physical memory utilization)</flag> |
526 |
+ <flag name='collectd_plugins_multimeter'>Build the multimeter input plugin (reads a voltage or current from a multimeter connected to a serial bus)</flag> |
527 |
+ <flag name='collectd_plugins_mysql'>Build the mysql input plugin (connects to an MySQL-database and issues a SHOW STATUS command)</flag> |
528 |
+ <flag name='collectd_plugins_netlink'>Build the netlink input plugin (opens a netlink socket to the Linux kernel for getting statistics)</flag> |
529 |
+ <flag name='collectd_plugins_network'>Build the network input/output plugin (communicates with other instances of collectd)</flag> |
530 |
+ <flag name='collectd_plugins_nfs'>Build the nfs input plugin (usage of the Network File System)</flag> |
531 |
+ <flag name='collectd_plugins_nginx'>Build the nginx input plugin (number of requests handled by the nginx daemon)</flag> |
532 |
+ <flag name='collectd_plugins_notify_desktop'>Build the notify_desktop output plugin (uses libnotify to display notifications to the user)</flag> |
533 |
+ <flag name='collectd_plugins_notify_email'>Build the notify_email output plugin (uses libESMTP to send notifications to a configured email address)</flag> |
534 |
+ <flag name='collectd_plugins_ntpd'>Build the ntpd input plugin (queries an NTP server)</flag> |
535 |
+ <flag name='collectd_plugins_numa'>Build the numa input plugin (statistics of the Linux Non-Uniform Memory Access (NUMA) subsystem)</flag> |
536 |
+ <flag name='collectd_plugins_nut'>Build the nut input plugin (collects UPS statistics using the Network UPS Tools)</flag> |
537 |
+ <flag name='collectd_plugins_oracle'>Build the oracle input plugin (SQL-queries one or more Oracle database systems)</flag> |
538 |
+ <flag name='collectd_plugins_olsrd'>Build the olsrd input plugin (reads information about the Optimized Link State Routing daemon)</flag> |
539 |
+ <flag name='collectd_plugins_onewire'>Build the onewire input plugin (collects temperature information from sensors)</flag> |
540 |
+ <flag name='collectd_plugins_openvpn'>Build the openvpn input plugin (reads the status file printed by OpenVPN)</flag> |
541 |
+ <flag name='collectd_plugins_perl'>Build the perl language binding plugin (embeds a Perl interpreter into collectd for writing plugins)</flag> |
542 |
+ <flag name='collectd_plugins_ping'>Build the ping input plugin (measures network latency)</flag> |
543 |
+ <flag name='collectd_plugins_postgresql'>Build the postgresql input plugin (connects to and executes SQL statements on a PostgreSQL database)</flag> |
544 |
+ <flag name='collectd_plugins_powerdns'>Build the powerdns input plugin (connects to a local PowerDNS instance)</flag> |
545 |
+ <flag name='collectd_plugins_processes'>Build the processes input plugin (statistics about processes)</flag> |
546 |
+ <flag name='collectd_plugins_protocols'>Build the protocols input plugin (network protocols)</flag> |
547 |
+ <flag name='collectd_plugins_python'>Build the python language binding plugin (embeds a Python interpreter into collectd for writing plugins)</flag> |
548 |
+ <flag name='collectd_plugins_rrdcached'>Build the rrdcached input/output plugin (connects to rrdcached and submits updates for RRD files)</flag> |
549 |
+ <flag name='collectd_plugins_rrdtool'>Build the rrdtool output plugin (writes values to RRD-files)</flag> |
550 |
+ <flag name='collectd_plugins_routeros'>Build the routeros input plugin (collect information on devices running RouterOS)</flag> |
551 |
+ <flag name='collectd_plugins_sensors'>Build the sensors input plugin (uses lm-sensors to read hardware sensors)</flag> |
552 |
+ <flag name='collectd_plugins_serial'>Build the serial input plugin (collects the traffic on serial interfaces)</flag> |
553 |
+ <flag name='collectd_plugins_snmp'>Build the snmp input plugin (read values from network devices using SNMP)</flag> |
554 |
+ <flag name='collectd_plugins_swap'>Build the swap input plugin (amount of memory currently written to swap)</flag> |
555 |
+ <flag name='collectd_plugins_syslog'>Build the syslog output plugin (receives messages from collectd and dispatches them to syslog)</flag> |
556 |
+ <flag name='collectd_plugins_table'>Build the table input plugin (parses table-like structured plain text)</flag> |
557 |
+ <flag name='collectd_plugins_tail'>Build the tail input plugin (follows logfiles as e.g. tail -f)</flag> |
558 |
+ <flag name='collectd_plugins_target_notification'>Build the target_notification filter plugin</flag> |
559 |
+ <flag name='collectd_plugins_target_replace'>Build the target_replace filter plugin</flag> |
560 |
+ <flag name='collectd_plugins_target_scale'>Build the target_scale filter plugin</flag> |
561 |
+ <flag name='collectd_plugins_target_set'>Build the target_set filter plugin</flag> |
562 |
+ <flag name='collectd_plugins_tcpconns'>Build the tcpconns input plugin (number of TCP connections to or from a specified port)</flag> |
563 |
+ <flag name='collectd_plugins_teamspeak2'>Build the teamspeak2 input plugin (collects traffic statistics from a teamspeak2 instance)</flag> |
564 |
+ <flag name='collectd_plugins_ted'>Build the ted input plugin (connects to The Energy Detective and reads the current power over connected power lines)</flag> |
565 |
+ <flag name='collectd_plugins_thermal'>Build the thermal input plugin (ACPI thermal zone information)</flag> |
566 |
+ <flag name='collectd_plugins_tokyotyrant'>Build the tokyotyrant input plugin (number of records and file size from a running Tokyo Tyrant server)</flag> |
567 |
+ <flag name='collectd_plugins_uptime'>Build the uptime input plugin (system uptime)</flag> |
568 |
+ <flag name='collectd_plugins_unixsock'>Build the unixsock output plugin (opens a UNIX domain socket and accepts connections)</flag> |
569 |
+ <flag name='collectd_plugins_users'>Build the users input plugin (number of users currently logged in)</flag> |
570 |
+ <flag name='collectd_plugins_uuid'>Build the uuid plugin (tries hard to determine the UUID of the system it is running on)</flag> |
571 |
+ <flag name='collectd_plugins_varnish'>Build the varnish input plugin</flag> |
572 |
+ <flag name='collectd_plugins_vmem'>Build the vmem input plugin (information about the virtual memory subsystem)</flag> |
573 |
+ <flag name='collectd_plugins_vserver'>Build the vserver input plugin (virtual servers running on a system)</flag> |
574 |
+ <flag name='collectd_plugins_wireless'>Build the wireless input plugin (signal quality, signal power and signal-to-noise ratio for wireless LAN cards)</flag> |
575 |
+ <flag name='collectd_plugins_write_graphite'>Build the write_graphite output plugin (sends the values collected by collectd to Carbon, the storage layer of the Graphite time-series database)</flag> |
576 |
+ <flag name='collectd_plugins_write_http'>Build the write_http output plugin (sends the values collected by collectd to a web-server)</flag> |
577 |
+ <flag name='collectd_plugins_write_mongodb'>Build the write_mongodb output plugin (sends the values collected by collectd to a MongoDB)</flag> |
578 |
+ <flag name='contrib'>Install user-contributed files in the doc directory</flag> |
579 |
+ </use> |
580 |
+</pkgmetadata> |