app-admin/collectd: Security cleanup (bug #614848)
authorThomas Deutschmann <whissi@gentoo.org>
Thu, 6 Apr 2017 15:49:15 +0000 (17:49 +0200)
committerThomas Deutschmann <whissi@gentoo.org>
Thu, 6 Apr 2017 15:49:15 +0000 (17:49 +0200)
Package-Manager: Portage-2.3.5, Repoman-2.3.2

12 files changed:
app-admin/collectd/Manifest
app-admin/collectd/collectd-5.5.2.ebuild [deleted file]
app-admin/collectd/collectd-5.6.1-r1.ebuild [deleted file]
app-admin/collectd/collectd-5.6.2-r1.ebuild [deleted file]
app-admin/collectd/collectd-5.6.2.ebuild [deleted file]
app-admin/collectd/files/collectd-4.10.3-werror.patch [deleted file]
app-admin/collectd/files/collectd-5.5.1-libocci.patch [deleted file]
app-admin/collectd/files/collectd-5.5.1-lt.patch [deleted file]
app-admin/collectd/files/collectd-5.5.1-nohal.patch [deleted file]
app-admin/collectd/files/collectd-5.5.2-issue-1870.patch [deleted file]
app-admin/collectd/files/collectd-5.5.2-issue-1877.patch [deleted file]
app-admin/collectd/files/collectd-5.6.0-use-_LINUX_CAPABILITY_VERSION_3.patch [deleted file]

index 9dd5ed06455b223651c076f7a933ade436bb0df0..9a8a53363ca41d4274fa172fb3be167293d4d0e5 100644 (file)
@@ -1,3 +1 @@
-DIST collectd-5.5.2.tar.bz2 1800476 SHA256 017f3a4062187e594d8ab6af685655fb82a8a942dc574668e68242bdb8ba820f SHA512 9d311db4f3677b95e3a47c03af01bdf1127957f6fccb6c601455632d0ea3b39e3f4cd9a6f8f510083e208714bbb0da2e04aaa574a90b0ad6fe984506675475b3 WHIRLPOOL 98ed4fb29eec0ae660d3e1651380a3f17f7bf7f22e687633c4a44974bc84e49cf8de11fd6fea349bfe24809ac3c29a407459a1203b72bcf741e1587c6c0b1773
-DIST collectd-5.6.1.tar.bz2 1903962 SHA256 c30ff644f91407b4dc2d99787b99cc45ec00e538bd1cc269429d3c5e8a4aee2c SHA512 da25f1a9cbaf47533f5a4d2f5f78b966317d4f21865c5a714954ad9d7d02b4798a3e0471ce52199dc80e01dc2808376cb10a7e19c402aafc984bf595f09951a6 WHIRLPOOL 68ed2b27bbd48f5af5e29743dcd2871ab4c2904d5593bbb6f3e68129f318389e32e13b256d489ea7842b90c406974511c8f324383253c7b438e7b6a9d36d299d
 DIST collectd-5.6.2.tar.bz2 1806969 SHA256 cc0b4118a91e5369409ced22d1d8a85c1a400098419414160c1839268ecad0c6 SHA512 81438e2e653649cf8a447f475b41844b7adb8ec436b43fb395ba9cf8b09b56a068633fe4b6c802d5cde3909d85a3af2542f5804005b3843f7936a37553911d61 WHIRLPOOL ab3a1d160418cf1a826ae7c3b8999b239d15f2f16d70e1305d185ddc79c307071cfd529214c9406fc9c85435a94775abbf2cdb807a2e2b6da8f666cc0550886a
diff --git a/app-admin/collectd/collectd-5.5.2.ebuild b/app-admin/collectd/collectd-5.5.2.ebuild
deleted file mode 100644 (file)
index 0d4f633..0000000
+++ /dev/null
@@ -1,485 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit autotools fcaps flag-o-matic java-pkg-opt-2 linux-info multilib perl-functions python-single-r1 systemd user
-
-DESCRIPTION="Collects system statistics and provides mechanisms to store the values"
-
-HOMEPAGE="http://collectd.org/"
-SRC_URI="${HOMEPAGE}/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="contrib debug java kernel_Darwin kernel_FreeBSD kernel_linux perl selinux static-libs udev xfs"
-
-# The plugin lists have to follow here since they extend IUSE
-
-# Plugins that don't build (e.g. dependencies not in Gentoo)
-# apple_sensors: Requires libIOKit
-# aquaero:       Requires aerotools-ng/libaquaero5
-# barometer:     Requires libi2c (i2c_smbus_read_i2c_block_data)
-# lpar:          Requires libperfstat (AIX only)
-# mic:           Requires Intel Many Integrated Core Architecture API
-#                (part of Intel's  Xeon Phi software)
-# netapp:        Requires libnetapp (http://communities.netapp.com/docs/DOC-1110)
-# pf:            Requires BSD packet filter
-# pinba:         Requires MySQL Pinba engine (http://pinba.org/)
-# tape:          Requires libkstat (Solaris only)
-# write_mongodb: https://github.com/collectd/collectd/issues/492
-# xmms:          Requires libxmms (v1)
-COLLECTD_IMPOSSIBLE_PLUGINS="apple_sensors aquaero mic netapp pf pinba tape write_kafka write_mongodb xmms"
-
-# Plugins that have been (compile) tested and can be enabled via COLLECTD_PLUGINS
-COLLECTD_TESTED_PLUGINS="amqp aggregation apache apcups ascent battery bind ceph
-       cgroups conntrack contextswitch cpu cpufreq csv curl curl_json curl_xml dbi df
-       disk dns drbd email entropy ethstat exec fhcount filecount fscache genericjmx
-       gmond hddtemp interface ipc ipmi iptables ipvs irq java load logfile log_logstash
-       lvm madwifi match_empty_counter match_hashed match_regex match_timediff match_value
-       mbmon md memcachec memcached memory modbus multimeter mysql netlink network network
-       nfs nginx notify_desktop notify_email ntpd numa nut olsrd onewire openldap openvpn
-       oracle perl ping postgresql powerdns processes protocols python python redis
-       routeros rrdcached rrdtool sensors serial sigrok smart snmp statsd swap syslog
-       table tail tail_csv target_notification target_replace target_scale target_set
-       tcpconns teamspeak2 ted thermal threshold tokyotyrant turbostat unixsock uptime
-       users uuid varnish virt vmem vserver wireless write_graphite write_http write_kafka
-       write_log write_redis write_riemann write_sensu write_tsdb zfs_arc zookeeper"
-
-COLLECTD_DISABLED_PLUGINS="${COLLECTD_IMPOSSIBLE_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="
-       dev-libs/libgcrypt:=
-       dev-libs/libltdl:0=
-       perl?                                   ( dev-lang/perl:=[ithreads] )
-       udev?                                   ( virtual/udev )
-       xfs?                                    ( sys-fs/xfsprogs )
-       collectd_plugins_amqp?                  ( net-libs/rabbitmq-c )
-       collectd_plugins_apache?                ( net-misc/curl:0= )
-       collectd_plugins_ascent?                ( net-misc/curl:0= dev-libs/libxml2:2= )
-       collectd_plugins_bind?                  ( dev-libs/libxml2:2= )
-       collectd_plugins_ceph?                  ( dev-libs/yajl:= )
-       collectd_plugins_curl?                  ( net-misc/curl:0= )
-       collectd_plugins_curl_json?             ( net-misc/curl:0= dev-libs/yajl:= )
-       collectd_plugins_curl_xml?              ( net-misc/curl:0= dev-libs/libxml2:2= )
-       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.13:0= )
-       collectd_plugins_log_logstash?          ( dev-libs/yajl:= )
-       collectd_plugins_lvm?                   ( sys-fs/lvm2 )
-       collectd_plugins_memcachec?             ( dev-libs/libmemcached )
-       collectd_plugins_modbus?                ( dev-libs/libmodbus )
-       collectd_plugins_mysql?                 ( >=virtual/mysql-5.0 )
-       collectd_plugins_netlink?               ( net-libs/libmnl )
-       collectd_plugins_nginx?                 ( net-misc/curl:0= )
-       collectd_plugins_notify_desktop?        ( x11-libs/libnotify )
-       collectd_plugins_notify_email?          ( net-libs/libesmtp )
-       collectd_plugins_nut?                   ( >=sys-power/nut-2.7.2-r2 )
-       collectd_plugins_openldap?              ( net-nds/openldap )
-       collectd_plugins_onewire?               ( >=sys-fs/owfs-3.1:= )
-       collectd_plugins_oracle?                ( dev-db/oracle-instantclient-basic )
-       collectd_plugins_perl?                  ( dev-lang/perl:=[ithreads] )
-       collectd_plugins_ping?                  ( net-libs/liboping )
-       collectd_plugins_postgresql?            ( dev-db/postgresql:= )
-       collectd_plugins_python?                ( ${PYTHON_DEPS} )
-       collectd_plugins_redis?                 ( dev-libs/hiredis:= )
-       collectd_plugins_routeros?              ( net-libs/librouteros )
-       collectd_plugins_rrdcached?             ( net-analyzer/rrdtool:= )
-       collectd_plugins_rrdtool?               ( net-analyzer/rrdtool:= )
-       collectd_plugins_sensors?               ( sys-apps/lm_sensors )
-       collectd_plugins_sigrok?                ( <sci-libs/libsigrok-0.4 )
-       collectd_plugins_smart?                 ( dev-libs/libatasmart )
-       collectd_plugins_snmp?                  ( net-analyzer/net-snmp )
-       collectd_plugins_tokyotyrant?           ( net-misc/tokyotyrant )
-       collectd_plugins_varnish?               ( www-servers/varnish )
-       collectd_plugins_virt?                  ( app-emulation/libvirt:= dev-libs/libxml2:2= )
-       collectd_plugins_write_http?            ( net-misc/curl:0= )
-       collectd_plugins_write_kafka?           ( >=dev-libs/librdkafka-0.9.0.99:= )
-       collectd_plugins_write_redis?           ( dev-libs/hiredis:= )
-       collectd_plugins_write_riemann?         ( dev-libs/protobuf-c:= )
-
-       kernel_FreeBSD? (
-               collectd_plugins_disk?          ( sys-libs/libstatgrab:= )
-               collectd_plugins_interface?     ( sys-libs/libstatgrab:= )
-               collectd_plugins_load?          ( sys-libs/libstatgrab:= )
-               collectd_plugins_memory?        ( sys-libs/libstatgrab:= )
-               collectd_plugins_swap?          ( sys-libs/libstatgrab:= )
-               collectd_plugins_users?         ( sys-libs/libstatgrab:= )
-       )"
-
-# Enforcing <=sys-kernel/linux-headers-4.4 due to #577846
-DEPEND="${COMMON_DEPEND}
-       collectd_plugins_genericjmx?            ( >=virtual/jdk-1.6 )
-       collectd_plugins_iptables?              ( <=sys-kernel/linux-headers-4.4 )
-       collectd_plugins_java?                  ( >=virtual/jdk-1.6 )
-       virtual/pkgconfig"
-
-RDEPEND="${COMMON_DEPEND}
-       collectd_plugins_genericjmx?            ( >=virtual/jre-1.6 )
-       collectd_plugins_java?                  ( >=virtual/jre-1.6 )
-       collectd_plugins_syslog?                ( virtual/logger )
-       selinux?                                ( sec-policy/selinux-collectd )
-       !<sys-apps/openrc-0.18.2"
-
-REQUIRED_USE="
-       collectd_plugins_genericjmx?            ( java )
-       collectd_plugins_java?                  ( java )
-       collectd_plugins_python?                ( ${PYTHON_REQUIRED_USE} )
-       collectd_plugins_smart?                 ( udev )"
-
-PATCHES=(
-       "${FILESDIR}"/${PN}-4.10.3-werror.patch
-       "${FILESDIR}"/${PN}-5.5.1-{libocci,lt,nohal}.patch
-       "${FILESDIR}"/${PN}-5.5.2-issue-{1870,1877}.patch
-)
-
-# @FUNCTION: collectd_plugin_kernel_linux
-# @DESCRIPTION:
-# USAGE: <plugin 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} plugin can use kernel features that are disabled now; enable ${multi_opt} in your kernel"
-                               ;;
-                               (warn)
-                                       ewarn "The ${1} plugin uses kernel features that are disabled now; enable ${multi_opt} in your kernel"
-                               ;;
-                               (error)
-                                       eerror "The ${1} plugin 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() {
-       if ! linux_chkconfig_present PROC_FS; then
-               ewarn "/proc file system support is disabled, many plugins will not be able to read any statistics from your system unless you enable PROC_FS in your kernel"
-       fi
-
-       if ! linux_chkconfig_present SYSFS; then
-               ewarn "/sys file system support is disabled, many plugins will not be able to read any statistics from your system unless you enable SYSFS in your kernel"
-       fi
-
-       # battery.c: /proc/pmu/battery_%i
-       # battery.c: /proc/acpi/battery
-       collectd_plugin_kernel_linux battery ACPI_BATTERY warn
-
-       # cgroups.c: /sys/fs/cgroup/
-       collectd_plugin_kernel_linux cgroups CGROUPS 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
-
-       # drbd.c: /proc/drbd
-       collectd_plugin_kernel_linux drbd BLK_DEV_DRBD warn
-
-       # conntrack.c: /proc/sys/net/netfilter/*
-       collectd_plugin_kernel_linux conntrack NETFILTER warn
-
-       # fscache.c: /proc/fs/fscache/stats
-       collectd_plugin_kernel_linux fscache FSCACHE 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 ACPI_THERMAL warn
-
-       # turbostat.c: /dev/cpu/%d/msr
-       collectd_plugin_kernel_linux turbostat X86_MSR warn
-
-       # vmem.c: /proc/vmstat
-       collectd_plugin_kernel_linux vmem VM_EVENT_COUNTERS warn
-
-       # vserver.c: /proc/virtual
-       collectd_plugin_kernel_linux vserver VSERVER warn
-
-       # uuid.c: /sys/hypervisor/uuid
-       collectd_plugin_kernel_linux uuid SYSFS info
-
-       # wireless.c: /proc/net/wireless
-       collectd_plugin_kernel_linux wireless "WIRELESS MAC80211 IEEE80211" warn
-
-       # zfs_arc.c: /proc/spl/kstat/zfs/arcstats
-       collectd_plugin_kernel_linux zfs_arc "SPL ZFS" warn
-}
-
-pkg_setup() {
-       if use kernel_linux; then
-               linux-info_pkg_setup
-
-               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
-
-       if use collectd_plugins_java || use collectd_plugins_genericjmx; then
-               java-pkg-opt-2_pkg_setup
-       fi
-
-       use collectd_plugins_python && python-single-r1_pkg_setup
-
-       enewgroup collectd
-       enewuser collectd -1 -1 /var/lib/collectd collectd
-}
-
-src_prepare() {
-       default
-
-       # 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
-
-       sed -i -e "s:/etc/collectd/collectd.conf:/etc/collectd.conf:g" contrib/collectd.service || die
-
-       # fix installdirs for perl, bug 444360
-       sed -i -e 's/INSTALL_BASE=$(DESTDIR)$(prefix) //' bindings/Makefile.am || die
-
-       if use collectd_plugins_java || use collectd_plugins_genericjmx; then
-               # Set javac -source and -target flags according to (R)DEPEND.
-               sed -i -e "s/\$(JAVAC)/\0 $(java-pkg_javac-args)/g" bindings/java/Makefile.am || die
-       fi
-
-       ebegin "Removing bundled libltdl"
-       rm -r libltdl || die
-       eend 0
-
-       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="barometer battery cpu cpufreq disk drbd entropy
-               ethstat interface iptables ipvs irq ipc load memory md netlink nfs
-               numa processes serial swap tcpconns thermal turbostat users vmem
-               wireless zfc_arc"
-
-       local need_libstatgrab=0
-       local libstatgrab_plugins="cpu disk interface load memory swap users"
-       local bsd_plugins="cpu tcpconns ${libstatgrab_plugins} zfc_arc"
-
-       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)"
-
-       # udev support?
-       # Required for smart plugin via REQUIRED_USE; Optional for disk plugin
-       if use udev; then
-               myconf+=" --with-libudev"
-       else
-               myconf+=" --without-libudev"
-       fi
-
-       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})"
-                               # ... must we link against libstatgrab? Bug #541518
-                               if use kernel_FreeBSD && has ${plugin} ${libstatgrab_plugins}; then
-                                       einfo "We must link against libstatgrab due to plugin \"${plugin}\" ..."
-                                       need_libstatgrab=1
-                               fi
-                       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
-
-       if [ "${need_libstatgrab}" -eq 1 ]; then
-               myconf+=" --with-libstatgrab"
-       else
-               myconf+=" --without-libstatgrab"
-       fi
-
-       # JAVA_HOME is set by eclasses.
-       if use collectd_plugins_java || use collectd_plugins_genericjmx; then
-               myconf+=" --with-java"
-       fi
-
-       # Need libiptc ONLY for iptables. If we try to use it otherwise bug 340109 happens.
-       # lots of libs are only needed for plugins, if they are disabled, also disable the lib
-       use collectd_plugins_iptables || myconf+=" --with-libiptc=no"
-       use collectd_plugins_openldap || myconf+=" --with-libldap=no"
-       use collectd_plugins_redis    || use collectd_plugins_write_redis || myconf+=" --with-libhiredis=no"
-       use collectd_plugins_smart    || myconf+=" --with-libatasmart=no"
-       use collectd_plugins_virt     || myconf+=" --with-libvirt=no"
-
-       if use perl; then
-               myconf+=" --with-perl-bindings=INSTALLDIRS=vendor"
-       else
-               myconf+=" --without-perl-bindings"
-       fi
-
-       # No need for v5upgrade
-       myconf+=" --disable-target_v5upgrade"
-
-       # Finally, run econf.
-       KERNEL_DIR="${KERNEL_DIR}" econf --config-cache --disable-ltdl-install \
-               --without-included-ltdl $(use_enable static-libs static) \
-               --localstatedir=/var ${myconf}
-
-       if ! use xfs; then
-               # Workaround for https://github.com/collectd/collectd/issues/1878
-               einfo "Disabling XFS support ..."
-               sed -i -e "s/HAVE_XFS_XQM_H 1/HAVE_XFS_XQM_H 0/" src/config.h || die
-       fi
-}
-
-src_install() {
-       emake DESTDIR="${D%/}" install
-
-       perl_delete_localpod
-
-       find "${ED}"usr/ -name "*.la" -delete || die
-
-       if use collectd_plugins_java || use collectd_plugins_genericjmx; then
-               java-pkg_regjar "${ED}"usr/share/${PN}/java/*.jar
-       fi
-
-       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-r1" ${PN}
-       newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
-       systemd_dounit "contrib/${PN}.service"
-
-       insinto /etc/logrotate.d
-       newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
-       sed -i -e 's:^.*PIDFile     "/var/run/collectd.pid":PIDFile     "/run/collectd/collectd.pid":' "${ED}"etc/collectd.conf || die
-       sed -i -e 's:^# SocketFile "/var/run/collectd-unixsock":#       SocketFile "/run/collectd/collectd.socket":' "${ED}"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>:' "${ED}"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>:' "${ED}"etc/collectd.conf || die
-}
-
-pkg_postinst() {
-       local caps=()
-       use collectd_plugins_ceph      && caps+=('cap_dac_override')
-       use collectd_plugins_exec      && caps+=('cap_setuid' 'cap_setgid')
-       use collectd_plugins_iptables  && caps+=('cap_net_admin')
-       use collectd_plugins_filecount && caps+=('cap_dac_read_search')
-       use collectd_plugins_turbostat && caps+=('cap_sys_rawio')
-
-       if use collectd_plugins_dns || use collectd_plugins_ping; then
-               caps+=('cap_net_raw')
-       fi
-
-       if [ ${#caps[@]} -gt 0 ]; then
-               local caps_str=$(IFS=","; echo "${caps[*]}")
-               fcaps ${caps_str} usr/sbin/collectd
-               elog "Capabilities for ${EROOT}usr/sbin/collectd set to:"
-               elog "  ${caps_str}+ep"
-               elog
-       fi
-
-       elog "Note: Collectd is only the collector."
-       elog "      You need to install 'data' sources (applications) locally or"
-       elog "      remotely on your own."
-
-       elog
-       elog "Collectd is configured to run as unprivileged user by default."
-       elog "You may want to revisit 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.6.1-r1.ebuild b/app-admin/collectd/collectd-5.6.1-r1.ebuild
deleted file mode 100644 (file)
index 454ffc4..0000000
+++ /dev/null
@@ -1,519 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-JAVA_PKG_OPT_USE="collectd_plugins_java"
-
-inherit autotools fcaps flag-o-matic java-pkg-opt-2 linux-info multilib perl-functions python-single-r1 systemd user
-
-DESCRIPTION="Collects system statistics and provides mechanisms to store the values"
-
-HOMEPAGE="https://collectd.org/"
-SRC_URI="${HOMEPAGE}/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="contrib debug java kernel_Darwin kernel_FreeBSD kernel_linux perl selinux static-libs udev xfs"
-
-# The plugin lists have to follow here since they extend IUSE
-
-# Plugins that don't build (e.g. dependencies not in Gentoo)
-# apple_sensors: Requires libIOKit
-# aquaero:       Requires aerotools-ng/libaquaero5
-# barometer:     Requires libi2c (i2c_smbus_read_i2c_block_data)
-# grpc:          Requires libgrpc
-# lpar:          Requires libperfstat (AIX only)
-# mic:           Requires Intel Many Integrated Core Architecture API
-#                (part of Intel's  Xeon Phi software)
-# netapp:        Requires libnetapp (http://communities.netapp.com/docs/DOC-1110)
-# pf:            Requires BSD packet filter
-# pinba:         Requires MySQL Pinba engine (http://pinba.org/)
-# tape:          Requires libkstat (Solaris only)
-# write_mongodb: https://github.com/collectd/collectd/issues/492
-# write_riemann: Requires riemann-c-client
-# xmms:          Requires libxmms (v1)
-# zone:          Solaris only...
-COLLECTD_IMPOSSIBLE_PLUGINS="apple_sensors aquaero barometer grpc lpar mic
-       netapp pf pinba tape write_kafka write_mongodb write_riemann xmms
-       zone"
-
-# Plugins that have been (compile) tested and can be enabled via COLLECTD_PLUGINS
-COLLECTD_TESTED_PLUGINS="aggregation amqp apache apcups ascent battery bind
-       ceph cgroups chrony conntrack contextswitch cpu cpufreq cpusleep
-       csv curl curl_json curl_xml dbi df disk dns drbd email entropy
-       ethstat exec fhcount filecount fscache gmond gps hddtemp interface
-       ipc ipmi iptables ipvs irq java lua load logfile log_logstash lvm
-       madwifi match_empty_counter match_hashed match_regex match_timediff
-       match_value mbmon md memcachec memcached memory modbus mqtt
-       multimeter mysql netlink network network nfs nginx notify_desktop
-       notify_email notify_nagios ntpd numa nut olsrd onewire openldap
-       openvpn oracle perl ping postgresql powerdns processes protocols
-       python python redis routeros rrdcached rrdtool sensors serial
-       sigrok smart snmp statsd swap syslog table tail tail_csv
-       target_notification target_replace target_scale target_set tcpconns
-       teamspeak2 ted thermal threshold tokyotyrant turbostat unixsock
-       uptime users uuid varnish virt vmem vserver wireless write_graphite
-       write_http write_kafka write_log write_redis write_sensu write_tsdb
-       xencpu zfs_arc zookeeper"
-
-COLLECTD_DISABLED_PLUGINS="${COLLECTD_IMPOSSIBLE_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="
-       dev-libs/libgcrypt:=
-       dev-libs/libltdl:0=
-       perl?                                   ( dev-lang/perl:=[ithreads] )
-       udev?                                   ( virtual/udev )
-       xfs?                                    ( sys-fs/xfsprogs )
-       collectd_plugins_amqp?                  ( net-libs/rabbitmq-c )
-       collectd_plugins_apache?                ( net-misc/curl:0= )
-       collectd_plugins_ascent?                ( net-misc/curl:0= dev-libs/libxml2:2= )
-       collectd_plugins_bind?                  ( net-misc/curl:0= dev-libs/libxml2:2= )
-       collectd_plugins_ceph?                  ( dev-libs/yajl:= )
-       collectd_plugins_curl?                  ( net-misc/curl:0= )
-       collectd_plugins_curl_json?             ( net-misc/curl:0= dev-libs/yajl:= )
-       collectd_plugins_curl_xml?              ( net-misc/curl:0= dev-libs/libxml2:2= )
-       collectd_plugins_dbi?                   ( dev-db/libdbi )
-       collectd_plugins_dns?                   ( net-libs/libpcap )
-       collectd_plugins_gmond?                 ( sys-cluster/ganglia )
-       collectd_plugins_gps?                   ( sci-geosciences/gpsd )
-       collectd_plugins_ipmi?                  ( >=sys-libs/openipmi-2.0.16-r1 )
-       collectd_plugins_iptables?              ( >=net-firewall/iptables-1.4.13:0= )
-       collectd_plugins_log_logstash?          ( dev-libs/yajl:= )
-       collectd_plugins_lua?                   ( dev-lang/lua:0= )
-       collectd_plugins_lvm?                   ( sys-fs/lvm2 )
-       collectd_plugins_memcachec?             ( dev-libs/libmemcached )
-       collectd_plugins_modbus?                ( dev-libs/libmodbus )
-       collectd_plugins_mqtt?                  ( app-misc/mosquitto )
-       collectd_plugins_mysql?                 ( >=virtual/mysql-5.0 )
-       collectd_plugins_netlink?               ( net-libs/libmnl )
-       collectd_plugins_nginx?                 ( net-misc/curl:0= )
-       collectd_plugins_notify_desktop?        ( x11-libs/libnotify )
-       collectd_plugins_notify_email?          ( net-libs/libesmtp )
-       collectd_plugins_nut?                   ( >=sys-power/nut-2.7.2-r2 )
-       collectd_plugins_openldap?              ( net-nds/openldap )
-       collectd_plugins_onewire?               ( >=sys-fs/owfs-3.1:= )
-       collectd_plugins_oracle?                ( dev-db/oracle-instantclient-basic )
-       collectd_plugins_perl?                  ( dev-lang/perl:=[ithreads] )
-       collectd_plugins_ping?                  ( net-libs/liboping )
-       collectd_plugins_postgresql?            ( dev-db/postgresql:= )
-       collectd_plugins_python?                ( ${PYTHON_DEPS} )
-       collectd_plugins_redis?                 ( dev-libs/hiredis:= )
-       collectd_plugins_routeros?              ( net-libs/librouteros )
-       collectd_plugins_rrdcached?             ( net-analyzer/rrdtool:= )
-       collectd_plugins_rrdtool?               ( net-analyzer/rrdtool:= )
-       collectd_plugins_sensors?               ( sys-apps/lm_sensors )
-       collectd_plugins_sigrok?                ( <sci-libs/libsigrok-0.4 dev-libs/glib:2 )
-       collectd_plugins_smart?                 ( dev-libs/libatasmart )
-       collectd_plugins_snmp?                  ( net-analyzer/net-snmp )
-       collectd_plugins_tokyotyrant?           ( net-misc/tokyotyrant )
-       collectd_plugins_varnish?               ( www-servers/varnish )
-       collectd_plugins_virt?                  ( app-emulation/libvirt:= dev-libs/libxml2:2= )
-       collectd_plugins_write_http?            ( net-misc/curl:0= dev-libs/yajl:= )
-       collectd_plugins_write_kafka?           ( >=dev-libs/librdkafka-0.9.0.99:= dev-libs/yajl:= )
-       collectd_plugins_write_redis?           ( dev-libs/hiredis:= )
-       collectd_plugins_xencpu?                ( app-emulation/xen-tools:= )
-
-       kernel_FreeBSD? (
-               collectd_plugins_disk?          ( sys-libs/libstatgrab:= )
-               collectd_plugins_interface?     ( sys-libs/libstatgrab:= )
-               collectd_plugins_load?          ( sys-libs/libstatgrab:= )
-               collectd_plugins_memory?        ( sys-libs/libstatgrab:= )
-               collectd_plugins_swap?          ( sys-libs/libstatgrab:= )
-               collectd_plugins_users?         ( sys-libs/libstatgrab:= )
-       )"
-
-# Enforcing <=sys-kernel/linux-headers-4.4 due to #577846
-DEPEND="${COMMON_DEPEND}
-       collectd_plugins_iptables?              ( <=sys-kernel/linux-headers-4.4 )
-       collectd_plugins_java?                  ( >=virtual/jdk-1.6 )
-       virtual/pkgconfig"
-
-RDEPEND="${COMMON_DEPEND}
-       collectd_plugins_java?                  ( >=virtual/jre-1.6 )
-       collectd_plugins_syslog?                ( virtual/logger )
-       selinux?                                ( sec-policy/selinux-collectd )
-       !<sys-apps/openrc-0.18.2"
-
-REQUIRED_USE="
-       collectd_plugins_python?                ( ${PYTHON_REQUIRED_USE} )
-       collectd_plugins_smart?                 ( udev )"
-
-PATCHES=(
-       "${FILESDIR}"/${PN}-5.6.0-gentoo.patch
-       "${FILESDIR}"/${PN}-5.6.0-use-_LINUX_CAPABILITY_VERSION_3.patch
-)
-
-# @FUNCTION: collectd_plugin_kernel_linux
-# @DESCRIPTION:
-# USAGE: <plugin 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} plugin can use kernel features that are disabled now; enable ${multi_opt} in your kernel"
-                               ;;
-                               (warn)
-                                       ewarn "The ${1} plugin uses kernel features that are disabled now; enable ${multi_opt} in your kernel"
-                               ;;
-                               (error)
-                                       eerror "The ${1} plugin 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() {
-       if ! linux_chkconfig_present PROC_FS; then
-               ewarn "/proc file system support is disabled, many plugins will not be able to read any statistics from your system unless you enable PROC_FS in your kernel"
-       fi
-
-       if ! linux_chkconfig_present SYSFS; then
-               ewarn "/sys file system support is disabled, many plugins will not be able to read any statistics from your system unless you enable SYSFS in your kernel"
-       fi
-
-       # battery.c: /proc/pmu/battery_%i
-       # battery.c: /proc/acpi/battery
-       collectd_plugin_kernel_linux battery ACPI_BATTERY warn
-
-       # cgroups.c: /sys/fs/cgroup/
-       collectd_plugin_kernel_linux cgroups CGROUPS 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
-
-       # drbd.c: /proc/drbd
-       collectd_plugin_kernel_linux drbd BLK_DEV_DRBD warn
-
-       # conntrack.c: /proc/sys/net/netfilter/*
-       collectd_plugin_kernel_linux conntrack NETFILTER warn
-
-       # fscache.c: /proc/fs/fscache/stats
-       collectd_plugin_kernel_linux fscache FSCACHE 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 ACPI_THERMAL warn
-
-       # turbostat.c: /dev/cpu/%d/msr
-       collectd_plugin_kernel_linux turbostat X86_MSR warn
-
-       # vmem.c: /proc/vmstat
-       collectd_plugin_kernel_linux vmem VM_EVENT_COUNTERS warn
-
-       # vserver.c: /proc/virtual
-       collectd_plugin_kernel_linux vserver VSERVER warn
-
-       # uuid.c: /sys/hypervisor/uuid
-       collectd_plugin_kernel_linux uuid SYSFS info
-
-       # wireless.c: /proc/net/wireless
-       collectd_plugin_kernel_linux wireless "WIRELESS MAC80211 IEEE80211" warn
-
-       # zfs_arc.c: /proc/spl/kstat/zfs/arcstats
-       collectd_plugin_kernel_linux zfs_arc "SPL ZFS" warn
-}
-
-pkg_setup() {
-       if use kernel_linux; then
-               linux-info_pkg_setup
-
-               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
-
-       if use collectd_plugins_java; then
-               java-pkg-opt-2_pkg_setup
-       fi
-
-       use collectd_plugins_python && python-single-r1_pkg_setup
-
-       enewgroup collectd
-       enewuser collectd -1 -1 /var/lib/collectd collectd
-}
-
-src_prepare() {
-       default
-
-       # 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
-
-       # fix installdirs for perl, bug 444360
-       sed -i -e 's/INSTALL_BASE=$(DESTDIR)$(prefix) //' bindings/Makefile.am || die
-
-       # Adjust upstream's systemd unit
-       #   - Get rid of EnvironmentFile directive; These files don't exist on Gentoo!
-       #   - Add User=collectd to run collectd as user "collectd" per default
-       sed -i \
-               -e '/^EnvironmentFile=.*/d' \
-               -e '/^\[Service\]/aUser=collectd' \
-               contrib/systemd.${PN}.service || die
-
-       if use collectd_plugins_java; then
-               # Set javac -source and -target flags according to (R)DEPEND.
-               sed -i -e "s/\$(JAVAC)/\0 $(java-pkg_javac-args)/g" bindings/java/Makefile.am || die
-       fi
-
-       ebegin "Removing bundled libltdl"
-       rm -rf libltdl || die
-       eend 0
-
-       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="barometer battery cpu cpufreq disk drbd entropy
-               ethstat interface iptables ipvs irq ipc load memory md netlink nfs
-               numa processes serial swap tcpconns thermal turbostat users vmem
-               wireless zfc_arc"
-
-       local need_libstatgrab=0
-       local libstatgrab_plugins="cpu disk interface load memory swap users"
-       local bsd_plugins="cpu tcpconns ${libstatgrab_plugins} zfc_arc"
-
-       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
-
-       local myconf="--disable-werror"
-
-       # Do we debug?
-       myconf+=" $(use_enable debug)"
-
-       # udev support?
-       # Required for smart plugin via REQUIRED_USE; Optional for disk plugin
-       if use udev; then
-               myconf+=" --with-libudev"
-       else
-               myconf+=" --without-libudev"
-       fi
-
-       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})"
-                               # ... must we link against libstatgrab? Bug #541518
-                               if use kernel_FreeBSD && has ${plugin} ${libstatgrab_plugins}; then
-                                       einfo "We must link against libstatgrab due to plugin \"${plugin}\" ..."
-                                       need_libstatgrab=1
-                               fi
-                       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
-
-       if [ "${need_libstatgrab}" -eq 1 ]; then
-               myconf+=" --with-libstatgrab"
-       else
-               myconf+=" --without-libstatgrab"
-       fi
-
-       # JAVA_HOME is set by eclasses.
-       if use collectd_plugins_java; then
-               myconf+=" --with-java"
-       fi
-
-       # Need libiptc ONLY for iptables. If we try to use it otherwise bug 340109 happens.
-       # lots of libs are only needed for plugins, if they are disabled, also disable the lib
-       use collectd_plugins_iptables || myconf+=" --with-libiptc=no"
-       use collectd_plugins_openldap || myconf+=" --with-libldap=no"
-       use collectd_plugins_redis    || use collectd_plugins_write_redis || myconf+=" --with-libhiredis=no"
-       use collectd_plugins_smart    || myconf+=" --with-libatasmart=no"
-       use collectd_plugins_gps      || myconf+=" --with-libgps=no"
-
-       if use perl; then
-               myconf+=" --with-perl-bindings=INSTALLDIRS=vendor"
-       else
-               myconf+=" --without-perl-bindings"
-       fi
-
-       # No need for v5upgrade
-       myconf+=" --disable-target_v5upgrade"
-
-       # Python
-       if use collectd_plugins_python; then
-               myconf+=" --with-libpython=yes"
-               export PYTHON_CONFIG=$(python_get_PYTHON_CONFIG)
-       else
-               myconf+=" --with-libpython=no"
-       fi
-
-       # XFS support
-       myconf+=" $(use_enable xfs)"
-
-       # Finally, run econf.
-       KERNEL_DIR="${KERNEL_DIR}" econf --config-cache \
-               $(use_enable static-libs static) \
-               --localstatedir=/var ${myconf}
-}
-
-src_install() {
-       emake DESTDIR="${D%/}" install
-
-       perl_delete_localpod
-
-       find "${ED}"usr/ -name "*.la" -delete || die
-
-       if use collectd_plugins_java; then
-               java-pkg_regjar "${ED}"usr/share/${PN}/java/*.jar
-       fi
-
-       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-r1" ${PN}
-       newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
-       systemd_newunit "contrib/systemd.${PN}.service" ${PN}.service
-
-       insinto /etc/logrotate.d
-       newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
-       sed -i -e 's:^.*PIDFile     "/var/run/collectd.pid":PIDFile     "/run/collectd/collectd.pid":' "${ED}"etc/collectd.conf || die
-       sed -i -e 's:^# SocketFile "/var/run/collectd-unixsock":#       SocketFile "/run/collectd/collectd.socket":' "${ED}"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>:' "${ED}"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>:' "${ED}"etc/collectd.conf || die
-}
-
-pkg_postinst() {
-       if use filecaps; then
-               local caps=()
-               use collectd_plugins_ceph      && caps+=('CAP_DAC_OVERRIDE')
-               use collectd_plugins_exec      && caps+=('CAP_SETUID' 'CAP_SETGID')
-               use collectd_plugins_iptables  && caps+=('CAP_NET_ADMIN')
-               use collectd_plugins_filecount && caps+=('CAP_DAC_READ_SEARCH')
-               use collectd_plugins_turbostat && caps+=('CAP_SYS_RAWIO')
-
-               if use collectd_plugins_dns || use collectd_plugins_ping; then
-                       caps+=('CAP_NET_RAW')
-               fi
-
-               if [ ${#caps[@]} -gt 0 ]; then
-                       local caps_str=$(IFS=","; echo "${caps[*]}")
-                       fcaps ${caps_str} usr/sbin/collectd
-                       elog "Capabilities for ${EROOT}usr/sbin/collectd set to:"
-                       elog "  ${caps_str}+EP"
-                       elog
-
-                       local systemd_unit="${EROOT}usr/lib/systemd/system/collectd.service"
-                       if [[ -e "${systemd_unit}" ]]; then
-                               caps_str="${caps[*]}"
-                               sed -i -e "s:^CapabilityBoundingSet=.*:CapabilityBoundingSet=${caps_str}:" "${systemd_unit}" || \
-                                       die "Failed to set CapabilityBoundingSet in '${systemd_unit}'"
-
-                               elog "CapabilityBoundingSet in '${systemd_unit}'"
-                               elog "updated to match capabilities set above."
-                               elog
-                       fi
-               fi
-       fi
-
-       elog "Note: Collectd is only the collector."
-       elog "      You need to install 'data' sources (applications) locally or"
-       elog "      remotely on your own."
-
-       elog
-       elog "Collectd is configured to run as unprivileged user by default."
-       elog "You may want to revisit 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.6.2-r1.ebuild b/app-admin/collectd/collectd-5.6.2-r1.ebuild
deleted file mode 100644 (file)
index b082b36..0000000
+++ /dev/null
@@ -1,530 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-JAVA_PKG_OPT_USE="collectd_plugins_java"
-
-inherit autotools fcaps flag-o-matic java-pkg-opt-2 linux-info multilib perl-functions python-single-r1 systemd user
-
-DESCRIPTION="Collects system statistics and provides mechanisms to store the values"
-
-HOMEPAGE="https://collectd.org/"
-SRC_URI="${HOMEPAGE%/}/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="contrib debug java kernel_Darwin kernel_FreeBSD kernel_linux perl selinux static-libs udev xfs"
-
-# The plugin lists have to follow here since they extend IUSE
-
-# Plugins that don't build (e.g. dependencies not in Gentoo)
-# apple_sensors: Requires libIOKit
-# aquaero:       Requires aerotools-ng/libaquaero5
-# barometer:     Requires libi2c (i2c_smbus_read_i2c_block_data)
-# grpc:          Requires libgrpc
-# lpar:          Requires libperfstat (AIX only)
-# mic:           Requires Intel Many Integrated Core Architecture API
-#                (part of Intel's  Xeon Phi software)
-# netapp:        Requires libnetapp (http://communities.netapp.com/docs/DOC-1110)
-# pf:            Requires BSD packet filter
-# pinba:         Requires MySQL Pinba engine (http://pinba.org/)
-# tape:          Requires libkstat (Solaris only)
-# write_mongodb: https://github.com/collectd/collectd/issues/492
-# write_riemann: Requires riemann-c-client
-# xmms:          Requires libxmms (v1)
-# zone:          Solaris only...
-COLLECTD_IMPOSSIBLE_PLUGINS="apple_sensors aquaero barometer grpc lpar mic
-       netapp pf pinba tape write_kafka write_mongodb write_riemann xmms
-       zone"
-
-# Plugins that have been (compile) tested and can be enabled via COLLECTD_PLUGINS
-COLLECTD_TESTED_PLUGINS="aggregation amqp apache apcups ascent battery bind
-       ceph cgroups chrony conntrack contextswitch cpu cpufreq cpusleep
-       csv curl curl_json curl_xml dbi df disk dns drbd email entropy
-       ethstat exec fhcount filecount fscache gmond gps hddtemp interface
-       ipc ipmi iptables ipvs irq java lua load logfile log_logstash lvm
-       madwifi match_empty_counter match_hashed match_regex match_timediff
-       match_value mbmon md memcachec memcached memory modbus mqtt
-       multimeter mysql netlink network network nfs nginx notify_desktop
-       notify_email notify_nagios ntpd numa nut olsrd onewire openldap
-       openvpn oracle perl ping postgresql powerdns processes protocols
-       python python redis routeros rrdcached rrdtool sensors serial
-       sigrok smart snmp statsd swap syslog table tail tail_csv
-       target_notification target_replace target_scale target_set tcpconns
-       teamspeak2 ted thermal threshold tokyotyrant turbostat unixsock
-       uptime users uuid varnish virt vmem vserver wireless write_graphite
-       write_http write_kafka write_log write_redis write_sensu write_tsdb
-       xencpu zfs_arc zookeeper"
-
-COLLECTD_DISABLED_PLUGINS="${COLLECTD_IMPOSSIBLE_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="
-       dev-libs/libgcrypt:=
-       dev-libs/libltdl:0=
-       perl?                                   ( dev-lang/perl:=[ithreads] )
-       udev?                                   ( virtual/udev )
-       xfs?                                    ( sys-fs/xfsprogs )
-       collectd_plugins_amqp?                  ( net-libs/rabbitmq-c )
-       collectd_plugins_apache?                ( net-misc/curl:0= )
-       collectd_plugins_ascent?                ( net-misc/curl:0= dev-libs/libxml2:2= )
-       collectd_plugins_bind?                  ( net-misc/curl:0= dev-libs/libxml2:2= )
-       collectd_plugins_ceph?                  ( dev-libs/yajl:= )
-       collectd_plugins_curl?                  ( net-misc/curl:0= )
-       collectd_plugins_curl_json?             ( net-misc/curl:0= dev-libs/yajl:= )
-       collectd_plugins_curl_xml?              ( net-misc/curl:0= dev-libs/libxml2:2= )
-       collectd_plugins_dbi?                   ( dev-db/libdbi )
-       collectd_plugins_dns?                   ( net-libs/libpcap )
-       collectd_plugins_gmond?                 ( sys-cluster/ganglia )
-       collectd_plugins_gps?                   ( sci-geosciences/gpsd )
-       collectd_plugins_ipmi?                  ( >=sys-libs/openipmi-2.0.16-r1 )
-       collectd_plugins_iptables?              ( >=net-firewall/iptables-1.4.13:0= )
-       collectd_plugins_log_logstash?          ( dev-libs/yajl:= )
-       collectd_plugins_lua?                   ( dev-lang/lua:0= )
-       collectd_plugins_lvm?                   ( sys-fs/lvm2 )
-       collectd_plugins_memcachec?             ( dev-libs/libmemcached )
-       collectd_plugins_modbus?                ( dev-libs/libmodbus )
-       collectd_plugins_mqtt?                  ( app-misc/mosquitto )
-       collectd_plugins_mysql?                 ( >=virtual/mysql-5.0 )
-       collectd_plugins_netlink?               ( net-libs/libmnl )
-       collectd_plugins_nginx?                 ( net-misc/curl:0= )
-       collectd_plugins_notify_desktop?        ( x11-libs/libnotify )
-       collectd_plugins_notify_email?          ( net-libs/libesmtp )
-       collectd_plugins_nut?                   ( >=sys-power/nut-2.7.2-r2 )
-       collectd_plugins_openldap?              ( net-nds/openldap )
-       collectd_plugins_onewire?               ( >=sys-fs/owfs-3.1:= )
-       collectd_plugins_oracle?                ( dev-db/oracle-instantclient-basic )
-       collectd_plugins_perl?                  ( dev-lang/perl:=[ithreads] )
-       collectd_plugins_ping?                  ( net-libs/liboping )
-       collectd_plugins_postgresql?            ( dev-db/postgresql:= )
-       collectd_plugins_python?                ( ${PYTHON_DEPS} )
-       collectd_plugins_redis?                 ( dev-libs/hiredis:= )
-       collectd_plugins_routeros?              ( net-libs/librouteros )
-       collectd_plugins_rrdcached?             ( net-analyzer/rrdtool:= )
-       collectd_plugins_rrdtool?               ( net-analyzer/rrdtool:= )
-       collectd_plugins_sensors?               ( sys-apps/lm_sensors )
-       collectd_plugins_sigrok?                ( <sci-libs/libsigrok-0.4 dev-libs/glib:2 )
-       collectd_plugins_smart?                 ( dev-libs/libatasmart )
-       collectd_plugins_snmp?                  ( net-analyzer/net-snmp )
-       collectd_plugins_tokyotyrant?           ( net-misc/tokyotyrant )
-       collectd_plugins_varnish?               ( www-servers/varnish )
-       collectd_plugins_virt?                  ( app-emulation/libvirt:= dev-libs/libxml2:2= )
-       collectd_plugins_write_http?            ( net-misc/curl:0= dev-libs/yajl:= )
-       collectd_plugins_write_kafka?           ( >=dev-libs/librdkafka-0.9.0.99:= dev-libs/yajl:= )
-       collectd_plugins_write_redis?           ( dev-libs/hiredis:= )
-       collectd_plugins_xencpu?                ( app-emulation/xen-tools:= )
-
-       kernel_FreeBSD? (
-               collectd_plugins_disk?          ( sys-libs/libstatgrab:= )
-               collectd_plugins_interface?     ( sys-libs/libstatgrab:= )
-               collectd_plugins_load?          ( sys-libs/libstatgrab:= )
-               collectd_plugins_memory?        ( sys-libs/libstatgrab:= )
-               collectd_plugins_swap?          ( sys-libs/libstatgrab:= )
-               collectd_plugins_users?         ( sys-libs/libstatgrab:= )
-       )"
-
-# Enforcing <=sys-kernel/linux-headers-4.4 due to #577846
-DEPEND="${COMMON_DEPEND}
-       collectd_plugins_iptables?              ( <=sys-kernel/linux-headers-4.4 )
-       collectd_plugins_java?                  ( >=virtual/jdk-1.6 )
-       virtual/pkgconfig"
-
-RDEPEND="${COMMON_DEPEND}
-       collectd_plugins_java?                  ( >=virtual/jre-1.6 )
-       collectd_plugins_syslog?                ( virtual/logger )
-       selinux?                                ( sec-policy/selinux-collectd )
-       !<sys-apps/openrc-0.18.2"
-
-REQUIRED_USE="
-       collectd_plugins_python?                ( ${PYTHON_REQUIRED_USE} )
-       collectd_plugins_smart?                 ( udev )"
-
-PATCHES=(
-       "${FILESDIR}"/${PN}-5.6.0-gentoo.patch
-)
-
-# @FUNCTION: collectd_plugin_kernel_linux
-# @DESCRIPTION:
-# USAGE: <plugin 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} plugin can use kernel features that are disabled now; enable ${multi_opt} in your kernel"
-                               ;;
-                               (warn)
-                                       ewarn "The ${1} plugin uses kernel features that are disabled now; enable ${multi_opt} in your kernel"
-                               ;;
-                               (error)
-                                       eerror "The ${1} plugin 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() {
-       if ! linux_chkconfig_present PROC_FS; then
-               ewarn "/proc file system support is disabled, many plugins will not be able to read any statistics from your system unless you enable PROC_FS in your kernel"
-       fi
-
-       if ! linux_chkconfig_present SYSFS; then
-               ewarn "/sys file system support is disabled, many plugins will not be able to read any statistics from your system unless you enable SYSFS in your kernel"
-       fi
-
-       # battery.c: /proc/pmu/battery_%i
-       # battery.c: /proc/acpi/battery
-       collectd_plugin_kernel_linux battery ACPI_BATTERY warn
-
-       # cgroups.c: /sys/fs/cgroup/
-       collectd_plugin_kernel_linux cgroups CGROUPS 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
-
-       # drbd.c: /proc/drbd
-       collectd_plugin_kernel_linux drbd BLK_DEV_DRBD warn
-
-       # conntrack.c: /proc/sys/net/netfilter/*
-       collectd_plugin_kernel_linux conntrack NETFILTER warn
-
-       # fscache.c: /proc/fs/fscache/stats
-       collectd_plugin_kernel_linux fscache FSCACHE 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 ACPI_THERMAL warn
-
-       # turbostat.c: /dev/cpu/%d/msr
-       collectd_plugin_kernel_linux turbostat X86_MSR warn
-
-       # vmem.c: /proc/vmstat
-       collectd_plugin_kernel_linux vmem VM_EVENT_COUNTERS warn
-
-       # vserver.c: /proc/virtual
-       collectd_plugin_kernel_linux vserver VSERVER warn
-
-       # uuid.c: /sys/hypervisor/uuid
-       collectd_plugin_kernel_linux uuid SYSFS info
-
-       # wireless.c: /proc/net/wireless
-       collectd_plugin_kernel_linux wireless "WIRELESS MAC80211 IEEE80211" warn
-
-       # zfs_arc.c: /proc/spl/kstat/zfs/arcstats
-       collectd_plugin_kernel_linux zfs_arc "SPL ZFS" warn
-}
-
-pkg_setup() {
-       if use kernel_linux; then
-               linux-info_pkg_setup
-
-               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
-
-       if use collectd_plugins_java; then
-               java-pkg-opt-2_pkg_setup
-       fi
-
-       use collectd_plugins_python && python-single-r1_pkg_setup
-
-       enewgroup collectd
-       enewuser collectd -1 -1 /var/lib/collectd collectd
-}
-
-src_prepare() {
-       default
-
-       # 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
-
-       # fix installdirs for perl, bug 444360
-       sed -i -e 's/INSTALL_BASE=$(DESTDIR)$(prefix) //' bindings/Makefile.am || die
-
-       # Adjust upstream's systemd unit
-       #   - Get rid of EnvironmentFile directive; These files don't exist on Gentoo!
-       #   - Add User=collectd to run collectd as user "collectd" per default
-       sed -i \
-               -e '/^EnvironmentFile=.*/d' \
-               -e '/^\[Service\]/aUser=collectd' \
-               contrib/systemd.${PN}.service || die
-
-       if use collectd_plugins_java; then
-               # Set javac -source and -target flags according to (R)DEPEND.
-               sed -i -e "s/\$(JAVAC)/\0 $(java-pkg_javac-args)/g" bindings/java/Makefile.am || die
-       fi
-
-       ebegin "Removing bundled libltdl"
-       rm -rf libltdl || die
-       eend 0
-
-       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="barometer battery cpu cpufreq disk drbd entropy
-               ethstat interface iptables ipvs irq ipc load memory md netlink nfs
-               numa processes serial swap tcpconns thermal turbostat users vmem
-               wireless zfc_arc"
-
-       local need_libstatgrab=0
-       local libstatgrab_plugins="cpu disk interface load memory swap users"
-       local bsd_plugins="cpu tcpconns ${libstatgrab_plugins} zfc_arc"
-
-       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
-
-       local myconf="--disable-werror"
-
-       # Do we debug?
-       myconf+=" $(use_enable debug)"
-
-       # udev support?
-       # Required for smart plugin via REQUIRED_USE; Optional for disk plugin
-       if use udev; then
-               myconf+=" --with-libudev"
-       else
-               myconf+=" --without-libudev"
-       fi
-
-       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})"
-                               # ... must we link against libstatgrab? Bug #541518
-                               if use kernel_FreeBSD && has ${plugin} ${libstatgrab_plugins}; then
-                                       einfo "We must link against libstatgrab due to plugin \"${plugin}\" ..."
-                                       need_libstatgrab=1
-                               fi
-                       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
-
-       if [ "${need_libstatgrab}" -eq 1 ]; then
-               myconf+=" --with-libstatgrab"
-       else
-               myconf+=" --without-libstatgrab"
-       fi
-
-       # JAVA_HOME is set by eclasses.
-       if use collectd_plugins_java; then
-               myconf+=" --with-java"
-       fi
-
-       # Need libiptc ONLY for iptables. If we try to use it otherwise bug 340109 happens.
-       # lots of libs are only needed for plugins, if they are disabled, also disable the lib
-       use collectd_plugins_iptables || myconf+=" --with-libiptc=no"
-       use collectd_plugins_openldap || myconf+=" --with-libldap=no"
-       use collectd_plugins_redis    || use collectd_plugins_write_redis || myconf+=" --with-libhiredis=no"
-       use collectd_plugins_smart    || myconf+=" --with-libatasmart=no"
-       use collectd_plugins_gps      || myconf+=" --with-libgps=no"
-
-       if use perl; then
-               myconf+=" --with-perl-bindings=INSTALLDIRS=vendor"
-       else
-               myconf+=" --without-perl-bindings"
-       fi
-
-       # No need for v5upgrade
-       myconf+=" --disable-target_v5upgrade"
-
-       # Python
-       if use collectd_plugins_python; then
-               myconf+=" --with-libpython=yes"
-               export PYTHON_CONFIG=$(python_get_PYTHON_CONFIG)
-       else
-               myconf+=" --with-libpython=no"
-       fi
-
-       # XFS support
-       myconf+=" $(use_enable xfs)"
-
-       # Finally, run econf.
-       KERNEL_DIR="${KERNEL_DIR}" econf --config-cache \
-               $(use_enable static-libs static) \
-               --localstatedir=/var ${myconf}
-}
-
-src_install() {
-       emake DESTDIR="${D%/}" install
-
-       perl_delete_localpod
-
-       find "${ED}"usr/ -name "*.la" -delete || die
-
-       if use collectd_plugins_java; then
-               java-pkg_regjar "${ED}"usr/share/${PN}/java/*.jar
-       fi
-
-       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-r1" ${PN}
-       newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
-       systemd_newunit "contrib/systemd.${PN}.service" ${PN}.service
-
-       insinto /etc/logrotate.d
-       newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
-       sed -i -e 's:^.*PIDFile     "/var/run/collectd.pid":PIDFile     "/run/collectd/collectd.pid":' "${ED}"etc/collectd.conf || die
-       sed -i -e 's:^# SocketFile "/var/run/collectd-unixsock":#       SocketFile "/run/collectd/collectd.socket":' "${ED}"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>:' "${ED}"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>:' "${ED}"etc/collectd.conf || die
-}
-
-pkg_postinst() {
-       if use filecaps; then
-               local caps=()
-               use collectd_plugins_ceph      && caps+=('CAP_DAC_OVERRIDE')
-               use collectd_plugins_exec      && caps+=('CAP_SETUID' 'CAP_SETGID')
-               use collectd_plugins_iptables  && caps+=('CAP_NET_ADMIN')
-               use collectd_plugins_filecount && caps+=('CAP_DAC_READ_SEARCH')
-
-               if use collectd_plugins_dns || use collectd_plugins_ping; then
-                       caps+=('CAP_NET_RAW')
-               fi
-
-               if use collectd_plugins_turbostat || use collectd_plugins_smart; then
-                       caps+=('CAP_SYS_RAWIO')
-               fi
-
-               if [ ${#caps[@]} -gt 0 ]; then
-                       local caps_str=$(IFS=","; echo "${caps[*]}")
-                       fcaps ${caps_str} usr/sbin/collectd
-                       elog "Capabilities for ${EROOT}usr/sbin/collectd set to:"
-                       elog "  ${caps_str}+EP"
-                       elog
-
-                       local systemd_unit="${EROOT}usr/lib/systemd/system/collectd.service"
-                       if [[ -e "${systemd_unit}" ]]; then
-                               caps_str="${caps[*]}"
-                               sed -i -e "s:^CapabilityBoundingSet=.*:CapabilityBoundingSet=${caps_str}:" "${systemd_unit}" || \
-                                       die "Failed to set CapabilityBoundingSet in '${systemd_unit}'"
-
-                               elog "CapabilityBoundingSet in '${systemd_unit}'"
-                               elog "updated to match capabilities set above."
-                               elog
-                       fi
-               fi
-       fi
-
-       elog "Note: Collectd is only the collector."
-       elog "      You need to install 'data' sources (applications) locally or"
-       elog "      remotely on your own."
-
-       elog
-       elog "Collectd is configured to run as unprivileged user by default."
-       elog "You may want to revisit 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 collectd_plugins_smart; then
-               elog ""
-               elog "If you are using smart plugin and don't run collectd as root make sure"
-               elog "that the collectd user is allowed to access the disk you want to monitor"
-               elog "(can be done via udev rule for example) and that collectd has the required"
-               elog "capabilities set (which is the default when package was emerged with"
-               elog "'filecaps' USE flag set)."
-       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.6.2.ebuild b/app-admin/collectd/collectd-5.6.2.ebuild
deleted file mode 100644 (file)
index 03fc400..0000000
+++ /dev/null
@@ -1,518 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-JAVA_PKG_OPT_USE="collectd_plugins_java"
-
-inherit autotools fcaps flag-o-matic java-pkg-opt-2 linux-info multilib perl-functions python-single-r1 systemd user
-
-DESCRIPTION="Collects system statistics and provides mechanisms to store the values"
-
-HOMEPAGE="https://collectd.org/"
-SRC_URI="${HOMEPAGE%/}/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="contrib debug java kernel_Darwin kernel_FreeBSD kernel_linux perl selinux static-libs udev xfs"
-
-# The plugin lists have to follow here since they extend IUSE
-
-# Plugins that don't build (e.g. dependencies not in Gentoo)
-# apple_sensors: Requires libIOKit
-# aquaero:       Requires aerotools-ng/libaquaero5
-# barometer:     Requires libi2c (i2c_smbus_read_i2c_block_data)
-# grpc:          Requires libgrpc
-# lpar:          Requires libperfstat (AIX only)
-# mic:           Requires Intel Many Integrated Core Architecture API
-#                (part of Intel's  Xeon Phi software)
-# netapp:        Requires libnetapp (http://communities.netapp.com/docs/DOC-1110)
-# pf:            Requires BSD packet filter
-# pinba:         Requires MySQL Pinba engine (http://pinba.org/)
-# tape:          Requires libkstat (Solaris only)
-# write_mongodb: https://github.com/collectd/collectd/issues/492
-# write_riemann: Requires riemann-c-client
-# xmms:          Requires libxmms (v1)
-# zone:          Solaris only...
-COLLECTD_IMPOSSIBLE_PLUGINS="apple_sensors aquaero barometer grpc lpar mic
-       netapp pf pinba tape write_kafka write_mongodb write_riemann xmms
-       zone"
-
-# Plugins that have been (compile) tested and can be enabled via COLLECTD_PLUGINS
-COLLECTD_TESTED_PLUGINS="aggregation amqp apache apcups ascent battery bind
-       ceph cgroups chrony conntrack contextswitch cpu cpufreq cpusleep
-       csv curl curl_json curl_xml dbi df disk dns drbd email entropy
-       ethstat exec fhcount filecount fscache gmond gps hddtemp interface
-       ipc ipmi iptables ipvs irq java lua load logfile log_logstash lvm
-       madwifi match_empty_counter match_hashed match_regex match_timediff
-       match_value mbmon md memcachec memcached memory modbus mqtt
-       multimeter mysql netlink network network nfs nginx notify_desktop
-       notify_email notify_nagios ntpd numa nut olsrd onewire openldap
-       openvpn oracle perl ping postgresql powerdns processes protocols
-       python python redis routeros rrdcached rrdtool sensors serial
-       sigrok smart snmp statsd swap syslog table tail tail_csv
-       target_notification target_replace target_scale target_set tcpconns
-       teamspeak2 ted thermal threshold tokyotyrant turbostat unixsock
-       uptime users uuid varnish virt vmem vserver wireless write_graphite
-       write_http write_kafka write_log write_redis write_sensu write_tsdb
-       xencpu zfs_arc zookeeper"
-
-COLLECTD_DISABLED_PLUGINS="${COLLECTD_IMPOSSIBLE_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="
-       dev-libs/libgcrypt:=
-       dev-libs/libltdl:0=
-       perl?                                   ( dev-lang/perl:=[ithreads] )
-       udev?                                   ( virtual/udev )
-       xfs?                                    ( sys-fs/xfsprogs )
-       collectd_plugins_amqp?                  ( net-libs/rabbitmq-c )
-       collectd_plugins_apache?                ( net-misc/curl:0= )
-       collectd_plugins_ascent?                ( net-misc/curl:0= dev-libs/libxml2:2= )
-       collectd_plugins_bind?                  ( net-misc/curl:0= dev-libs/libxml2:2= )
-       collectd_plugins_ceph?                  ( dev-libs/yajl:= )
-       collectd_plugins_curl?                  ( net-misc/curl:0= )
-       collectd_plugins_curl_json?             ( net-misc/curl:0= dev-libs/yajl:= )
-       collectd_plugins_curl_xml?              ( net-misc/curl:0= dev-libs/libxml2:2= )
-       collectd_plugins_dbi?                   ( dev-db/libdbi )
-       collectd_plugins_dns?                   ( net-libs/libpcap )
-       collectd_plugins_gmond?                 ( sys-cluster/ganglia )
-       collectd_plugins_gps?                   ( sci-geosciences/gpsd )
-       collectd_plugins_ipmi?                  ( >=sys-libs/openipmi-2.0.16-r1 )
-       collectd_plugins_iptables?              ( >=net-firewall/iptables-1.4.13:0= )
-       collectd_plugins_log_logstash?          ( dev-libs/yajl:= )
-       collectd_plugins_lua?                   ( dev-lang/lua:0= )
-       collectd_plugins_lvm?                   ( sys-fs/lvm2 )
-       collectd_plugins_memcachec?             ( dev-libs/libmemcached )
-       collectd_plugins_modbus?                ( dev-libs/libmodbus )
-       collectd_plugins_mqtt?                  ( app-misc/mosquitto )
-       collectd_plugins_mysql?                 ( >=virtual/mysql-5.0 )
-       collectd_plugins_netlink?               ( net-libs/libmnl )
-       collectd_plugins_nginx?                 ( net-misc/curl:0= )
-       collectd_plugins_notify_desktop?        ( x11-libs/libnotify )
-       collectd_plugins_notify_email?          ( net-libs/libesmtp )
-       collectd_plugins_nut?                   ( >=sys-power/nut-2.7.2-r2 )
-       collectd_plugins_openldap?              ( net-nds/openldap )
-       collectd_plugins_onewire?               ( >=sys-fs/owfs-3.1:= )
-       collectd_plugins_oracle?                ( dev-db/oracle-instantclient-basic )
-       collectd_plugins_perl?                  ( dev-lang/perl:=[ithreads] )
-       collectd_plugins_ping?                  ( net-libs/liboping )
-       collectd_plugins_postgresql?            ( dev-db/postgresql:= )
-       collectd_plugins_python?                ( ${PYTHON_DEPS} )
-       collectd_plugins_redis?                 ( dev-libs/hiredis:= )
-       collectd_plugins_routeros?              ( net-libs/librouteros )
-       collectd_plugins_rrdcached?             ( net-analyzer/rrdtool:= )
-       collectd_plugins_rrdtool?               ( net-analyzer/rrdtool:= )
-       collectd_plugins_sensors?               ( sys-apps/lm_sensors )
-       collectd_plugins_sigrok?                ( <sci-libs/libsigrok-0.4 dev-libs/glib:2 )
-       collectd_plugins_smart?                 ( dev-libs/libatasmart )
-       collectd_plugins_snmp?                  ( net-analyzer/net-snmp )
-       collectd_plugins_tokyotyrant?           ( net-misc/tokyotyrant )
-       collectd_plugins_varnish?               ( www-servers/varnish )
-       collectd_plugins_virt?                  ( app-emulation/libvirt:= dev-libs/libxml2:2= )
-       collectd_plugins_write_http?            ( net-misc/curl:0= dev-libs/yajl:= )
-       collectd_plugins_write_kafka?           ( >=dev-libs/librdkafka-0.9.0.99:= dev-libs/yajl:= )
-       collectd_plugins_write_redis?           ( dev-libs/hiredis:= )
-       collectd_plugins_xencpu?                ( app-emulation/xen-tools:= )
-
-       kernel_FreeBSD? (
-               collectd_plugins_disk?          ( sys-libs/libstatgrab:= )
-               collectd_plugins_interface?     ( sys-libs/libstatgrab:= )
-               collectd_plugins_load?          ( sys-libs/libstatgrab:= )
-               collectd_plugins_memory?        ( sys-libs/libstatgrab:= )
-               collectd_plugins_swap?          ( sys-libs/libstatgrab:= )
-               collectd_plugins_users?         ( sys-libs/libstatgrab:= )
-       )"
-
-# Enforcing <=sys-kernel/linux-headers-4.4 due to #577846
-DEPEND="${COMMON_DEPEND}
-       collectd_plugins_iptables?              ( <=sys-kernel/linux-headers-4.4 )
-       collectd_plugins_java?                  ( >=virtual/jdk-1.6 )
-       virtual/pkgconfig"
-
-RDEPEND="${COMMON_DEPEND}
-       collectd_plugins_java?                  ( >=virtual/jre-1.6 )
-       collectd_plugins_syslog?                ( virtual/logger )
-       selinux?                                ( sec-policy/selinux-collectd )
-       !<sys-apps/openrc-0.18.2"
-
-REQUIRED_USE="
-       collectd_plugins_python?                ( ${PYTHON_REQUIRED_USE} )
-       collectd_plugins_smart?                 ( udev )"
-
-PATCHES=(
-       "${FILESDIR}"/${PN}-5.6.0-gentoo.patch
-)
-
-# @FUNCTION: collectd_plugin_kernel_linux
-# @DESCRIPTION:
-# USAGE: <plugin 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} plugin can use kernel features that are disabled now; enable ${multi_opt} in your kernel"
-                               ;;
-                               (warn)
-                                       ewarn "The ${1} plugin uses kernel features that are disabled now; enable ${multi_opt} in your kernel"
-                               ;;
-                               (error)
-                                       eerror "The ${1} plugin 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() {
-       if ! linux_chkconfig_present PROC_FS; then
-               ewarn "/proc file system support is disabled, many plugins will not be able to read any statistics from your system unless you enable PROC_FS in your kernel"
-       fi
-
-       if ! linux_chkconfig_present SYSFS; then
-               ewarn "/sys file system support is disabled, many plugins will not be able to read any statistics from your system unless you enable SYSFS in your kernel"
-       fi
-
-       # battery.c: /proc/pmu/battery_%i
-       # battery.c: /proc/acpi/battery
-       collectd_plugin_kernel_linux battery ACPI_BATTERY warn
-
-       # cgroups.c: /sys/fs/cgroup/
-       collectd_plugin_kernel_linux cgroups CGROUPS 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
-
-       # drbd.c: /proc/drbd
-       collectd_plugin_kernel_linux drbd BLK_DEV_DRBD warn
-
-       # conntrack.c: /proc/sys/net/netfilter/*
-       collectd_plugin_kernel_linux conntrack NETFILTER warn
-
-       # fscache.c: /proc/fs/fscache/stats
-       collectd_plugin_kernel_linux fscache FSCACHE 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 ACPI_THERMAL warn
-
-       # turbostat.c: /dev/cpu/%d/msr
-       collectd_plugin_kernel_linux turbostat X86_MSR warn
-
-       # vmem.c: /proc/vmstat
-       collectd_plugin_kernel_linux vmem VM_EVENT_COUNTERS warn
-
-       # vserver.c: /proc/virtual
-       collectd_plugin_kernel_linux vserver VSERVER warn
-
-       # uuid.c: /sys/hypervisor/uuid
-       collectd_plugin_kernel_linux uuid SYSFS info
-
-       # wireless.c: /proc/net/wireless
-       collectd_plugin_kernel_linux wireless "WIRELESS MAC80211 IEEE80211" warn
-
-       # zfs_arc.c: /proc/spl/kstat/zfs/arcstats
-       collectd_plugin_kernel_linux zfs_arc "SPL ZFS" warn
-}
-
-pkg_setup() {
-       if use kernel_linux; then
-               linux-info_pkg_setup
-
-               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
-
-       if use collectd_plugins_java; then
-               java-pkg-opt-2_pkg_setup
-       fi
-
-       use collectd_plugins_python && python-single-r1_pkg_setup
-
-       enewgroup collectd
-       enewuser collectd -1 -1 /var/lib/collectd collectd
-}
-
-src_prepare() {
-       default
-
-       # 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
-
-       # fix installdirs for perl, bug 444360
-       sed -i -e 's/INSTALL_BASE=$(DESTDIR)$(prefix) //' bindings/Makefile.am || die
-
-       # Adjust upstream's systemd unit
-       #   - Get rid of EnvironmentFile directive; These files don't exist on Gentoo!
-       #   - Add User=collectd to run collectd as user "collectd" per default
-       sed -i \
-               -e '/^EnvironmentFile=.*/d' \
-               -e '/^\[Service\]/aUser=collectd' \
-               contrib/systemd.${PN}.service || die
-
-       if use collectd_plugins_java; then
-               # Set javac -source and -target flags according to (R)DEPEND.
-               sed -i -e "s/\$(JAVAC)/\0 $(java-pkg_javac-args)/g" bindings/java/Makefile.am || die
-       fi
-
-       ebegin "Removing bundled libltdl"
-       rm -rf libltdl || die
-       eend 0
-
-       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="barometer battery cpu cpufreq disk drbd entropy
-               ethstat interface iptables ipvs irq ipc load memory md netlink nfs
-               numa processes serial swap tcpconns thermal turbostat users vmem
-               wireless zfc_arc"
-
-       local need_libstatgrab=0
-       local libstatgrab_plugins="cpu disk interface load memory swap users"
-       local bsd_plugins="cpu tcpconns ${libstatgrab_plugins} zfc_arc"
-
-       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
-
-       local myconf="--disable-werror"
-
-       # Do we debug?
-       myconf+=" $(use_enable debug)"
-
-       # udev support?
-       # Required for smart plugin via REQUIRED_USE; Optional for disk plugin
-       if use udev; then
-               myconf+=" --with-libudev"
-       else
-               myconf+=" --without-libudev"
-       fi
-
-       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})"
-                               # ... must we link against libstatgrab? Bug #541518
-                               if use kernel_FreeBSD && has ${plugin} ${libstatgrab_plugins}; then
-                                       einfo "We must link against libstatgrab due to plugin \"${plugin}\" ..."
-                                       need_libstatgrab=1
-                               fi
-                       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
-
-       if [ "${need_libstatgrab}" -eq 1 ]; then
-               myconf+=" --with-libstatgrab"
-       else
-               myconf+=" --without-libstatgrab"
-       fi
-
-       # JAVA_HOME is set by eclasses.
-       if use collectd_plugins_java; then
-               myconf+=" --with-java"
-       fi
-
-       # Need libiptc ONLY for iptables. If we try to use it otherwise bug 340109 happens.
-       # lots of libs are only needed for plugins, if they are disabled, also disable the lib
-       use collectd_plugins_iptables || myconf+=" --with-libiptc=no"
-       use collectd_plugins_openldap || myconf+=" --with-libldap=no"
-       use collectd_plugins_redis    || use collectd_plugins_write_redis || myconf+=" --with-libhiredis=no"
-       use collectd_plugins_smart    || myconf+=" --with-libatasmart=no"
-       use collectd_plugins_gps      || myconf+=" --with-libgps=no"
-
-       if use perl; then
-               myconf+=" --with-perl-bindings=INSTALLDIRS=vendor"
-       else
-               myconf+=" --without-perl-bindings"
-       fi
-
-       # No need for v5upgrade
-       myconf+=" --disable-target_v5upgrade"
-
-       # Python
-       if use collectd_plugins_python; then
-               myconf+=" --with-libpython=yes"
-               export PYTHON_CONFIG=$(python_get_PYTHON_CONFIG)
-       else
-               myconf+=" --with-libpython=no"
-       fi
-
-       # XFS support
-       myconf+=" $(use_enable xfs)"
-
-       # Finally, run econf.
-       KERNEL_DIR="${KERNEL_DIR}" econf --config-cache \
-               $(use_enable static-libs static) \
-               --localstatedir=/var ${myconf}
-}
-
-src_install() {
-       emake DESTDIR="${D%/}" install
-
-       perl_delete_localpod
-
-       find "${ED}"usr/ -name "*.la" -delete || die
-
-       if use collectd_plugins_java; then
-               java-pkg_regjar "${ED}"usr/share/${PN}/java/*.jar
-       fi
-
-       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-r1" ${PN}
-       newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
-       systemd_newunit "contrib/systemd.${PN}.service" ${PN}.service
-
-       insinto /etc/logrotate.d
-       newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
-       sed -i -e 's:^.*PIDFile     "/var/run/collectd.pid":PIDFile     "/run/collectd/collectd.pid":' "${ED}"etc/collectd.conf || die
-       sed -i -e 's:^# SocketFile "/var/run/collectd-unixsock":#       SocketFile "/run/collectd/collectd.socket":' "${ED}"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>:' "${ED}"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>:' "${ED}"etc/collectd.conf || die
-}
-
-pkg_postinst() {
-       if use filecaps; then
-               local caps=()
-               use collectd_plugins_ceph      && caps+=('CAP_DAC_OVERRIDE')
-               use collectd_plugins_exec      && caps+=('CAP_SETUID' 'CAP_SETGID')
-               use collectd_plugins_iptables  && caps+=('CAP_NET_ADMIN')
-               use collectd_plugins_filecount && caps+=('CAP_DAC_READ_SEARCH')
-               use collectd_plugins_turbostat && caps+=('CAP_SYS_RAWIO')
-
-               if use collectd_plugins_dns || use collectd_plugins_ping; then
-                       caps+=('CAP_NET_RAW')
-               fi
-
-               if [ ${#caps[@]} -gt 0 ]; then
-                       local caps_str=$(IFS=","; echo "${caps[*]}")
-                       fcaps ${caps_str} usr/sbin/collectd
-                       elog "Capabilities for ${EROOT}usr/sbin/collectd set to:"
-                       elog "  ${caps_str}+EP"
-                       elog
-
-                       local systemd_unit="${EROOT}usr/lib/systemd/system/collectd.service"
-                       if [[ -e "${systemd_unit}" ]]; then
-                               caps_str="${caps[*]}"
-                               sed -i -e "s:^CapabilityBoundingSet=.*:CapabilityBoundingSet=${caps_str}:" "${systemd_unit}" || \
-                                       die "Failed to set CapabilityBoundingSet in '${systemd_unit}'"
-
-                               elog "CapabilityBoundingSet in '${systemd_unit}'"
-                               elog "updated to match capabilities set above."
-                               elog
-                       fi
-               fi
-       fi
-
-       elog "Note: Collectd is only the collector."
-       elog "      You need to install 'data' sources (applications) locally or"
-       elog "      remotely on your own."
-
-       elog
-       elog "Collectd is configured to run as unprivileged user by default."
-       elog "You may want to revisit 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/files/collectd-4.10.3-werror.patch b/app-admin/collectd/files/collectd-4.10.3-werror.patch
deleted file mode 100644 (file)
index 6ddb508..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ruN collectd-4.10.3.orig/src/Makefile.am collectd-4.10.3/src/Makefile.am
---- collectd-4.10.3.orig/src/Makefile.am       2011-03-26 17:08:53.000000000 +0100
-+++ collectd-4.10.3/src/Makefile.am    2011-04-24 22:56:39.521229944 +0200
-@@ -7,7 +7,7 @@
- endif
- if COMPILER_IS_GCC
--AM_CFLAGS = -Wall -Werror
-+AM_CFLAGS = -Wall
- endif
- AM_CPPFLAGS = -DPREFIX='"${prefix}"'
-diff -ruN collectd-4.10.3.orig/src/libcollectdclient/Makefile.am collectd-4.10.3/src/libcollectdclient/Makefile.am
---- collectd-4.10.3.orig/src/libcollectdclient/Makefile.am     2011-03-26 17:04:26.000000000 +0100
-+++ collectd-4.10.3/src/libcollectdclient/Makefile.am  2011-04-24 22:57:12.231229943 +0200
-@@ -1,7 +1,7 @@
- AUTOMAKE_OPTIONS = foreign no-dependencies
- if COMPILER_IS_GCC
--AM_CFLAGS = -Wall -Werror
-+AM_CFLAGS = -Wall
- endif
- pkginclude_HEADERS = client.h lcc_features.h
diff --git a/app-admin/collectd/files/collectd-5.5.1-libocci.patch b/app-admin/collectd/files/collectd-5.5.1-libocci.patch
deleted file mode 100644 (file)
index e7baaa0..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-[PATCH 1/3] Link Oracle plug-in against libocci
-
-Author: Aurelien Minet
-X-Gentoo-Bug: 347607
-X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=347607
----
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index fc1e11c..b977a0a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -3248,14 +3248,14 @@ AC_ARG_WITH(oracle, [AS_HELP_STRING([--with-oracle@<:@=ORACLE_HOME@:>@], [Path t
- ])
- if test "x$ORACLE_HOME" != "x"
- then
--      with_oracle_cppflags="-I$ORACLE_HOME/rdbms/public"
-+      with_oracle_cppflags="-I$ORACLE_HOME/rdbms/public -locci"
-       if test -e "$ORACLE_HOME/lib/ldflags"
-       then
-               with_oracle_libs=`cat "$ORACLE_HOME/lib/ldflags"`
-       fi
-       #with_oracle_libs="-L$ORACLE_HOME/lib $with_oracle_libs -lclntsh"
--      with_oracle_libs="-L$ORACLE_HOME/lib -lclntsh"
-+      with_oracle_libs="-L$ORACLE_HOME/lib -lclntsh -locci"
- fi
- if test "x$with_oracle" = "xyes"
- then
--- 
-2.7.1
-
diff --git a/app-admin/collectd/files/collectd-5.5.1-lt.patch b/app-admin/collectd/files/collectd-5.5.1-lt.patch
deleted file mode 100644 (file)
index eff1de8..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-[PATCH 2/3] Remove bundled libltdl
-
----
- Makefile.am  | 6 ------
- configure.ac | 5 -----
- 2 files changed, 11 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index b79ea1c..d574601 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,11 +1,5 @@
--ACLOCAL_AMFLAGS = -I libltdl/m4
--
- SUBDIRS =
--if BUILD_INCLUDED_LTDL
--SUBDIRS += libltdl
--endif
--
- SUBDIRS += src bindings .
- AM_CPPFLAGS = $(LTDLINCL)
-diff --git a/configure.ac b/configure.ac
-index b977a0a..78f3bee 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2,7 +2,6 @@ dnl Process this file with autoconf to produce a configure script.
- AC_INIT([collectd],[m4_esyscmd(./version-gen.sh)])
- AC_CONFIG_SRCDIR(src/)
- AC_CONFIG_HEADERS(src/config.h)
--AC_CONFIG_AUX_DIR([libltdl/config])
- dnl older automake's default of ARFLAGS=cru is noisy on newer binutils;
- dnl we don't really need the 'u' even in older toolchains.  Then there is
-@@ -12,7 +11,6 @@ m4_divert_text([DEFAULTS], [: "${ARFLAGS=cr} ${AR_FLAGS=cr}"])
- m4_ifdef([LT_PACKAGE_VERSION],
-       # libtool >= 2.2
-       [
--       LT_CONFIG_LTDL_DIR([libltdl])
-        LT_INIT([dlopen])
-        LTDL_INIT([convenience])
-        AC_DEFINE(LIBTOOL_VERSION, 2, [Define to used libtool version.])
-@@ -24,13 +22,10 @@ m4_ifdef([LT_PACKAGE_VERSION],
-        AC_SUBST(LTDLINCL)
-        AC_SUBST(LIBLTDL)
-        AC_LIBTOOL_DLOPEN
--       AC_CONFIG_SUBDIRS(libltdl)
-        AC_DEFINE(LIBTOOL_VERSION, 1, [Define to used libtool version.])
-       ]
- )
--AM_CONDITIONAL([BUILD_INCLUDED_LTDL], [test "x$LTDLDEPS" != "x"])
--
- AM_INIT_AUTOMAKE([tar-pax dist-bzip2 foreign])
- m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
- AC_LANG(C)
--- 
-2.7.1
-
diff --git a/app-admin/collectd/files/collectd-5.5.1-nohal.patch b/app-admin/collectd/files/collectd-5.5.1-nohal.patch
deleted file mode 100644 (file)
index fcdebb5..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-[PATCH 3/3] Remove libhal dependency
-
-X-Gentoo-Bug: 353839
-X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=353839
----
- configure.ac | 13 +------------
- 1 file changed, 1 insertion(+), 12 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 1c85964..cf38159 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1500,18 +1500,7 @@ AC_CHECK_LIB(resolv, res_search,
- AM_CONDITIONAL(BUILD_WITH_LIBRESOLV, test "x$with_libresolv" = "xyes")
- dnl Check for HAL (hardware abstraction library)
--with_libhal="yes"
--AC_CHECK_LIB(hal,libhal_device_property_exists,
--           [AC_DEFINE(HAVE_LIBHAL, 1, [Define to 1 if you have 'hal' library])],
--           [with_libhal="no"])
--if test "x$with_libhal" = "xyes"; then
--      if test "x$PKG_CONFIG" != "x"; then
--              BUILD_WITH_LIBHAL_CFLAGS="`$PKG_CONFIG --cflags hal`"
--              BUILD_WITH_LIBHAL_LIBS="`$PKG_CONFIG --libs hal`"
--              AC_SUBST(BUILD_WITH_LIBHAL_CFLAGS)
--              AC_SUBST(BUILD_WITH_LIBHAL_LIBS)
--      fi
--fi
-+with_libhal="no"
- # --with-libpthread {{{
- AC_ARG_WITH(libpthread, [AS_HELP_STRING([--with-libpthread=@<:@=PREFIX@:>@], [Path to libpthread.])],
--- 
-2.7.1
-
diff --git a/app-admin/collectd/files/collectd-5.5.2-issue-1870.patch b/app-admin/collectd/files/collectd-5.5.2-issue-1870.patch
deleted file mode 100644 (file)
index 6497271..0000000
+++ /dev/null
@@ -1,127 +0,0 @@
-From 262915c450f3a45579069212560ca9715aa5bd4b Mon Sep 17 00:00:00 2001
-From: Florian Forster <octo@collectd.org>
-Date: Tue, 26 Jul 2016 08:54:42 +0200
-Subject: [PATCH] network plugin: Fix error message for GCRYCTL_INIT_SECMEM
- failure.
-
----
- src/network.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/network.c b/src/network.c
-index b347f4a..45f2436 100644
---- a/src/network.c
-+++ b/src/network.c
-@@ -527,7 +527,7 @@ static void network_init_gcrypt (void) /* {{{ */
-   err = gcry_control (GCRYCTL_INIT_SECMEM, 32768);
-   if (err)
-   {
--    ERROR ("network plugin: gcry_control (GCRYCTL_SET_THREAD_CBS) failed: %s", gcry_strerror (err));
-+    ERROR ("network plugin: gcry_control (GCRYCTL_INIT_SECMEM) failed: %s", gcry_strerror (err));
-     abort ();
-   }
---
-2.9.2
-
-
-From a3000cbe3a12163148a28c818269bbdabda1cf5c Mon Sep 17 00:00:00 2001
-From: Sebastian Harl <sh@tokkee.org>
-Date: Wed, 27 Jul 2016 09:45:48 +0200
-Subject: [PATCH] network plugin: Don't abort() if gcrypt initialization
- failed.
-
-Instead, report an error and let plugin initialization fail.
----
- src/network.c | 31 +++++++++++++++++++++++--------
- 1 file changed, 23 insertions(+), 8 deletions(-)
-
-diff --git a/src/network.c b/src/network.c
-index 45f2436..71eb1f2 100644
---- a/src/network.c
-+++ b/src/network.c
-@@ -496,7 +496,7 @@ static int network_dispatch_notification (notification_t *n) /* {{{ */
- } /* }}} int network_dispatch_notification */
- #if HAVE_LIBGCRYPT
--static void network_init_gcrypt (void) /* {{{ */
-+static int network_init_gcrypt (void) /* {{{ */
- {
-   gcry_error_t err;
-@@ -504,7 +504,7 @@ static void network_init_gcrypt (void) /* {{{ */
-    * Because you can't know in a library whether another library has
-    * already initialized the library */
-   if (gcry_control (GCRYCTL_ANY_INITIALIZATION_P))
--    return;
-+    return (0);
-  /* http://www.gnupg.org/documentation/manuals/gcrypt/Multi_002dThreading.html
-   * To ensure thread-safety, it's important to set GCRYCTL_SET_THREAD_CBS
-@@ -518,7 +518,7 @@ static void network_init_gcrypt (void) /* {{{ */
-   if (err)
-   {
-     ERROR ("network plugin: gcry_control (GCRYCTL_SET_THREAD_CBS) failed: %s", gcry_strerror (err));
--    abort ();
-+    return (-1);
-   }
- # endif
-@@ -528,11 +528,12 @@ static void network_init_gcrypt (void) /* {{{ */
-   if (err)
-   {
-     ERROR ("network plugin: gcry_control (GCRYCTL_INIT_SECMEM) failed: %s", gcry_strerror (err));
--    abort ();
-+    return (-1);
-   }
-   gcry_control (GCRYCTL_INITIALIZATION_FINISHED);
--} /* }}} void network_init_gcrypt */
-+  return (0);
-+} /* }}} int network_init_gcrypt */
- static gcry_cipher_hd_t network_get_aes256_cypher (sockent_t *se, /* {{{ */
-     const void *iv, size_t iv_size, const char *username)
-@@ -2066,7 +2067,12 @@ static int sockent_init_crypto (sockent_t *se) /* {{{ */
-       {
-               if (se->data.client.security_level > SECURITY_LEVEL_NONE)
-               {
--                      network_init_gcrypt ();
-+                      if (network_init_gcrypt () < 0)
-+                      {
-+                              ERROR ("network plugin: Cannot configure client socket with "
-+                                              "security: Failed to initialize crypto library.");
-+                              return (-1);
-+                      }
-                       if ((se->data.client.username == NULL)
-                                       || (se->data.client.password == NULL))
-@@ -2086,7 +2092,12 @@ static int sockent_init_crypto (sockent_t *se) /* {{{ */
-       {
-               if (se->data.server.security_level > SECURITY_LEVEL_NONE)
-               {
--                      network_init_gcrypt ();
-+                      if (network_init_gcrypt () < 0)
-+                      {
-+                              ERROR ("network plugin: Cannot configure server socket with "
-+                                              "security: Failed to initialize crypto library.");
-+                              return (-1);
-+                      }
-                       if (se->data.server.auth_file == NULL)
-                       {
-@@ -3519,7 +3530,11 @@ static int network_init (void)
-       have_init = 1;
- #if HAVE_LIBGCRYPT
--      network_init_gcrypt ();
-+      if (network_init_gcrypt () < 0)
-+      {
-+              ERROR ("network plugin: Failed to initialize crypto library.");
-+              return (-1);
-+      }
- #endif
-       if (network_config_stats != 0)
---
-2.9.2
diff --git a/app-admin/collectd/files/collectd-5.5.2-issue-1877.patch b/app-admin/collectd/files/collectd-5.5.2-issue-1877.patch
deleted file mode 100644 (file)
index 658dc1e..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-[PATCH 5/5] Fix compilation against >=xfsprogs-4.7.0
-
-Gentoo-Bug: https://bugs.gentoo.org/590998
-Bug: https://github.com/collectd/collectd/issues/1877
----
- src/utils_mount.c | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/src/utils_mount.c b/src/utils_mount.c
-index da53b98..37b52d6 100644
---- a/src/utils_mount.c
-+++ b/src/utils_mount.c
-@@ -24,16 +24,17 @@
- # include "config.h"
- #endif
-+#define _GNU_SOURCE
-+
-+#include "collectd.h"
-+#include "utils_mount.h"
-+
- #if HAVE_XFS_XQM_H
--# define _GNU_SOURCE
- # include <xfs/xqm.h>
- #define XFS_SUPER_MAGIC_STR "XFSB"
- #define XFS_SUPER_MAGIC2_STR "BSFX"
- #endif
--#include "collectd.h"
--#include "utils_mount.h"
--
- #include "common.h" /* sstrncpy() et alii */
- #include "plugin.h" /* ERROR() macro */
--- 
-2.9.2
-
diff --git a/app-admin/collectd/files/collectd-5.6.0-use-_LINUX_CAPABILITY_VERSION_3.patch b/app-admin/collectd/files/collectd-5.6.0-use-_LINUX_CAPABILITY_VERSION_3.patch
deleted file mode 100644 (file)
index 6c7e635..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-From 5e4f2ae61dc39938c4df857854724ba1d36f3232 Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi@gentoo.org>
-Date: Tue, 11 Oct 2016 16:16:23 +0200
-Subject: [PATCH] common.c: Use _LINUX_CAPABILITY_VERSION_3 in cap_header
-
-While check_capability() function already requires
-_LINUX_CAPABILITY_VERSION_3 via "#ifdef" since commit 448627953c we still
-set the cap_header's version to deprecated _LINUX_CAPABILITY_VERSION. This
-results in a warning like
-
- > capability: warning: `collectd' uses 32-bit capabilities (legacy support in use)
-
-from the kernel when a plugin (like iptables) calls our check_capability()
-function.
-
-With this commit we will set cap_header to kernel's current capability
-version (_LINUX_CAPABILITY_VERSION_3), which is default since
-kernel 2.6.26.
-
-Signed-off-by: Florian Forster <octo@collectd.org>
----
- src/daemon/common.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/daemon/common.c b/src/daemon/common.c
-index e489449..477d759 100644
---- a/src/daemon/common.c
-+++ b/src/daemon/common.c
-@@ -1698,7 +1698,7 @@ int check_capability (int capability) /* {{{ */
-       }
-       cap_header->pid = getpid();
--      cap_header->version = _LINUX_CAPABILITY_VERSION;
-+      cap_header->version = _LINUX_CAPABILITY_VERSION_3;
-       if (capget(cap_header, cap_data) < 0)
-       {
-               ERROR("check_capability: capget failed");