diff options
author | Andreas Hüttel <dilfridge@gentoo.org> | 2011-04-24 17:10:05 +0000 |
---|---|---|
committer | Andreas Hüttel <dilfridge@gentoo.org> | 2011-04-24 17:10:05 +0000 |
commit | ebabf50b9edea2655ec01c270c721b3f24e8412f (patch) | |
tree | 6d4fbb643f647b570fd80398951da3527ba3c48e /app-admin | |
parent | Move libunique:3 from the gnome overlay to tree, ~hppa dropped w.r.t. KEYWORD... (diff) | |
download | historical-ebabf50b9edea2655ec01c270c721b3f24e8412f.tar.gz historical-ebabf50b9edea2655ec01c270c721b3f24e8412f.tar.bz2 historical-ebabf50b9edea2655ec01c270c721b3f24e8412f.zip |
Add useflag for perl bindings and static libs, run as unprivileged user; bug 361723. Thanks to Bruno 'bonbons' on #collectd.
Package-Manager: portage-2.1.9.46/cvs/Linux x86_64
Diffstat (limited to 'app-admin')
-rw-r--r-- | app-admin/collectd/ChangeLog | 12 | ||||
-rw-r--r-- | app-admin/collectd/Manifest | 38 | ||||
-rw-r--r-- | app-admin/collectd/collectd-4.10.2-r3.ebuild | 315 | ||||
-rw-r--r-- | app-admin/collectd/collectd-4.10.3-r1.ebuild (renamed from app-admin/collectd/collectd-4.10.3.ebuild) | 33 | ||||
-rw-r--r-- | app-admin/collectd/collectd-5.0.0-r1.ebuild (renamed from app-admin/collectd/collectd-5.0.0.ebuild) | 33 | ||||
-rw-r--r-- | app-admin/collectd/files/collectd.confd | 12 | ||||
-rw-r--r-- | app-admin/collectd/files/collectd.initd | 10 |
7 files changed, 104 insertions, 349 deletions
diff --git a/app-admin/collectd/ChangeLog b/app-admin/collectd/ChangeLog index b3f60f1b7461..52eff544153b 100644 --- a/app-admin/collectd/ChangeLog +++ b/app-admin/collectd/ChangeLog @@ -1,6 +1,16 @@ # 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.19 2011/04/24 16:01:24 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/ChangeLog,v 1.20 2011/04/24 17:10:05 dilfridge Exp $ + +*collectd-5.0.0-r1 (24 Apr 2011) +*collectd-4.10.3-r1 (24 Apr 2011) + + 24 Apr 2011; Andreas K. Huettel <dilfridge@gentoo.org> + -collectd-4.10.2-r3.ebuild, -collectd-4.10.3.ebuild, + +collectd-4.10.3-r1.ebuild, -collectd-5.0.0.ebuild, + +collectd-5.0.0-r1.ebuild, files/collectd.confd, files/collectd.initd: + Add useflag for perl bindings and static libs, run as unprivileged user; + bug 361723. Thanks to Bruno 'bonbons' on #collectd. 24 Apr 2011; Andreas K. Huettel <dilfridge@gentoo.org> collectd-4.10.3.ebuild, +files/collectd-4.10.3-lt.patch, diff --git a/app-admin/collectd/Manifest b/app-admin/collectd/Manifest index 0019c1a7e079..5718a2b50d7c 100644 --- a/app-admin/collectd/Manifest +++ b/app-admin/collectd/Manifest @@ -8,31 +8,29 @@ AUX collectd-4.10.2-libnotify-0.7.patch 823 RMD160 f3a0febc8487be06ad1cc5ffc6120 AUX collectd-4.10.2-libocci.patch 720 RMD160 c90872f76a771076efe500c78dc3e3a5545f8f51 SHA1 40197f33a565ea37774f577c036b1c75ef447cae SHA256 2338b8405e46d67bc71ebe4d4f8cba8658047a352cb7b0c3c0f4b15109a9c98b AUX collectd-4.10.2-nohal.patch 888 RMD160 a7d5969f3119f44eeb1b163d13bfd86c727854f3 SHA1 275e928e2bbad3b01d7e129793922d48348334fa SHA256 d1b8fccc96289c42e6aa33187bfca250ae0152a44d5cfba41ccf9e941a6aa799 AUX collectd-4.10.3-lt.patch 1006 RMD160 b7eee4c9261af6ac3d330494746b922792241bac SHA1 ce2f25fbb84912bce137866faecf147d4da4ee57 SHA256 b5640f7a029366d33d6821f8efe203097d56c0193ec39e1e52d93bc7723179c7 -AUX collectd.confd 633 RMD160 46f81e3f73d577c3f59df404012e33c419188acc SHA1 85f569035bbb6ff7d3e03a4b85c35ccb126c29a4 SHA256 30e41d63f3af1d736d86903046e5aac8f8a548714bab0acbbca0ffd6c16ed430 -AUX collectd.initd 1475 RMD160 27a19af6419a7bd450e7877bd8b95075e6653c70 SHA1 b8315ce1db2f755d4bc77047d66d0dad12e45668 SHA256 b09dea6513ed0d9932c84f46755c89afc4d04777a96230ead019f68d0b74a583 +AUX collectd.confd 865 RMD160 edf4e29bc193128d913443ba5251935726b13194 SHA1 0987c9546a814d0f6c888f46828ad66b3a190a97 SHA256 c24b11a65cb25587aa534c529a2b394b7c190ac44e1849ea5e1bc02d1e0a1592 +AUX collectd.initd 1644 RMD160 70c454364fdcef21fa48467e9fd66d3d1e5907fd SHA1 a6bd53ce58210796b216687582fc7f58316ca7a9 SHA256 6a5e169cc00aa393e501788414a661051b6218f9ad9413b960da012a94c6d78a AUX logrotate 115 RMD160 bc70b0fbacde2021a96851f781e096597b161f8c SHA1 4c9f65faab5a43b142fe7f34163ca6d07b8ed704 SHA256 eb359631805b6bfb9f2a9ae5ed21be8f8b3b6f1ffeed8d506231043c9a77262c -DIST collectd-4.10.2.tar.bz2 1419603 RMD160 13db504beb5cd560d60014183b67ce768fe4293e SHA1 8d83dd2d68ac4c0871774af99079564880abb5ef SHA256 17cd6741c360cb2544f00fbe902ec3e9aa0d04a7ab6a744e3e8ea5615bb794be 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.2-r3.ebuild 11214 RMD160 09dbcb98d4c40d3bf7647ecc694a546c7a245763 SHA1 432001d9d8b610cb4c5c22c4aef66f8ec274c4d3 SHA256 afcc4a0f5a34937b92a0384954def40d3635be8853703770fdd7f16e42be5814 -EBUILD collectd-4.10.3.ebuild 11320 RMD160 5e53cc47a1b0e50cdf3a7fd8481718ad4bf9da08 SHA1 37c2e84132af5a1bc10d167c6a3147fad20b520e SHA256 9706e8fa90fdaaee548b0be14214d72d77b543a0a21ffa9356625f3c72fc681b -EBUILD collectd-5.0.0.ebuild 11604 RMD160 457782c017efa9ff4c7be3bdd4510946bf51cfee SHA1 dcf14a9376c5206983872159ae58f043ec550b3e SHA256 f96a0bb7b3c107058c8902459a3e83142cf8d0faa2ba4fa2b4c19cba4f02d364 -MISC ChangeLog 4269 RMD160 3b8db9ff65f304d0f79ac3d3ca6daf86189aff7b SHA1 d25784c276ca4b66cfe2cb0b69a308660e1647e3 SHA256 40a0007e7da0a212c8b98734d4c66556a159a04dcde2d6b996c0de39c3da5330 +EBUILD collectd-4.10.3-r1.ebuild 12576 RMD160 cd13f21b8a20d1377a5d074595281f8c327765e0 SHA1 e5aaa66ebe93ef29077c89b8e23b4dbb02c7560a SHA256 2b31c89f69cf14589e41ca14b4b1eb9803b117984a2e1c419635c80d416dcef2 +EBUILD collectd-5.0.0-r1.ebuild 12860 RMD160 cf8db8fb0562aef7d99f58cdb2ca6cc287b91a3c SHA1 231c585fa421cca5f2613ac4db2eb31b1e779106 SHA256 b6b889a9581da351cf0cf5294b41c43631e7e73479474a817c8e6571445ca5d3 +MISC ChangeLog 4706 RMD160 c51af0c7c65d172a71c2fb82d718fc9730fe3fec SHA1 fa9cd1739d2e06f6bc9e44aba350b6a7872ae11f SHA256 991840ff3074e98a7873a8ebf62a56a06e903439959c06ee06a449f41e8fd2cd MISC metadata.xml 11499 RMD160 91369dcd7b9a2b5920ff1ea2d9e82f51b9032b7a SHA1 6742b43d634ce58b252c1232f5d86e6784e9881d SHA256 dcf8cb5d991f766895a4d2a70ec964cb1bde2fa94c666ebda299c29a327490dc -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iQIcBAEBCgAGBQJNtEn0AAoJENwGBM22xffeD28P/1d8rbq7fY5l0cLEJI6cK0Wy -MefGAnkfvoBAr1D70ucIJhtA05Fw63fFJrWxjYQBvBxQ5xqVFHIMRrsJqK5XXqo1 -RWdsFk7rtFFkh65fnGLgdSLmD2S7kWYxu6bcYy8s5+igZd0RxytD+dr92Tg4g7h+ -H6ME06hkqP8zAIrnXt4x5/Bssu4DF6/bGgO20tGtW1HTQoaYrL1SWEJNMAzmxi00 -59RIXQ9kqY8bFMS6CDuD9TUbD6OmoSDiDOFVmwU6X9cSyDVv6lG34c1gzVmoGaUi -/azVspMak2rJMp/l+EtNqgkvRLG28PHRCpnDTscH8n8XbPgI2+Crj8ltOFr3sBy3 -USDaVNJjRG3Wdc+pdpLtEbo5GyHfkKSrOEoFFB+gDxtpbMUIv0w8bW/+1vRiroba -hFs+mxM1g8z2Q0bbx33l21n49Gf41iyCCxRGOBpSJ9S1oKtpIXc9V6B9SeV2JvQo -5/h9puJ3AiigKz5Fgii/jhY6OdKXk71hlJYyuhN7Kw9lENOpftp6uUEionRnjkdS -5ksF2xI3pb8EXXVaSLZoSeOZoZ0kD3kMBDc2TxJ+C24Jib8GMZ69maRGnDESJBIc -yyb3I2XTdiXlVpnNgUJKL91BnOqNyB+D/347d4JaKjcJCNrPC9nhmZsS79QB5aiB -d5RE4PU+TAPQLtL+7Gh8 -=fOcE +iQIcBAEBCgAGBQJNtFoMAAoJENwGBM22xffenSYP+QH3a9iMXR456oLj13O5/KmD +4dlJ0AklO/MfmB4KpNbSj+F3CXzkCgj2dEbX9dJtt4dORxv76SXFDR2B4VdyCSkZ +0tbJlD8MSdD+OOcxTubZa8G/fSJL3G78pfwX+6/FHv1ehZ0OW1eWEABc2yT8h4Vy +vcQMFXB/qO2pSE3cILQNpBtPY5aDpNFy/36Z40PswXQ4RcRH74uXe7+N8ConaeHi +QOgqWr54yF59wi6PMGl9A6fiDqbHtTG2s00QN4ccFRtcI19Hbnsugy9R7UdpOM2F ++s7+vlTllDBLZeX6OapW6JE3tO/4da3m49lXogTbbug1M9ZJVkvTykw126CrVuMC +Ll06rCya004VByjBfyG1tTX09BQ58JP8NFX0uCtI1vaUD9H3Y7ILC5q/QIAg3l+R +eC3SuUnk3GAvgedhIpT9J4MgxUjKkZaR7y6WRPprDmIIxtBtLs/eJEwmnMBNvl46 +lbrf2fbnlbERIXJbSGL9itnTs9hEUUiynA6CIZoLS0hP/RjSYYr2+oI5h/8jHHP8 +n9Oq7nSn9mEP+U3in1k4FeAmW2tlcOHFcZqzhkTkz+uBidrVqAxcBGOCjD11+Xer +hAC4EhFtp41K6gHSIzdJJiZ+LIrBLeeN7R81pOHdDXW6zKJTrkmJN9lQh5ssggJB +6657zgKcW7Knwr34SMWT +=HJpc -----END PGP SIGNATURE----- diff --git a/app-admin/collectd/collectd-4.10.2-r3.ebuild b/app-admin/collectd/collectd-4.10.2-r3.ebuild deleted file mode 100644 index 0a92c7d68739..000000000000 --- a/app-admin/collectd/collectd-4.10.2-r3.ebuild +++ /dev/null @@ -1,315 +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.2-r3.ebuild,v 1.1 2011/02/07 21:21:52 dilfridge Exp $ - -EAPI="2" - -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" - -# 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 nut 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 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=" - 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_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}/${P}"-{libocci,libnotify-0.7,nohal}.patch - ) - -# @FUNCTION: collectd_plugin_kernel_linux -# @DESCRIPTION: -# USAGE: <plug-in name> <kernel_options> <severity> -# 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 -} - -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 - - 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 - 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 - - # Finally, run econf. - KERNEL_DIR="${KERNEL_DIR}" econf --config-cache --without-included-ltdl --disable-static --localstatedir=/var ${myconf} -} - -src_install() { - emake DESTDIR="${D}" install || die - - fixlocalpod - - find "${D}/usr/" -name "*.la" -exec rm -f {} + - - dodoc AUTHORS ChangeLog NEWS README TODO || die - - if use contrib ; then - insinto /usr/share/doc/${PF} - doins -r contrib || die - fi - - keepdir /var/lib/${PN} || die - - newinitd "${FILESDIR}/${PN}.initd" ${PN} || die - newconfd "${FILESDIR}/${PN}.confd" ${PN} || die - - insinto /etc/logrotate.d - newins "${FILESDIR}/logrotate" collectd || die - - 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 - 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 -} - -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" - - 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-4.10.3.ebuild b/app-admin/collectd/collectd-4.10.3-r1.ebuild index 28f76037532f..58e73fd8ac05 100644 --- a/app-admin/collectd/collectd-4.10.3.ebuild +++ b/app-admin/collectd/collectd-4.10.3-r1.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-4.10.3.ebuild,v 1.3 2011/04/24 16:01:24 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/collectd-4.10.3-r1.ebuild,v 1.1 2011/04/24 17:10:05 dilfridge Exp $ EAPI=3 @@ -13,7 +13,7 @@ SRC_URI="${HOMEPAGE}/files/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="contrib debug kernel_linux kernel_FreeBSD kernel_Darwin" +IUSE="contrib debug kernel_linux kernel_FreeBSD kernel_Darwin perl static-libs" # The plugin lists have to follow here since they extend IUSE @@ -47,6 +47,7 @@ unset plugin # Now come the dependencies. COMMON_DEPEND=" + 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 ) @@ -185,6 +186,7 @@ pkg_setup() { fi enewgroup collectd + enewuser collectd -1 -1 /var/lib/collectd collectd } src_prepare() { @@ -250,6 +252,13 @@ src_configure() { 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 @@ -265,8 +274,11 @@ src_configure() { 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 --disable-static --localstatedir=/var ${myconf} + KERNEL_DIR="${KERNEL_DIR}" econf --config-cache --without-included-ltdl $(use_enable static-libs static) --localstatedir=/var ${myconf} } src_install() { @@ -275,6 +287,13 @@ src_install() { 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 + + chown root:collectd "${D}/etc/collectd.conf" || die + chmod u=rw,g=r,o= "${D}/etc/collectd.conf" || die dodoc AUTHORS ChangeLog NEWS README TODO || die @@ -284,6 +303,7 @@ src_install() { fi keepdir /var/lib/${PN} || die + chown collectd:collectd "${D}/var/lib/${PN}" || die newinitd "${FILESDIR}/${PN}.initd" ${PN} || die newconfd "${FILESDIR}/${PN}.confd" ${PN} || die @@ -291,6 +311,8 @@ src_install() { insinto /etc/logrotate.d newins "${FILESDIR}/logrotate" collectd || die + 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# <LoadPlugin perl>\n# Globals true\n# </LoadPlugin>:' "${D}"/etc/collectd.conf || die 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 } @@ -309,6 +331,11 @@ pkg_postinst() { 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 diff --git a/app-admin/collectd/collectd-5.0.0.ebuild b/app-admin/collectd/collectd-5.0.0-r1.ebuild index bd5f421eaa2d..bd2cd36217c9 100644 --- a/app-admin/collectd/collectd-5.0.0.ebuild +++ b/app-admin/collectd/collectd-5.0.0-r1.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.ebuild,v 1.2 2011/04/24 16:01:24 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/collectd-5.0.0-r1.ebuild,v 1.1 2011/04/24 17:10:05 dilfridge Exp $ EAPI=4 @@ -13,7 +13,7 @@ SRC_URI="${HOMEPAGE}/files/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="contrib debug kernel_linux kernel_FreeBSD kernel_Darwin" +IUSE="contrib debug kernel_linux kernel_FreeBSD kernel_Darwin perl static-libs" # The plugin lists have to follow here since they extend IUSE @@ -47,6 +47,7 @@ unset plugin # Now come the dependencies. COMMON_DEPEND=" + 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 ) @@ -185,6 +186,7 @@ pkg_setup() { fi enewgroup collectd + enewuser collectd -1 -1 /var/lib/collectd collectd } src_prepare() { @@ -250,6 +252,13 @@ src_configure() { 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 @@ -265,8 +274,11 @@ src_configure() { 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 --disable-static --localstatedir=/var ${myconf} + KERNEL_DIR="${KERNEL_DIR}" econf --config-cache --without-included-ltdl $(use_enable static-libs static) --localstatedir=/var ${myconf} } src_install() { @@ -275,6 +287,13 @@ src_install() { 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 + + chown root:collectd "${D}/etc/collectd.conf" || die + chmod u=rw,g=r,o= "${D}/etc/collectd.conf" || die dodoc AUTHORS ChangeLog NEWS README TODO @@ -284,6 +303,7 @@ src_install() { fi keepdir /var/lib/${PN} + chown collectd:collectd "${D}/var/lib/${PN}" || die newinitd "${FILESDIR}/${PN}.initd" ${PN} newconfd "${FILESDIR}/${PN}.confd" ${PN} @@ -291,6 +311,8 @@ src_install() { 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# <LoadPlugin perl>\n# Globals true\n# </LoadPlugin>:' "${D}"/etc/collectd.conf || die 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 } @@ -309,6 +331,11 @@ pkg_postinst() { 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 diff --git a/app-admin/collectd/files/collectd.confd b/app-admin/collectd/files/collectd.confd index a08b9175fca5..ebb18efa8dc1 100644 --- a/app-admin/collectd/files/collectd.confd +++ b/app-admin/collectd/files/collectd.confd @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/files/collectd.confd,v 1.1 2010/09/28 15:17:05 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/files/collectd.confd,v 1.2 2011/04/24 17:10:05 dilfridge Exp $ # Nice value used to launch collectd, to change priority of the process. As # you usually will want to run it in background, a default of 5 is used. @@ -13,4 +13,10 @@ # File used to store the PID file. Usually you won't need to touch it. # -#COLLECTD_PIDFILE='/var/run/collectd.pid' +#COLLECTD_PIDFILE='/var/run/collectd/collectd.pid' + +# User to run collectd as (default is collectd, change to root or give +# collectd user appropriate privileges if you use one of the plugins that +# require it, as e.g. ping or iptables plugins) +# +#COLLECTD_USER='collectd' diff --git a/app-admin/collectd/files/collectd.initd b/app-admin/collectd/files/collectd.initd index 3240bfb0732f..6028c93f5efd 100644 --- a/app-admin/collectd/files/collectd.initd +++ b/app-admin/collectd/files/collectd.initd @@ -1,11 +1,12 @@ #!/sbin/runscript -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/files/collectd.initd,v 1.3 2010/12/16 17:33:45 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/files/collectd.initd,v 1.4 2011/04/24 17:10:05 dilfridge Exp $ -: ${COLLECTD_PIDFILE:='/var/run/collectd.pid'} +: ${COLLECTD_PIDFILE:='/var/run/collectd/collectd.pid'} : ${COLLECTD_CFGFILE:='/etc/collectd.conf'} : ${COLLECTD_NICELVL:='5'} +: ${COLLECTD_USER:='collectd'} opts="${opts} configtest" @@ -42,9 +43,10 @@ checkconfig() { start() { checkconfig || return 1 + [ -d /var/run/collectd ] || mkdir /var/run/collectd && chown collectd:collectd /var/run/collectd ebegin "Starting collectd" - start-stop-daemon --start \ + start-stop-daemon --start -c "${COLLECTD_USER}:collectd" \ --nicelevel "${COLLECTD_NICELVL}" --exec /usr/sbin/collectd -- \ -P "${COLLECTD_PIDFILE}" -C "${COLLECTD_CFGFILE}" eend $? "Failed to start collectd" |