* [gentoo-commits] gentoo-x86 commit in app-admin/collectd: ChangeLog collectd-4.10.1-r2.ebuild
@ 2010-09-29 18:26 Diego Petteno (flameeyes)
0 siblings, 0 replies; 4+ messages in thread
From: Diego Petteno (flameeyes) @ 2010-09-29 18:26 UTC (permalink / raw
To: gentoo-commits
flameeyes 10/09/29 18:26:44
Modified: ChangeLog collectd-4.10.1-r2.ebuild
Log:
Fix DEPEND variables.
(Portage version: 2.2_rc88/cvs/Linux x86_64)
Revision Changes Path
1.2 app-admin/collectd/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/collectd/ChangeLog?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/collectd/ChangeLog?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/collectd/ChangeLog?r1=1.1&r2=1.2
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/collectd/ChangeLog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ChangeLog 28 Sep 2010 15:17:05 -0000 1.1
+++ ChangeLog 29 Sep 2010 18:26:44 -0000 1.2
@@ -1,6 +1,10 @@
# ChangeLog for app-admin/collectd
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/ChangeLog,v 1.1 2010/09/28 15:17:05 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/ChangeLog,v 1.2 2010/09/29 18:26:44 flameeyes Exp $
+
+ 29 Sep 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+ collectd-4.10.1-r2.ebuild:
+ Fix DEPEND variables.
*collectd-4.10.1-r2 (28 Sep 2010)
1.3 app-admin/collectd/collectd-4.10.1-r2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/collectd/collectd-4.10.1-r2.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/collectd/collectd-4.10.1-r2.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/collectd/collectd-4.10.1-r2.ebuild?r1=1.2&r2=1.3
Index: collectd-4.10.1-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/collectd/collectd-4.10.1-r2.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- collectd-4.10.1-r2.ebuild 28 Sep 2010 15:55:08 -0000 1.2
+++ collectd-4.10.1-r2.ebuild 29 Sep 2010 18:26:44 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/collectd-4.10.1-r2.ebuild,v 1.2 2010/09/28 15:55:08 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/collectd-4.10.1-r2.ebuild,v 1.3 2010/09/29 18:26:44 flameeyes Exp $
EAPI="2"
@@ -46,6 +46,8 @@
# Now come the dependencies.
+# this cannot be in the dependencies if the USE flag is not listed
+# collectd_plugins_oracle? ( >=dev-db/oracle-instantclient-basic-11.1.0.7.0 )
COMMON_DEPEND="
collectd_plugins_apache? ( net-misc/curl )
collectd_plugins_ascent? ( net-misc/curl dev-libs/libxml2 )
@@ -65,7 +67,6 @@
collectd_plugins_notify_desktop? ( x11-libs/libnotify )
collectd_plugins_notify_email? ( >=net-libs/libesmtp-1.0.4 dev-libs/openssl )
collectd_plugins_onewire? ( sys-fs/owfs )
- collectd_plugins_oracle? ( >=dev-db/oracle-instantclient-basic-11.1.0.7.0 )
collectd_plugins_perl? ( dev-lang/perl[ithreads] sys-devel/libperl[ithreads] )
collectd_plugins_postgresql? ( >=dev-db/postgresql-base-8.2 )
collectd_plugins_python? ( =dev-lang/python-2* )
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-admin/collectd: ChangeLog collectd-4.10.1-r2.ebuild
@ 2010-10-03 16:28 Andreas HAttel (dilfridge)
0 siblings, 0 replies; 4+ messages in thread
From: Andreas HAttel (dilfridge) @ 2010-10-03 16:28 UTC (permalink / raw
To: gentoo-commits
dilfridge 10/10/03 16:28:00
Modified: ChangeLog collectd-4.10.1-r2.ebuild
Log:
Removed the PROCFS checks for speedup (on request from flameeyes)
(Portage version: 2.1.9.13/cvs/Linux x86_64)
Revision Changes Path
1.3 app-admin/collectd/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/collectd/ChangeLog?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/collectd/ChangeLog?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/collectd/ChangeLog?r1=1.2&r2=1.3
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/collectd/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ChangeLog 29 Sep 2010 18:26:44 -0000 1.2
+++ ChangeLog 3 Oct 2010 16:28:00 -0000 1.3
@@ -1,6 +1,10 @@
# ChangeLog for app-admin/collectd
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/ChangeLog,v 1.2 2010/09/29 18:26:44 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/ChangeLog,v 1.3 2010/10/03 16:28:00 dilfridge Exp $
+
+ 03 Oct 2010; Andreas K. Huettel <dilfridge@gentoo.org>
+ collectd-4.10.1-r2.ebuild:
+ Removed the PROCFS checks for speedup (on request from flameeyes)
29 Sep 2010; Diego E. Pettenò <flameeyes@gentoo.org>
collectd-4.10.1-r2.ebuild:
1.4 app-admin/collectd/collectd-4.10.1-r2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/collectd/collectd-4.10.1-r2.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/collectd/collectd-4.10.1-r2.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/collectd/collectd-4.10.1-r2.ebuild?r1=1.3&r2=1.4
Index: collectd-4.10.1-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/collectd/collectd-4.10.1-r2.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- collectd-4.10.1-r2.ebuild 29 Sep 2010 18:26:44 -0000 1.3
+++ collectd-4.10.1-r2.ebuild 3 Oct 2010 16:28:00 -0000 1.4
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/collectd-4.10.1-r2.ebuild,v 1.3 2010/09/29 18:26:44 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/collectd-4.10.1-r2.ebuild,v 1.4 2010/10/03 16:28:00 dilfridge Exp $
EAPI="2"
@@ -135,80 +135,35 @@
# battery.c:/proc/pmu/battery_%i
# battery.c:/proc/acpi/battery
- collectd_plugin_kernel_linux battery PROC_FS warn
collectd_plugin_kernel_linux battery ACPI_BATTERY warn
- # cpu.c:/proc/stat
- collectd_plugin_kernel_linux cpu PROC_FS warn
-
# cpufreq.c:/sys/devices/system/cpu/cpu%d/cpufreq/
collectd_plugin_kernel_linux cpufreq SYSFS warn
collectd_plugin_kernel_linux cpufreq CPU_FREQ_STAT warn
- # utils_mount.c:/proc/partitions
- collectd_plugin_kernel_linux df PROC_FS warn
-
- # disk.c:/proc/diskstats
- # disk.c:/proc/partitions
- collectd_plugin_kernel_linux disk PROC_FS warn
-
- # entropy.c:/proc/sys/kernel/random/entropy_avail
- collectd_plugin_kernel_linux entropy PROC_FS warn
-
- # hddtemp.c:/proc/partitions
- collectd_plugin_kernel_linux hddtemp PROC_FS info
-
- # interface.c:/proc/net/dev
- collectd_plugin_kernel_linux interface PROC_FS warn
-
- # irq.c:/proc/interrupts
- collectd_plugin_kernel_linux irq PROC_FS warn
-
- # load.c:/proc/loadavg
- collectd_plugin_kernel_linux load PROC_FS warn
-
- # memory.c:/proc/meminfo
- collectd_plugin_kernel_linux memory PROC_FS warn
-
# nfs.c:/proc/net/rpc/nfs
# nfs.c:/proc/net/rpc/nfsd
- collectd_plugin_kernel_linux nfs PROC_FS warn
collectd_plugin_kernel_linux nfs NFS_COMMON warn
- # processes.c:/proc/%i/task
- # processes.c:/proc/%i/stat
- collectd_plugin_kernel_linux processes PROC_FS warn
-
# serial.c:/proc/tty/driver/serial
# serial.c:/proc/tty/driver/ttyS
- collectd_plugin_kernel_linux serial PROC_FS warn
collectd_plugin_kernel_linux serial SERIAL_CORE warn
# swap.c:/proc/meminfo
- collectd_plugin_kernel_linux swap PROC_FS warn
collectd_plugin_kernel_linux swap SWAP warn
- # tcpconns.c:/proc/net/tcp
- # tcpconns.c:/proc/net/tcp6
- collectd_plugin_kernel_linux tcpconns PROC_FS warn
-
# thermal.c:/proc/acpi/thermal_zone
# thermal.c:/sys/class/thermal
collectd_plugin_kernel_linux thermal "PROC_FS SYSFS" warn
collectd_plugin_kernel_linux thermal ACPI_THERMAL warn
# vmem.c:/proc/vmstat
- collectd_plugin_kernel_linux vmem PROC_FS warn
collectd_plugin_kernel_linux vmem VM_EVENT_COUNTERS warn
- # vserver.c:/proc/virtual
- collectd_plugin_kernel_linux vserver PROC_FS warn
-
# uuid.c:/sys/hypervisor/uuid
collectd_plugin_kernel_linux uuid SYSFS info
# wireless.c:/proc/net/wireless
- collectd_plugin_kernel_linux wireless PROC_FS warn
collectd_plugin_kernel_linux wireless "MAC80211 IEEE80211" warn
}
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-admin/collectd: ChangeLog collectd-4.10.1-r2.ebuild
@ 2010-10-10 18:15 Andreas HAttel (dilfridge)
0 siblings, 0 replies; 4+ messages in thread
From: Andreas HAttel (dilfridge) @ 2010-10-10 18:15 UTC (permalink / raw
To: gentoo-commits
dilfridge 10/10/10 18:15:48
Modified: ChangeLog collectd-4.10.1-r2.ebuild
Log:
Added unconditional dependency on iptables as workaround for bug 340109.
(Portage version: 2.1.9.13/cvs/Linux i686)
Revision Changes Path
1.4 app-admin/collectd/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/collectd/ChangeLog?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/collectd/ChangeLog?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/collectd/ChangeLog?r1=1.3&r2=1.4
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/collectd/ChangeLog,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ChangeLog 3 Oct 2010 16:28:00 -0000 1.3
+++ ChangeLog 10 Oct 2010 18:15:48 -0000 1.4
@@ -1,6 +1,11 @@
# ChangeLog for app-admin/collectd
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/ChangeLog,v 1.3 2010/10/03 16:28:00 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/ChangeLog,v 1.4 2010/10/10 18:15:48 dilfridge Exp $
+
+ 10 Oct 2010; Andreas K. Huettel <dilfridge@gentoo.org>
+ collectd-4.10.1-r2.ebuild:
+ Added unconditional dependency on iptables as workaround for bug 340109. A
+ real resolution will follow.
03 Oct 2010; Andreas K. Huettel <dilfridge@gentoo.org>
collectd-4.10.1-r2.ebuild:
1.5 app-admin/collectd/collectd-4.10.1-r2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/collectd/collectd-4.10.1-r2.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/collectd/collectd-4.10.1-r2.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/collectd/collectd-4.10.1-r2.ebuild?r1=1.4&r2=1.5
Index: collectd-4.10.1-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/collectd/collectd-4.10.1-r2.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- collectd-4.10.1-r2.ebuild 3 Oct 2010 16:28:00 -0000 1.4
+++ collectd-4.10.1-r2.ebuild 10 Oct 2010 18:15:48 -0000 1.5
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/collectd-4.10.1-r2.ebuild,v 1.4 2010/10/03 16:28:00 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/collectd-4.10.1-r2.ebuild,v 1.5 2010/10/10 18:15:48 dilfridge Exp $
EAPI="2"
@@ -49,6 +49,7 @@
# this cannot be in the dependencies if the USE flag is not listed
# collectd_plugins_oracle? ( >=dev-db/oracle-instantclient-basic-11.1.0.7.0 )
COMMON_DEPEND="
+ >=net-firewall/iptables-1.4.9.1-r2
collectd_plugins_apache? ( net-misc/curl )
collectd_plugins_ascent? ( net-misc/curl dev-libs/libxml2 )
collectd_plugins_bind? ( dev-libs/libxml2 )
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-admin/collectd: ChangeLog collectd-4.10.1-r2.ebuild
@ 2010-10-12 17:59 Andreas HAttel (dilfridge)
0 siblings, 0 replies; 4+ messages in thread
From: Andreas HAttel (dilfridge) @ 2010-10-12 17:59 UTC (permalink / raw
To: gentoo-commits
dilfridge 10/10/12 17:59:52
Modified: ChangeLog collectd-4.10.1-r2.ebuild
Log:
Real fix for bug 340109: use libiptc only if needed and fully disable bundled copy
(Portage version: 2.1.9.14/cvs/Linux x86_64)
Revision Changes Path
1.6 app-admin/collectd/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/collectd/ChangeLog?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/collectd/ChangeLog?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/collectd/ChangeLog?r1=1.5&r2=1.6
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/collectd/ChangeLog,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ChangeLog 10 Oct 2010 19:13:04 -0000 1.5
+++ ChangeLog 12 Oct 2010 17:59:52 -0000 1.6
@@ -1,6 +1,11 @@
# ChangeLog for app-admin/collectd
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/ChangeLog,v 1.5 2010/10/10 19:13:04 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/ChangeLog,v 1.6 2010/10/12 17:59:52 dilfridge Exp $
+
+ 12 Oct 2010; Andreas K. Huettel <dilfridge@gentoo.org>
+ collectd-4.10.1-r2.ebuild, +files/collectd-4.10.1-noowniptc.patch:
+ Real fix for bug 340109: use libiptc only if needed for iptables plugin,
+ and completely disable bundled version
10 Oct 2010; Andreas K. Huettel <dilfridge@gentoo.org>
files/collectd.initd:
1.6 app-admin/collectd/collectd-4.10.1-r2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/collectd/collectd-4.10.1-r2.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/collectd/collectd-4.10.1-r2.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/collectd/collectd-4.10.1-r2.ebuild?r1=1.5&r2=1.6
Index: collectd-4.10.1-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/collectd/collectd-4.10.1-r2.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- collectd-4.10.1-r2.ebuild 10 Oct 2010 18:15:48 -0000 1.5
+++ collectd-4.10.1-r2.ebuild 12 Oct 2010 17:59:52 -0000 1.6
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/collectd-4.10.1-r2.ebuild,v 1.5 2010/10/10 18:15:48 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/collectd-4.10.1-r2.ebuild,v 1.6 2010/10/12 17:59:52 dilfridge Exp $
EAPI="2"
@@ -46,10 +46,7 @@
# Now come the dependencies.
-# this cannot be in the dependencies if the USE flag is not listed
-# collectd_plugins_oracle? ( >=dev-db/oracle-instantclient-basic-11.1.0.7.0 )
COMMON_DEPEND="
- >=net-firewall/iptables-1.4.9.1-r2
collectd_plugins_apache? ( net-misc/curl )
collectd_plugins_ascent? ( net-misc/curl dev-libs/libxml2 )
collectd_plugins_bind? ( dev-libs/libxml2 )
@@ -97,7 +94,7 @@
RDEPEND="${COMMON_DEPEND}
collectd_plugins_syslog? ( virtual/logger )"
-PATCHES=( "${FILESDIR}/${P}"-{libperl,libiptc}.patch )
+PATCHES=( "${FILESDIR}/${P}"-{libperl,libiptc,noowniptc}.patch )
# @FUNCTION: collectd_plugin_kernel_linux
# @DESCRIPTION:
@@ -251,6 +248,11 @@
myconf+=" --with-java=$(java-config -g JAVA_HOME)"
fi
+ # Need libiptc ONLY for iptables. If we try to use it otherwise bug 340109 happens.
+ if ! use collectd_plugins_iptables; then
+ myconf+=" --with-libiptc=no"
+ fi
+
# Finally, run econf.
KERNEL_DIR="${KERNEL_DIR}" econf --config-cache --without-included-ltdl --localstatedir=/var ${myconf}
}
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-10-12 17:59 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-10-03 16:28 [gentoo-commits] gentoo-x86 commit in app-admin/collectd: ChangeLog collectd-4.10.1-r2.ebuild Andreas HAttel (dilfridge)
-- strict thread matches above, loose matches on Subject: below --
2010-10-12 17:59 Andreas HAttel (dilfridge)
2010-10-10 18:15 Andreas HAttel (dilfridge)
2010-09-29 18:26 Diego Petteno (flameeyes)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox