From c1d24e6f485b85e713dba28bbff928f3e19a8374 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20H=C3=BCttel?= Date: Sat, 22 Oct 2011 17:35:40 +0000 Subject: [PATCH] Version bump; add varnish-3 patch, bug 386993 Package-Manager: portage-2.1.10.29/cvs/Linux x86_64 --- app-admin/collectd/ChangeLog | 9 +- app-admin/collectd/Manifest | 26 +- app-admin/collectd/collectd-4.10.3-r1.ebuild | 347 ------------------ ...-5.0.0-r1.ebuild => collectd-5.0.1.ebuild} | 12 +- .../files/collectd-5.0.1-varnish.patch | 159 ++++++++ 5 files changed, 191 insertions(+), 362 deletions(-) delete mode 100644 app-admin/collectd/collectd-4.10.3-r1.ebuild rename app-admin/collectd/{collectd-5.0.0-r1.ebuild => collectd-5.0.1.ebuild} (97%) create mode 100644 app-admin/collectd/files/collectd-5.0.1-varnish.patch diff --git a/app-admin/collectd/ChangeLog b/app-admin/collectd/ChangeLog index ec923b5b79b7..8253bd3443f6 100644 --- a/app-admin/collectd/ChangeLog +++ b/app-admin/collectd/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-admin/collectd # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/ChangeLog,v 1.29 2011/10/18 15:21:12 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/ChangeLog,v 1.30 2011/10/22 17:35:40 dilfridge Exp $ + +*collectd-5.0.1 (22 Oct 2011) + + 22 Oct 2011; Andreas K. Huettel + -collectd-4.10.3-r1.ebuild, -collectd-5.0.0-r1.ebuild, + +collectd-5.0.1.ebuild, +files/collectd-5.0.1-varnish.patch: + Version bump; add varnish-3 patch, bug 386993 18 Oct 2011; Jeroen Roovers metadata.xml: Fix maintainer tag order and remove bug wrangler instructions that machines diff --git a/app-admin/collectd/Manifest b/app-admin/collectd/Manifest index 23302a434f5c..8d6f85aa2381 100644 --- a/app-admin/collectd/Manifest +++ b/app-admin/collectd/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA512 AUX collectd-4.10.1-libiptc.patch 534 RMD160 dd6c016797ec4e6e5c7c67bbbeddd50d1c59badc SHA1 253efd36642f7ab1253bcc307e0f4d0e1a4d8e21 SHA256 f6c63e0cb686e4d7a655b9ff0b69e8ba75a9cf40c2ae79c6ec97c1e7377d2f4e AUX collectd-4.10.1-libperl.patch 917 RMD160 2feb20abbf7fd036e34957c190689f1e668ff321 SHA1 1c8312b576faa6a855f4f615995b007b108325ba SHA256 26e3c74392166a2438d7106e94953f871aedfe3b643c866afc8865c1ef7534c7 @@ -12,20 +12,30 @@ AUX collectd-4.10.3-werror.patch 849 RMD160 1bf304deb3addbdeb4d7e12ea06f49dd3f85 AUX collectd-5.0.0-varnish.patch 4122 RMD160 8674c631d7b6906dae0ba1446852d7a6f6b644af SHA1 7bc294830f2740d0a0261dda6072eac144ad4b80 SHA256 781cd9773c198824db629487bffdc09e93aa924dae2b3d27f4d20660f2e340fb AUX collectd-5.0.0-yajl2-2.patch 735 RMD160 58f634894c80b7c17656fde910a9917c46b15c17 SHA1 06b9c515587fcc39c2fb9c744db2e18d06628273 SHA256 06f82f3a8d350482a5ae1804db9f97948c02f527d9fdcdad8646c56e42cbc8fd AUX collectd-5.0.0-yajl2.patch 3586 RMD160 7bbd917f5dabd645a72b32d8bf70826014736e89 SHA1 32df19c19620adea658320e917f791690fb02342 SHA256 463ed3de9819000d37883698e25756d775fac232405310ae6a6b4494878e285d +AUX collectd-5.0.1-varnish.patch 5779 RMD160 2853c02f56d3aa2dbdea8011750b89d993909ae2 SHA1 4a4a8c9f3250c031209ec43b45e68f0f4a09d59e SHA256 84e0083fb7a1687fb5a0f1349bf6b38492a9a1491110ea75fbcf52fa59377678 AUX collectd.confd 865 RMD160 edf4e29bc193128d913443ba5251935726b13194 SHA1 0987c9546a814d0f6c888f46828ad66b3a190a97 SHA256 c24b11a65cb25587aa534c529a2b394b7c190ac44e1849ea5e1bc02d1e0a1592 AUX collectd.initd 1648 RMD160 75e310da33a8205dd166d93af2f877d1f8e4d2af SHA1 7f363f6b5f2f085e896e2130494701498a5146da SHA256 a8be14bf15922c423602c5cc595f69bb425c80983a7fd25df13b3caf15d4779a AUX logrotate 115 RMD160 bc70b0fbacde2021a96851f781e096597b161f8c SHA1 4c9f65faab5a43b142fe7f34163ca6d07b8ed704 SHA256 eb359631805b6bfb9f2a9ae5ed21be8f8b3b6f1ffeed8d506231043c9a77262c -DIST collectd-4.10.3.tar.bz2 1343806 RMD160 3c6257880de6385ee0ad891b5e8fff0916969be8 SHA1 fbeb672d9e1a32f9eb4a5df535519e2fdb8da636 SHA256 ffd1959273301b302c144057baf68128e62c42bcff156ba941336e7389439b65 DIST collectd-5.0.0.tar.bz2 1372805 RMD160 7b0b9060a4dbde937fa2263076fdd81f328f46aa SHA1 720746ee2542ddec9ef7b42b5f3e00412d1b3b43 SHA256 2df6ef3b90d588b82a16da479ad652fdd5837fb9e6fd04b728c6427a3d767e3c -EBUILD collectd-4.10.3-r1.ebuild 12528 RMD160 2ad40970131dc4bc194a9d109d3120767b1d68c4 SHA1 46d610c1107d8f51aa5627e6a8ac1d036bf6a593 SHA256 c2b7de77077f354dc676b7d4785943037972803f238f1d3bb8a4d3aa5a256cda -EBUILD collectd-5.0.0-r1.ebuild 12903 RMD160 3b9b1d9dbe1e3862c7811bc3921a84d4556a9ffa SHA1 c9666d55467fbd10ad50a4585857af19db580ca3 SHA256 545ca644b98970d4eedef9058470ea76a01817b90c4cad71c886ac600f903efe +DIST collectd-5.0.1.tar.bz2 1331938 RMD160 26911d3d2c528df43be4ef50dde6e6a6d009132d SHA1 43c61e2aadb4fe648a24a690163a34cd7da76af2 SHA256 23968cf17ef509832bd7c206de5247571b5120418fc537a14d7c26ebd714d86b EBUILD collectd-5.0.0-r2.ebuild 12996 RMD160 5e5ecc67f2b206e3d4c1cf1c014123a147b6ec4e SHA1 6fb1867f1529d8cf2a73a1b10656257e7239931e SHA256 675b625a33de100858da8ccfbc73c9469e9086d7594a87d3285eddb6bdf59a90 -MISC ChangeLog 6256 RMD160 55005240a8e47ea0188f465c64e529c588faebbb SHA1 f998cf4ffce6373417aad30be648815d2236bc69 SHA256 8b0402f384020d19bc7675f955ae57b0a1fd155ea77265b2e942cc87e3dbe73c +EBUILD collectd-5.0.1.ebuild 12892 RMD160 78d9ce373f35c4388f9a64962badc80e9d5aa9cc SHA1 184f449f8f205bcb2619156a36a96c3f76da5184 SHA256 8ebe516152bfa09d524b0762fe3c16aa32538a545ac74e280a256b14737fad08 +MISC ChangeLog 6519 RMD160 5c4f8ad45f5824e604947c7c68f4db4159d242a7 SHA1 3698266121b859809856b7ef4740be91b28a8db1 SHA256 bdb42356d275f2bc43db3f3400135805d2667b41f5eb5d9d99f757cbe4b944b8 MISC metadata.xml 11747 RMD160 8c7912edcc4970ba68ce6e8e87620e71ebad8ddd SHA1 f4c50a6232b9e581ddc679b8cd3b9d8887977ee6 SHA256 360c8d20b14cccbced28fdf08f199a932ae5dee8106541c9a99f2d041288c54e -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk6dmW4ACgkQVWmRsqeSphMvXgCffO6eAYHMLy0H0jGhxLTCPnpU -KnkAnA3s4hproMVL6MHbRD3aQTms2Mqa -=us3f +iQIcBAEBCgAGBQJOov78AAoJENwGBM22xffee7IQAKAadqrnmXUgh6Q3gIU6Rpuv +saXHXA72rIaqZNUzEWCB5PfgVYd36koKo2L0SGsDWhW5visJw/GLYloANTugxyNF +eHhrt3umirMhDYhju5tZiFjuBDIzglMSVgDCXI/ltZZ3Qv/SAx6QQZtYwzg5b017 +ftqw/JCVOFBaivj5AMnyScwlsk6QgMwwe+xM9VR1nivaYJIXLhL5FTzjbGgChiw2 +vkgZ3vB4dcfTWDQvWTnpuO8nGIYngKYlTjXE5gXncdgvw5/XghYgCi08ybny30iD +/i+R76n9awp/85Ag6E5+Fk9uxcIBzQOtu0wRIhGYKg2v+NHERJrpBGe12D6vSqby ++VvRoPQoIyOmX5O8PBdAI/N2gQt71EqkHsu2SaJ7YuIr/aHStqlw/vHmaAHokcot +EFIA6KzEo7p6z70fqLoWyrcauhzWSGrB/npQB09mvJuBFjjeVVIA5yHnWHvstD06 +LVPRGPE0K/48vTGN1DZhape/w/SEHjXYcX0lVbMQkKf7ZWO7NMkT4eLVKX0udfYV +EDqt6BGSrdEyueBZ6OvyQ43XUElnxr3yg+bjFyz+VrZlhMRdelJjv5CXGN27jAm8 +svdFzL8ZvanrtU3kxprIngPblWBI83G+rzKInwqMamacn1m6/+E/jNoUrTcx3/DV +hxJox8SKUWJ34sOm+UkB +=KtQT -----END PGP SIGNATURE----- diff --git a/app-admin/collectd/collectd-4.10.3-r1.ebuild b/app-admin/collectd/collectd-4.10.3-r1.ebuild deleted file mode 100644 index 5778331d8a9c..000000000000 --- a/app-admin/collectd/collectd-4.10.3-r1.ebuild +++ /dev/null @@ -1,347 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/collectd-4.10.3-r1.ebuild,v 1.3 2011/07/25 21:00:48 dilfridge Exp $ - -EAPI=4 - -inherit eutils base linux-info perl-app autotools - -DESCRIPTION="A small daemon which collects system performance statistics - with a near-infinite number of plugins" -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 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="netapp pinba xmms" - -# Plugins that still need some work -COLLECTD_UNTESTED_PLUGINS="ipvs apple_sensors routeros tape zfs_arc modbus" - -# Plugins that have been (compile) tested and can be enabled via COLLECTD_PLUGINS -COLLECTD_TESTED_PLUGINS="apache apcups ascent battery bind conntrack contextswitch - cpu cpufreq curl curl_json curl_xml dbi df disk dns email entropy exec filecount fscache gmond - hddtemp interface ipmi iptables irq java libvirt load madwifi mbmon memcachec - memcached memory multimeter mysql netlink network nfs nginx ntpd nut olsrd - onewire openvpn perl ping postgresql powerdns processes protocols python - rrdcached sensors serial snmp swap table tail tcpconns teamspeak2 ted thermal - tokyotyrant uptime users vmem vserver wireless csv exec logfile network - notify_desktop notify_email oracle perl python rrdcached rrdtool syslog unixsock write_http - match_empty_counter match_hashed match_regex match_timediff match_value - target_notification target_replace target_scale target_set uuid" - -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=" - sys-devel/libtool - perl? ( dev-lang/perl[ithreads] ( || ( sys-devel/libperl[ithreads] >=sys-devel/libperl-5.10 ) ) ) - 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.9.1-r2 ) - collectd_plugins_java? ( virtual/jre dev-java/java-config-wrapper ) - collectd_plugins_libvirt? ( app-emulation/libvirt dev-libs/libxml2 ) - collectd_plugins_memcachec? ( dev-libs/libmemcached ) - collectd_plugins_mysql? ( >=virtual/mysql-5.0 ) - collectd_plugins_netlink? ( >=sys-apps/iproute2-2.6.34 ) - collectd_plugins_network? ( dev-libs/libgcrypt ) - collectd_plugins_nginx? ( net-misc/curl ) - collectd_plugins_notify_desktop? ( x11-libs/libnotify ) - collectd_plugins_notify_email? ( >=net-libs/libesmtp-1.0.4 dev-libs/openssl ) - collectd_plugins_nut? ( sys-power/nut ) - collectd_plugins_onewire? ( sys-fs/owfs ) - collectd_plugins_oracle? ( >=dev-db/oracle-instantclient-basic-11.2.0.1.0 ) - collectd_plugins_perl? ( dev-lang/perl[ithreads] ( || ( sys-devel/libperl[ithreads] >=sys-devel/libperl-5.10 ) ) ) - collectd_plugins_ping? ( net-libs/liboping ) - collectd_plugins_postgresql? ( >=dev-db/postgresql-base-8.2 ) - collectd_plugins_python? ( =dev-lang/python-2* ) - collectd_plugins_rrdcached? ( >=net-analyzer/rrdtool-1.4 ) - collectd_plugins_rrdtool? ( >=net-analyzer/rrdtool-1.2.27 ) - collectd_plugins_sensors? ( sys-apps/lm_sensors ) - collectd_plugins_snmp? ( net-analyzer/net-snmp ) - collectd_plugins_tokyotyrant? ( net-misc/tokyotyrant ) - collectd_plugins_write_http? ( net-misc/curl ) - - kernel_FreeBSD? ( - collectd_plugins_disk? ( >=sys-libs/libstatgrab-0.16 ) - collectd_plugins_interface? ( >=sys-libs/libstatgrab-0.16 ) - collectd_plugins_load? ( >=sys-libs/libstatgrab-0.16 ) - collectd_plugins_memory? ( >=sys-libs/libstatgrab-0.16 ) - collectd_plugins_swap? ( >=sys-libs/libstatgrab-0.16 ) - collectd_plugins_users? ( >=sys-libs/libstatgrab-0.16 ) - )" - -DEPEND="${COMMON_DEPEND} - dev-util/pkgconfig - kernel_linux? ( - collectd_plugins_vserver? ( sys-kernel/vserver-sources ) - )" - -RDEPEND="${COMMON_DEPEND} - collectd_plugins_syslog? ( virtual/logger )" - -PATCHES=( - "${FILESDIR}/${PN}-4.10.1"-{libperl,libiptc,noowniptc}.patch - "${FILESDIR}/${PN}-4.10.2"-{libocci,libnotify-0.7,nohal}.patch - "${FILESDIR}/${PN}-4.10.3"-{lt,werror}.patch - ) - -# @FUNCTION: collectd_plugin_kernel_linux -# @DESCRIPTION: -# USAGE: -# kernel_options is a list of kernel configurations options; the check tests whether at least -# one of them is enabled. If no, depending on the third argument an elog, ewarn, or eerror message -# is emitted. -collectd_plugin_kernel_linux() { - local multi_opt opt - if has ${1} ${COLLECTD_ALL_PLUGINS}; then - if use collectd_plugins_${1}; then - for opt in ${2}; do - if linux_chkconfig_present ${opt}; then return 0; fi - done - multi_opt=${2//\ /\ or\ } - case ${3} in - (info) - elog "The ${1} plug-in can use kernel features that are disabled now; enable ${multi_opt} in your kernel" - ;; - (warn) - ewarn "The ${1} plug-in uses kernel features that are disabled now; enable ${multi_opt} in your kernel" - ;; - (error) - eerror "The ${1} plug-in needs kernel features that are disabled now; enable ${multi_opt} in your kernel" - ;; - (*) - die "function collectd_plugin_kernel_linux called with invalid third argument" - ;; - esac - fi - fi -} - -collectd_linux_kernel_checks() { - linux-info_pkg_setup - - # battery.c:/proc/pmu/battery_%i - # battery.c:/proc/acpi/battery - collectd_plugin_kernel_linux battery ACPI_BATTERY 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 - - # nfs.c:/proc/net/rpc/nfs - # nfs.c:/proc/net/rpc/nfsd - collectd_plugin_kernel_linux nfs NFS_COMMON warn - - # serial.c:/proc/tty/driver/serial - # serial.c:/proc/tty/driver/ttyS - collectd_plugin_kernel_linux serial SERIAL_CORE warn - - # swap.c:/proc/meminfo - collectd_plugin_kernel_linux swap SWAP 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 VM_EVENT_COUNTERS warn - - # uuid.c:/sys/hypervisor/uuid - collectd_plugin_kernel_linux uuid SYSFS info - - # wireless.c:/proc/net/wireless - collectd_plugin_kernel_linux wireless "MAC80211 IEEE80211" warn -} - -pkg_setup() { - if use kernel_linux; then - if linux_config_exists; then - einfo "Checking your linux kernel configuration:" - collectd_linux_kernel_checks - else - elog "Cannot find a linux kernel configuration. Continuing anyway." - fi - fi - - enewgroup collectd - enewuser collectd -1 -1 /var/lib/collectd collectd -} - -src_prepare() { - base_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 - - rm -r libltdl || die - - eautoreconf -} - -src_configure() { - # Now come the lists of os-dependent plugins. Any plugin that is not listed anywhere here - # should work independent of the operating system. - - local linux_plugins="battery cpu cpufreq disk entropy interface iptables ipvs irq load - memory netlink nfs processes serial swap tcpconns thermal users vmem vserver - wireless" - - local libstatgrab_plugins="cpu disk interface load memory swap users" - local bsd_plugins="cpu tcpconns ${libstatgrab_plugins}" - - local darwin_plugins="apple_sensors battery cpu disk interface memory processes tcpconns" - - local osdependent_plugins="${linux_plugins} ${bsd_plugins} ${darwin_plugins}" - local myos_plugins="" - if use kernel_linux; then - einfo "Enabling Linux plugins." - myos_plugins=${linux_plugins} - elif use kernel_FreeBSD; then - einfo "Enabling FreeBSD plugins." - myos_plugins=${bsd_plugins} - elif use kernel_Darwin; then - einfo "Enabling Darwin plugins." - myos_plugins=${darwin_plugins} - fi - - # Do we debug? - local myconf="$(use_enable debug)" - - local plugin - - # Disable what needs to be disabled. - for plugin in ${COLLECTD_DISABLED_PLUGINS}; do - myconf+=" --disable-${plugin}" - done - - # Set enable/disable for each single plugin. - for plugin in ${COLLECTD_ALL_PLUGINS}; do - if has ${plugin} ${osdependent_plugins}; then - # plugin is os-dependent ... - if has ${plugin} ${myos_plugins}; then - # ... and available in this os - myconf+=" $(use_enable collectd_plugins_${plugin} ${plugin})" - else - # ... and NOT available in this os - if use collectd_plugins_${plugin}; then - ewarn "You try to enable the ${plugin} plugin, but it is not available for this" - ewarn "kernel. Disabling it automatically." - fi - myconf+=" --disable-${plugin}" - fi - elif [[ "${plugin}" = "collectd_plugins_perl" ]]; then - if use collectd_plugins_perl && ! use perl; then - ewarn "Perl plugin disabled as perl bindings disabled by -perl use flag" - myconf+= --disable-perl - else - myconf+=" $(use_enable collectd_plugins_${plugin} ${plugin})" - fi - else - myconf+=" $(use_enable collectd_plugins_${plugin} ${plugin})" - fi - done - - # Need JAVA_HOME for java. - if use collectd_plugins_java; then - 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 - - # The perl bindings - myconf+=" $(use_with perl perl-bindings)" - - # Finally, run econf. - KERNEL_DIR="${KERNEL_DIR}" econf --config-cache --without-included-ltdl $(use_enable static-libs static) --localstatedir=/var ${myconf} -} - -src_install() { - emake DESTDIR="${D}" install || die - - fixlocalpod - - find "${D}/usr/" -name "*.la" -exec rm -f {} + - rm "${D}/usr/$(get_libdir)"/collectd/*.a - - # use collectd_plugins_ping && setcap cap_net_raw+ep ${D}/usr/sbin/collectd - # we cannot do this yet - - fowners root:collectd /etc/collectd.conf - fperms u=rw,g=r,o= /etc/collectd.conf - - dodoc AUTHORS ChangeLog NEWS README TODO - - if use contrib ; then - insinto /usr/share/doc/${PF} - doins -r contrib - fi - - keepdir /var/lib/${PN} - fowners collectd:collectd /var/lib/${PN} - - newinitd "${FILESDIR}/${PN}.initd" ${PN} - newconfd "${FILESDIR}/${PN}.confd" ${PN} - - insinto /etc/logrotate.d - newins "${FILESDIR}/logrotate" collectd - - sed -i -e 's:^.*PIDFile "/var/run/collectd.pid":PIDFile "/var/run/collectd/collectd.pid":' "${D}"/etc/collectd.conf || die - sed -i -e 's:^# SocketFile "/var/run/collectd-unixsock":# SocketFile "/var/run/collectd/collectd-unixsock":' "${D}"/etc/collectd.conf || die - sed -i -e 's:^.*LoadPlugin perl$:# The new, correct way to load the perl plugin -- \n# \n# Globals true\n# :' "${D}"/etc/collectd.conf || die - sed -i -e 's:^.*LoadPlugin python$:# The new, correct way to load the python plugin -- \n# \n# Globals true\n# :' "${D}"/etc/collectd.conf || die -} - -collectd_rdeps() { - if (use collectd_plugins_${1} && ! has_version "${2}"); then - elog "The ${1} plug-in needs ${2} to be installed locally or remotely to work." - fi -} - -pkg_postinst() { - collectd_rdeps apcups sys-power/apcupsd - collectd_rdeps hddtemp app-admin/hddtemp - collectd_rdeps mbmon sys-apps/xmbmon - collectd_rdeps memcached ">=net-misc/memcached-1.2.2-r2" - collectd_rdeps ntpd net-misc/ntp - collectd_rdeps openvpn ">=net-misc/openvpn-2.0.9" - - echo - elog "collectd is now started as unprivileged user by default." - elog "You may want to recheck the configuration." - elog - - if use collectd_plugins_email; then - ewarn "The email plug-in is deprecated. To submit statistics please use the unixsock plugin." - fi - if use contrib; then - elog "The scripts in /usr/share/doc/${PF}/collection3 for generating graphs need dev-perl/HTML-Parser," - elog "dev-perl/config-general, dev-perl/regexp-common, and net-analyzer/rrdtool[perl] to be installed." - fi -} diff --git a/app-admin/collectd/collectd-5.0.0-r1.ebuild b/app-admin/collectd/collectd-5.0.1.ebuild similarity index 97% rename from app-admin/collectd/collectd-5.0.0-r1.ebuild rename to app-admin/collectd/collectd-5.0.1.ebuild index cfd899870157..bb10204075dc 100644 --- a/app-admin/collectd/collectd-5.0.0-r1.ebuild +++ b/app-admin/collectd/collectd-5.0.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/collectd-5.0.0-r1.ebuild,v 1.6 2011/08/26 20:36:03 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/collectd-5.0.1.ebuild,v 1.1 2011/10/22 17:35:40 dilfridge Exp $ EAPI=4 @@ -21,7 +21,7 @@ IUSE="contrib debug kernel_linux kernel_FreeBSD kernel_Darwin perl static-libs" COLLECTD_IMPOSSIBLE_PLUGINS="netapp pinba xmms" # Plugins that still need some work -COLLECTD_UNTESTED_PLUGINS="ipvs apple_sensors routeros tape zfs_arc modbus amqp genericjmx lpar redis threshold varnish write_redis v5upgrade" +COLLECTD_UNTESTED_PLUGINS="ipvs apple_sensors routeros tape zfs_arc modbus amqp genericjmx lpar redis threshold write_redis v5upgrade" # Plugins that have been (compile) tested and can be enabled via COLLECTD_PLUGINS COLLECTD_TESTED_PLUGINS="apache apcups ascent battery bind conntrack contextswitch @@ -30,7 +30,7 @@ COLLECTD_TESTED_PLUGINS="apache apcups ascent battery bind conntrack contextswit memcached memory multimeter mysql netlink network nfs nginx ntpd nut olsrd onewire openvpn perl ping postgresql powerdns processes protocols python rrdcached sensors serial snmp swap table tail tcpconns teamspeak2 ted thermal - tokyotyrant uptime users vmem vserver wireless csv exec logfile network + tokyotyrant uptime users varnish vmem vserver wireless csv exec logfile network notify_desktop notify_email oracle perl python rrdcached rrdtool syslog unixsock write_http match_empty_counter match_hashed match_regex match_timediff match_value target_notification target_replace target_scale target_set uuid" @@ -81,6 +81,7 @@ COMMON_DEPEND=" collectd_plugins_sensors? ( sys-apps/lm_sensors ) collectd_plugins_snmp? ( net-analyzer/net-snmp ) collectd_plugins_tokyotyrant? ( net-misc/tokyotyrant ) + collectd_plugins_varnish? ( www-servers/varnish ) collectd_plugins_write_http? ( net-misc/curl ) kernel_FreeBSD? ( @@ -103,10 +104,9 @@ RDEPEND="${COMMON_DEPEND} PATCHES=( "${FILESDIR}/${PN}-4.10.1"-{libperl,libiptc,noowniptc}.patch - "${FILESDIR}/${PN}-4.10.2"-{libocci,libnotify-0.7,nohal}.patch + "${FILESDIR}/${PN}-4.10.2"-{libocci,nohal}.patch "${FILESDIR}/${PN}-4.10.3"-{lt,werror}.patch - "${FILESDIR}/${PN}-5.0.0"-yajl2.patch - "${FILESDIR}/${PN}-5.0.0"-yajl2-2.patch + "${FILESDIR}/${P}"-varnish.patch ) # @FUNCTION: collectd_plugin_kernel_linux diff --git a/app-admin/collectd/files/collectd-5.0.1-varnish.patch b/app-admin/collectd/files/collectd-5.0.1-varnish.patch new file mode 100644 index 000000000000..2f1a4e996d65 --- /dev/null +++ b/app-admin/collectd/files/collectd-5.0.1-varnish.patch @@ -0,0 +1,159 @@ +--- a/external/collectd/5.0.0-r2-gen2/configure.in ++++ a/external/collectd/5.0.0-r2-gen2/configure.in +@@ -3959,9 +3959,17 @@ then + CPPFLAGS="$CPPFLAGS $with_libvarnish_cflags" + #LDFLAGS="$LDFLAGS $with_libvarnish_libs" + +- AC_CHECK_LIB(varnishapi, VSL_OpenStats, ++### Varnish 2 ### ++# AC_CHECK_LIB(varnishapi, VSL_OpenStats, ++# [with_libvarnish="yes"], ++# [with_libvarnish="no (symbol VSL_OpenStats not found)"], ++# [$with_libvarnish_libs]) ++ ++### Varnish 3 ### ++# Replaced VSL_OpenStats with VSC_Main ++ AC_CHECK_LIB(varnishapi, VSC_Main, + [with_libvarnish="yes"], +- [with_libvarnish="no (symbol VSL_OpenStats not found)"], ++ [with_libvarnish="no (symbol VSC_Main not found)"], + [$with_libvarnish_libs]) + + CPPFLAGS="$SAVE_CPPFLAGS" +--- a/external/collectd/5.0.0-r2-gen2/src/varnish.c ++++ a/external/collectd/5.0.0-r2-gen2/src/varnish.c +@@ -127,12 +127,17 @@ + * esi_errors ESI parse errors (unlock) Y + * }}} + */ ++// enable the Varnish 3 interface. ++#define VARNISH3 + #include "collectd.h" + #include "common.h" + #include "plugin.h" + #include "configfile.h" + + #include ++#ifdef VARNISH3 ++#include ++#endif + + /* {{{ user_config_s */ + struct user_config_s { +@@ -204,7 +209,11 @@ static int varnish_submit_derive (const char *plugin_instance, /* {{{ */ + return (varnish_submit (plugin_instance, category, type, type_instance, value)); + } /* }}} int varnish_submit_derive */ + ++#ifdef VARNISH3 ++static void varnish_monitor (const user_config_t *conf, struct VSC_C_main *VSL_stats) ++#else + static void varnish_monitor (const user_config_t *conf, struct varnish_stats *VSL_stats) /* {{{ */ ++#endif + { + if (conf->collect_cache) + { +@@ -229,7 +238,11 @@ static void varnish_monitor (const user_config_t *conf, struct varnish_stats *VS + if (conf->collect_esi) + { + /* Objects ESI parsed (unlock) */ ++#ifdef VARNISH3 ++ varnish_submit_derive (conf->instance, "esi", "total_operations", "warnings", VSL_stats->esi_warnings); ++#else + varnish_submit_derive (conf->instance, "esi", "total_operations", "parsed", VSL_stats->esi_parse); ++#endif + /* ESI parse errors (unlock) */ + varnish_submit_derive (conf->instance, "esi", "total_operations", "error", VSL_stats->esi_errors); + } +@@ -250,8 +263,13 @@ static void varnish_monitor (const user_config_t *conf, struct varnish_stats *VS + varnish_submit_derive (conf->instance, "backend", "connections", "was-closed" , VSL_stats->backend_toolate); + /* Backend conn. recycles */ + varnish_submit_derive (conf->instance, "backend", "connections", "recycled" , VSL_stats->backend_recycle); ++#ifdef VARNISH3 ++ /* Backend conn. retries */ ++ varnish_submit_derive (conf->instance, "backend", "connections", "retries" , VSL_stats->backend_retry); ++#else + /* Backend conn. unused */ + varnish_submit_derive (conf->instance, "backend", "connections", "unused" , VSL_stats->backend_unused); ++#endif + } + + if (conf->collect_fetch) +@@ -300,6 +318,10 @@ static void varnish_monitor (const user_config_t *conf, struct varnish_stats *VS + varnish_submit_derive (conf->instance, "shm", "total_operations", "cycles" , VSL_stats->shm_cycles); + } + ++#ifdef VARNISH3 ++ /* sm & sma stats seem to have gone away. The SMA stuff looks like it may ++ have been moved into another structure somewhere else. */ ++#else + if (conf->collect_sm) + { + /* allocator requests */ +@@ -325,6 +347,7 @@ static void varnish_monitor (const user_config_t *conf, struct varnish_stats *VS + /* SMA bytes free */ + varnish_submit_derive (conf->instance, "sma", "total_bytes", "free" , VSL_stats->sma_bfree); + } ++#endif + + if (conf->collect_sms) + { +@@ -368,10 +391,17 @@ static void varnish_monitor (const user_config_t *conf, struct varnish_stats *VS + varnish_submit_derive (conf->instance, "workers", "total_threads", "failed", VSL_stats->n_wrk_failed); + /* worker threads limited */ + varnish_submit_derive (conf->instance, "workers", "total_threads", "limited", VSL_stats->n_wrk_max); ++#ifdef VARNISH3 ++ /* work requests queue length */ ++ varnish_submit_derive (conf->instance, "workers", "total_requests", "queue_length",VSL_stats->n_wrk_lqueue); ++ /* queued work requests */ ++ varnish_submit_derive (conf->instance, "workers", "total_requests", "queued", VSL_stats->n_wrk_queued); ++#else + /* queued work requests */ + varnish_submit_derive (conf->instance, "workers", "total_requests", "queued", VSL_stats->n_wrk_queue); + /* overflowed work requests */ + varnish_submit_derive (conf->instance, "workers", "total_requests", "overflowed", VSL_stats->n_wrk_overflow); ++#endif + /* dropped work requests */ + varnish_submit_derive (conf->instance, "workers", "total_requests", "dropped", VSL_stats->n_wrk_drop); + } +@@ -379,7 +409,12 @@ static void varnish_monitor (const user_config_t *conf, struct varnish_stats *VS + + static int varnish_read (user_data_t *ud) /* {{{ */ + { ++#ifdef VARNISH3 ++ struct VSM_data *vd; ++ struct VSC_C_main *VSL_stats; ++#else + struct varnish_stats *VSL_stats; ++#endif + user_config_t *conf; + + if ((ud == NULL) || (ud->data == NULL)) +@@ -387,15 +422,28 @@ static int varnish_read (user_data_t *ud) /* {{{ */ + + conf = ud->data; + ++#ifdef VARNISH3 ++ vd = VSM_New(); ++ VSC_Setup(vd); ++ if(conf->instance) VSM_n_Arg(vd, conf->instance); ++ if(VSC_Open(vd, 1) || (VSL_stats = VSC_Main(vd))==NULL) ++#else + VSL_stats = VSL_OpenStats (conf->instance); + if (VSL_stats == NULL) ++#endif + { ++#ifdef VARNISH3 ++ VSM_Delete(vd); ++#endif + ERROR ("Varnish plugin : unable to load statistics"); + + return (-1); + } + + varnish_monitor (conf, VSL_stats); ++#ifdef VARNISH3 ++ VSM_Delete(vd); ++#endif + + return (0); + } /* }}} */ -- 2.26.2