diff options
Diffstat (limited to 'app-admin')
41 files changed, 1285 insertions, 2172 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz Binary files differindex 51b00041d1e8..ad35529963a8 100644 --- a/app-admin/Manifest.gz +++ b/app-admin/Manifest.gz diff --git a/app-admin/collectd/Manifest b/app-admin/collectd/Manifest index 35cdbeb311e5..2206025c11b1 100644 --- a/app-admin/collectd/Manifest +++ b/app-admin/collectd/Manifest @@ -1,19 +1,11 @@ AUX collectd-5.6.0-gentoo.patch 4294 BLAKE2B 99274b5a2734910a35ab6a0003d6fe257e239fc0a3b1f3ca398c82b0e28b9365729980999af0db417b3818c7b4de47f48c0118eea88a43f8de162ae40eeb68be SHA512 088f65e2d90c29092621693847f165be7024caa2237a2129dbffcedba3c1f93baa8169de9d3c2979c709219ec12ee0d3b6dd36586ede92062d1a14a28b8611c8 -AUX collectd-5.6.2-CVE-2017-7401.patch 1823 BLAKE2B b723cbe76f0e5b3a6671f9bc385cf1b122dfe919c8ebbf24b82eba0d5b0d49eaac294c0ec5d5961757d688e00e6812c131dc5c051888f2e058970e7f05e7d1f4 SHA512 731fc3d8af2459425ff779325cf1dc9f633521ed539932cb8b254fc49cb5ab2ccae4350d197e479a333658cfc405f4dfcc0a7289bdb9f93e2341c64ee0c772e4 -AUX collectd-5.6.2-issue2303.patch 1349 BLAKE2B ab96687595437f1d6644cba941c2d67ed2ed2ce73dd5f8f2910b33ec4dd7c7a82137317442802a1f05d1577b301d7cf72f33f9c1edf616f19009876012f274e0 SHA512 6d46020d2fad43e1e624c7058d5ea5962bdf647bcd8f4c282ea83a0c57d026408be5efea8190c301fc45e134cb6e52ba02c88c02a693204dc3a917a750813965 AUX collectd-5.7.2-CVE-2017-16820.patch 1326 BLAKE2B 0dbd15e6c52531423b47d25b0fab0319c867482fbcd7f9e5a59c9ae6908ce1844f9ed41590a048ff247acf2bfdb8ddd34723dd289074269fb8bd7133ae324d40 SHA512 13e7ad198c88538a8bdcdd1d0ee8ed3ebe7b8ac00df98341a1248a4e5fd02b44b24d239c6c3ac70fce6492674163371755f126e2f4a0099159032514a842ea0b AUX collectd-5.7.2-issue-2443.patch 4628 BLAKE2B 357f4171c4cc5e13e43da0709bcecff8d9c7d529c1c2c910e14ec2502ea4abd3df2e1be591b2d98b06d6dd5f984e9dd5615f7cd7e14cad79d49adc6f369cf37b SHA512 16c7bc99a6401c96fb3b2cda5ad6e540024ae13d66268b4d5ada4c65c456a5dbd210ea58d116463381dbac953f9f8d4907d2185a24195a304e0f5a645829755e -AUX collectd.confd-r1 1742 BLAKE2B fd6b1909bdfae7ee8c63d8c6659651af8318313800a60bdff932202616b8455e7b6459119b590f498dd0720229670ba0fbd2ae0a1f99a5eae6e1a8fc975fb8d1 SHA512 31fc083a5c3a1e16246fc767c24d23d4b4763621ad2b2464f6d333fb3e327150caaf26905ab1c7aae5f6ec503882fc823e05fb272e2941af903f2b5b71aa788d +AUX collectd-5.7.2-varnish-5.2+.patch 40982 BLAKE2B a1f90a27e95b2665626fc2112646f5fb092472f32b58fb6bcc2a6a15e2916bb067b7f8aa7c85fba12eaf839d10b94004a1847f537d5f5535d9a7aac0fe2fe5a7 SHA512 eea0fd89f65b14ba6012160c4d2560e8c6339f7aeb873d93ed35b9c3551d76d6087c6cdbe986610502e8a73b144fba945f1efd1db31e5be792b9ecead2d0eeec AUX collectd.confd-r2 2001 BLAKE2B fbf1a64aab6ec60111553466c3a8b725200ab13d0e09c1ba1d71e68213e8f978c3cad0dfc5eb2c536ced8213f172804f0596b3494f9b42b0cacf3432105cab5a SHA512 729f2b4e06c4a8c95d32c03c6f3f292eaa4895780ace180b74fcf139a949e9c28a2b3ae823bdebec0014f9b4d919adb399bc7f019c68c0e268b263326959edb7 -AUX collectd.initd-r1 2118 BLAKE2B 1824662e55640e09cfeddd982bcc048e17815570af3a603f815195a8515e4e0887fb9e3c9df311e6998badf3b368faf6aeda33b386f9b0f9ba294f94d7fa1162 SHA512 556b0255e5d7ab93e934693431c02ef96d7a3a8df5ec6eb0c1e946f54eac822a1fbdf2a1784c617634cf60c2348681dc639b8c80cab041517a4ac39f18f6ae98 AUX collectd.initd-r2 1843 BLAKE2B ccb12e55de72565aa7b6bb0f2c4e7a5a6d15ff23d5bc75e9cb36e1f2dba85b3b2b587336f976059af165ae89333d681ffe0cf53bbcd8098eaeff75228cb80b68 SHA512 8f0a73f0f2b2280c0f2e35894a9dfa38af937930eb090eab52cbe81089a146bd974f6a2a3062b7147611f9c13b770a945a1a9228a026405d31578e27a3fd3b80 AUX collectd.logrotate 115 BLAKE2B ce2a79787096b04af6ecd128633dde68fb868a02cc1d246c3e512c1733133fcc8da41b3ab2a0051b4da78c53e6629b2ad8085872dec1d4c28e397c88cafe3a90 SHA512 87ec01784d415f00834c2b20614f11f7e08b70f88d7c87509a8b8fd7e1af8758565b9ed6a6840af7bf1006cb941a61a6ff4f3176f6ded722728f24483b08bc8e AUX collectd.tmpfile 39 BLAKE2B 0d1ee2f02e539e854b62b47032308d08505fa31d8428e98f8d150c924201074c5edae22eea3990edf3a7837f1473193fe009a501645bf064638c532ec53a36cc SHA512 55fb70da9ece74b143c3e971b890954842230691039f8ad2240cc4c8d699e4e7a21efcbfd0b3cb2503e90af0bbdd0c7d886e09baf9fc86ec26c115a0bce6a668 -DIST collectd-5.6.2.tar.bz2 1806969 BLAKE2B 2311b6cc51297264e1bfc705553c728ad2ae3355ce8b5fb25b8ac91aaef4b78921235c675ff26535e3388c1b1af37aec4d810b2e6c6b60fcc3d79e0149841989 SHA512 81438e2e653649cf8a447f475b41844b7adb8ec436b43fb395ba9cf8b09b56a068633fe4b6c802d5cde3909d85a3af2542f5804005b3843f7936a37553911d61 -DIST collectd-5.7.1.tar.bz2 1797725 BLAKE2B 5a24d74ff26ed8745d3b50d3b22db0a939aedc6048ff279880f892572d5e5799b1e3b4630250ebb9066325b2583f99b441a42d0bd0ab4a3c20b1aba82b9d16f2 SHA512 f2edf4ecf3bbf5f4e10c797614a7ae39c18678601038574cec4f2ea6a8773444af4592e2872ed75a5afe5f746adaff2449df51443d98d2560a23722e46bef164 DIST collectd-5.7.2.tar.bz2 1798777 BLAKE2B 4af359a773457bb9c05b6a301d7728eea7598c200f7ca534875b07d1d011b280ab138f680d9607723f14523dd71dcbec3a41e0d8d183848c8ef809cef86c2b8f SHA512 8844b67159f8da2203b5ac57ef19fce0a01050a016174d196b48b5fb24925ad2935af9bdd9af06097ff663499abc496cdcc2d9e9a10f403f8d707c465c1a88f3 -EBUILD collectd-5.6.2-r4.ebuild 19013 BLAKE2B 01d5c6d9c6258f7956d115e562e8166c3efbe59e4e99a19ed4ee58c4751c1e0c0f896bbd6a0e3a65f562ed404446ebbafef4d728ca0116e4a90896062090b423 SHA512 b5f7790378a0c78c1c7bb052f52d8736fe52b4f7046083a55df33b4139f78b67110a4ca63391f8d5748a8d3085ac24dc141fa47c17b88b3e7431e33b1250e7f1 -EBUILD collectd-5.7.1.ebuild 19243 BLAKE2B 419ca67a4e4ad7526305101feeacd723a11b4ec0807f81e23aa9f0fcb44375798a4e400b5e4c1b5a361a4fdb6b418073069957675dbc0f0f47b1f0d5af366018 SHA512 608a21594c5d608be74f3ab55e206c0ead06e3ae8444bee34e6131a981959de9d01a41ca5ce3664986513873f872da02ce58546d593e52ff44da3275bd98bbba -EBUILD collectd-5.7.2-r1.ebuild 19328 BLAKE2B 9a24f57709e01faa261cf9e427dc4f05e42d3a4234aacc791276af83828ff2880f444c832a728df5133473da2c3d45221e70d88385c09c14c9ee224b8356eccd SHA512 0b535d952b7e12286466ca5786ab915d57aeb825375479cc0daaa69ab1a194bb8e794734515ce25daaa96a5c96cbdf1b04f7833586827662432a05eee80eafe3 -EBUILD collectd-5.7.2.ebuild 19197 BLAKE2B 2696638e0bc1b82d5522040ec654cf720acaa16b947d3248d6b9c5f7eeba61840103e6757271ef561ad3c4cb0d353b0d34b0ddf4be18c97b8dc7e2d8542a51e0 SHA512 810a8f73af91f7cd03caedc361eb421c912bc6ca1386c87527d9e20b8bfba7f25e0064fb5fec52ee00dff264f0756d64a7cc2aa78569ebecca427512f40c5075 +EBUILD collectd-5.7.2-r1.ebuild 19374 BLAKE2B 045fcc1d04414d76f4d39006471783484635328c8fa489cbb1e612a3c4bb53b367723d3e1e3551b678b8f5f3a109eb66c115252e8343097de6a241c5692194dd SHA512 b39c2de505c2e9f2d5649c6b594fb2477373967287300170d17f983d14222111bd18df4a8c586c903365d8fa578d6fe7b388a726e49238f9d51b2d2e618ce742 MISC metadata.xml 1515 BLAKE2B 5525766b822463f94f7c2cddbdf78b4c4ea5a473880a473d0b51481d948569cfc7f51bd2e74eb67065ab2be1b23e4fb7ee99512d018c6e6b5ac1ee7331eae9eb SHA512 51c17c16d27b722d729d036d67c562ab76e212dac9bcd004a7e43c2c5e041b8c46e74f9a130f30c2e18cc95ca1b367034246eff02cfaf55f6f9375ff836749e5 diff --git a/app-admin/collectd/collectd-5.6.2-r4.ebuild b/app-admin/collectd/collectd-5.6.2-r4.ebuild deleted file mode 100644 index af56c138d936..000000000000 --- a/app-admin/collectd/collectd-5.6.2-r4.ebuild +++ /dev/null @@ -1,532 +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,3_6} ) -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.5 > due to #577846 -DEPEND="${COMMON_DEPEND} - collectd_plugins_iptables? ( || ( <=sys-kernel/linux-headers-4.4 >=sys-kernel/linux-headers-4.6 ) ) - 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.2-CVE-2017-7401.patch - "${FILESDIR}"/${PN}-5.6.2-issue2303.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.7.1.ebuild b/app-admin/collectd/collectd-5.7.1.ebuild deleted file mode 100644 index 300d0261307e..000000000000 --- a/app-admin/collectd/collectd-5.7.1.ebuild +++ /dev/null @@ -1,537 +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,3_6} ) -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) -# dpdkstat: Requires dpdk -# grpc: Requires libgrpc -# intel_rdt Requires libpqos from intel-cmt-cat project -# 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 dpdkstat grpc - intel_rdt lpar mic netapp pf pinba tape 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 - hugepages 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_prometheus 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_prometheus? ( >=dev-libs/protobuf-c-1.2.1-r1:= net-libs/libmicrohttpd:= ) - 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.5 > due to #577846 -DEPEND="${COMMON_DEPEND} - collectd_plugins_iptables? ( || ( <=sys-kernel/linux-headers-4.4 >=sys-kernel/linux-headers-4.6 ) ) - 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.2-CVE-2017-7401.patch - "${FILESDIR}"/${PN}-5.6.2-issue2303.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 hugepages 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 README - - 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.7.2-r1.ebuild b/app-admin/collectd/collectd-5.7.2-r1.ebuild index a040f5e72fca..c2cd8a8283ea 100644 --- a/app-admin/collectd/collectd-5.7.2-r1.ebuild +++ b/app-admin/collectd/collectd-5.7.2-r1.ebuild @@ -158,6 +158,7 @@ PATCHES=( "${FILESDIR}"/${PN}-5.6.0-gentoo.patch "${FILESDIR}"/${PN}-5.7.2-issue-2443.patch "${FILESDIR}"/${PN}-5.7.2-CVE-2017-16820.patch + "${FILESDIR}"/${PN}-5.7.2-varnish-5.2+.patch ) # @FUNCTION: collectd_plugin_kernel_linux diff --git a/app-admin/collectd/collectd-5.7.2.ebuild b/app-admin/collectd/collectd-5.7.2.ebuild deleted file mode 100644 index a24d03f2715a..000000000000 --- a/app-admin/collectd/collectd-5.7.2.ebuild +++ /dev/null @@ -1,536 +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,3_6} ) -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) -# dpdkstat: Requires dpdk -# grpc: Requires libgrpc -# intel_rdt Requires libpqos from intel-cmt-cat project -# 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 dpdkstat grpc - intel_rdt lpar mic netapp pf pinba tape 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 - hugepages 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_prometheus 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_prometheus? ( >=dev-libs/protobuf-c-1.2.1-r1:= net-libs/libmicrohttpd:= ) - 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.5 > due to #577846 -DEPEND="${COMMON_DEPEND} - collectd_plugins_iptables? ( || ( <=sys-kernel/linux-headers-4.4 >=sys-kernel/linux-headers-4.6 ) ) - 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.7.2-issue-2443.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 hugepages 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 README - - 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/files/collectd-5.6.2-CVE-2017-7401.patch b/app-admin/collectd/files/collectd-5.6.2-CVE-2017-7401.patch deleted file mode 100644 index 7c23ac18d8f8..000000000000 --- a/app-admin/collectd/files/collectd-5.6.2-CVE-2017-7401.patch +++ /dev/null @@ -1,56 +0,0 @@ -From f6be4f9b49b949b379326c3d7002476e6ce4f211 Mon Sep 17 00:00:00 2001 -From: Pavel Rochnyack <pavel2000@ngs.ru> -Date: Mon, 3 Apr 2017 11:57:09 +0600 -Subject: [PATCH] network plugin: Fix endless loop DOS in parse_packet() - -When correct 'Signature part' is received by Collectd, configured without -AuthFile option, condition for endless loop occurs due to missing increase -of pointer to next unprocessed part. - -This is a forward-port of #2233. - -Fixes: CVE-2017-7401 -Closes: #2174 -Signed-off-by: Florian Forster <octo@collectd.org> ---- - src/network.c | 20 ++++++++++++-------- - 1 file changed, 12 insertions(+), 8 deletions(-) - -diff --git a/src/network.c b/src/network.c -index be4c3ba..2ff09af 100644 ---- a/src/network.c -+++ b/src/network.c -@@ -1003,14 +1003,6 @@ static int parse_part_sign_sha256(sockent_t *se, /* {{{ */ - buffer_len = *ret_buffer_len; - buffer_offset = 0; - -- if (se->data.server.userdb == NULL) { -- c_complain( -- LOG_NOTICE, &complain_no_users, -- "network plugin: Received signed network packet but can't verify it " -- "because no user DB has been configured. Will accept it."); -- return (0); -- } -- - /* Check if the buffer has enough data for this structure. */ - if (buffer_len <= PART_SIGNATURE_SHA256_SIZE) - return (-ENOMEM); -@@ -1027,6 +1019,18 @@ static int parse_part_sign_sha256(sockent_t *se, /* {{{ */ - return (-1); - } - -+ if (se->data.server.userdb == NULL) { -+ c_complain( -+ LOG_NOTICE, &complain_no_users, -+ "network plugin: Received signed network packet but can't verify it " -+ "because no user DB has been configured. Will accept it."); -+ -+ *ret_buffer = buffer + pss_head_length; -+ *ret_buffer_len -= pss_head_length; -+ -+ return (0); -+ } -+ - /* Copy the hash. */ - BUFFER_READ(pss.hash, sizeof(pss.hash)); - diff --git a/app-admin/collectd/files/collectd-5.6.2-issue2303.patch b/app-admin/collectd/files/collectd-5.6.2-issue2303.patch deleted file mode 100644 index 0fffcd6b9224..000000000000 --- a/app-admin/collectd/files/collectd-5.6.2-issue2303.patch +++ /dev/null @@ -1,44 +0,0 @@ -From fd01cdd0546ccbbda7f4cf5db2d0ae28e1e770cd Mon Sep 17 00:00:00 2001 -From: Ruben Kerkhof <ruben@rubenkerkhof.com> -Date: Tue, 30 May 2017 17:25:17 +0200 -Subject: [PATCH] Bind plugin: plug a few leaks - -Fixes: #2303 ---- - src/bind.c | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/src/bind.c b/src/bind.c -index 4860f1b604..853b9c26a3 100644 ---- a/src/bind.c -+++ b/src/bind.c -@@ -526,8 +526,10 @@ static int bind_parse_generic_name_value(const char *xpath_expression, /* {{{ */ - status = bind_xml_read_gauge(doc, counter, &value.gauge); - else - status = bind_xml_read_derive(doc, counter, &value.derive); -- if (status != 0) -+ if (status != 0) { -+ xmlFree(name); - continue; -+ } - - status = (*list_callback)(name, value, current_time, user_data); - if (status == 0) -@@ -659,12 +661,16 @@ static int bind_parse_generic_name_attr_value_list( - status = bind_xml_read_gauge(doc, child, &value.gauge); - else - status = bind_xml_read_derive(doc, child, &value.derive); -- if (status != 0) -+ if (status != 0) { -+ xmlFree(attr_name); - continue; -+ } - - status = (*list_callback)(attr_name, value, current_time, user_data); - if (status == 0) - num_entries++; -+ -+ xmlFree(attr_name); - } - } - diff --git a/app-admin/collectd/files/collectd-5.7.2-varnish-5.2+.patch b/app-admin/collectd/files/collectd-5.7.2-varnish-5.2+.patch new file mode 100644 index 000000000000..60830042fa6a --- /dev/null +++ b/app-admin/collectd/files/collectd-5.7.2-varnish-5.2+.patch @@ -0,0 +1,1018 @@ +Fix building against >=www-servers/varnish-5.2 + +https://github.com/collectd/collectd/commit/3c42182e912e3d634fe8c4f6a636053959fcde49 +https://github.com/collectd/collectd/commit/3ab73ae8b23b9816fb69fde630c5ad667aa1e09f +https://github.com/collectd/collectd/commit/7978b43670472a000831f7ff37a6a30771a6ee6f +https://github.com/collectd/collectd/commit/68123637814ea09efff5bf56f3209eefbe41287a +https://github.com/collectd/collectd/commit/8192bfcf975ff6275505c99193a23e2a066927d0 +https://github.com/collectd/collectd/commit/c1e2bf3d2bfa1a1da3a6b42186577f635795e7f8 + +--- a/configure.ac ++++ b/configure.ac +@@ -5614,13 +5614,18 @@ then + + CPPFLAGS="$CPPFLAGS $with_libvarnish_cflags" + +- AC_CHECK_HEADERS(vapi/vsc.h, +- [AC_DEFINE([HAVE_VARNISH_V4], [1], [Varnish 4 API support])], +- [AC_CHECK_HEADERS(vsc.h, +- [AC_DEFINE([HAVE_VARNISH_V3], [1], [Varnish 3 API support])], +- [AC_CHECK_HEADERS(varnishapi.h, +- [AC_DEFINE([HAVE_VARNISH_V2], [1], [Varnish 2 API support])], +- [with_libvarnish="no (found none of the varnish header files)"])])]) ++ $PKG_CONFIG --atleast-version=5.2 'varnishapi' 2>/dev/null ++ if test $? -eq 0; then ++ AC_DEFINE([HAVE_VARNISH_V5], [1], [Varnish 5 API support]) ++ else ++ AC_CHECK_HEADERS(vapi/vsc.h, ++ [AC_DEFINE([HAVE_VARNISH_V4], [1], [Varnish 4 API support])], ++ [AC_CHECK_HEADERS(vsc.h, ++ [AC_DEFINE([HAVE_VARNISH_V3], [1], [Varnish 3 API support])], ++ [AC_CHECK_HEADERS(varnishapi.h, ++ [AC_DEFINE([HAVE_VARNISH_V2], [1], [Varnish 2 API support])], ++ [with_libvarnish="no (found none of the varnish header files)"])])]) ++ fi + + CPPFLAGS="$SAVE_CPPFLAGS" + fi +--- a/src/varnish.c ++++ b/src/varnish.c +@@ -21,6 +21,7 @@ + * Jérôme Renard <jerome.renard at gmail.com> + * Marc Fournier <marc.fournier at camptocamp.com> + * Florian octo Forster <octo at collectd.org> ++ * Denes Matetelki <dmatetelki at varnish-software.com> + **/ + + #include "collectd.h" +@@ -28,7 +29,7 @@ + #include "common.h" + #include "plugin.h" + +-#if HAVE_VARNISH_V4 ++#if HAVE_VARNISH_V4 || HAVE_VARNISH_V5 + #include <vapi/vsc.h> + #include <vapi/vsm.h> + typedef struct VSC_C_main c_varnish_stats_t; +@@ -69,17 +70,25 @@ struct user_config_s { + _Bool collect_sms; + #if HAVE_VARNISH_V2 + _Bool collect_sm; ++#endif ++#if HAVE_VARNISH_V2 || HAVE_VARNISH_V4 || HAVE_VARNISH_V5 + _Bool collect_sma; + #endif + _Bool collect_struct; + _Bool collect_totals; +-#if HAVE_VARNISH_V3 || HAVE_VARNISH_V4 ++#if HAVE_VARNISH_V3 || HAVE_VARNISH_V4 || HAVE_VARNISH_V5 + _Bool collect_uptime; + #endif + _Bool collect_vcl; + _Bool collect_workers; +-#if HAVE_VARNISH_V4 ++#if HAVE_VARNISH_V4 || HAVE_VARNISH_V5 + _Bool collect_vsm; ++ _Bool collect_lck; ++ _Bool collect_mempool; ++ _Bool collect_mgt; ++ _Bool collect_smf; ++ _Bool collect_vbe; ++ _Bool collect_mse; + #endif + }; + typedef struct user_config_s user_config_t; /* }}} */ +@@ -98,60 +107,70 @@ static int varnish_submit(const char *plugin_instance, /* {{{ */ + + if (plugin_instance == NULL) + plugin_instance = "default"; +- ssnprintf(vl.plugin_instance, sizeof(vl.plugin_instance), "%s-%s", +- plugin_instance, category); ++ snprintf(vl.plugin_instance, sizeof(vl.plugin_instance), "%s-%s", ++ plugin_instance, category); + + sstrncpy(vl.type, type, sizeof(vl.type)); + + if (type_instance != NULL) + sstrncpy(vl.type_instance, type_instance, sizeof(vl.type_instance)); + +- return (plugin_dispatch_values(&vl)); ++ return plugin_dispatch_values(&vl); + } /* }}} int varnish_submit */ + + static int varnish_submit_gauge(const char *plugin_instance, /* {{{ */ + const char *category, const char *type, + const char *type_instance, + uint64_t gauge_value) { +- return (varnish_submit(plugin_instance, category, type, type_instance, +- (value_t){.gauge = (gauge_t)gauge_value})); ++ return varnish_submit(plugin_instance, category, type, type_instance, ++ (value_t){ ++ .gauge = (gauge_t)gauge_value, ++ }); + } /* }}} int varnish_submit_gauge */ + + static int varnish_submit_derive(const char *plugin_instance, /* {{{ */ + const char *category, const char *type, + const char *type_instance, + uint64_t derive_value) { +- return (varnish_submit(plugin_instance, category, type, type_instance, +- (value_t){.derive = (derive_t)derive_value})); ++ return varnish_submit(plugin_instance, category, type, type_instance, ++ (value_t){ ++ .derive = (derive_t)derive_value, ++ }); + } /* }}} int varnish_submit_derive */ + +-#if HAVE_VARNISH_V3 || HAVE_VARNISH_V4 ++#if HAVE_VARNISH_V3 || HAVE_VARNISH_V4 || HAVE_VARNISH_V5 + static int varnish_monitor(void *priv, + const struct VSC_point *const pt) /* {{{ */ + { + uint64_t val; + const user_config_t *conf; +- const char *class; + const char *name; + + if (pt == NULL) +- return (0); ++ return 0; + + conf = priv; + +-#if HAVE_VARNISH_V4 +- class = pt->section->fantom->type; +- name = pt->desc->name; ++#if HAVE_VARNISH_V5 ++ char namebuff[DATA_MAX_NAME_LEN]; + +- if (strcmp(class, "MAIN") != 0) +- return (0); ++ char const *c = strrchr(pt->name, '.'); ++ if (c == NULL) { ++ return EINVAL; ++ } ++ sstrncpy(namebuff, c + 1, sizeof(namebuff)); ++ name = namebuff; ++ ++#elif HAVE_VARNISH_V4 ++ if (strcmp(pt->section->fantom->type, "MAIN") != 0) ++ return 0; + ++ name = pt->desc->name; + #elif HAVE_VARNISH_V3 +- class = pt->class; +- name = pt->name; ++ if (strcmp(pt->class, "") != 0) ++ return 0; + +- if (strcmp(class, "") != 0) +- return (0); ++ name = pt->name; + #endif + + val = *(const volatile uint64_t *)pt->ptr; +@@ -178,6 +197,14 @@ static int varnish_monitor(void *priv, + else if (strcmp(name, "client_req") == 0) + return varnish_submit_derive(conf->instance, "connections", "connections", + "received", val); ++#if HAVE_VARNISH_V4 || HAVE_VARNISH_V5 ++ else if (strcmp(name, "client_req_400") == 0) ++ return varnish_submit_derive(conf->instance, "connections", "connections", ++ "error_400", val); ++ else if (strcmp(name, "client_req_417") == 0) ++ return varnish_submit_derive(conf->instance, "connections", "connections", ++ "error_417", val); ++#endif + } + + #ifdef HAVE_VARNISH_V3 +@@ -207,6 +234,9 @@ static int varnish_monitor(void *priv, + else if (strcmp(name, "esi_warnings") == 0) + return varnish_submit_derive(conf->instance, "esi", "total_operations", + "warning", val); ++ else if (strcmp(name, "esi_maxdepth") == 0) ++ return varnish_submit_derive(conf->instance, "esi", "total_operations", ++ "max_depth", val); + } + + if (conf->collect_backend) { +@@ -282,6 +312,20 @@ static int varnish_monitor(void *priv, + else if (strcmp(name, "fetch_304") == 0) + return varnish_submit_derive(conf->instance, "fetch", "http_requests", + "no_body_304", val); ++#if HAVE_VARNISH_V4 || HAVE_VARNISH_V5 ++ else if (strcmp(name, "fetch_no_thread") == 0) ++ return varnish_submit_derive(conf->instance, "fetch", "http_requests", ++ "no_thread", val); ++ else if (strcmp(name, "fetch_none") == 0) ++ return varnish_submit_derive(conf->instance, "fetch", "http_requests", ++ "none", val); ++ else if (strcmp(name, "busy_sleep") == 0) ++ return varnish_submit_derive(conf->instance, "fetch", "http_requests", ++ "busy_sleep", val); ++ else if (strcmp(name, "busy_wakeup") == 0) ++ return varnish_submit_derive(conf->instance, "fetch", "http_requests", ++ "busy_wakeup", val); ++#endif + } + + if (conf->collect_hcb) { +@@ -327,6 +371,14 @@ static int varnish_monitor(void *priv, + else if (strcmp(name, "n_objoverflow") == 0) + return varnish_submit_derive(conf->instance, "objects", "total_objects", + "workspace_overflow", val); ++#if HAVE_VARNISH_V4 || HAVE_VARNISH_V5 ++ else if (strcmp(name, "exp_mailed") == 0) ++ return varnish_submit_gauge(conf->instance, "struct", "objects", ++ "exp_mailed", val); ++ else if (strcmp(name, "exp_received") == 0) ++ return varnish_submit_gauge(conf->instance, "struct", "objects", ++ "exp_received", val); ++#endif + } + + #if HAVE_VARNISH_V3 +@@ -351,7 +403,7 @@ static int varnish_monitor(void *priv, + "duplicate", val); + } + #endif +-#if HAVE_VARNISH_V4 ++#if HAVE_VARNISH_V4 || HAVE_VARNISH_V5 + if (conf->collect_ban) { + if (strcmp(name, "bans") == 0) + return varnish_submit_derive(conf->instance, "ban", "total_operations", +@@ -377,6 +429,33 @@ static int varnish_monitor(void *priv, + else if (strcmp(name, "bans_dups") == 0) + return varnish_submit_derive(conf->instance, "ban", "total_operations", + "duplicate", val); ++ else if (strcmp(name, "bans_tested") == 0) ++ return varnish_submit_derive(conf->instance, "ban", "total_operations", ++ "tested", val); ++ else if (strcmp(name, "bans_lurker_contention") == 0) ++ return varnish_submit_derive(conf->instance, "ban", "total_operations", ++ "lurker_contention", val); ++ else if (strcmp(name, "bans_lurker_obj_killed") == 0) ++ return varnish_submit_derive(conf->instance, "ban", "total_operations", ++ "lurker_obj_killed", val); ++ else if (strcmp(name, "bans_lurker_tested") == 0) ++ return varnish_submit_derive(conf->instance, "ban", "total_operations", ++ "lurker_tested", val); ++ else if (strcmp(name, "bans_lurker_tests_tested") == 0) ++ return varnish_submit_derive(conf->instance, "ban", "total_operations", ++ "lurker_tests_tested", val); ++ else if (strcmp(name, "bans_obj_killed") == 0) ++ return varnish_submit_derive(conf->instance, "ban", "total_operations", ++ "obj_killed", val); ++ else if (strcmp(name, "bans_persisted_bytes") == 0) ++ return varnish_submit_derive(conf->instance, "ban", "total_bytes", ++ "persisted_bytes", val); ++ else if (strcmp(name, "bans_persisted_fragmentation") == 0) ++ return varnish_submit_derive(conf->instance, "ban", "total_bytes", ++ "persisted_fragmentation", val); ++ else if (strcmp(name, "bans_tests_tested") == 0) ++ return varnish_submit_derive(conf->instance, "ban", "total_operations", ++ "tests_tested", val); + } + #endif + +@@ -411,6 +490,15 @@ static int varnish_monitor(void *priv, + else if (strcmp(name, "sess_herd") == 0) + return varnish_submit_derive(conf->instance, "session", + "total_operations", "herd", val); ++#if HAVE_VARNISH_V4 || HAVE_VARNISH_V5 ++ else if (strcmp(name, "sess_closed_err") == 0) ++ return varnish_submit_derive(conf->instance, "session", ++ "total_operations", "closed_err", val); ++ else if (strcmp(name, "sess_dropped") == 0) ++ return varnish_submit_derive(conf->instance, "session", ++ "total_operations", "dropped_for_thread", ++ val); ++#endif + } + + if (conf->collect_shm) { +@@ -510,12 +598,18 @@ static int varnish_monitor(void *priv, + else if (strcmp(name, "s_req_bodybytes") == 0) + return varnish_submit_derive(conf->instance, "totals", "total_bytes", + "req_body", val); ++ else if (strcmp(name, "s_req_protobytes") == 0) ++ return varnish_submit_derive(conf->instance, "totals", "total_bytes", ++ "req_proto", val); + else if (strcmp(name, "s_resp_hdrbytes") == 0) + return varnish_submit_derive(conf->instance, "totals", "total_bytes", + "resp_header", val); + else if (strcmp(name, "s_resp_bodybytes") == 0) + return varnish_submit_derive(conf->instance, "totals", "total_bytes", + "resp_body", val); ++ else if (strcmp(name, "s_resp_protobytes") == 0) ++ return varnish_submit_derive(conf->instance, "totals", "total_bytes", ++ "resp_proto", val); + else if (strcmp(name, "s_pipe_hdrbytes") == 0) + return varnish_submit_derive(conf->instance, "totals", "total_bytes", + "pipe_header", val); +@@ -580,8 +674,8 @@ static int varnish_monitor(void *priv, + return varnish_submit_derive(conf->instance, "workers", "total_threads", + "dropped", val); + else if (strcmp(name, "thread_queue_len") == 0) +- return varnish_submit_derive(conf->instance, "workers", "queue_length", +- "threads", val); ++ return varnish_submit_gauge(conf->instance, "workers", "queue_length", ++ "threads", val); + else if (strcmp(name, "n_wrk") == 0) + return varnish_submit_gauge(conf->instance, "workers", "threads", + "worker", val); +@@ -609,9 +703,17 @@ static int varnish_monitor(void *priv, + else if (strcmp(name, "n_wrk_lqueue") == 0) + return varnish_submit_derive(conf->instance, "workers", "total_requests", + "queue_length", val); ++#if HAVE_VARNISH_V4 || HAVE_VARNISH_V5 ++ else if (strcmp(name, "pools") == 0) ++ return varnish_submit_gauge(conf->instance, "workers", "pools", "pools", ++ val); ++ else if (strcmp(name, "busy_killed") == 0) ++ return varnish_submit_derive(conf->instance, "workers", "http_requests", ++ "busy_killed", val); ++#endif + } + +-#if HAVE_VARNISH_V4 ++#if HAVE_VARNISH_V4 || HAVE_VARNISH_V5 + if (conf->collect_vsm) { + if (strcmp(name, "vsm_free") == 0) + return varnish_submit_gauge(conf->instance, "vsm", "bytes", "free", val); +@@ -627,9 +729,262 @@ static int varnish_monitor(void *priv, + return varnish_submit_derive(conf->instance, "vsm", "total_bytes", + "overflowed", val); + } ++ ++ if (conf->collect_vbe) { ++ /* @TODO figure out the collectd type for bitmap ++ if (strcmp(name, "happy") == 0) ++ return varnish_submit_derive(conf->instance, "vbe", ++ "bitmap", "happy_hprobes", val); ++ */ ++ if (strcmp(name, "bereq_hdrbytes") == 0) ++ return varnish_submit_derive(conf->instance, "vbe", "total_bytes", ++ "bereq_hdrbytes", val); ++ else if (strcmp(name, "bereq_bodybytes") == 0) ++ return varnish_submit_derive(conf->instance, "vbe", "total_bytes", ++ "bereq_bodybytes", val); ++ else if (strcmp(name, "bereq_protobytes") == 0) ++ return varnish_submit_derive(conf->instance, "vbe", "total_bytes", ++ "bereq_protobytes", val); ++ else if (strcmp(name, "beresp_hdrbytes") == 0) ++ return varnish_submit_derive(conf->instance, "vbe", "total_bytes", ++ "beresp_hdrbytes", val); ++ else if (strcmp(name, "beresp_bodybytes") == 0) ++ return varnish_submit_derive(conf->instance, "vbe", "total_bytes", ++ "beresp_bodybytes", val); ++ else if (strcmp(name, "beresp_protobytes") == 0) ++ return varnish_submit_derive(conf->instance, "vbe", "total_bytes", ++ "beresp_protobytes", val); ++ else if (strcmp(name, "pipe_hdrbytes") == 0) ++ return varnish_submit_derive(conf->instance, "vbe", "total_bytes", ++ "pipe_hdrbytes", val); ++ else if (strcmp(name, "pipe_out") == 0) ++ return varnish_submit_derive(conf->instance, "vbe", "total_bytes", ++ "pipe_out", val); ++ else if (strcmp(name, "pipe_in") == 0) ++ return varnish_submit_derive(conf->instance, "vbe", "total_bytes", ++ "pipe_in", val); ++ else if (strcmp(name, "conn") == 0) ++ return varnish_submit_derive(conf->instance, "vbe", "connections", ++ "c_conns", val); ++ else if (strcmp(name, "req") == 0) ++ return varnish_submit_derive(conf->instance, "vbe", "http_requests", ++ "b_reqs", val); ++ } ++ ++ /* All Stevedores support these counters */ ++ if (conf->collect_sma || conf->collect_smf || conf->collect_mse) { ++ ++ char category[4]; ++ if (conf->collect_sma) ++ strncpy(category, "sma", 4); ++ else if (conf->collect_smf) ++ strncpy(category, "smf", 4); ++ else ++ strncpy(category, "mse", 4); ++ ++ if (strcmp(name, "c_req") == 0) ++ return varnish_submit_derive(conf->instance, category, "total_operations", ++ "alloc_req", val); ++ else if (strcmp(name, "c_fail") == 0) ++ return varnish_submit_derive(conf->instance, category, "total_operations", ++ "alloc_fail", val); ++ else if (strcmp(name, "c_bytes") == 0) ++ return varnish_submit_derive(conf->instance, category, "total_bytes", ++ "bytes_allocated", val); ++ else if (strcmp(name, "c_freed") == 0) ++ return varnish_submit_derive(conf->instance, category, "total_bytes", ++ "bytes_freed", val); ++ else if (strcmp(name, "g_alloc") == 0) ++ return varnish_submit_derive(conf->instance, category, "total_operations", ++ "alloc_outstanding", val); ++ else if (strcmp(name, "g_bytes") == 0) ++ return varnish_submit_gauge(conf->instance, category, "bytes", ++ "bytes_outstanding", val); ++ else if (strcmp(name, "g_space") == 0) ++ return varnish_submit_gauge(conf->instance, category, "bytes", ++ "bytes_available", val); ++ } ++ ++ /* No SMA specific counters */ ++ ++ if (conf->collect_smf) { ++ if (strcmp(name, "g_smf") == 0) ++ return varnish_submit_gauge(conf->instance, "smf", "objects", ++ "n_struct_smf", val); ++ else if (strcmp(name, "g_smf_frag") == 0) ++ return varnish_submit_gauge(conf->instance, "smf", "objects", ++ "n_small_free_smf", val); ++ else if (strcmp(name, "g_smf_large") == 0) ++ return varnish_submit_gauge(conf->instance, "smf", "objects", ++ "n_large_free_smf", val); ++ } ++ ++ if (conf->collect_mgt) { ++ if (strcmp(name, "uptime") == 0) ++ return varnish_submit_gauge(conf->instance, "mgt", "uptime", ++ "mgt_proc_uptime", val); ++ else if (strcmp(name, "child_start") == 0) ++ return varnish_submit_derive(conf->instance, "mgt", "total_operations", ++ "child_start", val); ++ else if (strcmp(name, "child_exit") == 0) ++ return varnish_submit_derive(conf->instance, "mgt", "total_operations", ++ "child_exit", val); ++ else if (strcmp(name, "child_stop") == 0) ++ return varnish_submit_derive(conf->instance, "mgt", "total_operations", ++ "child_stop", val); ++ else if (strcmp(name, "child_died") == 0) ++ return varnish_submit_derive(conf->instance, "mgt", "total_operations", ++ "child_died", val); ++ else if (strcmp(name, "child_dump") == 0) ++ return varnish_submit_derive(conf->instance, "mgt", "total_operations", ++ "child_dump", val); ++ else if (strcmp(name, "child_panic") == 0) ++ return varnish_submit_derive(conf->instance, "mgt", "total_operations", ++ "child_panic", val); ++ } ++ ++ if (conf->collect_lck) { ++ if (strcmp(name, "creat") == 0) ++ return varnish_submit_gauge(conf->instance, "lck", "objects", "created", ++ val); ++ else if (strcmp(name, "destroy") == 0) ++ return varnish_submit_gauge(conf->instance, "lck", "objects", "destroyed", ++ val); ++ else if (strcmp(name, "locks") == 0) ++ return varnish_submit_derive(conf->instance, "lck", "total_operations", ++ "lock_ops", val); ++ } ++ ++ if (conf->collect_mempool) { ++ if (strcmp(name, "live") == 0) ++ return varnish_submit_gauge(conf->instance, "mempool", "objects", ++ "in_use", val); ++ else if (strcmp(name, "pool") == 0) ++ return varnish_submit_gauge(conf->instance, "mempool", "objects", ++ "in_pool", val); ++ else if (strcmp(name, "sz_wanted") == 0) ++ return varnish_submit_gauge(conf->instance, "mempool", "bytes", ++ "size_requested", val); ++ else if (strcmp(name, "sz_actual") == 0) ++ return varnish_submit_gauge(conf->instance, "mempool", "bytes", ++ "size_allocated", val); ++ else if (strcmp(name, "allocs") == 0) ++ return varnish_submit_derive(conf->instance, "mempool", ++ "total_operations", "allocations", val); ++ else if (strcmp(name, "frees") == 0) ++ return varnish_submit_derive(conf->instance, "mempool", ++ "total_operations", "frees", val); ++ else if (strcmp(name, "recycle") == 0) ++ return varnish_submit_gauge(conf->instance, "mempool", "objects", ++ "recycled", val); ++ else if (strcmp(name, "timeout") == 0) ++ return varnish_submit_gauge(conf->instance, "mempool", "objects", ++ "timed_out", val); ++ else if (strcmp(name, "toosmall") == 0) ++ return varnish_submit_gauge(conf->instance, "mempool", "objects", ++ "too_small", val); ++ else if (strcmp(name, "surplus") == 0) ++ return varnish_submit_gauge(conf->instance, "mempool", "objects", ++ "surplus", val); ++ else if (strcmp(name, "randry") == 0) ++ return varnish_submit_gauge(conf->instance, "mempool", "objects", ++ "ran_dry", val); ++ } ++ ++ if (conf->collect_mse) { ++ if (strcmp(name, "c_full") == 0) ++ return varnish_submit_derive(conf->instance, "mse", "total_operations", ++ "full_allocs", val); ++ else if (strcmp(name, "c_truncated") == 0) ++ return varnish_submit_derive(conf->instance, "mse", "total_operations", ++ "truncated_allocs", val); ++ else if (strcmp(name, "c_expanded") == 0) ++ return varnish_submit_derive(conf->instance, "mse", "total_operations", ++ "expanded_allocs", val); ++ else if (strcmp(name, "c_failed") == 0) ++ return varnish_submit_derive(conf->instance, "mse", "total_operations", ++ "failed_allocs", val); ++ else if (strcmp(name, "c_bytes") == 0) ++ return varnish_submit_derive(conf->instance, "mse", "total_bytes", ++ "bytes_allocated", val); ++ else if (strcmp(name, "c_freed") == 0) ++ return varnish_submit_derive(conf->instance, "mse", "total_bytes", ++ "bytes_freed", val); ++ else if (strcmp(name, "g_fo_alloc") == 0) ++ return varnish_submit_derive(conf->instance, "mse", "total_operations", ++ "fo_allocs_outstanding", val); ++ else if (strcmp(name, "g_fo_bytes") == 0) ++ return varnish_submit_gauge(conf->instance, "mse", "bytes", ++ "fo_bytes_outstanding", val); ++ else if (strcmp(name, "g_membuf_alloc") == 0) ++ return varnish_submit_gauge(conf->instance, "mse", "objects", ++ "membufs_allocated", val); ++ else if (strcmp(name, "g_membuf_inuse") == 0) ++ return varnish_submit_gauge(conf->instance, "mse", "objects", ++ "membufs_inuse", val); ++ else if (strcmp(name, "g_bans_bytes") == 0) ++ return varnish_submit_gauge(conf->instance, "mse", "bytes", ++ "persisted_banspace_used", val); ++ else if (strcmp(name, "g_bans_space") == 0) ++ return varnish_submit_gauge(conf->instance, "mse", "bytes", ++ "persisted_banspace_available", val); ++ else if (strcmp(name, "g_bans_persisted") == 0) ++ return varnish_submit_derive(conf->instance, "mse", "total_operations", ++ "bans_persisted", val); ++ else if (strcmp(name, "g_bans_lost") == 0) ++ return varnish_submit_derive(conf->instance, "mse", "total_operations", ++ "bans_lost", val); ++ ++ /* mse seg */ ++ else if (strcmp(name, "g_journal_bytes") == 0) ++ return varnish_submit_gauge(conf->instance, "mse_reg", "bytes", ++ "journal_bytes_used", val); ++ else if (strcmp(name, "g_journal_space") == 0) ++ return varnish_submit_gauge(conf->instance, "mse_reg", "bytes", ++ "journal_bytes_free", val); ++ ++ /* mse segagg */ ++ else if (strcmp(name, "g_bigspace") == 0) ++ return varnish_submit_gauge(conf->instance, "mse_segagg", "bytes", ++ "big_extents_bytes_available", val); ++ else if (strcmp(name, "g_extfree") == 0) ++ return varnish_submit_gauge(conf->instance, "mse_segagg", "objects", ++ "free_extents", val); ++ else if (strcmp(name, "g_sparenode") == 0) ++ return varnish_submit_gauge(conf->instance, "mse_segagg", "objects", ++ "spare_nodes_available", val); ++ else if (strcmp(name, "g_objnode") == 0) ++ return varnish_submit_gauge(conf->instance, "mse_segagg", "objects", ++ "object_nodes_in_use", val); ++ else if (strcmp(name, "g_extnode") == 0) ++ return varnish_submit_gauge(conf->instance, "mse_segagg", "objects", ++ "extent_nodes_in_use", val); ++ else if (strcmp(name, "g_bigextfree") == 0) ++ return varnish_submit_gauge(conf->instance, "mse_segagg", "objects", ++ "free_big_extents", val); ++ else if (strcmp(name, "c_pruneloop") == 0) ++ return varnish_submit_derive(conf->instance, "mse_segagg", ++ "total_operations", "prune_loops", val); ++ else if (strcmp(name, "c_pruned") == 0) ++ return varnish_submit_derive(conf->instance, "mse_segagg", ++ "total_objects", "pruned_objects", val); ++ else if (strcmp(name, "c_spared") == 0) ++ return varnish_submit_derive(conf->instance, "mse_segagg", ++ "total_operations", "spared_objects", val); ++ else if (strcmp(name, "c_skipped") == 0) ++ return varnish_submit_derive(conf->instance, "mse_segagg", ++ "total_operations", "missed_objects", val); ++ else if (strcmp(name, "c_nuked") == 0) ++ return varnish_submit_derive(conf->instance, "mse_segagg", ++ "total_operations", "nuked_objects", val); ++ else if (strcmp(name, "c_sniped") == 0) ++ return varnish_submit_derive(conf->instance, "mse_segagg", ++ "total_operations", "sniped_objects", val); ++ } ++ + #endif + +- return (0); ++ return 0; + + } /* }}} static int varnish_monitor */ + #else /* if HAVE_VARNISH_V2 */ +@@ -971,21 +1326,32 @@ static void varnish_monitor(const user_config_t *conf, /* {{{ */ + } /* }}} void varnish_monitor */ + #endif + +-#if HAVE_VARNISH_V3 || HAVE_VARNISH_V4 ++#if HAVE_VARNISH_V3 || HAVE_VARNISH_V4 || HAVE_VARNISH_V5 + static int varnish_read(user_data_t *ud) /* {{{ */ + { ++#if HAVE_VARNISH_V3 || HAVE_VARNISH_V4 + struct VSM_data *vd; +- const c_varnish_stats_t *stats; + _Bool ok; ++ const c_varnish_stats_t *stats; ++#elif HAVE_VARNISH_V5 ++ struct vsm *vd; ++ struct vsc *vsc; ++ int vsm_status; ++#endif + + user_config_t *conf; + + if ((ud == NULL) || (ud->data == NULL)) +- return (EINVAL); ++ return EINVAL; + + conf = ud->data; + + vd = VSM_New(); ++ ++#if HAVE_VARNISH_V5 ++ vsc = VSC_New(); ++#endif ++ + #if HAVE_VARNISH_V3 + VSC_Setup(vd); + #endif +@@ -993,48 +1359,85 @@ static int varnish_read(user_data_t *ud) /* {{{ */ + if (conf->instance != NULL) { + int status; + ++#if HAVE_VARNISH_V3 || HAVE_VARNISH_V4 + status = VSM_n_Arg(vd, conf->instance); ++#elif HAVE_VARNISH_V5 ++ status = VSM_Arg(vd, 'n', conf->instance); ++#endif ++ + if (status < 0) { ++#if HAVE_VARNISH_V3 || HAVE_VARNISH_V4 + VSM_Delete(vd); +- ERROR("varnish plugin: VSM_n_Arg (\"%s\") failed " ++#elif HAVE_VARNISH_V5 ++ VSC_Destroy(&vsc, vd); ++ VSM_Destroy(&vd); ++#endif ++ ERROR("varnish plugin: VSM_Arg (\"%s\") failed " + "with status %i.", + conf->instance, status); +- return (-1); ++ return -1; + } + } + + #if HAVE_VARNISH_V3 + ok = (VSC_Open(vd, /* diag = */ 1) == 0); +-#else /* if HAVE_VARNISH_V4 */ ++#elif HAVE_VARNISH_V4 + ok = (VSM_Open(vd) == 0); + #endif ++#if HAVE_VARNISH_V3 || HAVE_VARNISH_V4 + if (!ok) { + VSM_Delete(vd); + ERROR("varnish plugin: Unable to open connection."); +- +- return (-1); ++ return -1; + } ++#endif + + #if HAVE_VARNISH_V3 + stats = VSC_Main(vd); +-#else /* if HAVE_VARNISH_V4 */ ++#elif HAVE_VARNISH_V4 + stats = VSC_Main(vd, NULL); + #endif ++#if HAVE_VARNISH_V3 || HAVE_VARNISH_V4 + if (!stats) { + VSM_Delete(vd); + ERROR("varnish plugin: Unable to get statistics."); ++ return -1; ++ } ++#endif ++ ++#if HAVE_VARNISH_V5 ++ if (VSM_Attach(vd, STDERR_FILENO)) { ++ ERROR("varnish plugin: Cannot attach to varnish. %s", VSM_Error(vd)); ++ VSC_Destroy(&vsc, vd); ++ VSM_Destroy(&vd); ++ return -1; ++ } + +- return (-1); ++ vsm_status = VSM_Status(vd); ++ if (vsm_status & ~(VSM_MGT_RUNNING | VSM_WRK_RUNNING)) { ++ ERROR("varnish plugin: Unable to get statistics."); ++ VSC_Destroy(&vsc, vd); ++ VSM_Destroy(&vd); ++ return -1; + } ++#endif + + #if HAVE_VARNISH_V3 + VSC_Iter(vd, varnish_monitor, conf); +-#else /* if HAVE_VARNISH_V4 */ ++#elif HAVE_VARNISH_V4 + VSC_Iter(vd, NULL, varnish_monitor, conf); ++#elif HAVE_VARNISH_V5 ++ VSC_Iter(vsc, vd, varnish_monitor, conf); + #endif ++ ++#if HAVE_VARNISH_V3 || HAVE_VARNISH_V4 + VSM_Delete(vd); ++#elif HAVE_VARNISH_V5 ++ VSC_Destroy(&vsc, vd); ++ VSM_Destroy(&vd); ++#endif + +- return (0); ++ return 0; + } /* }}} */ + #else /* if HAVE_VARNISH_V2 */ + static int varnish_read(user_data_t *ud) /* {{{ */ +@@ -1044,7 +1447,7 @@ static int varnish_read(user_data_t *ud) /* {{{ */ + user_config_t *conf; + + if ((ud == NULL) || (ud->data == NULL)) +- return (EINVAL); ++ return EINVAL; + + conf = ud->data; + +@@ -1052,12 +1455,12 @@ static int varnish_read(user_data_t *ud) /* {{{ */ + if (stats == NULL) { + ERROR("Varnish plugin : unable to load statistics"); + +- return (-1); ++ return -1; + } + + varnish_monitor(conf, stats); + +- return (0); ++ return 0; + } /* }}} */ + #endif + +@@ -1075,7 +1478,7 @@ static void varnish_config_free(void *ptr) /* {{{ */ + static int varnish_config_apply_default(user_config_t *conf) /* {{{ */ + { + if (conf == NULL) +- return (EINVAL); ++ return EINVAL; + + conf->collect_backend = 1; + conf->collect_cache = 1; +@@ -1096,21 +1499,29 @@ static int varnish_config_apply_default(user_config_t *conf) /* {{{ */ + conf->collect_shm = 1; + #if HAVE_VARNISH_V2 + conf->collect_sm = 0; ++#endif ++#if HAVE_VARNISH_V2 || HAVE_VARNISH_V4 || HAVE_VARNISH_V5 + conf->collect_sma = 0; + #endif + conf->collect_sms = 0; + conf->collect_struct = 0; + conf->collect_totals = 0; +-#if HAVE_VARNISH_V3 || HAVE_VARNISH_V4 ++#if HAVE_VARNISH_V3 || HAVE_VARNISH_V4 || HAVE_VARNISH_V5 + conf->collect_uptime = 0; + #endif + conf->collect_vcl = 0; + conf->collect_workers = 0; +-#if HAVE_VARNISH_V4 ++#if HAVE_VARNISH_V4 || HAVE_VARNISH_V5 + conf->collect_vsm = 0; ++ conf->collect_lck = 0; ++ conf->collect_mempool = 0; ++ conf->collect_mgt = 0; ++ conf->collect_smf = 0; ++ conf->collect_vbe = 0; ++ conf->collect_mse = 0; + #endif + +- return (0); ++ return 0; + } /* }}} int varnish_config_apply_default */ + + static int varnish_init(void) /* {{{ */ +@@ -1118,11 +1529,11 @@ static int varnish_init(void) /* {{{ */ + user_config_t *conf; + + if (have_instance) +- return (0); ++ return 0; + + conf = calloc(1, sizeof(*conf)); + if (conf == NULL) +- return (ENOMEM); ++ return ENOMEM; + + /* Default settings: */ + conf->instance = NULL; +@@ -1133,11 +1544,12 @@ static int varnish_init(void) /* {{{ */ + /* group = */ "varnish", + /* name = */ "varnish/localhost", + /* callback = */ varnish_read, +- /* interval = */ 0, &(user_data_t){ +- .data = conf, .free_func = varnish_config_free, +- }); ++ /* interval = */ 0, ++ &(user_data_t){ ++ .data = conf, .free_func = varnish_config_free, ++ }); + +- return (0); ++ return 0; + } /* }}} int varnish_init */ + + static int varnish_config_instance(const oconfig_item_t *ci) /* {{{ */ +@@ -1147,7 +1559,7 @@ static int varnish_config_instance(const oconfig_item_t *ci) /* {{{ */ + + conf = calloc(1, sizeof(*conf)); + if (conf == NULL) +- return (ENOMEM); ++ return ENOMEM; + conf->instance = NULL; + + varnish_config_apply_default(conf); +@@ -1158,7 +1570,7 @@ static int varnish_config_instance(const oconfig_item_t *ci) /* {{{ */ + status = cf_util_get_string(ci, &conf->instance); + if (status != 0) { + sfree(conf); +- return (status); ++ return status; + } + assert(conf->instance != NULL); + +@@ -1170,7 +1582,7 @@ static int varnish_config_instance(const oconfig_item_t *ci) /* {{{ */ + WARNING("Varnish plugin: \"Instance\" blocks accept only " + "one argument."); + sfree(conf); +- return (EINVAL); ++ return EINVAL; + } + + for (int i = 0; i < ci->children_num; i++) { +@@ -1218,11 +1630,11 @@ static int varnish_config_instance(const oconfig_item_t *ci) /* {{{ */ + else if (strcasecmp("CollectSMS", child->key) == 0) + cf_util_get_boolean(child, &conf->collect_sms); + else if (strcasecmp("CollectSMA", child->key) == 0) +-#if HAVE_VARNISH_V2 ++#if HAVE_VARNISH_V2 || HAVE_VARNISH_V4 || HAVE_VARNISH_V5 + cf_util_get_boolean(child, &conf->collect_sma); + #else + WARNING("Varnish plugin: \"%s\" is available for Varnish %s only.", +- child->key, "v2"); ++ child->key, "v2 and v4"); + #endif + else if (strcasecmp("CollectSM", child->key) == 0) + #if HAVE_VARNISH_V2 +@@ -1236,7 +1648,7 @@ static int varnish_config_instance(const oconfig_item_t *ci) /* {{{ */ + else if (strcasecmp("CollectTotals", child->key) == 0) + cf_util_get_boolean(child, &conf->collect_totals); + else if (strcasecmp("CollectUptime", child->key) == 0) +-#if HAVE_VARNISH_V3 || HAVE_VARNISH_V4 ++#if HAVE_VARNISH_V3 || HAVE_VARNISH_V4 || HAVE_VARNISH_V5 + cf_util_get_boolean(child, &conf->collect_uptime); + #else + WARNING("Varnish plugin: \"%s\" is available for Varnish %s only.", +@@ -1247,11 +1659,60 @@ static int varnish_config_instance(const oconfig_item_t *ci) /* {{{ */ + else if (strcasecmp("CollectWorkers", child->key) == 0) + cf_util_get_boolean(child, &conf->collect_workers); + else if (strcasecmp("CollectVSM", child->key) == 0) +-#if HAVE_VARNISH_V4 ++#if HAVE_VARNISH_V4 || HAVE_VARNISH_V5 + cf_util_get_boolean(child, &conf->collect_vsm); + #else + WARNING("Varnish plugin: \"%s\" is available for Varnish %s only.", + child->key, "v4"); ++#endif ++ else if (strcasecmp("CollectLock", child->key) == 0) ++#if HAVE_VARNISH_V4 || HAVE_VARNISH_V5 ++ cf_util_get_boolean(child, &conf->collect_lck); ++#else ++ WARNING("Varnish plugin: \"%s\" is available for Varnish %s only.", ++ child->key, "v4"); ++#endif ++ else if (strcasecmp("CollectMempool", child->key) == 0) ++#if HAVE_VARNISH_V4 || HAVE_VARNISH_V5 ++ cf_util_get_boolean(child, &conf->collect_mempool); ++#else ++ WARNING("Varnish plugin: \"%s\" is available for Varnish %s only.", ++ child->key, "v4"); ++#endif ++ else if (strcasecmp("CollectManagement", child->key) == 0) ++#if HAVE_VARNISH_V4 || HAVE_VARNISH_V5 ++ cf_util_get_boolean(child, &conf->collect_mgt); ++#else ++ WARNING("Varnish plugin: \"%s\" is available for Varnish %s only.", ++ child->key, "v4"); ++#endif ++ else if (strcasecmp("CollectSMF", child->key) == 0) ++#if HAVE_VARNISH_V4 || HAVE_VARNISH_V5 ++ cf_util_get_boolean(child, &conf->collect_smf); ++#else ++ WARNING("Varnish plugin: \"%s\" is available for Varnish %s only.", ++ child->key, "v4"); ++#endif ++ else if (strcasecmp("CollectSMF", child->key) == 0) ++#if HAVE_VARNISH_V4 || HAVE_VARNISH_V5 ++ cf_util_get_boolean(child, &conf->collect_smf); ++#else ++ WARNING("Varnish plugin: \"%s\" is available for Varnish %s only.", ++ child->key, "v4"); ++#endif ++ else if (strcasecmp("CollectVBE", child->key) == 0) ++#if HAVE_VARNISH_V4 || HAVE_VARNISH_V5 ++ cf_util_get_boolean(child, &conf->collect_vbe); ++#else ++ WARNING("Varnish plugin: \"%s\" is available for Varnish %s only.", ++ child->key, "v4"); ++#endif ++ else if (strcasecmp("CollectMSE", child->key) == 0) ++#if HAVE_VARNISH_V4 || HAVE_VARNISH_V5 ++ cf_util_get_boolean(child, &conf->collect_mse); ++#else ++ WARNING("Varnish plugin: \"%s\" is available for Varnish %s only.", ++ child->key, "Plus v4"); + #endif + else { + WARNING("Varnish plugin: Ignoring unknown " +@@ -1275,38 +1736,44 @@ static int varnish_config_instance(const oconfig_item_t *ci) /* {{{ */ + #endif + && !conf->collect_session && !conf->collect_shm && !conf->collect_sms + #if HAVE_VARNISH_V2 +- && !conf->collect_sma && !conf->collect_sm ++ && !conf->collect_sm ++#endif ++#if HAVE_VARNISH_V2 || HAVE_VARNISH_V4 || HAVE_VARNISH_V5 ++ && !conf->collect_sma + #endif + && !conf->collect_struct && !conf->collect_totals +-#if HAVE_VARNISH_V3 || HAVE_VARNISH_V4 ++#if HAVE_VARNISH_V3 || HAVE_VARNISH_V4 || HAVE_VARNISH_V5 + && !conf->collect_uptime + #endif + && !conf->collect_vcl && !conf->collect_workers +-#if HAVE_VARNISH_V4 +- && !conf->collect_vsm ++#if HAVE_VARNISH_V4 || HAVE_VARNISH_V5 ++ && !conf->collect_vsm && !conf->collect_vbe && !conf->collect_smf && ++ !conf->collect_mgt && !conf->collect_lck && !conf->collect_mempool && ++ !conf->collect_mse + #endif + ) { + WARNING("Varnish plugin: No metric has been configured for " + "instance \"%s\". Disabling this instance.", + (conf->instance == NULL) ? "localhost" : conf->instance); + sfree(conf); +- return (EINVAL); ++ return EINVAL; + } + +- ssnprintf(callback_name, sizeof(callback_name), "varnish/%s", +- (conf->instance == NULL) ? "localhost" : conf->instance); ++ snprintf(callback_name, sizeof(callback_name), "varnish/%s", ++ (conf->instance == NULL) ? "localhost" : conf->instance); + + plugin_register_complex_read( + /* group = */ "varnish", + /* name = */ callback_name, + /* callback = */ varnish_read, +- /* interval = */ 0, &(user_data_t){ +- .data = conf, .free_func = varnish_config_free, +- }); ++ /* interval = */ 0, ++ &(user_data_t){ ++ .data = conf, .free_func = varnish_config_free, ++ }); + + have_instance = 1; + +- return (0); ++ return 0; + } /* }}} int varnish_config_instance */ + + static int varnish_config(oconfig_item_t *ci) /* {{{ */ +@@ -1323,7 +1790,7 @@ static int varnish_config(oconfig_item_t *ci) /* {{{ */ + } + } + +- return (0); ++ return 0; + } /* }}} int varnish_config */ + + void module_register(void) /* {{{ */ +@@ -1331,5 +1798,3 @@ void module_register(void) /* {{{ */ + plugin_register_complex_config("varnish", varnish_config); + plugin_register_init("varnish", varnish_init); + } /* }}} */ +- +-/* vim: set sw=8 noet fdm=marker : */ diff --git a/app-admin/collectd/files/collectd.confd-r1 b/app-admin/collectd/files/collectd.confd-r1 deleted file mode 100644 index 1ad78f839d8a..000000000000 --- a/app-admin/collectd/files/collectd.confd-r1 +++ /dev/null @@ -1,45 +0,0 @@ -# Distributed under the terms of the GNU General Public License v2 - -# Nice value used to launch collectd, to change priority of the process. As -# you usually we want to run it in background, a default of 5 is used. -# -#COLLECTD_NICELEVEL=5 - -# Location of configuration file. Modify if you don't like the standard -# one. -# -#COLLECTD_CONFIGFILE="/etc/collectd.conf" - -# File used to store the PID file. Usually you won't need to touch it. -# -#COLLECTD_PIDFILE="/run/collectd/collectd.pid" - -# User to run collectd as (default is collectd, change to root or give -# collectd user appropriate privileges if you use one of the plugins that -# require it, as e.g. ping or iptables plugins) -# -#COLLECTD_USER="collectd" - -# The group is only important if you are using collectd's UNIX socket -# in the default location (/run/collectd) because we will chown the -# default location to COLLECTD_USER:COLLECTD_GROUP. The default value -# is "collectd". -#COLLECTD_GROUP="collectd" - -# You can use this configuration option to pass additional options to the -# start-stop-daemon, see start-stop-daemon(8) for more details. -# Per default we wait 1000ms after we have started the service to ensure -# that the daemon is really up and running. -#COLLECTD_SSDARGS="--wait 1000" - -# The termination timeout (start-stop-daemon parameter "retry") ensures -# that the service will be terminated within a given time (25 + 5 seconds -# per default) when you are stopping the service. -#COLLECTD_TERMTIMEOUT="TERM/25/KILL/5" - -# Options to collectd -# See collectd(8) for more details -# Notes: -# * Do not specify another PIDFILE but use the variable above to change the location -# * Do not specify another CONFIGFILE but use the variable above to change the location -#COLLECTD_OPTS="" diff --git a/app-admin/collectd/files/collectd.initd-r1 b/app-admin/collectd/files/collectd.initd-r1 deleted file mode 100644 index e65f85a7bcbf..000000000000 --- a/app-admin/collectd/files/collectd.initd-r1 +++ /dev/null @@ -1,78 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -COLLECTD_CONFIGFILE=${COLLECTD_CONFIGFILE:-"/etc/collectd.conf"} -COLLECTD_PIDFILE=${COLLECTD_PIDFILE:-"/run/collectd/collectd.pid"} -COLLECTD_NICELEVEL=${COLLECTD_NICELEVEL:-5} -COLLECTD_USER=${COLLECTD_USER:-"collectd"} -COLLECTD_GROUP=${COLLECTD_GROUP:-"collectd"} -COLLECTD_SSDARGS=${COLLECTD_SSDARGS:-"--wait 1000"} -COLLECTD_TERMTIMEOUT=${COLLECTD_TERMTIMEOUT:-"TERM/25/KILL/5"} -COLLECTD_OPTS=${COLLECTD_OPTS:-""} - -command="/usr/sbin/collectd" -command_args="${COLLECTD_OPTS} -C \"${COLLECTD_CONFIGFILE}\" -P \"${COLLECTD_PIDFILE}\"" -start_stop_daemon_args="${COLLECTD_SSDARGS} --nice ${COLLECTD_NICELEVEL} --user ${COLLECTD_USER}:${COLLECTD_GROUP}" -pidfile="${COLLECTD_PIDFILE}" -retry="${COLLECTD_TERMTIMEOUT}" - -extra_commands="configtest" -description_configtest="Run collectd's internal config check." - -required_files="\"${COLLECTD_CONFIGFILE}\"" - -depend() { - use dns -} - -_checkconfig() { - if [ $(sed '/^$\|^#/d' "${COLLECTD_CONFIGFILE}" | grep 'LoadPlugin[[:space:]]\+oracle' | wc -l) -ge 1 ] ; then - if [ -e /etc/env.d/50oracle-instantclient-basic ] ; then - . /etc/env.d/50oracle-instantclient-basic - export ORACLE_HOME - export TNS_ADMIN - else - ewarn "Unable to set Oracle environment, Oracle plugin wont work" - fi - fi - - local test_command="${command} -t -C \"${COLLECTD_CONFIGFILE}\"" - - eval ${test_command} 1>/dev/null 2>&1 - ret=$? - if [ $ret -ne 0 ]; then - eerror "${SVCNAME} has detected an error in your configuration:" - eval ${test_command} - fi - - return $ret -} - -configtest() { - ebegin "Checking ${SVCNAME} configuration" - _checkconfig - eend $? -} - -start_pre() { - if [ "${RC_CMD}" != "restart" ]; then - configtest || return 1 - fi - - checkpath --directory --mode 0770 --owner ${COLLECTD_USER}:${COLLECTD_GROUP} "$(dirname "${COLLECTD_PIDFILE}")" -} - -stop_pre() { - if [ "${RC_CMD}" = "restart" ]; then - configtest || return 1 - fi -} - -stop_post() { - if [ -f "${COLLECTD_PIDFILE}" ]; then - vebegin "Removing stale PID file" - rm --force "${COLLECTD_PIDFILE}" - veend $? - fi -} diff --git a/app-admin/conserver/Manifest b/app-admin/conserver/Manifest index 35df9fa4b56a..42eeff422019 100644 --- a/app-admin/conserver/Manifest +++ b/app-admin/conserver/Manifest @@ -5,6 +5,6 @@ AUX conserver.initd 1055 BLAKE2B a515ff3c81c1e66b53f49d28db082d2a9eb3cd69a60f73b AUX conserver.initd-r1 1088 BLAKE2B 2ab26bafddf29f24488b147c2a90dca6e482361af96fc008df0029581a0308f380db36b7985ac8fdfc1884e0eeb897d3e84fed9ed3341e2b9ba35c9393850200 SHA512 332e59313f066a8e313f65b0f04c4a7f464cb77f9ac2b3ab5beb24b5fee393d9036b9f80a1c9cc0f6ba43a5c3519801aea6d61f96bed861d5caa3130ab4ff1e3 AUX conserver.pam-pambase 194 BLAKE2B ad284008c94f4c19b911a93279b12893a1c686806b22f7f19500e7216c19768ab161f9ba5cf2405d9d46f412a08c0cb04de0bc05ead15fb75da931575c2c3be2 SHA512 5368394be5b9d97e0ae751d84fbb4848aa27fd57b1a2eea8c7919e56246e390985deca80f0019c2104034103f73ac382a5ab2129113a0ff0b63b0b8bd83648c9 DIST conserver-8.1.18.tar.gz 323247 BLAKE2B 48176ba8be648df16ddb18c1a760af8069f7d926d2e0767e3b7ef903276d6104cfa9464a6ebdce009720fe5118862d89cf5371e104d17b967e11fe8e8968e8f9 SHA512 a8029aef5fd84f93eb3ae56ba7f751d79a6065c012bfd805e050f8c9edf09fd660c272d3f3ce0a47cfb17678574babbecad63f8bfd50ad4fdccdbabc2249435f -EBUILD conserver-8.1.18-r1.ebuild 2294 BLAKE2B 3df61824650b1243e0b57764ea5e9268616b69c8862775e72892349edcbb32a2ee8ca92d05d20d5f2034a761b6d29284c264b991fd81b5561f25272a291b3de7 SHA512 567fa7751509fdcdbbbcf7b8a71b2322a2396e77b15a85549a5b3e9caf771d7561b2fde485059a362b5f3510f3f1b5721b04879f84a957f1bb78f35700f4fb27 +EBUILD conserver-8.1.18-r1.ebuild 2293 BLAKE2B fc5fd86847ad09fcb971a02b3ee2ed3cf63984cb731531e816384617e21118a5837bed9ef98d48d788b0dfda38b638fd3fa6423e14c21e14659d67435448f029 SHA512 e07ac71ac70733d8aa7ba5ef4f0b60839edf88e5add653299dcbc86d2fd858f41c250925da57426f29bfe776fce6bd64b671a0abe44a06347a9faea01b415188 EBUILD conserver-8.1.18.ebuild 2230 BLAKE2B 2aa79efe824e6fbaa8fba254016187842699ca9aa119c693e25ba071d670065ef3ac8aa0f6363275b11703210d8d5baf6dd6ecef053de236f3ef48353f9d4e96 SHA512 a77a9c4550d25b134033f7d549528f58438f06012d2ecc8564dde521ed4dca880b7fd9ad75b43e0061988574a43c395e7760bb3b10e9709bdae54cfbf9311dc1 MISC metadata.xml 1170 BLAKE2B cb2e515dc5e79cd5bea66d737f507c4a65be82b46968fa3f07ead05d5467756ca3a3f6b348ff50fe21c20dada080b1ddf2f2b24d703752b0266259d74d3c3327 SHA512 8b8babc1d68eadb8e5ffac32145fd28fe5c372cb87ad9d12c6266e17aef59511c7e20db0a97958e6da7120d9f7555ad708197395263c301eac222c1f7718eed1 diff --git a/app-admin/conserver/conserver-8.1.18-r1.ebuild b/app-admin/conserver/conserver-8.1.18-r1.ebuild index 2ea0b792127e..86c1d7954963 100644 --- a/app-admin/conserver/conserver-8.1.18-r1.ebuild +++ b/app-admin/conserver/conserver-8.1.18-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -11,7 +11,7 @@ SRC_URI="http://www.conserver.com/${P}.tar.gz" LICENSE="BSD GPL-2" SLOT="0" -KEYWORDS="alpha amd64 ia64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="alpha amd64 ia64 ppc ~ppc64 ~sparc x86" IUSE="kerberos libressl pam ssl tcpd debug" DEPEND="ssl? ( diff --git a/app-admin/eselect/Manifest b/app-admin/eselect/Manifest index 5a5444a11d48..1e6963ccbea2 100644 --- a/app-admin/eselect/Manifest +++ b/app-admin/eselect/Manifest @@ -1,7 +1,7 @@ DIST eselect-1.4.11.tar.xz 177444 BLAKE2B e6f758e2acd17cea3ae37af48e4b4327a9c9d74784aa0723b003f2e1d84ec4c13167de33c311b785fddf7b045b3312955c4d84cf6e35ef7ec9265ef5de503670 SHA512 eec3091c5e386e8b7a52cb263e3c5ce6f41e285d2ae7974f4876e2ffa93b00f9f939055d978c6b9032ee1be2561992015560cdfa93a1ff2b1720ea0100fcf96d DIST eselect-1.4.12.tar.xz 177520 BLAKE2B 0938fe9bd8785fe711edc1af63a9c318a4a5fe9141c61d7f1c4da0352242322f1e18e4f68f7e219a1aa2beae5b25ddac58d7c47d4272408fd8fe5207324ef7c7 SHA512 2ea182364dfb2333112e9eebe691e1963e95a4c9ab40945eb2e5bc8c81da76105c1ae6aa3d153b78dea6c1e0cadb9b0237f7556b8ceb9d48e0fba67a642d6081 DIST eselect-1.4.8.tar.xz 176692 BLAKE2B d24f87ecd7fed1f23a26f9017ecaecaf5b69c02ffbcf9cf7d7b93fa8cad6364d934de8196aff1af955076c167ac4fa8911be03473c757f6a623c63820f3b8255 SHA512 13faa3b21d352975498eb2ea62dfb8d371f30afd6e283c30ff4e89cef035598a8cfe8fafbc6763f39081c547f6743c7f4731d21170625781b89d64eb46c22194 -EBUILD eselect-1.4.11.ebuild 1640 BLAKE2B 9428490db13290dfd4740570469b012e1b5af18e30f4f677eab3e158aa1161b6e480dacd7301a8e8c7ddcfce7fb75427c5b85a8469d267c2687804ca50f83876 SHA512 5815a229db38d199abf072ce1933c1d8e30dd9774fe940d4249b47271c01e182f5a77b3334420e898e01c3ce434ad5981aa347d78fed2cbb55f1866eb16f689b +EBUILD eselect-1.4.11.ebuild 1639 BLAKE2B fea0163e873806744d19a8d06fc5f3fd0c106468c0f4d1df7b12ea4c4ea15fe28bd565aafbb720776f3aff7ea2dc3a6afdf5940d08131348044fe285a18bd0fd SHA512 163ca6467c86c89c4fe462b95eaac8e93c70676ecb3cc119aea13e2fb5c1615be250e100014bde86b7218efeb1511e1f8219aab57fafa1a270f6f89cb03c1cbc EBUILD eselect-1.4.12.ebuild 1647 BLAKE2B d8dece0d1f857c5282ce3cbe97239881fbfd7762a0903e1bed9b2dae72cb9c5c7f06cb9cd84cd6b6b0ce337649759605dfb90db12fb83c9031b5968ceb3a8173 SHA512 2f39fe3845cee90e304591ade02b935118be3840fa07f1913741e28914fc0f99b7e41d240afe87006c7c8c65440c9759fe22aef0458b856f7beeb05fcd481e53 EBUILD eselect-1.4.8.ebuild 1641 BLAKE2B 3bef4d6f93da92e36d99ae5fdcae1fb121cdbd41e1fb1b6a1d0c616a04e5919247872d3164867daa2b16f6f18d128fcdca72fbdf51fa81e4df6bb064ae58bac6 SHA512 3b45491ae813cf8cc99c9103392b2c4ab9e84b4f22f3035affac93e8bf08f3b9e130927333c5cb3bc8874ea90d8a089b542013f86c36c68a09b8a03eb0bdc8d6 EBUILD eselect-9999.ebuild 1437 BLAKE2B a390e3198a7f7f52f48ef56bdb73a8075d5c4c1560c0df7971d32798f1296114053b16a8faeee2982b8e106be835e3b61c3655dc2de270b488259f185e8a8980 SHA512 06a5eb4f7bed5a17f9cd56fe497a7cadb7a153580fac6aeefd6f0762ed029c78c79e4f4a50301177eff4e50ac3ac5ddfae342eb0eb4b5c64aa6a840493fa5868 diff --git a/app-admin/eselect/eselect-1.4.11.ebuild b/app-admin/eselect/eselect-1.4.11.ebuild index a3d8be1c47b9..73e99d1f5764 100644 --- a/app-admin/eselect/eselect-1.4.11.ebuild +++ b/app-admin/eselect/eselect-1.4.11.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz" LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-3.0 )" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="doc emacs vim-syntax" RDEPEND="sys-apps/sed diff --git a/app-admin/fam/Manifest b/app-admin/fam/Manifest index bcdb4595186d..760d1057f8ec 100644 --- a/app-admin/fam/Manifest +++ b/app-admin/fam/Manifest @@ -1,7 +1,11 @@ +AUX fam-2.7.0-AM_CONFIG_HEADER.patch 242 BLAKE2B dd0c34f6f4e1c7b9b1893001faf911f428dcf7949828f5ea1fa448aaadad98ea1e671ea49ef5e1e619396495f8a95c5e2874550e4aae5056e1fbf00ed600f5d8 SHA512 874c2242dd3b1300fd87da5e13674a25d426bba688fb4dc9d80914392f9934050a1c9f338cd5591c170bfb1fb30bcd12c85a5f75d1687fff61d41ba85b3ab5e2 AUX fam-2.7.0-out-of-tree.patch 262 BLAKE2B 06a18408ce56a9502c6ff779ff48f884d77d4b33b4dbfc0e35fc4b2fbd41cb268f0bcb272dc2575c8acbccd4e426c5ad83ecb1c1bc4138c29c0314c4f8e8bfdb SHA512 20e92a60b67167aa29e699dd61731e5564a22243cbc0634903421545f6918033bce9849de2d3f665ecf3fd24406dd9fef98c98e3d49759b632293c773c4ac813 +AUX fam-2.7.0-patch-header.patch 3292 BLAKE2B f6e96ab2ac33ddfee2efb20fa32c010d1d554e83efe106191ace70001cdca9de80c0c845ad997cc1ee3efb007769032e2c7904c1acf18a3a56a75155f9898b22 SHA512 055ee28f30286f236436e84fde4b4c89736252216f3484d8f068c3b5f285adf9de78b87007c18f4d6752246b9595d9cf1d3e1ac4ab6cad6b96a3bb9e9f1ba334 AUX fam-2.7.0-sysmacros.patch 343 BLAKE2B c4b1d4ff996517f9c7a9f17b3e4a7c12053fb4fde9af64e3dbf1a57e26db377951331fdd54fd46982776cad342c6836f09034292a8e198d814e6ed72b095850b SHA512 474ab9d24175d6b3a58d05bc463a53979dfafbd67cf92f892cbf0e9f9330cc8e4b5a34aff261c052fd1080c09c936c0195432404d608b669a824b455d243f3c3 AUX famd 393 BLAKE2B 5e6fd2f1e7eb9c48fcae90da144a1b6953e2469d0e4f3c7124e5f71440ae2de5195179d0abc969ef11fb59cb2290d541518e36a983e98c735d36837ca0ae8e29 SHA512 ddad96e311a678c5907086b69a6478c5c6e735ff2614846585a2b26476a5049ab90f984d82eba5ba3f0175c3675d478e2abdf4ef2bf98c457a9e1304324979e1 DIST fam-2.7.0.tar.gz 301974 BLAKE2B 9a915e61b2898717cac1b7bbe9b2049aee0701314710906c5c8323aafe0847a9f017d09c4d9345e1fba386ac3c1001ec013325f9841d716e8c91e35bcf1e3962 SHA512 62b6222ee925eb2af1e258097c9bb676191690f38f8504ae16b1883a1019e0ac6dc7116ac2c4c596a956b3b3cfc3ce3ee7b613c319654681afb13e3ad3f284e2 +DIST fam_2.7.0-17.2.diff.gz 28826 BLAKE2B 880f8614304b048a24be03231ec26a02901befd75c8c5d51abf07d5afb42f370f4d3702d0db790f2f651f040372791024d9cbfbea15a1932629fb13a7b6a5ec8 SHA512 295c954fcecb7357a72ecf3c7469bb37c29e8969fc7be3a0e92e40e79911c9578f44c42a0a6f900610c8a9886f1addc62e50f258105aaadb61c718f526608697 DIST fam_2.7.0-17.diff.gz 28056 BLAKE2B 4db010fdf7a2548f5651e9da876df63d3bd0d1a5f184b26df99f7d4204bbcbadf4c7672d248d9d1af2e7297b0ec17a5ec80e6b57016774877465a957ae3c6ae8 SHA512 76b14e1d17713eb86d52cb804d34012e5369b5f4e8bcbdc73a063d2ad9219e0c4a261cef9e144ee07744a953a2e893bdf2ceeefcf21edc7a2ac5e70a51a8e209 EBUILD fam-2.7.0-r7.ebuild 1477 BLAKE2B b105c2c3183f1a39a062d7e64ac507af7b1ab4b33f0e974ccf7f4c3d607db7b9284e85f5d570ab2536910f415f2a00b2a346dad6f8a693dda2a63ffcb67dbe81 SHA512 e3ab8591d5bb3cced1c603e1379195f7f0826a019e1cee7902239116d625db383023d9ee3581f0258477f88ea191f353425f817771303e5916dca1234d2a1ac8 +EBUILD fam-2.7.0_p17_p2.ebuild 1767 BLAKE2B 9e79b10067faa4edec26c4c698ca43de136b7afcfb80bad400b246d758051a7df8033be04521246ef1a4ee1e97744a6437105240bfee69e7ef82e6d9485d64d1 SHA512 764fe44abd020c1f027f07a85e5c57323b4546f384323b78b2eb15b92ce4fafae04267b1d7ce7668043b2d8b2ec09bc5d2bd1ff9db0a1556b116070d8b0d2c1f MISC metadata.xml 244 BLAKE2B 9c6750147c240d7416fad33e04b53730dc89cbb615648a7f3defeed3ec058aeee6dbed55a1f81241417b42ca9f7daec177c725692166a5ba08765b5dcf5a6bc5 SHA512 1da71f4fae0251c97a8fcfa1e13b0a3f8b95a856fa919ebd30bf4f2f1b8fa900841db09ebc2a0ae9fe0d91f786ac40b63290382668412fcb05bca15b0746f1db diff --git a/app-admin/fam/fam-2.7.0_p17_p2.ebuild b/app-admin/fam/fam-2.7.0_p17_p2.ebuild new file mode 100644 index 000000000000..2872f6a3d335 --- /dev/null +++ b/app-admin/fam/fam-2.7.0_p17_p2.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit autotools eutils flag-o-matic ltprune multilib-minimal + +FAM_PV="${PV/_p*/}" +DEBIAN_PATCH="${PV#*_p}" +DEBIAN_PATCH="${DEBIAN_PATCH/_p/.}" +DESCRIPTION="FAM, the File Alteration Monitor" +HOMEPAGE="http://oss.sgi.com/projects/fam/" +SRC_URI=" + ftp://oss.sgi.com/projects/fam/download/stable/${PN}-${FAM_PV}.tar.gz + mirror://debian/pool/main/f/${PN}/${PN}_${FAM_PV}-${DEBIAN_PATCH}.diff.gz +" + +LICENSE="GPL-2 LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="static-libs" + +DEPEND=" + !app-admin/gamin + net-libs/libtirpc + net-nds/rpcbind +" +RDEPEND=" + ${DEPEND} +" +DOCS=( AUTHORS ChangeLog INSTALL NEWS TODO README ) +S=${WORKDIR}/${PN}-${FAM_PV} + +src_prepare() { + eapply "${WORKDIR}"/${PN}_${FAM_PV}-${DEBIAN_PATCH}.diff + edos2unix debian/patches/10_debianbug375967.patch + eapply "${FILESDIR}"/${PN}-${FAM_PV}-patch-header.patch + + eapply debian/patches/*patch + + eapply "${FILESDIR}"/${PN}-${FAM_PV}-AM_CONFIG_HEADER.patch + eapply "${FILESDIR}"/${PN}-${FAM_PV}-out-of-tree.patch + eapply "${FILESDIR}"/${PN}-${FAM_PV}-sysmacros.patch #580702 + + eapply_user + + eautoreconf +} + +multilib_src_configure() { + tc-export PKG_CONFIG + append-cppflags $(${PKG_CONFIG} --cflags libtirpc) + append-libs $(${PKG_CONFIG} --libs libtirpc) + ECONF_SOURCE=${S} econf $(use_enable static-libs static) + + # These are thrown away later + if ! multilib_is_native_abi ; then + sed -i -e 's/src conf man//' Makefile || die + fi +} + +multilib_src_install_all() { + prune_libtool_files + einstalldocs + + sed -i "${D}"/etc/fam.conf \ + -e "s:local_only = false:local_only = true:g" \ + || die "sed fam.conf" + + doinitd "${FILESDIR}/famd" +} diff --git a/app-admin/fam/files/fam-2.7.0-AM_CONFIG_HEADER.patch b/app-admin/fam/files/fam-2.7.0-AM_CONFIG_HEADER.patch new file mode 100644 index 000000000000..5799fb3eff1b --- /dev/null +++ b/app-admin/fam/files/fam-2.7.0-AM_CONFIG_HEADER.patch @@ -0,0 +1,11 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -7,7 +7,7 @@ + AM_INIT_AUTOMAKE + AM_MAINTAINER_MODE + dnl AC_CONFIG_SRCDIR([acconfig.h]) +-AM_CONFIG_HEADER([config.h]) ++AC_CONFIG_HEADERS([config.h]) + AC_LANG(C++) + + # Variables used by the FAM source. diff --git a/app-admin/fam/files/fam-2.7.0-patch-header.patch b/app-admin/fam/files/fam-2.7.0-patch-header.patch new file mode 100644 index 000000000000..808f4324db4a --- /dev/null +++ b/app-admin/fam/files/fam-2.7.0-patch-header.patch @@ -0,0 +1,66 @@ +--- a/debian/patches/15-partial_send.patch ++++ b/debian/patches/15-partial_send.patch +@@ -1,6 +1,6 @@ + diff -Naur fam-2.7.0/fam-2.7.0/src/NetConnection.c++ fam-2.7.0-mod/fam-2.7.0/src/NetConnection.c++ +---- fam-2.7.0/fam-2.7.0/src/NetConnection.c++ 2003-01-18 09:18:12.000000000 -0500 +-+++ fam-2.7.0-mod/fam-2.7.0/src/NetConnection.c++ 2007-07-30 12:57:19.812380334 -0400 ++--- a/src/NetConnection.c++ 2003-01-18 09:18:12.000000000 -0500 +++++ b/src/NetConnection.c++ 2007-07-30 12:57:19.812380334 -0400 + @@ -213,6 +213,7 @@ + + msgList_t * msg = new msgList_t; +@@ -31,8 +31,8 @@ + { + /* Since the client library can close it's fd before + diff -Naur fam-2.7.0/fam-2.7.0/src/NetConnection.h fam-2.7.0-mod/fam-2.7.0/src/NetConnection.h +---- fam-2.7.0/fam-2.7.0/src/NetConnection.h 2003-01-18 09:18:12.000000000 -0500 +-+++ fam-2.7.0-mod/fam-2.7.0/src/NetConnection.h 2007-07-30 12:53:46.746803625 -0400 ++--- a/src/NetConnection.h 2003-01-18 09:18:12.000000000 -0500 +++++ b/src/NetConnection.h 2007-07-30 12:53:46.746803625 -0400 + @@ -80,6 +80,7 @@ + typedef struct msgList_s { + char msg[MAXMSGSIZE+5]; // + 4 for 32-bit length, + 1 for overflow +--- a/debian/patches/16-port_number.patch ++++ b/debian/patches/16-port_number.patch +@@ -1,6 +1,6 @@ + diff -Naur fam-2.7.0/fam-2.7.0/man/famd.8 fam-2.7.0-mod/fam-2.7.0/man/famd.8 +---- fam-2.7.0/fam-2.7.0/man/famd.8 2003-01-19 19:58:11.000000000 -0500 +-+++ fam-2.7.0-mod/fam-2.7.0/man/famd.8 2007-07-30 12:23:15.292527117 -0400 ++--- a/man/famd.8 2003-01-19 19:58:11.000000000 -0500 +++++ b/man/famd.8 2007-07-30 12:23:15.292527117 -0400 + @@ -51,6 +51,9 @@ + Register with the portmapper using the specifed RPC program + and version numbers. +@@ -12,8 +12,8 @@ + Poll a remove NFS server every \fIperiod\fR seconds + to obtain file updates if the remove server is not running \fBfamd\fR. + diff -Naur fam-2.7.0/fam-2.7.0/src/Listener.c++ fam-2.7.0-mod/fam-2.7.0/src/Listener.c++ +---- fam-2.7.0/fam-2.7.0/src/Listener.c++ 2003-01-19 19:37:29.000000000 -0500 +-+++ fam-2.7.0-mod/fam-2.7.0/src/Listener.c++ 2007-07-26 16:32:03.863758810 -0400 ++--- a/src/Listener.c++ 2003-01-19 19:37:29.000000000 -0500 +++++ b/src/Listener.c++ 2007-07-26 16:32:03.863758810 -0400 + @@ -60,13 +60,14 @@ + + static void cleanup_negotiation(void *closure); +@@ -57,8 +57,8 @@ + if (listen(sock, 1) < 0) + { + diff -Naur fam-2.7.0/fam-2.7.0/src/Listener.h fam-2.7.0-mod/fam-2.7.0/src/Listener.h +---- fam-2.7.0/fam-2.7.0/src/Listener.h 2003-01-18 09:18:12.000000000 -0500 +-+++ fam-2.7.0-mod/fam-2.7.0/src/Listener.h 2007-07-26 16:32:50.682255289 -0400 ++--- a/src/Listener.h 2003-01-18 09:18:12.000000000 -0500 +++++ b/src/Listener.h 2007-07-26 16:32:50.682255289 -0400 + @@ -51,7 +51,9 @@ + + Listener(bool started_by_inetd, +@@ -79,8 +79,8 @@ + // Private Instance Methods + + diff -Naur fam-2.7.0/fam-2.7.0/src/main.c++ fam-2.7.0-mod/fam-2.7.0/src/main.c++ +---- fam-2.7.0/fam-2.7.0/src/main.c++ 2003-01-19 01:15:51.000000000 -0500 +-+++ fam-2.7.0-mod/fam-2.7.0/src/main.c++ 2007-05-08 16:42:35.618954322 -0400 ++--- a/src/main.c++ 2003-01-19 01:15:51.000000000 -0500 +++++ b/src/main.c++ 2007-05-08 16:42:35.618954322 -0400 + @@ -89,6 +89,7 @@ + fprintf(stderr, "\t-d\t\tdebug\n"); + fprintf(stderr, "\t-v\t\tverbose\n"); diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest index a28e792ab612..1ba8046c5997 100644 --- a/app-admin/keepassxc/Manifest +++ b/app-admin/keepassxc/Manifest @@ -1,8 +1,10 @@ DIST keepassxc-2.1.4.tar.gz 3345520 BLAKE2B d599321a412abc05ad0a911b8fe4d14e840d491e59d3f33172a5e6b10812fe8e00d03f23abcc9637be1b8c16b5c7ec640bbc2af63059dc0dd25c99f0bdacfce9 SHA512 48030eb6df595c73644f43d6222654c5f76962ae5aa2f44ca4dc9c8e45726380c6be4300af7a8279b07c06b70912da444f2b17c5b6c37a91cb239d695e7518d8 DIST keepassxc-2.2.4.tar.gz 3895421 BLAKE2B 0de35f394dae8cf8d70f75d73783965826cc03ac9f0921afa547d02e61cb04be167891d92aa0db09f007c47e96a5a7e5793772c50de14bf65a7f80a603ca6611 SHA512 f3308138d63b65a8b384a52f4723507be921d7bbf19031724886fcd12266bf2683326f5531c8f665b0e98ff63cd97251694199ef748191e59a5a8cceb3710025 DIST keepassxc-2.3.0-src.tar.xz 3803400 BLAKE2B 1e9d72bb71e3db0f7f4662bca22affe68c0ac857ce3b7b67924949622edf3a4d2f54717c1c629d79c2cfeccd29d0f1906a8f43e49483980d11afbb654a132f4f SHA512 44721a4dd9364898c69a10d73ceb3fce9b8e83bbe261d9bc656897bc01f37e9b65b923867e18d3c3269773075ad846a0e1195d8b7bf574fcbce7bef9a5778888 +DIST keepassxc-2.3.1-src.tar.xz 4085284 BLAKE2B 87ffb8a266056a147e84f97980eb19df64947fc56a6e39733269f4b88287c01dd8508792c22f247b05918f8beb98ea651c3bf91b642f863be2a4742e3e425fd0 SHA512 06c1b42e699b21c0cc2a6e7340649fa8964d8a0c880efad512f3ba16e12ee07a1b2b5ff13e0b3dc8d3f58fdf4f523cee3d1ef477a83ea434d97690dfea0633c9 EBUILD keepassxc-2.1.4-r1.ebuild 1540 BLAKE2B f16a6d6a45eca3926735ce4857c8007c421594e1e41a1d87feb75ce6234b92760a9221cd81734f5a8e1a55fef4f36f6faa0acba0b786dfd7c81d9f3f2c9f280c SHA512 7dcda961fda3b3166b2e38a878e2b2782e604c3373b67c358347746fccfa781082ce1c3417aeb8c1b76b8fc5ae94b38bff1442fc2477267b4a5096afdf1803ea -EBUILD keepassxc-2.2.4.ebuild 1544 BLAKE2B b0e6a6a0b5efeee5ca105a7ee9b8bbe674a9c1f0fc7a17a090c07a9287aba00c3c36f7bf8e41fb820d4056a92259151ba047ffa555a10df9639445f6d3083c84 SHA512 5695e22f30dc7e60c463ea4a0703111839345facb251e896526e4d5cb5d566516b939bc440c94e0a1b68272eeb458f47b8ddf1e529e5eb7037dca4b6698517a8 -EBUILD keepassxc-2.3.0.ebuild 1735 BLAKE2B d563e0a1470e6d2192e1a6741e63ead96638f29093eefd2e2ab15bd06904f17f8a1fd3a4f408180598a3727c10afef31054f7f294de4a18d5121f560482c1385 SHA512 8f29bbe8395d7ead800eea057d515ead2126eeea45e198b4d9d4ed21f4e0b1d3e920a7102cd7c8e05471e4c9511df35316da2cac29af922729a01e4f8b41f519 -EBUILD keepassxc-9999.ebuild 1735 BLAKE2B d563e0a1470e6d2192e1a6741e63ead96638f29093eefd2e2ab15bd06904f17f8a1fd3a4f408180598a3727c10afef31054f7f294de4a18d5121f560482c1385 SHA512 8f29bbe8395d7ead800eea057d515ead2126eeea45e198b4d9d4ed21f4e0b1d3e920a7102cd7c8e05471e4c9511df35316da2cac29af922729a01e4f8b41f519 +EBUILD keepassxc-2.2.4.ebuild 1543 BLAKE2B bb828c6e56544ce760b713d769f4b77457b9a45687bab10fb2d6a624d62ac71c11bc93b7a25d240ec5e1ab8686b6dd5cb2d98fc6ff2497ccd8c7579dac87cf2a SHA512 14b030ef70fd5e43d5591271353d511acf88d5020ae28d682e9fb992e7338c071d72aeda6932beb4d35408ca4b42052185f18cd2b743aaba0e167a5c37942dff +EBUILD keepassxc-2.3.0-r1.ebuild 1749 BLAKE2B f40cfce681a8fddbbdc39b727fc5d36bf45e533a5cd36d0fbca4853928d27e945bac88a9ef84af0b5c2a3bfed1b2603543584c4bdaafedc9cc003da1afa20869 SHA512 1a40422bb5e84a7f6a57ae72ea8dd1252fbd865fcfc8da243b1a87ca5b2d399bf481ed160726ce30a2cad5fa1de5135c0a7feffd48b1bd7e759d857049a23c10 +EBUILD keepassxc-2.3.1.ebuild 1749 BLAKE2B f40cfce681a8fddbbdc39b727fc5d36bf45e533a5cd36d0fbca4853928d27e945bac88a9ef84af0b5c2a3bfed1b2603543584c4bdaafedc9cc003da1afa20869 SHA512 1a40422bb5e84a7f6a57ae72ea8dd1252fbd865fcfc8da243b1a87ca5b2d399bf481ed160726ce30a2cad5fa1de5135c0a7feffd48b1bd7e759d857049a23c10 +EBUILD keepassxc-9999.ebuild 1749 BLAKE2B f40cfce681a8fddbbdc39b727fc5d36bf45e533a5cd36d0fbca4853928d27e945bac88a9ef84af0b5c2a3bfed1b2603543584c4bdaafedc9cc003da1afa20869 SHA512 1a40422bb5e84a7f6a57ae72ea8dd1252fbd865fcfc8da243b1a87ca5b2d399bf481ed160726ce30a2cad5fa1de5135c0a7feffd48b1bd7e759d857049a23c10 MISC metadata.xml 937 BLAKE2B 21a284b7ee94184c22cdb740d9a24f8371cfb6f62d97361cb3a2f853409b3044e8ddad30f58f4f8ad27277739533972d22c7009808c7ae9e6a1c4b8e02003d7b SHA512 bd2e47e2ba3911323f0b5bee78e9e394edef7722e934c70a1e7d3509044d566b2e6d46fd77bde2c303d0c97a8ce4f756e0b32b476af253274a3a941b059da3f9 diff --git a/app-admin/keepassxc/keepassxc-2.2.4.ebuild b/app-admin/keepassxc/keepassxc-2.2.4.ebuild index 15016b6c462e..169a403dbe9d 100644 --- a/app-admin/keepassxc/keepassxc-2.2.4.ebuild +++ b/app-admin/keepassxc/keepassxc-2.2.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -13,7 +13,7 @@ HOMEPAGE="https://keepassxc.org" if [[ "${PV}" != 9999 ]] ; then SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64 x86" else EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}" fi diff --git a/app-admin/keepassxc/keepassxc-2.3.0.ebuild b/app-admin/keepassxc/keepassxc-2.3.0-r1.ebuild index 6207e109fd62..69a100508278 100644 --- a/app-admin/keepassxc/keepassxc-2.3.0.ebuild +++ b/app-admin/keepassxc/keepassxc-2.3.0-r1.ebuild @@ -43,8 +43,8 @@ RDEPEND=" DEPEND=" ${RDEPEND} dev-qt/linguist-tools:5 + dev-qt/qttest:5 dev-qt/qtconcurrent:5 - test? ( dev-qt/qttest:5 ) " src_prepare() { @@ -59,9 +59,10 @@ src_configure() { -DWITH_GUI_TESTS=OFF -DWITH_TESTS="$(usex test)" -DWITH_XC_AUTOTYPE="$(usex autotype)" + -DWITH_XC_BROWSER="$(usex browser)" -DWITH_XC_HTTP=OFF -DWITH_XC_NETWORKING="$(usex network)" - -DWITH_XC_BROWSER="$(usex browser)" + -DWITH_XC_SSHAGENT=ON -DWITH_XC_YUBIKEY="$(usex yubikey)" ) cmake-utils_src_configure diff --git a/app-admin/keepassxc/keepassxc-2.3.1.ebuild b/app-admin/keepassxc/keepassxc-2.3.1.ebuild new file mode 100644 index 000000000000..69a100508278 --- /dev/null +++ b/app-admin/keepassxc/keepassxc-2.3.1.ebuild @@ -0,0 +1,81 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit cmake-utils gnome2-utils xdg-utils + +DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition" +HOMEPAGE="https://keepassxc.org" + +if [[ "${PV}" != 9999 ]] ; then + #SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz" + KEYWORDS="~amd64 ~x86" +else + inherit git-r3 + EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}" +fi + +LICENSE="LGPL-2.1 GPL-2 GPL-3" +SLOT="0" +IUSE="autotype browser debug network test yubikey" + +RDEPEND=" + app-crypt/argon2:= + dev-libs/libgcrypt:= + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtwidgets:5 + sys-libs/zlib + autotype? ( + dev-qt/qtx11extras:5 + x11-libs/libX11 + x11-libs/libXi + x11-libs/libXtst + ) + browser? ( >=dev-libs/libsodium-1.0.12 ) + yubikey? ( sys-auth/ykpers ) +" + +DEPEND=" + ${RDEPEND} + dev-qt/linguist-tools:5 + dev-qt/qttest:5 + dev-qt/qtconcurrent:5 +" + +src_prepare() { + use test || \ + sed -e "/^find_package(Qt5Test/d" -i CMakeLists.txt || die + + cmake-utils_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DWITH_GUI_TESTS=OFF + -DWITH_TESTS="$(usex test)" + -DWITH_XC_AUTOTYPE="$(usex autotype)" + -DWITH_XC_BROWSER="$(usex browser)" + -DWITH_XC_HTTP=OFF + -DWITH_XC_NETWORKING="$(usex network)" + -DWITH_XC_SSHAGENT=ON + -DWITH_XC_YUBIKEY="$(usex yubikey)" + ) + cmake-utils_src_configure +} + +pkg_postinst() { + gnome2_icon_cache_update + xdg_desktop_database_update + xdg_mimeinfo_database_update +} + +pkg_postrm() { + gnome2_icon_cache_update + xdg_desktop_database_update + xdg_mimeinfo_database_update +} diff --git a/app-admin/keepassxc/keepassxc-9999.ebuild b/app-admin/keepassxc/keepassxc-9999.ebuild index 6207e109fd62..69a100508278 100644 --- a/app-admin/keepassxc/keepassxc-9999.ebuild +++ b/app-admin/keepassxc/keepassxc-9999.ebuild @@ -43,8 +43,8 @@ RDEPEND=" DEPEND=" ${RDEPEND} dev-qt/linguist-tools:5 + dev-qt/qttest:5 dev-qt/qtconcurrent:5 - test? ( dev-qt/qttest:5 ) " src_prepare() { @@ -59,9 +59,10 @@ src_configure() { -DWITH_GUI_TESTS=OFF -DWITH_TESTS="$(usex test)" -DWITH_XC_AUTOTYPE="$(usex autotype)" + -DWITH_XC_BROWSER="$(usex browser)" -DWITH_XC_HTTP=OFF -DWITH_XC_NETWORKING="$(usex network)" - -DWITH_XC_BROWSER="$(usex browser)" + -DWITH_XC_SSHAGENT=ON -DWITH_XC_YUBIKEY="$(usex yubikey)" ) cmake-utils_src_configure diff --git a/app-admin/packagekit-qt/Manifest b/app-admin/packagekit-qt/Manifest index 3f05853e8c8f..5233f3648023 100644 --- a/app-admin/packagekit-qt/Manifest +++ b/app-admin/packagekit-qt/Manifest @@ -1,7 +1,5 @@ -DIST PackageKit-Qt-0.9.6.tar.xz 43288 BLAKE2B 7f00595ae91163346b1bd5b80da0f243388cb9a5ff64520a2574b96b3e6f240bc270b1083d24d4075960474d55720736c47cb84033d26f2ae5fce3ab6f062a23 SHA512 67d025e4e5b9860ec188518c11b3941b9a26cf9dce65665ea56307731721dac57dbb4e8726eb253f9fb39022aa3d0b0c7b9765532fa12b014fe9357028ece8aa DIST packagekit-qt-1.0.0.tar.gz 53495 BLAKE2B a19ff095ec42bc16e498455323a4046365f6ae144fdfc998dee799df9f4ea022696ab30682316b6417c8a96e80e75db31704e36e43c1a5eddd0a7d86309adada SHA512 4109117a94c47180cff0f073c03820ac39a139b6b3ac88dec82758fffe01271f7a3dae85d94e86a4a1167f4660326adc1d58dc6eb0fd164bd0aefee2e412dad4 DIST packagekit-qt-1.0.1.tar.gz 53503 BLAKE2B af96899e520f4139d6025746c2a2e7a65c67c2900cdf4fbdb410c12e33f494343d078ec24e7dcdb33749b1d5206b0bf622809827ed64beae162888e48d0aaec0 SHA512 e1291545b496571c00a6a24586c45b7173e85e3704d419af6a0ec47ea5ce256c8ec7e887721b1bf8038cb967ceb82726925800ab06aa784b2bdd560e49be724a -EBUILD packagekit-qt-0.9.6.ebuild 600 BLAKE2B 08678d739d7dcfc84ed766939393c14121248c9533bc80d327081060b0c5aa0f0fbe912090036aed39d754652ddb6544e0c6e31944e78cf0de248d4a7ed07816 SHA512 314156c2fea244321fe3e4dec1e3d4e85654562865ebea6932b8ce559a7e31c485ef6a1719faae0dfc4651dd9cc6998151c936bc2e36f447f79a38f4b96f747f EBUILD packagekit-qt-1.0.0.ebuild 571 BLAKE2B c727718b29d9defc285a177eb4eb1c3d4f31d9f153e636efbd1d9d7508b47602d425ea75ad4061b1c8ed7107c1af6a644065564764093497d456327fe03110ee SHA512 e55e2dae9a6bd9a40526eb451f1b2b0a4df166bed31a839e6857311bf25f9a5fdda748935aed51050dd4c956af35a9f70212de63f5abf0cef0f17d66f00994e7 EBUILD packagekit-qt-1.0.1.ebuild 573 BLAKE2B 00cfe9c488622ff84ef1dd979ef3c0475105a86348eca5d72ff862ef8c5fcee233b78a8f037a55e3b2e4c03d9a900619cacdfc33c5ef9766f1684567752db719 SHA512 73cbce3de7c9f7cef8ab4e08dcb1b70bd7f01ae79609caa9606ac42ac3de7aa3c8ddd67ab0464ad3302ccd3bf4e669248188ace3c5eefc70a786e011ae17f544 MISC metadata.xml 551 BLAKE2B 2a6881f45a4f44ea61556de150346743992c914d56673e51160a8fbf708a0cd22dfd3c0a89b272122a003af150e6f8311e7d472bd9696770481fe0c1e93778d3 SHA512 bebe5e7a9945182bf7650f762be1cd319a8ecd17a0f8822ad584ff67c363f87125e5f08b3f8a9934875f28c732451a6d9ac84b9b3b57284b799c76fa73415b70 diff --git a/app-admin/packagekit-qt/packagekit-qt-0.9.6.ebuild b/app-admin/packagekit-qt/packagekit-qt-0.9.6.ebuild deleted file mode 100644 index a10b5392407d..000000000000 --- a/app-admin/packagekit-qt/packagekit-qt-0.9.6.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils - -MY_PN="PackageKit-Qt" -MY_P=${MY_PN}-${PV} - -DESCRIPTION="Qt PackageKit backend library" -HOMEPAGE="http://www.packagekit.org/" -SRC_URI="https://www.freedesktop.org/software/PackageKit/releases/${MY_P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm x86" -IUSE="" - -RDEPEND=" - >=app-admin/packagekit-base-0.9 - >=dev-qt/qtcore-5.6:5 - >=dev-qt/qtdbus-5.6:5 - >=dev-qt/qtsql-5.6:5 -" -DEPEND="${RDEPEND} - dev-libs/libxslt - virtual/pkgconfig -" - -S="${WORKDIR}/${MY_P}" diff --git a/app-admin/puppetdb/Manifest b/app-admin/puppetdb/Manifest index 81244f2d1f2f..9cd266f3630d 100644 --- a/app-admin/puppetdb/Manifest +++ b/app-admin/puppetdb/Manifest @@ -1,10 +1,6 @@ AUX puppetdb.initd 1824 BLAKE2B 76d8252b2fee61270f440734d91735fa002df1583126de60befd3cc756cc0f5368ce49461cee85ffca4c6893b1e1859bff9af86e75d73171d15ae344a9fb4149 SHA512 0d0f67b7eaf7d10474e73eb77174a51e0f891bf664706e11c7a5ef1f918d7967c67251bab797e1d117b0f2b08f4b634ad06a81f6022ef04e6394c15e36a73961 -DIST puppetdb-4.4.0.tar.gz 23629723 BLAKE2B 03f78df8598216b213843c7277818ae443217d69bf2dca3f79c408e8b75d6ce5f4315b77cb801f3af877e6533dd71cfa8f420b52504aa0b0e4986f4d84f5caba SHA512 2caaa2b39146b42388b03ecd830d386efcc25774dfe9b6e1bd25fd6f1820902364dda7526c2e019657d18371be4afdb84a165d9bec1078a6c3621bc80241a5a2 -DIST puppetdb-5.0.1.tar.gz 24055687 BLAKE2B 8769009e85c632b4dbf1015eebe7305acff28a0803f046b3be5d6100f8be39850f5a0f9bee565a2c8d1428c2a7715551805f31633d823aa8ac66e577a8efc910 SHA512 0e08e27a2004b6cf07704a77d931ad30326559e3fd6504c9a839f468c8379c49407214187bf47f960fd3b5cdba9ec162c69e67e7ed7125c4137a77ed076e42f1 DIST puppetdb-5.1.3.tar.gz 24157962 BLAKE2B 750159e8c83cfdc820040bb6837c83309d96da519a84fdf6aadd394473993f128edbd76b7a5b0e2591f75d52c9fdf942e84545ff97b8a7d29ac3ae3520d04ea1 SHA512 153e6cba59fb824fd9bca802ea4f0e05e6c6d69d6ef47566079bdf1ac26f7bc13fa893b633f9506494d2189ef160b6b3c23fcb340e76df41089228c047c566e0 DIST puppetdb-5.1.4.tar.gz 25425088 BLAKE2B daa4788676d85d3a51d2b572aa9bf88b50fa1a35c92d175b44c532e7d82c3f19b734d885411174a8929a772b25a405738a08dca009a1369bfcb69a456e819f96 SHA512 2a34a6188bc474742e6b9cba5f0df1d5bcecd176f2874e12dbbf9c2fa8706b2d9276baece09f7a593eb6ab7cccd6b8804e15d67cb99cedcf7f6226fd59e82308 -EBUILD puppetdb-4.4.0.ebuild 2807 BLAKE2B 58006223111d7f7d4bc97b7cdf66701aa6c305e2975c0c89b6ce627487fda0374a57f1195bc760e6d8de06e5ed2fd2319989134774ea54c8e84e24b2d537b75e SHA512 16d8e30f793351b58fee71964122754bf270dc977480804e86461e0131c67e2081eff5f2b728bcce69186ebdab7707aa7f03cf70b3afc4e42a18b59d1ed2d11a -EBUILD puppetdb-5.0.1.ebuild 2763 BLAKE2B 4f7058feec44cc0b681cb7d83b494c8e024a923fb84dc173f013ffed64103ed46f6725278e2039bc6c33bc79798f1e3e03f481959a8a08f05d3b820af36ff993 SHA512 032e3f021880cd77a83d5841e130af2eb2e831f54d3760542ee7c3a97a98e5f92e7abe2697d83e896881fd285c7af826854030faade413bba66f0642cd6d7fcf EBUILD puppetdb-5.1.3.ebuild 2763 BLAKE2B 4f7058feec44cc0b681cb7d83b494c8e024a923fb84dc173f013ffed64103ed46f6725278e2039bc6c33bc79798f1e3e03f481959a8a08f05d3b820af36ff993 SHA512 032e3f021880cd77a83d5841e130af2eb2e831f54d3760542ee7c3a97a98e5f92e7abe2697d83e896881fd285c7af826854030faade413bba66f0642cd6d7fcf -EBUILD puppetdb-5.1.4.ebuild 2765 BLAKE2B 9a316933c8e8d0e28eb674c4b5aaa6830a7f1db5aad515d6fd7ac1c649c067d482b367a9fff7e6de0c31bd06b35e915a165a50f9af192ae5440a5cd9cf3207f7 SHA512 19a3c9de354f5c9a88cfe8d6b350878a63b9c0bdc262cf66c9ca2655df3f88a269c78afef7cd89d6f28689989e593ada7221c842e6be1e041a329e37192b57cf +EBUILD puppetdb-5.1.4.ebuild 2763 BLAKE2B a3aece6216d2a180ea14cb90e7d306720c09ce617e430c1b78241a696153f6d33787ab3d89f466b8635f80889531923d2e7a6305ede45e7b2c83bfa5438eb72a SHA512 34767f94ee58a38a05f975fc3f28b6b851eae1f9e0dab5985d671139319cf3c5df70c1afc2aee34a77c0172b499918aee8d188c290220d4ce2cca2abe91039c2 MISC metadata.xml 485 BLAKE2B 5f2ffba1725ce7168c4bacbef8170b7ca626d4e639cc2c32e0063e076fc951681c9a7154d08036e935617bd5cf67a5640acec9ae3964829da9bc3a7cdf412222 SHA512 b9461d712e74a7ff469a554a21c1e4e67954395eaae8de9a8669f7e816e2291120be14e8c659f34b41f65962027cfa73030ef2678003b52a1a56b35de0f9b2b2 diff --git a/app-admin/puppetdb/puppetdb-4.4.0.ebuild b/app-admin/puppetdb/puppetdb-4.4.0.ebuild deleted file mode 100644 index c2792c8d0e2f..000000000000 --- a/app-admin/puppetdb/puppetdb-4.4.0.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit multilib systemd user - -DESCRIPTION="PuppetDB collects data generated by Puppet." -HOMEPAGE="http://docs.puppetlabs.com/puppetdb/" -SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="" -# will need the same keywords as puppet -KEYWORDS="amd64 x86" - -RDEPEND+=">=virtual/jdk-1.7.0" -DEPEND+="" - -pkg_setup() { - enewgroup puppetdb - enewuser puppetdb -1 -1 /opt/puppetlabs/server/data/puppetdb "puppetdb" -} - -src_prepare() { - sed -i 's/sysconfig/conf\.d/g' ext/redhat/puppetdb.service || die - sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetdb || die - sed -i 's/sysconfig/conf\.d/g' install.sh || die - sed -i 's/var\/run/run/g' ext/puppetdb.tmpfiles.conf || die - sed -i 's/var\/run/run/g' install.sh || die - default -} - -src_compile() { - einfo "not compiling" -} - -src_install() { - dodir /opt/puppetlabs/server/data/puppetdb - insinto /opt/puppetlabs/server/apps/puppetdb - insopts -m0744 - doins ext/ezbake-functions.sh - insopts -m0644 - doins ext/ezbake.manifest - doins puppetdb.jar - insinto /etc/puppetlabs/puppetdb - doins ext/config/logback.xml - doins ext/config/bootstrap.cfg - doins ext/config/request-logging.xml - insinto /etc/puppetlabs/puppetdb/conf.d - doins ext/config/conf.d/jetty.ini - doins ext/config/conf.d/repl.ini - doins ext/config/conf.d/database.ini - doins ext/config/conf.d/config.ini - insopts -m0755 - insinto /opt/puppetlabs/server/apps/puppetdb/scripts - doins install.sh - insinto /opt/puppetlabs/server/apps/puppetdb/cli/apps - doins ext/cli/foreground - doins ext/cli/ssl-setup - doins ext/cli/export - doins ext/cli/config-migration - doins ext/cli/foreground - doins ext/cli/anonymize - doins ext/cli/import - doins ext/cli/reload - doins ext/cli/start - doins ext/cli/stop - insinto /opt/puppetlabs/server/apps/puppetdb/bin - doins ext/bin/puppetdb - insopts -m0644 - dodir /opt/puppetlabs/server/bin - dosym ../apps/puppetdb/bin/puppetdb /opt/puppetlabs/server/bin/puppetdb - dodir /opt/puppetlabs/bin - dosym ../server/apps/puppetdb/bin/puppetdb /opt/puppetlabs/bin/puppetdb - dosym ../../opt/puppetlabs/server/apps/puppetdb/bin/puppetdb /usr/bin/puppetdb - # init type tasks - newconfd ext/default puppetdb - systemd_dounit ext/redhat/puppetdb.service - systemd_newtmpfilesd ext/puppetdb.tmpfiles.conf puppetdb.conf - newinitd "${FILESDIR}/puppetdb.initd" puppetdb - # misc - insinto /etc/logrotate.d - newins ext/puppetdb.logrotate.conf puppetdb - fowners -R puppetdb:puppetdb /opt/puppetlabs/server/data/puppetdb - fperms -R 770 /opt/puppetlabs/server/data/puppetdb -} - -pkg_postinst() { - elog "to install please run '/opt/puppetlabs/server/bin/puppetdb ssl-setup'" - elog - elog "to upgrade please run '/opt/puppetlabs/server/bin/puppetdb config-migration'" -} diff --git a/app-admin/puppetdb/puppetdb-5.0.1.ebuild b/app-admin/puppetdb/puppetdb-5.0.1.ebuild deleted file mode 100644 index f9227ac7708d..000000000000 --- a/app-admin/puppetdb/puppetdb-5.0.1.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit multilib systemd user - -DESCRIPTION="PuppetDB collects data generated by Puppet." -HOMEPAGE="http://docs.puppetlabs.com/puppetdb/" -SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="" -# will need the same keywords as puppet -KEYWORDS="amd64 x86" - -RDEPEND+=">=virtual/jdk-1.7.0" -DEPEND+="" - -pkg_setup() { - enewgroup puppetdb - enewuser puppetdb -1 -1 /opt/puppetlabs/server/data/puppetdb "puppetdb" -} - -src_prepare() { - sed -i 's/sysconfig/conf\.d/g' ext/redhat/puppetdb.service || die - sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetdb || die - sed -i 's/sysconfig/conf\.d/g' install.sh || die - sed -i 's/var\/run/run/g' ext/puppetdb.tmpfiles.conf || die - sed -i 's/var\/run/run/g' install.sh || die - default -} - -src_compile() { - einfo "not compiling" -} - -src_install() { - dodir /opt/puppetlabs/server/data/puppetdb - insinto /opt/puppetlabs/server/apps/puppetdb - insopts -m0744 - doins ext/ezbake-functions.sh - insopts -m0644 - doins ext/ezbake.manifest - doins puppetdb.jar - insinto /etc/puppetlabs/puppetdb - doins ext/config/logback.xml - doins ext/config/bootstrap.cfg - doins ext/config/request-logging.xml - insinto /etc/puppetlabs/puppetdb/conf.d - doins ext/config/conf.d/jetty.ini - doins ext/config/conf.d/repl.ini - doins ext/config/conf.d/database.ini - doins ext/config/conf.d/config.ini - insopts -m0755 - insinto /opt/puppetlabs/server/apps/puppetdb/scripts - doins install.sh - insinto /opt/puppetlabs/server/apps/puppetdb/cli/apps - doins ext/cli/foreground - doins ext/cli/ssl-setup - doins ext/cli/config-migration - doins ext/cli/foreground - doins ext/cli/anonymize - doins ext/cli/reload - doins ext/cli/start - doins ext/cli/stop - insinto /opt/puppetlabs/server/apps/puppetdb/bin - doins ext/bin/puppetdb - insopts -m0644 - dodir /opt/puppetlabs/server/bin - dosym ../apps/puppetdb/bin/puppetdb /opt/puppetlabs/server/bin/puppetdb - dodir /opt/puppetlabs/bin - dosym ../server/apps/puppetdb/bin/puppetdb /opt/puppetlabs/bin/puppetdb - dosym ../../opt/puppetlabs/server/apps/puppetdb/bin/puppetdb /usr/bin/puppetdb - # init type tasks - newconfd ext/default puppetdb - systemd_dounit ext/redhat/puppetdb.service - systemd_newtmpfilesd ext/puppetdb.tmpfiles.conf puppetdb.conf - newinitd "${FILESDIR}/puppetdb.initd" puppetdb - # misc - insinto /etc/logrotate.d - newins ext/puppetdb.logrotate.conf puppetdb - fowners -R puppetdb:puppetdb /opt/puppetlabs/server/data/puppetdb - fperms -R 770 /opt/puppetlabs/server/data/puppetdb -} - -pkg_postinst() { - elog "to install please run '/opt/puppetlabs/server/bin/puppetdb ssl-setup'" - elog - elog "to upgrade please run '/opt/puppetlabs/server/bin/puppetdb config-migration'" -} diff --git a/app-admin/puppetdb/puppetdb-5.1.4.ebuild b/app-admin/puppetdb/puppetdb-5.1.4.ebuild index 5c45e1c342fd..e2e9e4db500f 100644 --- a/app-admin/puppetdb/puppetdb-5.1.4.ebuild +++ b/app-admin/puppetdb/puppetdb-5.1.4.ebuild @@ -13,7 +13,7 @@ LICENSE="Apache-2.0" SLOT="0" IUSE="" # will need the same keywords as puppet -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" RDEPEND+=">=virtual/jdk-1.7.0" DEPEND+="" diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest index 80ebc1d5d0e5..d83fee98713f 100644 --- a/app-admin/puppetserver/Manifest +++ b/app-admin/puppetserver/Manifest @@ -2,5 +2,5 @@ AUX puppetserver.init 2138 BLAKE2B 6c157cb6bbe9e085ae67920abadf99ff97798115f784a DIST puppetserver-5.1.4.tar.gz 66628031 BLAKE2B 815f0eb1508589855556ae0f82a2f595a22fd3e13a8168c7c2d8add0f7c18981bb220feee9573d29a94a06e13ac801797e6d96a9ef378c4a743889c938e4238f SHA512 4444880041e36aaee8834476dacdbd5fb166326f054b8beca55f644d1c97318bc2dd0d3d3ae8bfbc1b072e61efcde87c31e763c48a77b05c3af5f873e969d820 DIST puppetserver-5.1.5.tar.gz 66639947 BLAKE2B 897b340711facada214e68d6ae571e5eca1d6f966a72509fb6d862f89a9e1befa388d1766ee8332edbd8a3a61ba320888525e265b93953a3c6e2931c760c44fc SHA512 7451ae86b5bce59aad502e344bdc60fe4fb3a2351ff1737bc249051e0628bbdf5d6b5fd3e2764c15783945d4604dc7c1efbeb2fd9faedd36d870cc3669d7af53 EBUILD puppetserver-5.1.4.ebuild 4888 BLAKE2B 530aec65438466346b7f8a3499164ebb0c8b70b4c58d583fb6e97d8a1d3d841e278dd82d2089aef15bf4a45b412ec580052d9dd10bba47271394df934422ed2c SHA512 093de3334a5fab1e58a3f3202ed4f194af1441910e0282f9c5b58055a190f74605bd49c982f72851268086775212e63cfa79442997ec94b79fd45b9a9ed76dd5 -EBUILD puppetserver-5.1.5.ebuild 4890 BLAKE2B 53593fd7c160edd1ec9d8802cdd93dcb00b050721071ab09e41c385f791a3f5a59652e6336d41ef58b0a2a63dada18cd7fa85389a3b7a662f87a7e8c7e3635c3 SHA512 8f6e778ab9e799dc7b1211b4639e32d95e1d693938446a203e1824132e3132788a5d60e884f7a3851cdeb062e3bd0de84f7e8c9ba1fb377bec682e214bffac2e +EBUILD puppetserver-5.1.5.ebuild 4888 BLAKE2B 24f004c85c5726d79a4d8ad3563b03560d59f4b36380d9ade3954860cc36eb2d3070d4a491d7f6a01e9a5c09ff4d77c5220117b8c9b5119192db3a657dabcdd7 SHA512 281a4673302b36b1073df542be68a8dccd6bf682a9cd68aecfe63d185d9c7eda17ec79d627fb1790ebf0d85a93d92132f6eb5a850aee28995ddaf7c851c81609 MISC metadata.xml 468 BLAKE2B eb3daaf61cea0ff7524b0034463c7bdbf2fa8c40277deb106f28fd8e1ab90964600e3922c10eb317ce826e2b9b7db5162ad1c2e6e76d4b0c01de486e6b5a89fe SHA512 0bf5e337ba3d5d3e4d84cc397ecf40d0c0ba298aa22c9d54a89381391a69a2374ce736443edacc67403490d2a4950a7c386fb4741b149d0eca700d115b0ac24c diff --git a/app-admin/puppetserver/puppetserver-5.1.5.ebuild b/app-admin/puppetserver/puppetserver-5.1.5.ebuild index 2b6f7873b99e..20133466d29d 100644 --- a/app-admin/puppetserver/puppetserver-5.1.5.ebuild +++ b/app-admin/puppetserver/puppetserver-5.1.5.ebuild @@ -13,7 +13,7 @@ LICENSE="Apache-2.0" SLOT="0" IUSE="puppetdb" # will need the same keywords as puppet -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" RDEPEND+=" >=virtual/jdk-1.8.0 diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest index c5f16fea0867..23047d3423ba 100644 --- a/app-admin/rsyslog/Manifest +++ b/app-admin/rsyslog/Manifest @@ -8,7 +8,6 @@ AUX 8-stable/rsyslog-8.27.0-fix-librdkafka-detection.patch 1556 BLAKE2B b8a7d1cc AUX 8-stable/rsyslog-8.27.0-fix-mmnormalize-tests.patch 509 BLAKE2B e50fd76f239be9fe15a0a7c8dd2b5984af69487c5ffe5a4f12e415f9c4040e600c5552dbe66c32879729c0f497bf74f1f63730b2f4c6a9a658fd385cb684cf05 SHA512 70bfe4f95b23e4e88e5b7535a1b86742a02438f2eadc6fd2e82c66ebdc9d59d983c1ded7d4902dd5d7ef9413847398c1318df82bace3b7e5b1ca8bd23ca9e8e4 AUX 8-stable/rsyslog-8.30.0-fix-kerberos.patch 736 BLAKE2B fb404b5435d861934c70677baec2c552ba576c989996431650df1f55d1a172d9e78fda6d74fc59c32c918a43affc4dec991a8e2808d41bc37f898ae7bdd08615 SHA512 8d72cad0106afdf953ce0cf8a5dd0ecfb7daf63c3e274c26e3283ac486de1fc4ce10a450019f1a11f067d320d299dc2b350e4cd5eda283c3b514864e924465a9 AUX 8-stable/rsyslog-8.32.0-fix-building-without-curl-r3.patch 3878 BLAKE2B 9f1a030807a312801ce6c66bb5120029b935bf5ba2029b4d7297713f865f509fd1761595ba05c479a1aa860c8564fe38bdebe51c3c36ab278aa518de0f2285dd SHA512 19765cbd9aa13cce9590ab08c4a626eba06b94fd4345b3fc3b77149ed9401ea91c41f00b105a5b7f15bae611f5b718abdac23fff9ec205c3385686203e6aa701 -AUX 8-stable/rsyslog-8.33.0-missing-files.patch 2551 BLAKE2B 359c34b9b9ddc669c208fec5e8b58540cc660222e647bd9141759d4d56b96514399ba24991e58fb8438fca69ab56e7024660d40c26cb76f317616e4662642955 SHA512 c8a46b93d39b2c217692bdd31cbf0831400cbafd29c35d5e30ccce002776bfea417d593569dff8cca689d2fc052c2f28372b02361968f18143b080b517dad021 AUX 8-stable/rsyslog.conf 1562 BLAKE2B 3abbc4c13c8c1d3817ac9a7c7f048aa1a8d7f279bf638dc91d15a785ad42c1b34a61de0be33b4ffa218a655849aeceff3e8686384e1d77472417235ce453b546 SHA512 1720174fab020e2de590f3d6bbb03784aca1928fe05f7e75e02fb4597cb8b2ee755e6deb8e8f989060511044ae483f791f496f24e0eecaf27eb9e0b5e20a2c7a AUX 8-stable/rsyslog.confd-r1 1145 BLAKE2B 06e63c7500238dd31abddd105269714387b990a3530ad11443a8502ad68221c3f8e8b0db02ba3ad2b7010483364d36a5b526a461d3465972b74d2cd36ff08747 SHA512 a7f8621bdd490596b09f9a7583dd0c992006c55335b2e6e687bef4141bb18cd4bb43e23f590a138e9c8d5a3cbac0cc46c3b01c7d3ff9f9dd3c53418b13b0dd4a AUX 8-stable/rsyslog.initd-r1 1758 BLAKE2B 1af0e2371067ac2c51bff7b9c4442abba8d8a14714b7604e2f49d244fb08bef7614e73cbad201e6f4902504abd78ab32fdd093acb5714d53238353c8a9bd977e SHA512 0ddd385e77759370344032f52f945b1e90d4961140db63e2562e4be78dfc2bae16ac9439d40fe078110593999b5c5efd7680b402fc0771b1261ff28b1725e265 @@ -23,7 +22,7 @@ DIST rsyslog-8.29.0.tar.gz 2447907 BLAKE2B dd3a34e4c1b4edc989d58369933b94b11d89c DIST rsyslog-8.30.0.tar.gz 2468224 BLAKE2B 3c5c94661abc2e34d688ca08d6dea0d2bcca9f287f45328a0d1b240bcb1b9223800207ce8759da823fa3acd974fcc70f01565f95fbcec108f8f71c7cb14a2409 SHA512 90e172d08ba7548252fc9744f71259dadf5a40afef405516e7b1601620913ca4b2ffc4859b16f369b9c1974ea10f4e41bc2d987e3d6bf9aabeb979f7de6aefe0 DIST rsyslog-8.31.0.tar.gz 2498675 BLAKE2B 8b80394ea3919dba29a431f3c5c1fc337a9e60a886a3c258c3895eb4341a941d8af6370ceb0d2e212934f64ab38c7238e99f40e1dc27e648bd4b75e158586a28 SHA512 aab888dda8df3ad7ff404767a58539cdc0bb92d0e537b703cf5833555688dd6d8223889b8d70bf8c594339a51831b57df7a65b397d8b40cded608dfb007befe7 DIST rsyslog-8.32.0.tar.gz 2478990 BLAKE2B 21bfc93b55da107bec2eddb89cb42d76990ced2675caeb6e73183a109f9bc8293bde43f202bb56007f9ea4e49de385b004c158059cb13e8d3d376bf050ca445a SHA512 eea85d77bf3624fbad6f0838fa2a4af7c14d853c8f120f14cf697cdfda7f7e0692dab684d2ddd07fe44a0bcd50cf91baf69af1bb63dc9d60e19146f1150155ac -DIST rsyslog-8.33.0.tar.gz 2487783 BLAKE2B 2bb38007ee911ee3198818968053fd2ed97cd962d0761c4bc9be571d95eda9bdfd63dae4b8b724dbb5d87cbcbacfdeff5ed2529342af9678b064f2e2b1422cc6 SHA512 b0fd0c5976325bee9b29534c6f6dfad2f70d22e2fc4a7d5f28563116b7360290c7e31aa77ee5ecdf25e726b45d03899b00e4d653d0954284b88e8be918e0f333 +DIST rsyslog-8.33.1.tar.gz 2494338 BLAKE2B 680ad2c062386e4e3e6c6e1a83cf0001d63da305edae9df527d1079a2fa13b8715e3cbfa211ca908e0005f1762becfd88369a7cd1488134564980137f0e98d86 SHA512 c4b426409e89463a8e8f7f9d0267f2fa1df1a84e947ce7bf91255db88b4cad5b7e607c476ba2db0543af069c44cdbb35330e0839696bf83668200e8ac009c6a0 DIST rsyslog-docs-8.19.0.tar.gz 4271094 BLAKE2B c866f66fc1ae9ef8c227a2e03bab4a815e408ccaafe9da97f8b6b6f6b89bb33d0c8a9e004552d5a1287a19bc8f3677517259a4f9bcebffbbeff506d80454945b SHA512 120f229a641119649fc897948fb0934039a95d0ef63e68b10ab635620d84988d794fd5dc33617353028e786513a86b3a1cd0c4fef9c755dab5bedd8e0246532e DIST rsyslog-docs-8.24.0.tar.gz 4344877 BLAKE2B a3d9ea90580c3e24e3c40c07f871740cdf33ad4206627586bfb42523a758cbd18f5303f35f2fa036e492dece9a83d9c151b60023aed99f63c42ed8f9bf7da9f1 SHA512 b55cde1485a7baec6d4c4928107c22a078cf412a2994c0dfcbb12c47b49c3b263af8a64011b1329567cf86e04927b9e383581dc868eaea81d554adada6b3786b DIST rsyslog-docs-8.25.0.tar.gz 4359583 BLAKE2B 349e057d3c94ca6fc92753459f8fca011927e82a787cc50685ebe1c5a40a624e4f74764b04cf00f5c250cd65eb6e2862d7225790cc029cd7256c072d63db1726 SHA512 e0068ec00bbda2d1cf7f14105ad83e82bea9291ed5d5fda3ffcff2db32747b65e7b6d65743a3221aeca03be9c6efcee1db7f03c2da115a3aed60848556befa71 @@ -34,7 +33,7 @@ DIST rsyslog-docs-8.29.0.tar.gz 4473644 BLAKE2B 18fc4aea0551f1ad770cd882aaf51242 DIST rsyslog-docs-8.30.0.tar.gz 4487378 BLAKE2B 7d39fc7642ec2122f254dd6660a13efa4b214ee669fe5772b4d68a8ce94ed5ac3ca2500c23b5752924b5befca2a66c228b6f2bb48c7b9f72a2a4b98e2a14810b SHA512 8068bb9bb8408447bff49730e9aac105eab1bd610592dd524e7639b668b2d05a4836d3a9862622445a0bb8d8b140db67c861dad6ec207d11049ac368e363684d DIST rsyslog-docs-8.31.0.tar.gz 4484950 BLAKE2B 8ee4346a095942133bb473509f275c625fdb4a1aa81293a15604bdb95670ff0676677fe5481be3bc2ea7097b2c8de7fd3b0eb8033701522b372bffe44325a10a SHA512 51a63fa520d8176e183afa44ccf889374810dddfd5fdb363ed06b134bfbe0d1a94085e4836cf3bb2a07cb83564bbb87cef3763ac9429a5efc50aff276542defa DIST rsyslog-docs-8.32.0.tar.gz 5368254 BLAKE2B 6d1efb191698bb1cfb03660167e5dcf9eea8f2fd2e459c350cd55aa24afcc5fb44d2bc0ef5590c6951326fbd0215aecbd59a6122e88ff449f566b37d1ee00d56 SHA512 e64eba3c40eab35e266826fb7e183418f38eb008f2a21ddf2c523d1e42aacaa20f882a561e5df67a979463048b58232fa82759645a21dc6962f6836ac8f57bce -DIST rsyslog-docs-8.33.0.tar.gz 6770247 BLAKE2B e850ed0cc0c61c1d97c488b37034a0ce56d6fb41f324c4de4c56cbd13a5157ad35fa34062cc883ffdf1ad2d08b764490dbfd04c03571a3e549f28adba97e46e9 SHA512 fd1e21ce5b7e69058273e9232b682541faee21554fb83e3c1c6f4b88cc21ce00e56e199eb0e0a554b1290fbc456f989f65632cf94653005e0c25e311dedb6733 +DIST rsyslog-docs-8.33.1.tar.gz 6770438 BLAKE2B e076688d7559c16986241149c00f6df603e2c90771222f4f91dc944fbdeace3dbc6e47fc82602f852a7407e064fe31df0a1c2940d521ae6ae21f5663518bfeb7 SHA512 fcc8ffee372c0b0dc2ab1b76dcf68a66ce820996cf2d46a2b5c6fd40e6fad5ef3c33da97a2e88956751597c20cf0c4a9b6537c22db0b3b46d1a734a9d9f95df5 EBUILD rsyslog-8.19.0.ebuild 12240 BLAKE2B c5de14a1f8dd0b12bb2e2b90707d86647766fcb3df54bc1a8c7428781248a5a1617b57990953037c3e6c8bc24751cc245e7a6faae520571a0fbef40b30828ce0 SHA512 7363c435c65394abda4a4f576e8433d8038a6e420534f3bb0419477ab3b4e3ab179f53bae016b372522884ac12eab467d3ece7db15303b3cc33d954f963fda8b EBUILD rsyslog-8.24.0-r2.ebuild 12396 BLAKE2B 0c0456e8d54b24a02e0d07e0672f81156afce8deff1094e9644bcc3dcee3aab0bd7c43ea70957504308563bb51419c9a24436fff36a1be450e1e0078ec23d739 SHA512 2acbc370ca468dcfc021b66a31b2617dc5093b518c5c486487e306548445c1bb472dd48458a3171a99f1bc82276bed39ccaff5be31603191d261d11c2cd521c9 EBUILD rsyslog-8.25.0-r2.ebuild 12487 BLAKE2B 3e2715a63afe272a18b172ac7d67d2ad738d18d3c6f469cbc8642e4f75a5679f627f1dd768fb7301e1a37be4434f8f51fb1709217a5165dff99fbe218b3d84f5 SHA512 1a73a37139e8af1017f7cc53bbd35238130cfa30a7e3236f304a4d079931d0304fbde4f026254a951253c4060bcb6e774b6643f42ad14ef431b697833450f521 @@ -45,5 +44,5 @@ EBUILD rsyslog-8.29.0.ebuild 12527 BLAKE2B c992fcb0783af6c15d89f8455ff47dc11248f EBUILD rsyslog-8.30.0.ebuild 12518 BLAKE2B d50e7a8dbeb492e8339d2b6f6fc237554059db89b0b9593bfc34111d1ffbef1cc518282f0b1b3c90dd04828fba7639dffab49c50e2ba779b4e4009886d5a2ce1 SHA512 aade46a36a893585f63d11a6030f6ad1ec0529e6cd79650ed96278a1a12f943d1710a1c853bcf54d528cff34dc8a706ab6d69823cab861f8a5c3f2f58b8f588f EBUILD rsyslog-8.31.0.ebuild 12565 BLAKE2B 29ca871aa60781bacec26e4809b8b3710958120011a5b3c7f31867c992faaab2f6b66707e013e855563e875104bb7e9fb93dac60836903c1a2f031600f2083fc SHA512 cb044ac578f29e7332191af95113882b2973870e37994b216eeb54b816e05cb42dae6e492c53b18d54dcac7425f6228aa1ac805f267dd6bf4fa344019c2b121f EBUILD rsyslog-8.32.0-r3.ebuild 12703 BLAKE2B 92e145a4f0d2d81c2af4376356ade084dfb986fc4c45bba9bcaf1ff7b70c349a52409081cc3641bf5016493e1a075f329618a6c3c84f29c05d2872b5218b6156 SHA512 1d945f977a7317fb4ba5349265351354db6bb4561296ad75edefc6b754be3e427c3e32e6a1bfd386249781de72b468d55ad1305eec104685ee3c7d0270232b4c -EBUILD rsyslog-8.33.0.ebuild 12682 BLAKE2B bbc6c3f8d1237e01096e955d3e87775d353d7f435399d395118dfa5e21d290529918416575f2d19a5e24d63154484f3bfa2d695fc2ff44bbc4e6ae6135698739 SHA512 4b953bffd2c225d5cfc5c30ff8120f169805843f5bfe5b977bbec63079f11a321ce8ff976a18afba65174509b37f898d4128840a108c516f6c7360bbdeb050b5 +EBUILD rsyslog-8.33.1.ebuild 12620 BLAKE2B 6f6c4c1bdeb252bb32eec2764647bf74f4e94a2a88334aa7c4be58f5f77fb7c16c71f3485b4e1311232f035254268405d1bb140384e9160825eb44f8fab0e36b SHA512 2b898600948e94f98051eba4eeb41b409a8616f85c03b7894a1874677f48d4c67ba627612915835ed74114b48db3efd7c287a70b60a5d14c5c6c3102bcd28f3d MISC metadata.xml 3397 BLAKE2B 368cc15a6a51952b0aeed7314e0d8cf4be6a82f0bb5275f87f09b8707353543d26d839be016e7ae9523e8594e2ddf85f2f26e36ce2332b95131729f4da959a90 SHA512 8d5f78dafe981b3874fe60a54d3f041ab163e3e94a5f3ceb943bfe075e55dbdc260aa2dd035c7d241708f21b8f8f1f9d268ffd65538b0fc5b36c43a59f5a0f27 diff --git a/app-admin/rsyslog/files/8-stable/rsyslog-8.33.0-missing-files.patch b/app-admin/rsyslog/files/8-stable/rsyslog-8.33.0-missing-files.patch deleted file mode 100644 index 9b0b24e89574..000000000000 --- a/app-admin/rsyslog/files/8-stable/rsyslog-8.33.0-missing-files.patch +++ /dev/null @@ -1,80 +0,0 @@ -https://github.com/rsyslog/rsyslog/issues/2493 - ---- /dev/null -+++ b/tests/omstdout-basic.sh -@@ -0,0 +1,27 @@ -+#!/bin/bash -+# add 2016-11-22 by Pascal Withopf, released under ASL 2.0 -+. $srcdir/diag.sh init -+. $srcdir/diag.sh generate-conf -+. $srcdir/diag.sh add-conf ' -+module(load="../plugins/imtcp/.libs/imtcp") -+module(load="../plugins/omstdout/.libs/omstdout") -+input(type="imtcp" port="13514") -+ -+template(name="outfmt" type="string" string="-%msg%-\n") -+action(type="omstdout" template="outfmt") -+ -+' -+. $srcdir/diag.sh startup > rsyslog.out.log -+. $srcdir/diag.sh tcpflood -m1 -+. $srcdir/diag.sh shutdown-when-empty -+. $srcdir/diag.sh wait-shutdowna -+ -+grep "msgnum:00000000:" rsyslog.out.log > /dev/null -+if [ $? -ne 0 ]; then -+ echo -+ echo "FAIL: expected message not found. rsyslog.out.log is:" -+ cat rsyslog.out.log -+ . $srcdir/diag.sh error-exit 1 -+fi -+ -+. $srcdir/diag.sh exit ---- /dev/null -+++ b/tests/template-const-jsonf.sh -@@ -0,0 +1,18 @@ -+#!/bin/bash -+# added 2018-02-10 by Rainer Gerhards; Released under ASL 2.0 -+. $srcdir/diag.sh init -+. $srcdir/diag.sh generate-conf -+. $srcdir/diag.sh add-conf ' -+template(name="outfmt" type="list") { -+ constant(outname="@version" value="1" format="jsonf") -+ constant(value="\n") -+} -+ -+local4.* action(type="omfile" file="rsyslog.out.log" template="outfmt") -+' -+. $srcdir/diag.sh startup -+. $srcdir/diag.sh injectmsg 0 1 -+. $srcdir/diag.sh shutdown-when-empty -+. $srcdir/diag.sh wait-shutdown -+. $srcdir/diag.sh content-cmp '"@version": "1"' -+. $srcdir/diag.sh exit ---- /dev/null -+++ b/tests/template-pure-json.sh -@@ -0,0 +1,18 @@ -+#!/bin/bash -+# added 2018-02-10 by Rainer Gerhards; Released under ASL 2.0 -+. $srcdir/diag.sh init -+. $srcdir/diag.sh generate-conf -+. $srcdir/diag.sh add-conf ' -+template(name="outfmt" type="list" option.jsonf="on") { -+ property(outname="message" name="msg" format="jsonf") -+ constant(outname="@version" value="1" format="jsonf") -+} -+ -+local4.* action(type="omfile" file="rsyslog.out.log" template="outfmt") -+' -+. $srcdir/diag.sh startup -+. $srcdir/diag.sh injectmsg 0 1 -+. $srcdir/diag.sh shutdown-when-empty -+. $srcdir/diag.sh wait-shutdown -+. $srcdir/diag.sh content-cmp '{"message":" msgnum:00000000:", "@version": "1"}' -+. $srcdir/diag.sh exit ---- /dev/null -+++ b/tests/testsuites/include-std-omfile-action.conf -@@ -0,0 +1,3 @@ -+# this include provides our standard omfile action. It is primarily -+# used for include() tests, but may have other uses as well. -+action(type="omfile" template="outfmt" file="rsyslog.out.log") diff --git a/app-admin/rsyslog/rsyslog-8.33.0.ebuild b/app-admin/rsyslog/rsyslog-8.33.1.ebuild index b69e229a28b6..7dafd1e2920f 100644 --- a/app-admin/rsyslog/rsyslog-8.33.0.ebuild +++ b/app-admin/rsyslog/rsyslog-8.33.1.ebuild @@ -47,8 +47,6 @@ else http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-${MY_PV}.tar.gz -> ${MY_FILENAME} doc? ( http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-doc-${MY_PV}.tar.gz -> ${MY_FILENAME_DOCS} ) " - - PATCHES=( "${FILESDIR}"/8-stable/${P}-missing-files.patch ) fi LICENSE="GPL-3 LGPL-3 Apache-2.0" diff --git a/app-admin/setools/Manifest b/app-admin/setools/Manifest index 4a897d9f4f3a..329a4b37fd6e 100644 --- a/app-admin/setools/Manifest +++ b/app-admin/setools/Manifest @@ -9,6 +9,6 @@ DIST setools-4.0.1.tar.gz 399888 BLAKE2B 688a5ed18b197391b43a89375818b50b47dda58 DIST setools-4.1.1.tar.gz 461649 BLAKE2B a753718aa6a5de889ba7a2eea921340061edf1bcb0b572a365e858949a92d2f8a92a876be2e4bc539d85fa6029511ab6afabfbe8138cdb5a73b587a9b58551bb SHA512 2e55a3b07e2f94d7c84054f31d266567b9acc708fe2b0e16ac3ea24e8301c712bcf564ff915a6135a1a6ba6822682bb3a6530dae20161a832fb7048364acbd04 EBUILD setools-3.3.8-r7.ebuild 3686 BLAKE2B 440799c9f4d5a944adb5bbe4f6826c1445835db6a6c0ff3a3278f516fc67b4aac83f535dbb4b306524766f947dd40dcb4ff9edd2b24ffae13a85e92c62eaca9e SHA512 984ceb81a0fd293e16097cbbf8aba94ad2418095cd21de4ac322c02ea77d1a64cce97ddceaa8495b1f6a02fe927511532d54572a8c88888014796529ade6126c EBUILD setools-4.0.1.ebuild 1245 BLAKE2B 93963b8a7f7a82c105d52e23645f6b81097df55095141b72d0216a66333a90cce40b0afac652bc243d98b872301a1c5fcbcd474dcf6e9fa81ed753d12c682853 SHA512 1803bfdb18d0fb1278c24ed5272bbb55327381debc023fce62f9897c1d863a8afe4d509c0514bd24f52ac77ba7d64702ee6bce4ed33467bf0bf72a3ba778efb3 -EBUILD setools-4.1.1.ebuild 1342 BLAKE2B 4b30ee50bae7f8317b43c9b825e27383ddabe8a9be69345accde5485f06a1d7848f072270a82ed7196feb6a78ffae7b9fd045ad7f2bed859ec649413cc1c5706 SHA512 5ba23ec96a9ae926899e25c65c8b8455a6e6da9f76d66df91799b240ecde048fae0816db82cdb83dba99718b8f07d5d00cec7646f5d86e9972a5539c37bc2821 +EBUILD setools-4.1.1.ebuild 1349 BLAKE2B 972acc7929aa60c4373c72129ae53a0762a46664aa66c40af20489e35178507eabf64ad99dba305391380d7fe543151bc40d5a983816e2676f372cbdc9aa2e00 SHA512 8baa0cbe696c1ec8ba3ab885316423106945746629c0f18a23e8e44ca5d60793dd9ddf562ca7e1dfdf8c6a5f5289444c8eae10dccff601cd0d75b011da5a71a4 EBUILD setools-9999.ebuild 1344 BLAKE2B 1ece52a683c8d99a436655acd639ac78f81e7ecc7a08730ea87bd8dcea8379738d9fe4ae1926ffefb8726f2d080ee40135f5c649fe8e8a4a911990dc1a7694d1 SHA512 c7507642de4d6a100982d6da702a47fc6a47ca9f106b248aac8c158be0fc77d1a9d4af8727f531e80570710f94260a68702f8a4892970b4b76a97ba9bc40fb81 MISC metadata.xml 403 BLAKE2B 954bfb344e48933f43c746ed626da3851b9e887b9d1c68541fa97356992c2e80f0626198d2170b431d32489347bb6e5ee46d2577a5d672940892ec5d5fd87e4e SHA512 be645abfaf1149e2f2a9b7f0613b61f015df81a16bc6dde593513aa2ba7b4a9a8fba65520b53a2511ba65c022258f48bcd2aed3f85c273a35c94359e358a8fa6 diff --git a/app-admin/setools/setools-4.1.1.ebuild b/app-admin/setools/setools-4.1.1.ebuild index f9967bce90f1..03451253583d 100644 --- a/app-admin/setools/setools-4.1.1.ebuild +++ b/app-admin/setools/setools-4.1.1.ebuild @@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://github.com/TresysTechnology/setools.git" else SRC_URI="https://github.com/TresysTechnology/setools/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 x86" + KEYWORDS="amd64 ~arm64 x86" fi LICENSE="GPL-2 LGPL-2.1" diff --git a/app-admin/tenshi/Manifest b/app-admin/tenshi/Manifest index 840790be2249..2a2f83520664 100644 --- a/app-admin/tenshi/Manifest +++ b/app-admin/tenshi/Manifest @@ -10,5 +10,5 @@ EBUILD tenshi-0.12.ebuild 1342 BLAKE2B c5fb552dbf0ecb866a993cdd2c2fc9fdd80d4d2c7 EBUILD tenshi-0.14.ebuild 1185 BLAKE2B f17ca46a042bd6f0514135a9cf528854cc6173d1c959929618f50c87075075d6703cae63c16fb0f787af1cfefd9776202a386683c8c137c75f6adcfac60cac26 SHA512 53b7df0fc590a83cd12d8ba0c6c5404941f71ab1e81787b8ce924a0baaee2c8162a7abaf3b1d36e6f634bb16520aec29ab3ff7ea1efeace731b676f167335331 EBUILD tenshi-0.15.ebuild 1186 BLAKE2B 20916392433c56dfe9af50ffb4b46a9f112c28c836d18c7cf28c8ed7a0663f65f0daa494e8dc4b21d00735b5ce9b8f2bf8ec39e05e294624bb853d1eb09dfd16 SHA512 eaffd6c1308d4c8111f443008eb7a2ec8bae686460b91509834c68801719d277f334660ae1330b6215959e6be8fa7349229e0ad214af593fb8a22d756120e769 EBUILD tenshi-0.16-r1.ebuild 1201 BLAKE2B 39b1532683d3e310c36594ce0843b5ff29f6a3b754a2ed33ddfbbfcc2158667954a748ab5da3f989e4f1caf7ef019b9c99a193190861942f6913a839d8a5159f SHA512 f344b3f8b6d1a3e61d4a5a1f819d2cc787b20a23d310b4c7545bcbc0593d6b14572c0697659f21d083aee2387dad7e1847b5cac0cfe2052fc83f786cb540fd3d -EBUILD tenshi-0.17.ebuild 1200 BLAKE2B ae65e3eb0b2a4cf068c62b1da33bbdb54029092677a2280482d3c642d1a3516630b21b3d62b8f996f1d30356cd25f169e23606189813572122f106db5e9a9ff8 SHA512 c553e7a6d998224d35fc4c868850f7a74f5c5f29c9c5598a4538cde7b65bc7ff8f78b1c71b378ea37b666aff57ca6c6ca8a13ec09f29b2fa67694c3220bac63a +EBUILD tenshi-0.17.ebuild 1199 BLAKE2B e7e0499c5659c35fbd2b8662bd543350e06fbf98c4ddbfa6681fe3926949a9ccf4e2a4376ec5390704c95afc95f452481f431516d21ce060cb3d8c59bd7de136 SHA512 c8ebcb56ef759ad01bfe4f9be27b5cdff560e1184b93eac61b6e35f6dbad26dfc942923969a30d00e5b44022955b5eaa74d93aa0ce47b2465d7dbe5b5af972f7 MISC metadata.xml 464 BLAKE2B 7a6641b592d206396a955c7aef2ce071335c3b937700f8fc5d9aacb1be093b84570afa4702ecb9d9eaec328d2aebf37f260b176d6b8e75921cdf52eff5980dd9 SHA512 db98f1636bb66ec2f345b93d9c52894032f408ae893135bb776394a5e7a1173629f58d8fce1d3b6a77962517067ca5e3859ecf4efb56bdfb950d2450d100c954 diff --git a/app-admin/tenshi/tenshi-0.17.ebuild b/app-admin/tenshi/tenshi-0.17.ebuild index 5c5c80c067cc..aa5c431f8c84 100644 --- a/app-admin/tenshi/tenshi-0.17.ebuild +++ b/app-admin/tenshi/tenshi-0.17.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/inversepath/${PN}/archive/${PV}.tar.gz LICENSE="ISC" SLOT="0" -KEYWORDS="amd64 ~ppc x86" +KEYWORDS="amd64 ppc x86" IUSE="" RDEPEND="dev-lang/perl diff --git a/app-admin/webalizer/Manifest b/app-admin/webalizer/Manifest index 9a287dca46c9..68b0f6149585 100644 --- a/app-admin/webalizer/Manifest +++ b/app-admin/webalizer/Manifest @@ -8,5 +8,5 @@ DIST webalizer-geodb-20140201.tgz 733070 BLAKE2B fd97dfd14e2fcbc6c97d6cb423c922d DIST webalizer-geodb-latest.tgz 639447 BLAKE2B a4a604f8ead42c403ce750c9f373e8ffc4a7510aab6cfd43b88f39b93f5636460860b72fcfcb9468a5a06739b830149878c948e5b3dd0748e14ee9cbfb2be9d4 SHA512 0f32d1249902e17f37cd0e7680004262bbe5b4a34a00d882319258c6aed80503e89ed192d8365731ab507fa54560082ae16c7023d0bc2232350709106be24117 DIST webalizer.conf.gz 8986 BLAKE2B 6cee5f96c31a189bf7ce75ec845081d9a2f0e547362d415c84f78f1ddaa8e3ffd327517968037ac1606a485d9cba740054bb9851065d0ea03739b5558c7ef6f9 SHA512 ec7f815e0215116d72e6d93b471a4b86a1c152a8ebae7c374144cabeeb06750d3a39fde65faf069e9aeb133f27b0b4cdee16bed5442e7fbd4eb4f45a4f3cd84b EBUILD webalizer-2.23.05.ebuild 3813 BLAKE2B 73b3e795b6463598b432ed32a2cb9cb58c14824141c6edade11786c54bb52449cd13da01d68f930ece01376a8581c16e3779c394e3641ff9de2086a80e91ee35 SHA512 c81bdbb98168cb608c9eee163e71dbea85c487f16034fad1d772880f6b0b5350aa071fc5f3e870eaf49e8bfa5c6354c31c93866d8faaff9cec0843993afcde24 -EBUILD webalizer-2.23.08.ebuild 4227 BLAKE2B 69a84eaf7b6b4066ab3c7b62adf56ea0c79fac2016c7635d08c34a3dc4c8402e75204777a3a1a782874b938fd904b09186405f20adde01aaf9005655a9555255 SHA512 54f29cd70efd47f266797208f9aa0d8ed35a67c3c71b56dd1f6ba0e855db3c09c2cb5ec791046c770eb92cbfe419bd3d419683e3aeb7bb6a4d8ce5ae3e8c8055 +EBUILD webalizer-2.23.08.ebuild 4225 BLAKE2B 01f659175e505b063f794d715ea885f1d14682cc03a86bf54d5adeb6a31adc44800fe2a50803804524ae4ebcc3d5ba0db6b1d87de5ec47ea2419af1dd8461d10 SHA512 ada471733096149b3cc3cc7893e093d89da096d9e9b5ff78298fd3edc7f1446986e0823805dc6ea3d2d206cd8159106378489bfff82b2c72001c2d8ae80759c3 MISC metadata.xml 434 BLAKE2B 72cde450aa4735601e14978c5bfc3be91f257907988e6017dc27f7aca8dad9b8586dc78943d69a10344d25d2435fb8394b5fe1239a0ea7ff2ae3ae2b26ba0eec SHA512 9d006c56a0019b4ea29e8f9f845ca9006ecdccf64b9e50c343420af4b3852b5c08f09a23d792c3d1454454f8a0696a0dbc4b36b4da2c6f0d4967f533ad3a3149 diff --git a/app-admin/webalizer/webalizer-2.23.08.ebuild b/app-admin/webalizer/webalizer-2.23.08.ebuild index 04e5cfb7eead..b9d657830e5d 100644 --- a/app-admin/webalizer/webalizer-2.23.08.ebuild +++ b/app-admin/webalizer/webalizer-2.23.08.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # uses webapp.eclass to create directories with right permissions @@ -27,7 +27,7 @@ SRC_URI="ftp://ftp.mrunix.net/pub/webalizer/${MY_P}-src.tar.bz2 ${GEODB_URL}/webalizer-geodb-${GEODB_DATE}.tgz" LICENSE="GPL-2" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86" IUSE="bzip2 xtended geoip nls" SLOT="0" |