diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-04-05 21:52:00 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-04-05 21:52:00 +0100 |
| commit | 2d446203bcf1a0db08e99abca43513d246dfa73d (patch) | |
| tree | ec623bb5f1f389976977e375342ec59ff441eab7 /app-admin | |
| parent | 171a011ad3a131671aeb5a98b9e3adf219ad2865 (diff) | |
gentoo resync : 05.04.2018
Diffstat (limited to 'app-admin')
88 files changed, 348 insertions, 7411 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz Binary files differindex 7f3728b9743c..afdb354ea6c7 100644 --- a/app-admin/Manifest.gz +++ b/app-admin/Manifest.gz diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest index b42f43583cf0..e110640c7d72 100644 --- a/app-admin/ansible/Manifest +++ b/app-admin/ansible/Manifest @@ -1,9 +1,11 @@ DIST ansible-2.4.2.0.tar.gz 6503595 BLAKE2B df4ec4e24671f1488950f2d9eb7705fbad4e035d6ac67d5017417281455cc44cde1290976a9ed16675c0cc19a9190200b95b29890725c56df5f2699398accd6b SHA512 32a075959dca01e184d9c3988fc9c491e904e7627a38e3527c37a8b26340f331bd294cacfe7353d339d15488857ba5ee1b36d9ae4ebeb8b5827934a73f4b42b0 DIST ansible-2.4.3.0.tar.gz 6511115 BLAKE2B d43679c651f6aa5fd86c797a204645a8ee98efbcde9abaa25385aeb6f1d7c8b4ad74185434bfd159dbf673fe9339ef8f915f78238f8b8a5caf924b54cb9bdd52 SHA512 a7cda358c67c519c7e5ba248bf47070f21a27203fb29d70d9d75ecf027ba1275d71c0f96493e047281211d172a3be8273d7e08144446284695fb0bc8b94daa82 +DIST ansible-2.4.4.0.tar.gz 6512938 BLAKE2B 51e397d2242209271a8aef211c3bdeb34a15e2061a202415749ecb4232e0521aff304d5585d536b1805f14ff476b0733d559eeabe6e44de7b273b8606b11b805 SHA512 f0dcf92f2c69931fa06e6dd3845c11592d5a7e44f19a99c4d6c361022708560170f2b74ad20eded61fa5812c90eed281b78396aa92e0b33717970afb5966dd72 DIST ansible-2.5.0.tar.gz 10073927 BLAKE2B 00e5d4245b7ea89a3826a3ab25c880c3acfdb713a045b9583dcc7fe913673954f1bee31d10a5125a8c386eca8d478ca807e44466a4c2729cfb571323836d5353 SHA512 93dee0404c5de0a9c8c5b8987f1fb2dbacceb848e8d5b4c70c5a6692d6fe8e9d4bec67d592071346f458b46b9ed2d800609a080d7d4b16266943f32d56a19220 EBUILD ansible-2.4.2.0-r1.ebuild 1406 BLAKE2B 9f63cd0a25a4ada0913f0e94c5dc221043936b60a0287d32668f3b9ede027f4b32695d527d5b6402252c5294e3bedc00d2ccdb3f8b0d8f892a9c6c003f81d73e SHA512 492cb42bc894ed7b07275828117689901b90574135397b73bbe9b7447a06df6024a18f9cc61bd48ac8d2f3ead9b0555ad79c708d275894725aa6ed1548a00fb7 EBUILD ansible-2.4.2.0.ebuild 1445 BLAKE2B f00ce2aaff90cbdff9a6eee800a61bfca78491671a3b8e7c931fe8f24cced9b6b8bb5552f42d34b106d8b101173c373f4ee69f8dba8738936af3866e946164df SHA512 2f731321ff758ca6db6cd90701ae234cd63fb84f8dcfe730c6b2cf824fb8f801ceb174e1bde7b3f3e9d14723574ff5c18d5ca68c82b27192aef3d4b355df5ff0 EBUILD ansible-2.4.3.0.ebuild 1404 BLAKE2B 520e1d8270be10a88249acf994577545b9b2e41289446b2bd5f164a1a5ea3e9b19a7d522dd57a732abbdfe0b8d2439cd4aaa9d7c46cd79a8bea3fed2fdd856fa SHA512 c72349eb645c40f7399975a12f1fb9daacdabee4dc9d801e8bc7c4ac8bffeae178906481eb6e69fe2dc81505179092ca30f4b7c7e0a92715e14f2d93f3143c7e +EBUILD ansible-2.4.4.0.ebuild 1406 BLAKE2B 9f63cd0a25a4ada0913f0e94c5dc221043936b60a0287d32668f3b9ede027f4b32695d527d5b6402252c5294e3bedc00d2ccdb3f8b0d8f892a9c6c003f81d73e SHA512 492cb42bc894ed7b07275828117689901b90574135397b73bbe9b7447a06df6024a18f9cc61bd48ac8d2f3ead9b0555ad79c708d275894725aa6ed1548a00fb7 EBUILD ansible-2.5.0.ebuild 1406 BLAKE2B 9f63cd0a25a4ada0913f0e94c5dc221043936b60a0287d32668f3b9ede027f4b32695d527d5b6402252c5294e3bedc00d2ccdb3f8b0d8f892a9c6c003f81d73e SHA512 492cb42bc894ed7b07275828117689901b90574135397b73bbe9b7447a06df6024a18f9cc61bd48ac8d2f3ead9b0555ad79c708d275894725aa6ed1548a00fb7 EBUILD ansible-9999.ebuild 1475 BLAKE2B f2718a27295c6d9ce5ad4415573558ab2e651f52dae85ae9dc79a3e39e5692a29279b5d6a96166c91b7d0b1a389915848e7e9480979c4fa3e0878ae6b2fdc662 SHA512 a1c816593bb2052ce3f89c37fa44322b25af436bf6f3bbbfb8c87e1b1ed33aac880e8e3499fcbc52a0d0bd85db6ad0ac48a858400b1806ae4b61beb66a634244 MISC metadata.xml 952 BLAKE2B 53640d081ebb558274f8c10095aa6e477820e28a7fdf62c169f5fb3b82153223a7f8ecd1807d14646eae2ec2262b50341919bbb13255293d379ba017b30b20bd SHA512 03b75d65cd0a4b32021b34d9f7ba21b6c4c6893cf185a36dbe6fc10728e0f18c65fc5b6a4c197be8c2b1dadb7243ddce02dbe2f504034a2df1c621f8ba6e26a7 diff --git a/app-admin/ansible/ansible-2.4.4.0.ebuild b/app-admin/ansible/ansible-2.4.4.0.ebuild new file mode 100644 index 000000000000..346b2f5aea95 --- /dev/null +++ b/app-admin/ansible/ansible-2.4.4.0.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 python3_{5,6} ) + +inherit distutils-r1 eutils versionator + +DESCRIPTION="Model-driven deployment, config management, and command execution framework" +HOMEPAGE="http://ansible.com/" +SRC_URI="http://releases.ansible.com/${PN}/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~x64-macos" +IUSE="test" + +RDEPEND=" + dev-python/paramiko[${PYTHON_USEDEP}] + dev-python/jinja[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] + dev-python/cryptography[${PYTHON_USEDEP}] + dev-python/httplib2[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}] + dev-python/netaddr[${PYTHON_USEDEP}] + net-misc/sshpass + virtual/ssh +" +DEPEND=" + dev-python/setuptools[${PYTHON_USEDEP}] + >=dev-python/packaging-16.6[${PYTHON_USEDEP}] + test? ( + ${RDEPEND} + dev-python/nose[${PYTHON_USEDEP}] + >=dev-python/mock-1.0.1[${PYTHON_USEDEP}] + dev-python/passlib[${PYTHON_USEDEP}] + dev-python/coverage[${PYTHON_USEDEP}] + dev-python/unittest2[${PYTHON_USEDEP}] + dev-vcs/git + )" + +# not included in release tarball +RESTRICT="test" + +python_test() { + nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die +} + +python_install_all() { + distutils-r1_python_install_all + + doman docs/man/man1/*.1 + dodoc -r examples +} diff --git a/app-admin/collectd/Manifest b/app-admin/collectd/Manifest deleted file mode 100644 index 93df5f371038..000000000000 --- a/app-admin/collectd/Manifest +++ /dev/null @@ -1,11 +0,0 @@ -AUX collectd-5.6.0-gentoo.patch 4294 BLAKE2B 99274b5a2734910a35ab6a0003d6fe257e239fc0a3b1f3ca398c82b0e28b9365729980999af0db417b3818c7b4de47f48c0118eea88a43f8de162ae40eeb68be SHA512 088f65e2d90c29092621693847f165be7024caa2237a2129dbffcedba3c1f93baa8169de9d3c2979c709219ec12ee0d3b6dd36586ede92062d1a14a28b8611c8 -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-5.7.2-varnish-5.2+.patch 40982 BLAKE2B a1f90a27e95b2665626fc2112646f5fb092472f32b58fb6bcc2a6a15e2916bb067b7f8aa7c85fba12eaf839d10b94004a1847f537d5f5535d9a7aac0fe2fe5a7 SHA512 eea0fd89f65b14ba6012160c4d2560e8c6339f7aeb873d93ed35b9c3551d76d6087c6cdbe986610502e8a73b144fba945f1efd1db31e5be792b9ecead2d0eeec -AUX collectd.confd-r2 2001 BLAKE2B fbf1a64aab6ec60111553466c3a8b725200ab13d0e09c1ba1d71e68213e8f978c3cad0dfc5eb2c536ced8213f172804f0596b3494f9b42b0cacf3432105cab5a SHA512 729f2b4e06c4a8c95d32c03c6f3f292eaa4895780ace180b74fcf139a949e9c28a2b3ae823bdebec0014f9b4d919adb399bc7f019c68c0e268b263326959edb7 -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.7.2.tar.bz2 1798777 BLAKE2B 4af359a773457bb9c05b6a301d7728eea7598c200f7ca534875b07d1d011b280ab138f680d9607723f14523dd71dcbec3a41e0d8d183848c8ef809cef86c2b8f SHA512 8844b67159f8da2203b5ac57ef19fce0a01050a016174d196b48b5fb24925ad2935af9bdd9af06097ff663499abc496cdcc2d9e9a10f403f8d707c465c1a88f3 -EBUILD collectd-5.7.2-r2.ebuild 19598 BLAKE2B 4b42c29dddb14f0348415335110744e215d041e3a112b35a71654bf0afa48e48ded21f389fa4d620f7efde4b65178c4c07b46b5948553983dd09e193570d21f7 SHA512 6417a2f8a86569b9487b1719ba50c738d0e86a0adb003fbe8238bd0ef9da99f0ee8ca8393c166927f103ee6b3339e476c2468cfbae633e3705e3492fc37eb0cc -MISC metadata.xml 1515 BLAKE2B 5525766b822463f94f7c2cddbdf78b4c4ea5a473880a473d0b51481d948569cfc7f51bd2e74eb67065ab2be1b23e4fb7ee99512d018c6e6b5ac1ee7331eae9eb SHA512 51c17c16d27b722d729d036d67c562ab76e212dac9bcd004a7e43c2c5e041b8c46e74f9a130f30c2e18cc95ca1b367034246eff02cfaf55f6f9375ff836749e5 diff --git a/app-admin/collectd/collectd-5.7.2-r2.ebuild b/app-admin/collectd/collectd-5.7.2-r2.ebuild deleted file mode 100644 index 9adfa6322e16..000000000000 --- a/app-admin/collectd/collectd-5.7.2-r2.ebuild +++ /dev/null @@ -1,548 +0,0 @@ -# Copyright 1999-2018 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 tmpfiles 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="alpha 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 - "${FILESDIR}"/${PN}-5.7.2-CVE-2017-16820.patch - "${FILESDIR}"/${PN}-5.7.2-varnish-5.2+.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-r2" ${PN} - newconfd "${FILESDIR}/${PN}.confd-r2" ${PN} - systemd_newunit "contrib/systemd.${PN}.service" ${PN}.service - - insinto /etc/logrotate.d - newins "${FILESDIR}/${PN}.logrotate" ${PN} - - newtmpfiles "${FILESDIR}"/${PN}.tmpfile ${PN}.conf - - sed -i -e 's:^.*PIDFile "/var/run/collectd.pid":#PIDFile "/run/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() { - tmpfiles_process "${PN}.conf" - - 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="$(systemd_get_systemunitdir)/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 - else - if has_version "sys-apps/systemd"; then - # Bug 596852 - ewarn "Failed to update CapabilityBondingSet in '${systemd_unit}'" - ewarn "because unit was not found. Please file a bug about this." - fi - 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.0-gentoo.patch b/app-admin/collectd/files/collectd-5.6.0-gentoo.patch deleted file mode 100644 index dd8c1576354c..000000000000 --- a/app-admin/collectd/files/collectd-5.6.0-gentoo.patch +++ /dev/null @@ -1,153 +0,0 @@ -From 8fe20883e248572690798e4dd1423511aa2f4e5d Mon Sep 17 00:00:00 2001 -From: Thomas Deutschmann <whissi@gentoo.org> -Date: Thu, 22 Sep 2016 00:53:58 +0200 -Subject: [PATCH 1/3] Remove bundled libltdl - ---- - Makefile.am | 6 ------ - configure.ac | 8 ++++---- - 2 files changed, 4 insertions(+), 10 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 03bdd39..ad04a3c 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,11 +1,5 @@ --ACLOCAL_AMFLAGS = -I libltdl/m4 -- - SUBDIRS = - --if BUILD_INCLUDED_LTDL --SUBDIRS += libltdl --endif -- - SUBDIRS += proto src bindings . - - AM_CPPFLAGS = $(LTDLINCL) -diff --git a/configure.ac b/configure.ac -index 9a6da11..68e15e0 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -3,7 +3,6 @@ AC_PREREQ([2.60]) - AC_INIT([collectd],[m4_esyscmd(./version-gen.sh)]) - AC_CONFIG_SRCDIR(src/target_set.c) - AC_CONFIG_HEADERS(src/config.h) --AC_CONFIG_AUX_DIR([libltdl/config]) - - dnl older automake's default of ARFLAGS=cru is noisy on newer binutils; - dnl we don't really need the 'u' even in older toolchains. Then there is -@@ -13,7 +12,6 @@ m4_divert_text([DEFAULTS], [: "${ARFLAGS=cr} ${AR_FLAGS=cr}"]) - m4_ifdef([LT_PACKAGE_VERSION], - # libtool >= 2.2 - [ -- LT_CONFIG_LTDL_DIR([libltdl]) - LT_INIT([dlopen]) - LTDL_INIT([convenience]) - AC_DEFINE(LIBTOOL_VERSION, 2, [Define to used libtool version.]) -@@ -25,12 +23,14 @@ m4_ifdef([LT_PACKAGE_VERSION], - AC_SUBST(LTDLINCL) - AC_SUBST(LIBLTDL) - AC_LIBTOOL_DLOPEN -- AC_CONFIG_SUBDIRS(libltdl) - AC_DEFINE(LIBTOOL_VERSION, 1, [Define to used libtool version.]) - ] - ) - --AM_CONDITIONAL([BUILD_INCLUDED_LTDL], [test "x$LTDLDEPS" != "x"]) -+if test "x$LTDLDEPS" != "x" -+then -+ AC_MSG_ERROR(["system's libltdl is too old! Should never happen. Please file a bug at https://bugs.gentoo.org"]) -+fi - - AM_INIT_AUTOMAKE([subdir-objects tar-pax dist-bzip2 no-dist-gzip foreign]) - m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) --- -2.10.0 - - -From 0b00f519ce183b8ceaab5cf8e56f574ecd2cb7c4 Mon Sep 17 00:00:00 2001 -From: Thomas Deutschmann <whissi@gentoo.org> -Date: Thu, 22 Sep 2016 00:54:08 +0200 -Subject: [PATCH 2/3] Remove libhal dependency - -X-Gentoo-Bug: 353839 -X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=353839 ---- - configure.ac | 24 ------------------------ - 1 file changed, 24 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 68e15e0..1700c44 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1663,30 +1663,6 @@ AM_CONDITIONAL(BUILD_WITH_LIBRESOLV, test "x$with_libresolv" = "xyes") - - dnl Check for HAL (hardware abstraction library) - with_libhal="no" --PKG_CHECK_MODULES([HAL], [hal], -- [ -- SAVE_LIBS="$LIBS" -- LIBS="$HAL_LIBS $LIBS" -- AC_CHECK_LIB([hal], [libhal_device_property_exists], -- [ -- SAVE_CPPFLAGS="$CPPFLAGS" -- CPPFLAGS="$HAL_CFLAGS $CPPFLAGS" -- AC_CHECK_HEADERS([libhal.h], -- [ -- with_libhal="yes" -- BUILD_WITH_LIBHAL_CFLAGS="$HAL_CFLAGS" -- BUILD_WITH_LIBHAL_LIBS="$HAL_LIBS" -- ]) -- CPPFLAGS="$SAVE_CPPFLAGS" -- ], -- [ : ] -- ) -- LIBS="$SAVE_LIBS" -- ], -- [ : ] --) --AC_SUBST(BUILD_WITH_LIBHAL_CFLAGS) --AC_SUBST(BUILD_WITH_LIBHAL_LIBS) - - - SAVE_LIBS="$LIBS" --- -2.10.0 - - -From 380c61888bed5856319fa32816d8f2f4c88ee7bc Mon Sep 17 00:00:00 2001 -From: Thomas Deutschmann <whissi@gentoo.org> -Date: Thu, 22 Sep 2016 00:54:19 +0200 -Subject: [PATCH 3/3] Link Oracle plug-in against libocci - -Author: Aurelien Minet -X-Gentoo-Bug: 347607 -X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=347607 ---- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 1700c44..83909a0 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -3587,14 +3587,14 @@ AC_ARG_WITH(oracle, [AS_HELP_STRING([--with-oracle@<:@=ORACLE_HOME@:>@], [Path t - ]) - if test "x$ORACLE_HOME" != "x" - then -- with_oracle_cppflags="-I$ORACLE_HOME/rdbms/public" -+ with_oracle_cppflags="-I$ORACLE_HOME/rdbms/public -locci" - - if test -e "$ORACLE_HOME/lib/ldflags" - then - with_oracle_libs=`cat "$ORACLE_HOME/lib/ldflags"` - fi - #with_oracle_libs="-L$ORACLE_HOME/lib $with_oracle_libs -lclntsh" -- with_oracle_libs="-L$ORACLE_HOME/lib -lclntsh" -+ with_oracle_libs="-L$ORACLE_HOME/lib -lclntsh -locci" - fi - if test "x$with_oracle" = "xyes" - then --- -2.10.0 - diff --git a/app-admin/collectd/files/collectd-5.7.2-CVE-2017-16820.patch b/app-admin/collectd/files/collectd-5.7.2-CVE-2017-16820.patch deleted file mode 100644 index 0090f2940bf6..000000000000 --- a/app-admin/collectd/files/collectd-5.7.2-CVE-2017-16820.patch +++ /dev/null @@ -1,39 +0,0 @@ -CVE-2017-16820: Fix double free of request PDU - -https://github.com/collectd/collectd/commit/d16c24542b2f96a194d43a73c2e5778822b9cb47 - ---- a/src/snmp.c -+++ b/src/snmp.c -@@ -1357,11 +1357,13 @@ static int csnmp_read_table(host_definition_t *host, data_definition_t *data) { - if (oid_list_todo_num == 0) { - /* The request is still empty - so we are finished */ - DEBUG("snmp plugin: all variables have left their subtree"); -+ snmp_free_pdu(req); - status = 0; - break; - } - - res = NULL; -+ /* snmp_sess_synch_response always frees our req PDU */ - status = snmp_sess_synch_response(host->sess_handle, req, &res); - if ((status != STAT_SUCCESS) || (res == NULL)) { - char *errstr = NULL; -@@ -1376,8 +1378,6 @@ static int csnmp_read_table(host_definition_t *host, data_definition_t *data) { - snmp_free_pdu(res); - res = NULL; - -- /* snmp_synch_response already freed our PDU */ -- req = NULL; - sfree(errstr); - csnmp_host_close_session(host); - -@@ -1492,9 +1492,6 @@ static int csnmp_read_table(host_definition_t *host, data_definition_t *data) { - snmp_free_pdu(res); - res = NULL; - -- if (req != NULL) -- snmp_free_pdu(req); -- req = NULL; - - if (status == 0) - csnmp_dispatch_table(host, data, instance_list_head, value_list_head); diff --git a/app-admin/collectd/files/collectd-5.7.2-issue-2443.patch b/app-admin/collectd/files/collectd-5.7.2-issue-2443.patch deleted file mode 100644 index 19410c139b0a..000000000000 --- a/app-admin/collectd/files/collectd-5.7.2-issue-2443.patch +++ /dev/null @@ -1,160 +0,0 @@ -turbostat: import msr-index header from linux to allow building against - >=linux-4.12 - -Backport of https://github.com/collectd/collectd/pull/2446 - ---- a/configure.ac -+++ b/configure.ac -@@ -805,28 +805,6 @@ AC_CACHE_CHECK([whether clock_boottime and clock_monotonic are supported], - - - # For the turbostat plugin --have_asm_msrindex_h="no" --AC_CHECK_HEADERS(asm/msr-index.h, [have_asm_msrindex_h="yes"]) -- --if test "x$have_asm_msrindex_h" = "xyes" --then -- AC_CACHE_CHECK([whether asm/msr-index.h has MSR_PKG_C10_RESIDENCY], -- [c_cv_have_usable_asm_msrindex_h], -- AC_COMPILE_IFELSE([AC_LANG_PROGRAM( --[[[ --#include<asm/msr-index.h> --]]], --[[[ --int y = MSR_PKG_C10_RESIDENCY; --return(y); --]]] -- )], -- [c_cv_have_usable_asm_msrindex_h="yes"], -- [c_cv_have_usable_asm_msrindex_h="no"], -- ) -- ) --fi -- - have_cpuid_h="no" - AC_CHECK_HEADERS(cpuid.h, [have_cpuid_h="yes"]) - -@@ -6108,7 +6086,7 @@ then - then - plugin_ipvs="yes" - fi -- if test "x$c_cv_have_usable_asm_msrindex_h" = "xyes" && test "x$have_cpuid_h" = "xyes" -+ if test "x$have_cpuid_h" = "xyes" - then - plugin_turbostat="yes" - fi ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -1212,7 +1212,9 @@ endif - - if BUILD_PLUGIN_TURBOSTAT - pkglib_LTLIBRARIES += turbostat.la --turbostat_la_SOURCES = turbostat.c -+turbostat_la_SOURCES = \ -+ turbostat.c \ -+ msr-index.h - turbostat_la_LDFLAGS = $(PLUGIN_LDFLAGS) - endif - ---- /dev/null -+++ b/src/msr-index.h -@@ -0,0 +1,88 @@ -+/* -+ * Partial header file imported from the linux kernel -+ * (arch/x86/include/asm/msr-index.h) -+ * as it is not provided by the kernel sources anymore -+ * -+ * Only the minimal blocks of macro have been included -+ * ---- -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms and conditions of the GNU General Public License, -+ * version 2, as published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. -+ * -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. -+ * ---- -+ */ -+ -+#ifndef _ASM_X86_MSR_INDEX_H -+#define _ASM_X86_MSR_INDEX_H -+ -+/* -+ * CPU model specific register (MSR) numbers. -+ * -+ * Do not add new entries to this file unless the definitions are shared -+ * between multiple compilation units. -+ */ -+ -+/* Intel MSRs. Some also available on other CPUs */ -+ -+/* C-state Residency Counters */ -+#define MSR_PKG_C3_RESIDENCY 0x000003f8 -+#define MSR_PKG_C6_RESIDENCY 0x000003f9 -+#define MSR_ATOM_PKG_C6_RESIDENCY 0x000003fa -+#define MSR_PKG_C7_RESIDENCY 0x000003fa -+#define MSR_CORE_C3_RESIDENCY 0x000003fc -+#define MSR_CORE_C6_RESIDENCY 0x000003fd -+#define MSR_CORE_C7_RESIDENCY 0x000003fe -+#define MSR_KNL_CORE_C6_RESIDENCY 0x000003ff -+#define MSR_PKG_C2_RESIDENCY 0x0000060d -+#define MSR_PKG_C8_RESIDENCY 0x00000630 -+#define MSR_PKG_C9_RESIDENCY 0x00000631 -+#define MSR_PKG_C10_RESIDENCY 0x00000632 -+ -+/* Run Time Average Power Limiting (RAPL) Interface */ -+ -+#define MSR_RAPL_POWER_UNIT 0x00000606 -+ -+#define MSR_PKG_POWER_LIMIT 0x00000610 -+#define MSR_PKG_ENERGY_STATUS 0x00000611 -+#define MSR_PKG_PERF_STATUS 0x00000613 -+#define MSR_PKG_POWER_INFO 0x00000614 -+ -+#define MSR_DRAM_POWER_LIMIT 0x00000618 -+#define MSR_DRAM_ENERGY_STATUS 0x00000619 -+#define MSR_DRAM_PERF_STATUS 0x0000061b -+#define MSR_DRAM_POWER_INFO 0x0000061c -+ -+#define MSR_PP0_POWER_LIMIT 0x00000638 -+#define MSR_PP0_ENERGY_STATUS 0x00000639 -+#define MSR_PP0_POLICY 0x0000063a -+#define MSR_PP0_PERF_STATUS 0x0000063b -+ -+#define MSR_PP1_POWER_LIMIT 0x00000640 -+#define MSR_PP1_ENERGY_STATUS 0x00000641 -+#define MSR_PP1_POLICY 0x00000642 -+ -+ -+ -+/* Intel defined MSRs. */ -+#define MSR_IA32_TSC 0x00000010 -+#define MSR_SMI_COUNT 0x00000034 -+ -+#define MSR_IA32_MPERF 0x000000e7 -+#define MSR_IA32_APERF 0x000000e8 -+ -+#define MSR_IA32_THERM_STATUS 0x0000019c -+ -+#define MSR_IA32_TEMPERATURE_TARGET 0x000001a2 -+ -+#define MSR_IA32_PACKAGE_THERM_STATUS 0x000001b1 -+ -+ -+#endif /* _ASM_X86_MSR_INDEX_H */ ---- a/src/turbostat.c -+++ b/src/turbostat.c -@@ -41,7 +41,7 @@ - #include "plugin.h" - #include "utils_time.h" - --#include <asm/msr-index.h> -+#include "msr-index.h" - #include <cpuid.h> - #ifdef HAVE_SYS_CAPABILITY_H - #include <sys/capability.h> 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 deleted file mode 100644 index 60830042fa6a..000000000000 --- a/app-admin/collectd/files/collectd-5.7.2-varnish-5.2+.patch +++ /dev/null @@ -1,1018 +0,0 @@ -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-r2 b/app-admin/collectd/files/collectd.confd-r2 deleted file mode 100644 index 835936d5bce2..000000000000 --- a/app-admin/collectd/files/collectd.confd-r2 +++ /dev/null @@ -1,49 +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. -# If you are going to change PID file location make sure that *only* -# root is allowed to write into that directory. -# -#COLLECTD_PIDFILE="/run/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 default collectd UNIX socket location in /run/collectd is now -# maintained via tmpfiles service. Therefore, the COLLECTD_GROUP setting -# isn't used anymore. -# If you are going to change UNIX socket location or change COLLECTD_USER -# setting above, make sure you overwrite /usr/lib/tmpfiles.d/collectd.conf -# via copy in /etc/tmpfiles.d/collectd.conf to match your setup. -#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-r2 b/app-admin/collectd/files/collectd.initd-r2 deleted file mode 100644 index 0a4ca71494f6..000000000000 --- a/app-admin/collectd/files/collectd.initd-r2 +++ /dev/null @@ -1,70 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2018 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.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}\" -f" -command_background=true -command_user="${COLLECTD_USER}" -start_stop_daemon_args="${COLLECTD_SSDARGS} --nice ${COLLECTD_NICELEVEL}" -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 -} - -stop_pre() { - if [ "${RC_CMD}" = "restart" ]; then - configtest || return 1 - fi -} diff --git a/app-admin/collectd/files/collectd.logrotate b/app-admin/collectd/files/collectd.logrotate deleted file mode 100644 index 5d344f6208f1..000000000000 --- a/app-admin/collectd/files/collectd.logrotate +++ /dev/null @@ -1,9 +0,0 @@ -# -# /etc/logrotate.d/collectd -# -/var/log/collectd.log { - daily - rotate 5 - notifempty - missingok -} diff --git a/app-admin/collectd/files/collectd.tmpfile b/app-admin/collectd/files/collectd.tmpfile deleted file mode 100644 index 4524a56ec183..000000000000 --- a/app-admin/collectd/files/collectd.tmpfile +++ /dev/null @@ -1 +0,0 @@ -d /run/collectd 0770 collectd collectd diff --git a/app-admin/collectd/metadata.xml b/app-admin/collectd/metadata.xml deleted file mode 100644 index 5f027424cee4..000000000000 --- a/app-admin/collectd/metadata.xml +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>whissi@gentoo.org</email> - <name>Thomas Deutschmann</name> - </maintainer> - <longdescription lang="en"> - Collectd gathers statistics about the system it is running on and stores this - information. Those statistics can then be used to find current performance - bottlenecks (i.e. performance analysis) and predict future system load (i.e. - capacity planning). Or if you just want pretty graphs of your private server - and are fed up with some homegrown solution you're at the right place. - </longdescription> - <upstream> - <bugs-to>https://github.com/collectd/collectd/issues</bugs-to> - <doc lang="en">https://collectd.org/documentation.shtml</doc> - <remote-id type="github">collectd/collectd</remote-id> - </upstream> - <use> - <flag name="contrib">Install user-contributed files in the doc directory</flag> - <flag name="filecaps">When set collectd daemon will have set required capabilities to run most plugins even if run as unprivileged user</flag> - <flag name="java">Must be set (workaround for java-pkg-opt-2 eclass limitation) when you want java or genericjmx plugin</flag> - <flag name="udev">Enable optional udev usage in disk plugin; Required for smart plugin</flag> - <flag name="xfs">Enable optional capability to filter on XFS file system in df plugin; Requires XFS headers from <pkg>sys-fs/xfsprogs</pkg></flag> - </use> -</pkgmetadata> diff --git a/app-admin/go-updater/Manifest b/app-admin/go-updater/Manifest new file mode 100644 index 000000000000..e2d2253af1ac --- /dev/null +++ b/app-admin/go-updater/Manifest @@ -0,0 +1,3 @@ +DIST go-updater-0.1.0.tar.gz 1754 BLAKE2B 720a328e8f28d2f0b28400053776ff8dbe52e24be7b20812d01b148bde72eda948acb5867b8ca16af7b40d20e36d36d3ffbd846c4992bb1dbe2af6db0069e765 SHA512 321f7faaec62b653c2b01f6f2e2c0104b536e63dfeb6aacd72c493d3fdc7b3bc5b96d6eff02ec1603adde1879dacbd51f4ced37c3cd94361120cc482432cb8a5 +EBUILD go-updater-0.1.0.ebuild 484 BLAKE2B 7a8413ef6a49557411bd98527880b63bd1e06ab26b3da010dbc02105de4216cf697e428d9e6d60181872a7279dd428689424363bd9a85d916b1d5b15521303ae SHA512 ffaf2957d335ebde1c981d0593d0f239740fbc155d5f28b8fd744a3c1ab193bbf6cb1ce35d5beea40ffe45a5461582be38d7c336ec235b1026cc1dd2e3f269a4 +MISC metadata.xml 326 BLAKE2B 6da205ed08b301f995aefb59116b618e24495abd172c9a152acb99d9d3e118500c9c3e55a5abb8987f33bb7d334516fa1595829e35ca9835df6622b4318d8a88 SHA512 55cfe9cb2c45438ace6fa2915828d032dfb377af270f024d78008bf5912e2527d88662f79b4b6aedbe2e9870cb52262b25624a4c598f94c4e0e4cb9f649aec92 diff --git a/app-admin/go-updater/go-updater-0.1.0.ebuild b/app-admin/go-updater/go-updater-0.1.0.ebuild new file mode 100644 index 000000000000..78dc6698a598 --- /dev/null +++ b/app-admin/go-updater/go-updater-0.1.0.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DESCRIPTION="Checks if Gentoo go packages are compiled with the system's golang version" +HOMEPAGE="https://github.com/mrueg/go-updater" +SRC_URI="https://github.com/mrueg/go-updater/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" +IUSE="" + +RDEPEND="dev-go/goversion" + +src_compile() { + :; +} + +src_install() { + dobin ${PN} + dodoc README.md +} diff --git a/app-admin/go-updater/metadata.xml b/app-admin/go-updater/metadata.xml new file mode 100644 index 000000000000..f2eeaac7c70e --- /dev/null +++ b/app-admin/go-updater/metadata.xml @@ -0,0 +1,11 @@ +<?xml version='1.0' encoding='UTF-8'?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>mrueg@gentoo.org</email> + <name>Manuel Rüger</name> + </maintainer> + <upstream> + <remote-id type="github">mrueg/go-updater</remote-id> + </upstream> +</pkgmetadata> diff --git a/app-admin/kube-bench/Manifest b/app-admin/kube-bench/Manifest index c85f6b951265..d0e4481ddde7 100644 --- a/app-admin/kube-bench/Manifest +++ b/app-admin/kube-bench/Manifest @@ -21,5 +21,7 @@ DIST github.com-spf13-jwalterweatherman-12bd96e66386c1960ab0f74ced1362f66f552f7b DIST github.com-spf13-pflag-4c012f6dcd9546820e378d0bdda4d8fc772cdfea.tar.gz 40078 BLAKE2B 4a15afdf122a58dd006d57da88176fd2804d98706ac3d8c496dc14b084851288dd28bad95f7871d738f0487db46aa7969dffbdf005c14fc6f46bcd0ad7e0f673 SHA512 4f4d606bfe94ea51a6cde535f16078602f1d63bd2896aed52bb53b3d219510ab38ad4bdc692da2eb355c9361041d7322db6424f63783bcc367343a1666cdf297 DIST github.com-spf13-viper-25b30aa063fc18e48662b86996252eabdcf2f0c7.tar.gz 30849 BLAKE2B 8e66dbb5c90c47e66ea72848d86602861791fe3198ce6cde5ea87330f15dd19cdd249788bebc31b2a66577c20edeef01c8beb59a4140d57167c4b13d33118a04 SHA512 4acd37411683d753d81d839e83c2257bc424c42b8e295868da84cb045db131be063b0e5a0fb88c587332582f356186659d5a181e65ae1838e868576543c1fecd DIST kube-bench-0.0.11.tar.gz 175361 BLAKE2B 844e252ccf270561154f1bab9c02144ff10a0594d71a2cd6e63a828ecabee2132a8756848642c475bfa705f360a5d69812519f705ad7c4717d5a4bf9d84cbd1b SHA512 52debf132bae38588f0b49c54f07d2550fc254665a0549b7369fb34b6884724624a44d14e6ea1120dc0c2586f2647b56d30e66695f2d8829c3f26ec5f2443f38 +DIST kube-bench-0.0.12.tar.gz 175549 BLAKE2B f909caa4735ed4c6698b756bea24ffbf176c1ff111130ed17f421c894dbefbec28e88305701ab42e40c255dbc4f4a748db2d3ede29951cf38715afd1f61cefe6 SHA512 c91de2ca9b1cb5769885dfb7691c95680f2a82d22e0df3b0060135281c3e42a8824302ec14b3f462ad2f76fa39c32bf93721428c2f3e9a50dbebcacfc6d840a4 EBUILD kube-bench-0.0.11.ebuild 2382 BLAKE2B e07d33ac0bc2f6802742deb31bc1958e0ae86383fe73f64e03b409603cd0a23bacda46cd9ae3e2252142c5f69dff0e1fb3249fe0f26f789f46c95a9efa6fd3ab SHA512 f9e32a20fcc8612a3061457d309900726b91fcbfc2b80da549aeb6e5d8b2d2c0ee2cd7300fec27b3191f0cf35e7307f5f01bcecc1eda53a5a11300b5ace7f199 +EBUILD kube-bench-0.0.12.ebuild 2382 BLAKE2B e07d33ac0bc2f6802742deb31bc1958e0ae86383fe73f64e03b409603cd0a23bacda46cd9ae3e2252142c5f69dff0e1fb3249fe0f26f789f46c95a9efa6fd3ab SHA512 f9e32a20fcc8612a3061457d309900726b91fcbfc2b80da549aeb6e5d8b2d2c0ee2cd7300fec27b3191f0cf35e7307f5f01bcecc1eda53a5a11300b5ace7f199 MISC metadata.xml 333 BLAKE2B c8437977b6a07e36929b13f767af0f09158bedd1ea7a0bee1da52dd1b83acb2929248c3c385a5fba14362721ab6871d399ddfba53d15bbe84a87af0ad771b73b SHA512 295cae435555436e9091195ac585fd30d022aba0b76244c85927f19f14b38dde95fb14192c832f00f52e3cf71aa3d95f7527b22a90690f85206178c49d620c8d diff --git a/app-admin/kube-bench/kube-bench-0.0.12.ebuild b/app-admin/kube-bench/kube-bench-0.0.12.ebuild new file mode 100644 index 000000000000..01b95b2a0ede --- /dev/null +++ b/app-admin/kube-bench/kube-bench-0.0.12.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +EGO_PN="github.com/aquasecurity/kube-bench" + +EGO_VENDOR=( + "github.com/fatih/color 570b54cabe6b8eb0bc2dfce68d964677d63b5260" + "github.com/fsnotify/fsnotify 4da3e2cfbabc9f751898f250b49f2439785783a1" + "github.com/golang/glog 23def4e6c14b4da8ac2ed8007337bc5eb5007998" + "github.com/hashicorp/hcl 23c074d0eceb2b8a5bfdbb271ab780cde70f05a8" + "github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75" + "github.com/jinzhu/gorm 5174cc5c242a728b435ea2be8a2f7f998e15429b" + "github.com/jinzhu/inflection 1c35d901db3da928c72a72d8458480cc9ade058f" + "github.com/lib/pq 83612a56d3dd153a94a629cd64925371c9adad78" + "github.com/magiconair/properties 49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934" + "github.com/mattn/go-colorable 5411d3eea5978e6cdc258b30de592b60df6aba96" + "github.com/mattn/go-isatty 57fdcb988a5c543893cc61bce354a6e24ab70022" + "github.com/mitchellh/mapstructure 06020f85339e21b2478f756a78e295255ffa4d6a" + "github.com/pelletier/go-toml 0131db6d737cfbbfb678f8b7d92e55e27ce46224" + "github.com/spf13/afero 57afd63c68602b63ed976de00dd066ccb3c319db" + "github.com/spf13/cast acbeb36b902d72a7a4c18e8f3241075e7ab763e4" + "github.com/spf13/cobra 7b2c5ac9fc04fc5efafb60700713d4fa609b777b" + "github.com/spf13/jwalterweatherman 12bd96e66386c1960ab0f74ced1362f66f552f7b" + "github.com/spf13/pflag 4c012f6dcd9546820e378d0bdda4d8fc772cdfea" + "github.com/spf13/viper 25b30aa063fc18e48662b86996252eabdcf2f0c7" + "golang.org/x/sys e24f485414aeafb646f6fca458b0bf869c0880a1 github.com/golang/sys" + "golang.org/x/text e19ae1496984b1c655b8044a65c0300a3c878dd3 github.com/golang/text" + "gopkg.in/yaml.v2 c95af922eae69f190717a0b7148960af8c55a072 github.com/go-yaml/yaml" +) + +inherit golang-build golang-vcs-snapshot bash-completion-r1 + +ARCHIVE_URI="https://github.com/aquasecurity/kube-bench/archive/v${PV}.tar.gz -> ${P}.tar.gz + ${EGO_VENDOR_URI}" +KEYWORDS="~amd64" + +DESCRIPTION="Kubernetes Bench for Security runs the CIS Kubernetes Benchmark" +HOMEPAGE="https://github.com/aquasecurity/kube-bench" +SRC_URI="${ARCHIVE_URI}" + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="" + +RESTRICT="test" + +src_compile() { + pushd src/${EGO_PN} || die + GOPATH="${S}" go build -o ${PN} . || die + popd || die +} + +src_install() { + dobin src/${EGO_PN}/${PN} + insinto /etc/kube-bench + doins -r src/${EGO_PN}/cfg +} diff --git a/app-admin/kubectx/Manifest b/app-admin/kubectx/Manifest index 2000490bb598..9839f9b8945f 100644 --- a/app-admin/kubectx/Manifest +++ b/app-admin/kubectx/Manifest @@ -1,5 +1,3 @@ -DIST kubectx-0.4.0_p20180118.tar.gz 398084 BLAKE2B fda8cae93e221fc4732b7cedbd44465541cdd7f31b29fbbfde781ea34b2c2d644ad6735d6bf7fa1ebcf04cc2b9dc3ac8e883808cd04c8a256b004a3293cee240 SHA512 04123596724dfc4dacc0beb578c716a3909d98d7df7dbf3c1439b5bb29ac14ea7b366be3e2252550ed89474c58ce83b028af79b0cd288f1ecd62c6c3f2729f62 DIST kubectx-0.4.1.tar.gz 397910 BLAKE2B 60b0ac75cf6358a3660c3e59f85e5c27a670095ad973edbf2b53350726b48f1036aa90dd999cf149c10956a43692389ab2e87c63bce3b711ae2c7cb894157753 SHA512 dcaf1c8f71f69037f9341ff29befb2507d7bfa11a25e6e864000b802fe1221d6b47f2f78faa6c490711e65d0dda4b289e5ed1ffc261e4d2142054f48d1aac140 -EBUILD kubectx-0.4.0_p20180118.ebuild 789 BLAKE2B 199715ce5c3fab1bc97580c7625888ae244585bb6d1f9efc24ee99188258c8540086b386e9efaaf77eb129f425fcb646c42e7908196a5b370d823846c404c50f SHA512 9b59c77fe6d81d3d794d0d21a6ae4441ce1546a587bb6dd27516c8741293ead21ebd5011237235e578f24ec3bee6d396a53de48fd38fa0dea55fbb24ada96bcd EBUILD kubectx-0.4.1.ebuild 695 BLAKE2B 7d577b4d94e9deb6ce514fc3997052526670ce9c4d9df60d90136388b04f80c360957ed46d3ca83093d73fe6ab696433d099ad853e3299ad897cd4d7460d2419 SHA512 ac6b600bbdb46ddb0bb2d4d4fffe25bd41217d231ccef053169bac0e5f5e8b0ff0ec85fa67bc73996c590845b6768dddea4cbc2b3afa53077a93a5f341597a40 MISC metadata.xml 324 BLAKE2B 78b22be6aaf9e018d9e75f572304e37680db02da78e20dd603c0c0c1eaaafdf37ae7b4d1534c743581e319cede030c25ce77fc701b10e4359522fe1cfe48ce04 SHA512 0361b6396f21c195af41c0f2fac3030071ad28d736ec3b7b731346b4cde955be334deb1ab0974f9b273d4dec63e6fffcaf288aa707e517bea6971cfc9e07b551 diff --git a/app-admin/kubectx/kubectx-0.4.0_p20180118.ebuild b/app-admin/kubectx/kubectx-0.4.0_p20180118.ebuild deleted file mode 100644 index 3cdfb0a50a87..000000000000 --- a/app-admin/kubectx/kubectx-0.4.0_p20180118.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit vcs-snapshot bash-completion-r1 - -COMMIT="b2992aa0df9143c25d64843b3ee40fbcd7332f07" - -DESCRIPTION="Fast way to switch between clusters and namespaces in kubectl" -HOMEPAGE="https://github.com/ahmetb/kubectx" -SRC_URI="https://github.com/ahmetb/kubectx/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" - -RDEPEND="sys-cluster/kubectl" - -src_install() { - insinto /usr/include - doins utils.bash - dobin kubectx kubens - - insinto /usr/share/zsh/site-functions - newins completion/kubectx.zsh _kubectx - newins completion/kubens.zsh _kubens - - newbashcomp completion/kubectx.bash kubectx - newbashcomp completion/kubens.bash kubens -} diff --git a/app-admin/logsentry/Manifest b/app-admin/logsentry/Manifest index d65edd173b59..ba883899420b 100644 --- a/app-admin/logsentry/Manifest +++ b/app-admin/logsentry/Manifest @@ -1,4 +1,4 @@ DIST logsentry-1.1.1.tar.gz 30267 BLAKE2B e81fb68484fb05f40d61e2d34bc6e0953e99a46b299f4384592bb4a5a1b53874ca382dfaf68f60ee232d56a9c23ec4840ddc71033fb20b88f653d2fc00384869 SHA512 4be045289259655e7b4da05dd1a07c649b2289fbc6f15dd424dc48ab980478f3ae49501f0e9e2035fddb9a40acaf2f4ab310ff8d95355196d82d41d6fc860143 -EBUILD logsentry-1.1.1-r2.ebuild 1673 BLAKE2B 4143d0b78ecd4f44ef3a922f5d874437c184e1830ce168ae049e111853634608b3f8b6b13d883b2b01b096b361a6b3ec4675e7bb163e81dcacacd33cc5897efa SHA512 02911e9068401f4d6928a87d2951eabf55fcd31fb37be590aab738c86d17d2111b3c98f01a9567ad74b136c4a5ac0d453f6d8dd4e6510383146caeaa9d3614ee +EBUILD logsentry-1.1.1-r2.ebuild 1672 BLAKE2B 2fe664d750585d2c9bf6ed4917a8f75e5c9d2fba637d5b216328ed9030bc1bc35bab12a55f3b0f87eff6d4a35095a5eed3c58a8dbcd3b0d0555373cd0fe6c4d0 SHA512 037e49a772278c28745bbe72c5d8cdae5bdb3f77476bf0a55c1b26fa3f9aeb321f33be358c13dd07a0d3186860c6beb85f9678fd81d1d76ab269caeeee0cad48 EBUILD logsentry-1.1.1.ebuild 1538 BLAKE2B e41bbcc95a1753d8d4e73601537a9294db2873609745eacf7fc752b3d00d570e029112470912da1ba75a9588b6c4c510a650ff547c2b4db70412b4f612752646 SHA512 69d37361a5d87fd1051a2742ffea623f49afbac03a9ee7b8e1ff256f985500cceb42072c7bd3c13f8b052d78afdd7d22d646489d4ec52681e177f476d365392e MISC metadata.xml 248 BLAKE2B 495eba242dfadfd944d3f74a526162dc04de2d8fcebcb6d5dce43c20500407485c24fe61d537f8015739463543b53ed6fbd9d07242a45782df2c2a8d68e053ab SHA512 52d286d2ecc5d8b66e2468683db28439cdcbcc96c88d8dba8a415049def3c53bc130783853aee9918c6b0dc4ae295aba44d601687d440196399903b25e92b5f9 diff --git a/app-admin/logsentry/logsentry-1.1.1-r2.ebuild b/app-admin/logsentry/logsentry-1.1.1-r2.ebuild index a89146d62c47..f21b1a952619 100644 --- a/app-admin/logsentry/logsentry-1.1.1-r2.ebuild +++ b/app-admin/logsentry/logsentry-1.1.1-r2.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 arm ~mips ~ppc ~s390 ~sh sparc x86" +KEYWORDS="amd64 arm ~mips ppc ~s390 ~sh sparc x86" IUSE="" DEPEND=">=sys-apps/sed-4" diff --git a/app-admin/packagekit-base/Manifest b/app-admin/packagekit-base/Manifest index 89c5057d1ade..68f5e5c125d7 100644 --- a/app-admin/packagekit-base/Manifest +++ b/app-admin/packagekit-base/Manifest @@ -1,14 +1,5 @@ AUX packagekit-base-1.1.1-cache-qafix.patch 469 BLAKE2B fb0666e27d2908236a0adf31adcc9dbcaab94bdb1d4b253369b2bf92e18279e289ea8b486285ce9b19abfc79c81e308675019777f49b98ce6aca1e341695cfb6 SHA512 7efb79f5b25f4b1b3db22247c695e13d748908c6802667bd8dc322c247881bd133aa8787192598b384ce8080ac986031e5fee64201f17e4e8af7e15fc7d18424 AUX packagekit-base-1.1.7-elogind-support.patch 5872 BLAKE2B a18f2e6016781b043d34cc82e76970a8fd18a4e08fb5516b2f332f6a3213e4fbb90311d6bd54a11b82b98e84d90598648562473aa497c8c4c69ad99a4cbd474e SHA512 26b6f163e44a1a837e8c9ac43b8f6ec9733962d746d0081e05d1691099c953e16055d530e7de5558aacd985b1690dcbea9c6087755d037d8029f34b158d74a45 -AUX packagekit-base-elogind-support.patch 5850 BLAKE2B d71b50661eaafe2d5bdb5bc7263dc561adc461eb61064fed754321eb4559a9b19f4a38bcd46e5e7dfba8084f0a8b3b451511cee7ad8d58d6063ecec36558623b SHA512 2494c80f7d6b20a9b55f18af8f111134e06d39dd140429da70cd90c36abe73c5b1b002efe79463d0e74cffd2653623473b6bf42579bc69525bcd10c268d41b4a -DIST PackageKit-1.0.11.tar.xz 1427404 BLAKE2B 74455b4b070eb16a1310d77ec50225daa09a3bb16754ab9ead5aac382e05e6ecb3c64545bf64a16bc09d1cdcd73a4c179812eb03296e514c12c0ba15be514197 SHA512 9529037685f76e883a71ae502eabd83c3e1e8905f76cfe5e938760677f0224f8758bca59e139588aa06589bcca7a20f13dea0fe419022cb950c7a4c631237bce -DIST PackageKit-1.1.1.tar.xz 1410632 BLAKE2B ffb9d96794dfafa5362277292a743dde0d66259801611043cfdb66e169f9cd377ad49a00bab8687bbacf5cb156eb83c0fc1d33bf13409a1f1af60b3a9ab88a1e SHA512 caf9b67f71a36479d32338c28343671e9586aade7a0f777b867772ad8da8e3206bf66a46b2fa2cba8f0f48af27db3888b68e336707db6f76c5e0dbed464e2874 -DIST PackageKit-1.1.4.tar.xz 1424756 BLAKE2B a9eb82857b37fc84c8b7d5e71f0b51c4f1d9ef74702afb6e92e9e84e1ccf9e905dafafbda61a3ea737e94173f53486591bb66cf43b19b25004815f3abfd05d8c SHA512 fc04d58c46f7e7dbb1386d26627ea246b5f21b8483862788bb734b8a137e4cb1d41de0f471b46f6d649e29337f9605acba0568a845577b27a2ac0faaf391b187 -DIST PackageKit-1.1.5.tar.xz 1418292 BLAKE2B 973cfaf1e6dd48bbf3ef5cfe421202804af584af227fb70c5835d70bc128da64fd4084dd2bc508ed63d2c46ac693d7b3fcb540992da4e13ea947696a75f870d9 SHA512 ecc6a4d39caa0a7ea2047f52f95980b23e61ae200e27559326f03302b1c0d798f9cbae53fcf2d397dca3d54e52f143e2e7aa4e3f0b2df8c39e53bd2993e86154 DIST PackageKit-1.1.7.tar.xz 1431648 BLAKE2B 0cc64e7ac38d6641a1fbd98ffad2e7920eb7b3c86ea36d3ad036541886191c38deeeb7241f81ec3d29f8268b1c84ec500511895312c29c706403607215117d5e SHA512 0d0277e24feb63e94aeb5fec2c4306ccdf5935c2f62d5eef3be8db9f534eb302eff09ea0e020db48b2dd0af9ba6b31f7960d661d1040774dccf650ebf04c4f83 -EBUILD packagekit-base-1.0.11.ebuild 2897 BLAKE2B 273c57376ea2e7a4ac18b78e1b3a2297e37186e921e0bf5dc33361a5db7aef447a417de105284a3fc181cc6b05a9c0f0b6abd172d127b90a74d6e157f8ec5561 SHA512 40f13d99bec2493be551c2bae8d34789f1155c57d5a01b5f5964f18e6124894ab31d72532d481d136175d37979752e8926d91b44bdc181d47856725c19727c33 -EBUILD packagekit-base-1.1.1.ebuild 3338 BLAKE2B 82a68620c4e6e9ff616dfce5b579eb3742e609e169b2cd3a133a8079f791e55efb85391a2b3e7af43ca12200d0a963fb3ef1701a3c6dc25f00ae064559172606 SHA512 95e673821d137a33e1622e1cad241bf9649ad1368ac4c27178643d40f39f3bc8408546f5f545dc325ca72be0586ee5dadc7f33af0c1d98acc7ec748eb305fc22 -EBUILD packagekit-base-1.1.4.ebuild 3372 BLAKE2B bac2e0a5ff37132fbf315e0958fec7237f0059191f0074169e1eaa53cda2338f408dff543325e859e6f20e0d8d900cf470e563196506fbc99af7cbcb2e4dcb36 SHA512 44ccfdf2114a4d2d0d90ce39e7b18ce8adebac5f423fda4661c0e848d39efd7a9dba12a54022e77e6171aa44037cb65b6a6c584346d1181c0ddfe18212354046 -EBUILD packagekit-base-1.1.5-r2.ebuild 3769 BLAKE2B 0f492fd80c02c3e057d862061f39b058ea403d56c6f453f4d824b5df7b884a3c4996113419fee66c2fcaffd1403e4d86dc05e4bdafdf4ac7ea9483344daad4c9 SHA512 a750ec8210a7b052452b5f8cae6f5a21fd2123225a92ad610b757368123235c048f8022f0609971b092b038493538a078db0f00655dd159e830383a49bad7c90 -EBUILD packagekit-base-1.1.7-r1.ebuild 3654 BLAKE2B 8ffc424c55301f0cf5e6bcb8d0f4715541ba0f02c46c05ea3fc7cfda3c63cde076a339ce46bd9f4bfe80cc636826059a62df8e19ae282629d76c3bc3be26b152 SHA512 88ad6091f959e73abf2bad826275463d925bde2fade010077578c6af19c1e026a6c0fe1c80d7280b0c3b7e2f5c91f58c58183e2b542b2a7c801068dfa5dc5dad +EBUILD packagekit-base-1.1.7-r1.ebuild 3676 BLAKE2B 33081996cac6656b7aa0cc729ff60de69263a710d35c37e01b2eb37e8ffc72e5b39ce14ba105e08c52105cc6716546dd6380bea8d96c3d40899eeccb41158d5a SHA512 3d104fe8464249496c2bc001b907d3f36533abc50643d6b002e03ce9e2b4c08c9b13b9a3eb68923d655c5933b5b6a04f82be870882ade4c2a2b2a5dd29dcb7fa MISC metadata.xml 664 BLAKE2B 4dcdb79a089d9ec0734d9af4c2b6206ad1add7b17f8c8984b2e7763672fc334000749b4332e92224d11b0382fe22a2ca0f83ced4da218fbd1e85d8b101fd3e1f SHA512 9b80a98e97af44ab81b497b2c71c73db41da7f250734d6b032e80151719a0a82e2c1e295b068a5e3657a509dbd74d1f65f6e49fc211f77d0623eb7bdcd32b323 diff --git a/app-admin/packagekit-base/files/packagekit-base-elogind-support.patch b/app-admin/packagekit-base/files/packagekit-base-elogind-support.patch deleted file mode 100644 index df7675761d49..000000000000 --- a/app-admin/packagekit-base/files/packagekit-base-elogind-support.patch +++ /dev/null @@ -1,184 +0,0 @@ ---- a/config.h.in 2017-06-07 16:38:45.046910693 +0200 -+++ b/config.h.in 2017-06-07 16:39:06.973911120 +0200 -@@ -78,8 +78,8 @@ - /* Define to 1 if you have the <string.h> header file. */ - #undef HAVE_STRING_H - --/* Build systemd code */ --#undef HAVE_SYSTEMD -+/* Build systemd-login code */ -+#undef HAVE_SYSTEMD_SD_LOGIN_H - - /* Define to 1 if you have the <sys/stat.h> header file. */ - #undef HAVE_SYS_STAT_H ---- a/configure.ac 2017-06-06 09:03:57.171355965 +0200 -+++ b/configure.ac 2017-06-06 09:55:11.242384458 +0200 -@@ -254,7 +254,6 @@ - AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]), - [has_systemdsystemunitdir=$with_systemdsystemunitdir], - [has_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)]) -- AC_DEFINE(HAVE_SYSTEMD,1,[Build systemd code]) - AC_SUBST([systemdsystemunitdir], [$has_systemdsystemunitdir]) - fi - AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$has_systemdsystemunitdir"]) -@@ -267,6 +266,24 @@ - AM_CONDITIONAL(ENABLE_OFFLINE_UPDATE, [test x$enable_systemd = xyes -a x$enable_offline_update = xyes]) - - dnl --------------------------------------------------------------------------- -+dnl - Use elogind instead of systemd-login -+dnl --------------------------------------------------------------------------- -+AC_ARG_ENABLE(elogind, AS_HELP_STRING([--enable-elogind],[enable elogind session tracker]), -+ enable_elogind=$enableval,enable_elogind=no) -+if test x$enable_elogind = xyes; then -+ PKG_CHECK_MODULES(ELOGIND, [libelogind >= 229.4], [have_elogind=yes], [have_elogind=no]) -+else -+ have_elogind=no -+fi -+ -+dnl --------------------------------------------------------------------------- -+dnl --- Is systemd/sd-login.h, either from systemd or elogind, available? -+dnl --------------------------------------------------------------------------- -+if test -n "$has_systemdsystemunitdir" -o "x$have_elogind" != "xno" ; then -+ AC_DEFINE(HAVE_SYSTEMD_SD_LOGIN_H,1,[Build systemd-login code]) -+fi -+ -+dnl --------------------------------------------------------------------------- - dnl - Generate man pages ? (default enabled) - dnl --------------------------------------------------------------------------- - AC_ARG_ENABLE(man_pages, AS_HELP_STRING([--disable-man-pages],[Disable man pages generation]), enable_man_pages=$enableval) -@@ -629,6 +644,7 @@ - cflags: ${CFLAGS} - cppflags: ${CPPFLAGS} - Able to run locally: ${enable_local} -+ Use elogind: ${enable_elogind} - Use systemd: ${enable_systemd} - Enable offline update: ${enable_offline_update} - Networking stacks: ${networking_apis} ---- a/src/Makefile.am 2017-06-06 10:02:19.902397328 +0200 -+++ b/src/Makefile.am 2017-06-06 10:04:05.013400483 +0200 -@@ -11,6 +11,7 @@ - $(PYTHON_CFLAGS) \ - $(NETWORK_MANAGER_CFLAGS) \ - $(CONNMAN_CFLAGS) \ -+ $(ELOGIND_CFLAGS) \ - $(SYSTEMD_CFLAGS) \ - -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \ - -DBINDIR=\"$(bindir)\" \ -@@ -104,6 +105,7 @@ - $(POLKIT_LIBS) \ - $(GIO_LIBS) \ - $(ARCHIVE_LIBS) \ -+ $(ELOGIND_LIBS) \ - $(SYSTEMD_LIBS) - - packagekit_direct_LDFLAGS = \ -@@ -134,6 +136,7 @@ - $(POLKIT_LIBS) \ - $(GIO_LIBS) \ - $(ARCHIVE_LIBS) \ -+ $(ELOGIND_LIBS) \ - $(SYSTEMD_LIBS) - - packagekitd_LDFLAGS = \ -@@ -161,6 +164,7 @@ - $(POLKIT_LIBS) \ - $(GIO_LIBS) \ - $(ARCHIVE_LIBS) \ -+ $(ELOGIND_LIBS) \ - $(SYSTEMD_LIBS) - - pk_self_test_CPPFLAGS = \ ---- a/src/pk-engine.c 2017-06-06 09:12:23.828371176 +0200 -+++ b/src/pk-engine.c 2017-06-06 09:55:47.426385545 +0200 -@@ -98,7 +98,7 @@ - guint owner_id; - GDBusNodeInfo *introspection; - GDBusConnection *connection; --#ifdef HAVE_SYSTEMD -+#ifdef HAVE_SYSTEMD_SD_LOGIN_H - GDBusProxy *logind_proxy; - gint logind_fd; - #endif -@@ -281,7 +281,7 @@ - static void - pk_engine_inhibit (PkEngine *engine) - { --#ifdef HAVE_SYSTEMD -+#ifdef HAVE_SYSTEMD_SD_LOGIN_H - g_autoptr(GError) error = NULL; - g_autoptr(GUnixFDList) out_fd_list = NULL; - g_autoptr(GVariant) res = NULL; -@@ -331,7 +331,7 @@ - static void - pk_engine_uninhibit (PkEngine *engine) - { --#ifdef HAVE_SYSTEMD -+#ifdef HAVE_SYSTEMD_SD_LOGIN_H - if (engine->priv->logind_fd == 0) - return; - g_debug ("closed logind fd %i", engine->priv->logind_fd); -@@ -1830,7 +1830,7 @@ - } - } - --#ifdef HAVE_SYSTEMD -+#ifdef HAVE_SYSTEMD_SD_LOGIN_H - /** - * pk_engine_proxy_logind_cb: - **/ -@@ -1872,7 +1872,7 @@ - /* save copy for emitting signals */ - engine->priv->connection = g_object_ref (connection); - --#ifdef HAVE_SYSTEMD -+#ifdef HAVE_SYSTEMD_SD_LOGIN_H - /* connect to logind */ - g_dbus_proxy_new (connection, - G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES, -@@ -2031,7 +2031,7 @@ - if (engine->priv->connection != NULL) - g_object_unref (engine->priv->connection); - --#ifdef HAVE_SYSTEMD -+#ifdef HAVE_SYSTEMD_SD_LOGIN_H - /* uninhibit */ - if (engine->priv->logind_fd != 0) - close (engine->priv->logind_fd); ---- a/src/pk-dbus.c 2017-06-06 09:12:13.254370858 +0200 -+++ b/src/pk-dbus.c 2017-06-06 10:09:17.249409857 +0200 -@@ -27,7 +27,7 @@ - #include <glib.h> - #include <gio/gio.h> - --#ifdef HAVE_SYSTEMD -+#ifdef HAVE_SYSTEMD_SD_LOGIN_H - #include <systemd/sd-login.h> - #endif - -@@ -177,7 +177,7 @@ - return cmdline; - } - --#ifdef HAVE_SYSTEMD -+#ifdef HAVE_SYSTEMD_SD_LOGIN_H - /** - * pk_dbus_get_session_systemd: - **/ -@@ -220,7 +220,7 @@ - pk_dbus_get_session (PkDbus *dbus, const gchar *sender) - { - gchar *session = NULL; --#ifndef HAVE_SYSTEMD -+#ifndef HAVE_SYSTEMD_SD_LOGIN_H - g_autoptr(GError) error = NULL; - #endif - guint pid; -@@ -250,7 +250,7 @@ - } - - /* get session from systemd or ConsoleKit */ --#ifdef HAVE_SYSTEMD -+#ifdef HAVE_SYSTEMD_SD_LOGIN_H - session = pk_dbus_get_session_systemd (pid); - #else - /* get session from ConsoleKit */ diff --git a/app-admin/packagekit-base/packagekit-base-1.0.11.ebuild b/app-admin/packagekit-base/packagekit-base-1.0.11.ebuild deleted file mode 100644 index 888c3f9057e8..000000000000 --- a/app-admin/packagekit-base/packagekit-base-1.0.11.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -# PackageKit supports 3.2+, but entropy and portage backends are untested -# Future note: use --enable-python3 -PYTHON_COMPAT=( python2_7 ) -VALA_USE_DEPEND="vapigen" - -inherit bash-completion-r1 multilib nsplugins python-single-r1 systemd vala - -MY_PN="PackageKit" -MY_P=${MY_PN}-${PV} - -DESCRIPTION="Manage packages in a secure way using a cross-distro and cross-architecture API" -HOMEPAGE="http://www.packagekit.org/" -SRC_URI="https://www.freedesktop.org/software/${MY_PN}/releases/${MY_P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0/18" -KEYWORDS="~alpha amd64 ~arm ~mips ~ppc ~ppc64 x86" -IUSE="connman cron command-not-found +introspection networkmanager nsplugin entropy systemd test vala" -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - vala? ( introspection ) -" - -# While not strictly needed, consolekit is the alternative to systemd-login -# to get current session's user. -CDEPEND=" - >=app-shells/bash-completion-2 - dev-db/sqlite:3 - >=dev-libs/dbus-glib-0.74 - >=dev-libs/glib-2.32.0:2[${PYTHON_USEDEP}] - >=sys-auth/polkit-0.98 - >=sys-apps/dbus-1.3.0 - ${PYTHON_DEPS} - connman? ( net-misc/connman ) - introspection? ( >=dev-libs/gobject-introspection-0.9.9[${PYTHON_USEDEP}] ) - networkmanager? ( >=net-misc/networkmanager-0.6.4 ) - nsplugin? ( - >=dev-libs/nspr-4.8 - x11-libs/cairo - >=x11-libs/gtk+-2.14.0:2 - x11-libs/pango - ) - systemd? ( >=sys-apps/systemd-204 ) -" -DEPEND="${CDEPEND} - dev-libs/libxslt[${PYTHON_USEDEP}] - >=dev-util/gtk-doc-am-1.11 - >=dev-util/intltool-0.35.0 - sys-devel/gettext - virtual/pkgconfig - nsplugin? ( >=net-misc/npapi-sdk-0.27 ) - vala? ( $(vala_depend) ) -" -RDEPEND="${CDEPEND} - >=app-portage/layman-2[${PYTHON_USEDEP}] - >=sys-apps/portage-2.2[${PYTHON_USEDEP}] - entropy? ( >=sys-apps/entropy-234[${PYTHON_USEDEP}] ) - !systemd? ( sys-auth/consolekit ) -" - -S="${WORKDIR}/${MY_P}" - -RESTRICT="test" - -src_prepare() { - use vala && vala_src_prepare -} - -src_configure() { - econf \ - --disable-gstreamer-plugin \ - --disable-gtk-doc \ - --disable-gtk-module \ - --disable-schemas-compile \ - --disable-static \ - --enable-bash-completion \ - --enable-man-pages \ - --enable-nls \ - --enable-portage \ - --localstatedir=/var \ - $(use_enable command-not-found) \ - $(use_enable connman) \ - $(use_enable cron) \ - $(use_enable entropy) \ - $(use_enable introspection) \ - $(use_enable networkmanager) \ - $(use_enable nsplugin browser-plugin) \ - $(use_enable systemd) \ - $(use_enable test daemon-tests) \ - $(use_enable vala) \ - $(systemd_with_unitdir) - #$(use_enable test local) -} - -src_install() { - emake DESTDIR="${D}" install - prune_libtool_files --all - - dodoc AUTHORS ChangeLog MAINTAINERS NEWS README - - if use nsplugin; then - dodir "/usr/$(get_libdir)/${PLUGINS_DIR}" - mv "${D}/usr/$(get_libdir)/mozilla/plugins"/* \ - "${D}/usr/$(get_libdir)/${PLUGINS_DIR}/" || die - fi -} diff --git a/app-admin/packagekit-base/packagekit-base-1.1.1.ebuild b/app-admin/packagekit-base/packagekit-base-1.1.1.ebuild deleted file mode 100644 index a78d97003aa6..000000000000 --- a/app-admin/packagekit-base/packagekit-base-1.1.1.ebuild +++ /dev/null @@ -1,113 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -# PackageKit supports 3.2+, but entropy and portage backends are untested -# Future note: use --enable-python3 -PYTHON_COMPAT=( python2_7 ) -VALA_USE_DEPEND="vapigen" - -inherit bash-completion-r1 multilib python-single-r1 systemd vala - -MY_PN="PackageKit" -MY_P=${MY_PN}-${PV} - -DESCRIPTION="Manage packages in a secure way using a cross-distro and cross-architecture API" -HOMEPAGE="http://www.packagekit.org/" -SRC_URI="https://www.freedesktop.org/software/${MY_PN}/releases/${MY_P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0/18" -KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~x86" -IUSE="connman cron command-not-found +introspection networkmanager entropy systemd test vala" -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - vala? ( introspection ) -" - -# While not strictly needed, consolekit is the alternative to systemd-login -# to get current session's user. -CDEPEND=" - >=app-shells/bash-completion-2 - dev-db/sqlite:3 - >=dev-libs/dbus-glib-0.74 - >=dev-libs/glib-2.46.0:2[${PYTHON_USEDEP}] - >=sys-auth/polkit-0.98 - >=sys-apps/dbus-1.3.0 - ${PYTHON_DEPS} - connman? ( net-misc/connman ) - introspection? ( >=dev-libs/gobject-introspection-0.9.9:= ) - networkmanager? ( >=net-misc/networkmanager-0.6.4:= ) - systemd? ( >=sys-apps/systemd-204 ) -" -DEPEND="${CDEPEND} - dev-libs/libxslt[${PYTHON_USEDEP}] - >=dev-util/gtk-doc-am-1.11 - >=dev-util/intltool-0.35.0 - sys-devel/gettext - virtual/pkgconfig - vala? ( $(vala_depend) ) -" -RDEPEND="${CDEPEND} - >=app-portage/layman-2[${PYTHON_USEDEP}] - >=sys-apps/portage-2.2[${PYTHON_USEDEP}] - entropy? ( >=sys-apps/entropy-234[${PYTHON_USEDEP}] ) - !systemd? ( sys-auth/consolekit ) -" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - # Fixes QA Notices: https://github.com/gentoo/gentoo/pull/1760 and https://github.com/hughsie/PackageKit/issues/143 - eapply "${FILESDIR}/${P}-cache-qafix.patch" - - # Disable unittests not working with portage backend - # console: requires terminal input - sed -e 's:^\(.*/packagekit-glib2/control\)://\1:' \ - -e 's:^\(.*/packagekit-glib2/transaction-list\)://\1:' \ - -e 's:^\(.*/packagekit-glib2/client"\)://\1:' \ - -e 's:^\(.*/packagekit-glib2/package-sack\)://\1:' \ - -e 's:^\(.*/packagekit-glib2/task\)://\1:' \ - -e 's:^\(.*/packagekit-glib2/console\)://\1:' \ - -i lib/packagekit-glib2/pk-test-daemon.c || die - sed -e 's:^\(.*/packagekit/spawn\)://\1:' \ - -e 's:^\(.*/packagekit/transaction-db\)://\1:' \ - -e 's:^\(.*/packagekit/backend\)://\1:' \ - -i src/pk-self-test.c || die - - eapply_user - use vala && vala_src_prepare -} - -src_configure() { - econf \ - --disable-gstreamer-plugin \ - --disable-gtk-doc \ - --disable-gtk-module \ - --disable-schemas-compile \ - --disable-static \ - --enable-bash-completion \ - --enable-man-pages \ - --enable-nls \ - --enable-portage \ - --localstatedir=/var \ - $(use_enable command-not-found) \ - $(use_enable connman) \ - $(use_enable cron) \ - $(use_enable entropy) \ - $(use_enable introspection) \ - $(use_enable networkmanager) \ - $(use_enable systemd) \ - $(use_enable test daemon-tests) \ - $(use_enable test local) \ - $(use_enable vala) \ - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" -} - -src_install() { - emake DESTDIR="${D}" install - prune_libtool_files --all - - dodoc AUTHORS ChangeLog MAINTAINERS NEWS README -} diff --git a/app-admin/packagekit-base/packagekit-base-1.1.4.ebuild b/app-admin/packagekit-base/packagekit-base-1.1.4.ebuild deleted file mode 100644 index 2e070c3b583c..000000000000 --- a/app-admin/packagekit-base/packagekit-base-1.1.4.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -# PackageKit supports 3.2+, but entropy and portage backends are untested -# Future note: use --enable-python3 -PYTHON_COMPAT=( python2_7 ) -VALA_USE_DEPEND="vapigen" - -inherit bash-completion-r1 multilib python-single-r1 systemd vala xdg - -MY_PN="PackageKit" -MY_P=${MY_PN}-${PV} - -DESCRIPTION="Manage packages in a secure way using a cross-distro and cross-architecture API" -HOMEPAGE="http://www.packagekit.org/" -SRC_URI="https://www.freedesktop.org/software/${MY_PN}/releases/${MY_P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0/18" -KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~x86" -IUSE="connman cron command-not-found +introspection networkmanager entropy systemd test vala" -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - vala? ( introspection ) -" - -# While not strictly needed, consolekit is the alternative to systemd-login -# to get current session's user. -CDEPEND=" - >=app-shells/bash-completion-2 - dev-db/sqlite:3 - >=dev-libs/dbus-glib-0.74 - >=dev-libs/glib-2.46.0:2[${PYTHON_USEDEP}] - >=sys-auth/polkit-0.98 - >=sys-apps/dbus-1.3.0 - ${PYTHON_DEPS} - connman? ( net-misc/connman ) - introspection? ( >=dev-libs/gobject-introspection-0.9.9:= ) - networkmanager? ( >=net-misc/networkmanager-0.6.4:= ) - systemd? ( >=sys-apps/systemd-204 ) -" -DEPEND="${CDEPEND} - dev-libs/libxslt[${PYTHON_USEDEP}] - >=dev-util/gtk-doc-am-1.11 - >=dev-util/intltool-0.35.0 - sys-devel/gettext - virtual/pkgconfig - vala? ( $(vala_depend) ) -" -RDEPEND="${CDEPEND} - >=app-portage/layman-2[${PYTHON_USEDEP}] - >=sys-apps/portage-2.2[${PYTHON_USEDEP}] - entropy? ( >=sys-apps/entropy-234[${PYTHON_USEDEP}] ) - !systemd? ( sys-auth/consolekit ) -" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - # Fixes QA Notices: - # - https://github.com/gentoo/gentoo/pull/1760 - # - https://github.com/hughsie/PackageKit/issues/143 - eapply "${FILESDIR}"/${PN}-1.1.1-cache-qafix.patch - - # Disable unittests not working with portage backend - # console: requires terminal input - sed -e 's:^\(.*/packagekit-glib2/control\)://\1:' \ - -e 's:^\(.*/packagekit-glib2/transaction-list\)://\1:' \ - -e 's:^\(.*/packagekit-glib2/client"\)://\1:' \ - -e 's:^\(.*/packagekit-glib2/package-sack\)://\1:' \ - -e 's:^\(.*/packagekit-glib2/task\)://\1:' \ - -e 's:^\(.*/packagekit-glib2/console\)://\1:' \ - -i lib/packagekit-glib2/pk-test-daemon.c || die - sed -e 's:^\(.*/packagekit/spawn\)://\1:' \ - -e 's:^\(.*/packagekit/transaction-db\)://\1:' \ - -e 's:^\(.*/packagekit/backend\)://\1:' \ - -i src/pk-self-test.c || die - - eapply_user - use vala && vala_src_prepare - xdg_src_prepare -} - -src_configure() { - econf \ - --disable-gstreamer-plugin \ - --disable-gtk-doc \ - --disable-gtk-module \ - --disable-schemas-compile \ - --disable-static \ - --enable-bash-completion \ - --enable-man-pages \ - --enable-nls \ - --enable-portage \ - --localstatedir=/var \ - $(use_enable command-not-found) \ - $(use_enable connman) \ - $(use_enable cron) \ - $(use_enable entropy) \ - $(use_enable introspection) \ - $(use_enable networkmanager) \ - $(use_enable systemd) \ - $(use_enable test daemon-tests) \ - $(use_enable test local) \ - $(use_enable vala) \ - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" -} - -src_install() { - emake DESTDIR="${D}" install - prune_libtool_files --all - - dodoc AUTHORS ChangeLog MAINTAINERS NEWS README -} diff --git a/app-admin/packagekit-base/packagekit-base-1.1.5-r2.ebuild b/app-admin/packagekit-base/packagekit-base-1.1.5-r2.ebuild deleted file mode 100644 index 4894b565df05..000000000000 --- a/app-admin/packagekit-base/packagekit-base-1.1.5-r2.ebuild +++ /dev/null @@ -1,131 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -# PackageKit supports 3.2+, but entropy and portage backends are untested -# Future note: use --enable-python3 -PYTHON_COMPAT=( python2_7 ) -VALA_USE_DEPEND="vapigen" - -inherit autotools bash-completion-r1 multilib python-single-r1 systemd vala xdg - -MY_PN="PackageKit" -MY_P=${MY_PN}-${PV} - -DESCRIPTION="Manage packages in a secure way using a cross-distro and cross-architecture API" -HOMEPAGE="http://www.packagekit.org/" -SRC_URI="https://www.freedesktop.org/software/${MY_PN}/releases/${MY_P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0/18" -KEYWORDS="~alpha amd64 ~arm ~mips ~ppc ~ppc64 x86" -IUSE="connman cron command-not-found elogind +introspection networkmanager entropy systemd test vala" -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - ?? ( elogind systemd ) - vala? ( introspection ) -" - -# While not strictly needed, consolekit is the alternative to systemd-login -# or elogind to get current session's user. -COMMON_DEPEND=" - >=app-shells/bash-completion-2 - dev-db/sqlite:3 - >=dev-libs/dbus-glib-0.74 - >=dev-libs/glib-2.46.0:2[${PYTHON_USEDEP}] - >=sys-auth/polkit-0.98 - >=sys-apps/dbus-1.3.0 - ${PYTHON_DEPS} - connman? ( net-misc/connman ) - elogind? ( >=sys-auth/elogind-229.4 ) - introspection? ( >=dev-libs/gobject-introspection-0.9.9:= ) - networkmanager? ( >=net-misc/networkmanager-0.6.4:= ) - systemd? ( >=sys-apps/systemd-204 ) -" -# vala-common needed for eautoreconf -DEPEND="${COMMON_DEPEND} - >=dev-cpp/glibmm-2.4 - dev-libs/libxslt[${PYTHON_USEDEP}] - dev-libs/vala-common - >=dev-util/gtk-doc-am-1.11 - >=dev-util/intltool-0.35.0 - sys-devel/gettext - virtual/pkgconfig - vala? ( $(vala_depend) ) -" -RDEPEND="${COMMON_DEPEND} - >=app-portage/layman-2[${PYTHON_USEDEP}] - >=sys-apps/portage-2.2[${PYTHON_USEDEP}] - entropy? ( >=sys-apps/entropy-234[${PYTHON_USEDEP}] ) - !systemd? ( !elogind? ( sys-auth/consolekit ) ) -" - -PATCHES=( - # Fixes QA Notices: - # - https://github.com/gentoo/gentoo/pull/1760 - # - https://github.com/hughsie/PackageKit/issues/143 - "${FILESDIR}"/${PN}-1.1.1-cache-qafix.patch - - # Adds elogind support: - # - https://bugs.gentoo.org/show_bug.cgi?id=620948 - "${FILESDIR}"/${PN}-elogind-support.patch -) - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - # Disable unittests not working with portage backend - # console: requires terminal input - sed -e 's:^\(.*/packagekit-glib2/control\)://\1:' \ - -e 's:^\(.*/packagekit-glib2/transaction-list\)://\1:' \ - -e 's:^\(.*/packagekit-glib2/client"\)://\1:' \ - -e 's:^\(.*/packagekit-glib2/package-sack\)://\1:' \ - -e 's:^\(.*/packagekit-glib2/task\)://\1:' \ - -e 's:^\(.*/packagekit-glib2/console\)://\1:' \ - -i lib/packagekit-glib2/pk-test-daemon.c || die - sed -e 's:^\(.*/packagekit/spawn\)://\1:' \ - -e 's:^\(.*/packagekit/transaction-db\)://\1:' \ - -e 's:^\(.*/packagekit/backend\)://\1:' \ - -i src/pk-self-test.c || die - - eapply_user - use vala && vala_src_prepare - xdg_src_prepare - - # Needed by elogind patch: - eautoreconf -} - -src_configure() { - econf \ - --disable-gstreamer-plugin \ - --disable-gtk-doc \ - --disable-gtk-module \ - --disable-schemas-compile \ - --disable-static \ - --enable-bash-completion \ - --enable-man-pages \ - --enable-nls \ - --enable-portage \ - --localstatedir=/var \ - $(use_enable command-not-found) \ - $(use_enable connman) \ - $(use_enable cron) \ - $(use_enable elogind) \ - $(use_enable entropy) \ - $(use_enable introspection) \ - $(use_enable networkmanager) \ - $(use_enable systemd) \ - $(use_enable test daemon-tests) \ - $(use_enable test local) \ - $(use_enable vala) \ - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" -} - -src_install() { - emake DESTDIR="${D}" install - prune_libtool_files --all - - dodoc AUTHORS ChangeLog MAINTAINERS NEWS README -} diff --git a/app-admin/packagekit-base/packagekit-base-1.1.7-r1.ebuild b/app-admin/packagekit-base/packagekit-base-1.1.7-r1.ebuild index 67e1ed23da45..4281826ad53c 100644 --- a/app-admin/packagekit-base/packagekit-base-1.1.7-r1.ebuild +++ b/app-admin/packagekit-base/packagekit-base-1.1.7-r1.ebuild @@ -14,7 +14,7 @@ MY_PN="PackageKit" MY_P=${MY_PN}-${PV} DESCRIPTION="Manage packages in a secure way using a cross-distro and cross-architecture API" -HOMEPAGE="http://www.packagekit.org/" +HOMEPAGE="https://www.freedesktop.org/software/PackageKit/" SRC_URI="https://www.freedesktop.org/software/${MY_PN}/releases/${MY_P}.tar.xz" LICENSE="GPL-2" diff --git a/app-admin/packagekit-gtk/Manifest b/app-admin/packagekit-gtk/Manifest index 29525b741119..bd6e34b0d492 100644 --- a/app-admin/packagekit-gtk/Manifest +++ b/app-admin/packagekit-gtk/Manifest @@ -1,11 +1,3 @@ -DIST PackageKit-1.0.11.tar.xz 1427404 BLAKE2B 74455b4b070eb16a1310d77ec50225daa09a3bb16754ab9ead5aac382e05e6ecb3c64545bf64a16bc09d1cdcd73a4c179812eb03296e514c12c0ba15be514197 SHA512 9529037685f76e883a71ae502eabd83c3e1e8905f76cfe5e938760677f0224f8758bca59e139588aa06589bcca7a20f13dea0fe419022cb950c7a4c631237bce -DIST PackageKit-1.1.1.tar.xz 1410632 BLAKE2B ffb9d96794dfafa5362277292a743dde0d66259801611043cfdb66e169f9cd377ad49a00bab8687bbacf5cb156eb83c0fc1d33bf13409a1f1af60b3a9ab88a1e SHA512 caf9b67f71a36479d32338c28343671e9586aade7a0f777b867772ad8da8e3206bf66a46b2fa2cba8f0f48af27db3888b68e336707db6f76c5e0dbed464e2874 -DIST PackageKit-1.1.4.tar.xz 1424756 BLAKE2B a9eb82857b37fc84c8b7d5e71f0b51c4f1d9ef74702afb6e92e9e84e1ccf9e905dafafbda61a3ea737e94173f53486591bb66cf43b19b25004815f3abfd05d8c SHA512 fc04d58c46f7e7dbb1386d26627ea246b5f21b8483862788bb734b8a137e4cb1d41de0f471b46f6d649e29337f9605acba0568a845577b27a2ac0faaf391b187 -DIST PackageKit-1.1.5.tar.xz 1418292 BLAKE2B 973cfaf1e6dd48bbf3ef5cfe421202804af584af227fb70c5835d70bc128da64fd4084dd2bc508ed63d2c46ac693d7b3fcb540992da4e13ea947696a75f870d9 SHA512 ecc6a4d39caa0a7ea2047f52f95980b23e61ae200e27559326f03302b1c0d798f9cbae53fcf2d397dca3d54e52f143e2e7aa4e3f0b2df8c39e53bd2993e86154 DIST PackageKit-1.1.7.tar.xz 1431648 BLAKE2B 0cc64e7ac38d6641a1fbd98ffad2e7920eb7b3c86ea36d3ad036541886191c38deeeb7241f81ec3d29f8268b1c84ec500511895312c29c706403607215117d5e SHA512 0d0277e24feb63e94aeb5fec2c4306ccdf5935c2f62d5eef3be8db9f534eb302eff09ea0e020db48b2dd0af9ba6b31f7960d661d1040774dccf650ebf04c4f83 -EBUILD packagekit-gtk-1.0.11.ebuild 1202 BLAKE2B 9bd82f8f7d1238121e934cba9bfe39aaf2abd04975113545e86b7238d06be63a0aad8121f3fe355506aea6314674e96e089bc2d06a2809616b7798833c8f04ac SHA512 8d17ca913c0c60d2b43c403247b21572d230757c55f79ebc466dc8051c12011ee3e38355759997c1f6774a14018601882a5b51f56a620aa02873a89e37f1104e -EBUILD packagekit-gtk-1.1.1.ebuild 1173 BLAKE2B d61381e48795b15c194e5e7f9eaad9ae5235379e84b527d59e2658809728aea9aa6d31334e3da70a9f6f672022d989eb31a0782a270f0a525ff1bed81f21bb89 SHA512 a77a29ed66c671e5a53ecea3b2b27bc7ac54d51578d05fe80570d626b6654933fc3645bad4c792af6e284b2ba4f475fbcc0f5327bc0456dd822aed169b574d3e -EBUILD packagekit-gtk-1.1.4.ebuild 1173 BLAKE2B d61381e48795b15c194e5e7f9eaad9ae5235379e84b527d59e2658809728aea9aa6d31334e3da70a9f6f672022d989eb31a0782a270f0a525ff1bed81f21bb89 SHA512 a77a29ed66c671e5a53ecea3b2b27bc7ac54d51578d05fe80570d626b6654933fc3645bad4c792af6e284b2ba4f475fbcc0f5327bc0456dd822aed169b574d3e -EBUILD packagekit-gtk-1.1.5.ebuild 1173 BLAKE2B d61381e48795b15c194e5e7f9eaad9ae5235379e84b527d59e2658809728aea9aa6d31334e3da70a9f6f672022d989eb31a0782a270f0a525ff1bed81f21bb89 SHA512 a77a29ed66c671e5a53ecea3b2b27bc7ac54d51578d05fe80570d626b6654933fc3645bad4c792af6e284b2ba4f475fbcc0f5327bc0456dd822aed169b574d3e -EBUILD packagekit-gtk-1.1.7.ebuild 1144 BLAKE2B 9f80f2b49dd5aa373c5198dfce9005d475259a0dc3842ceb8644a1170b27a3e95edd479a3feae96fe18673d463f88d6c32fa288fa1861b02c866148853c918e4 SHA512 468f8af2b8bf4b957b1f20f1ecec644ad36d3e1ed11a7ad841f4304bd9f66ec6a75b96bf935aab02844e5795b38127e23ba3ad36839cb097af7d1e7a9d4b67e2 +EBUILD packagekit-gtk-1.1.7.ebuild 1166 BLAKE2B 22ee861bbb6f346badbf1c053c43c02cdb532fdd25c1db4e4a2aba2c1933c21ffcb01b9882a1d98aff5ce8f083d4c1ad901d7a14cde5e1f15bcb3a79c4772ad8 SHA512 027a88ea2fefb7364acb76e2e7963d2e0dd3794f41da8419d4aebdcbf6e930a78d5e6e25cb4d924a68d7025c610e306ded4ba6321a6e9c01b35503e5ff3054a6 MISC metadata.xml 365 BLAKE2B 56b0b07f000f1e0960650c60d41063585322a4d4c6067db315c85ae2fb113b747c46e6f89f99183bc607007f9d625d9e45c12d4bb81f82f002eab046e16b3f48 SHA512 7efd2e5bf58f32e97348200e6a891143009398504480ec30a8ee4f71bef600065094a8cb451bf8d5a86342add5251c5b54cd522b9f8b458501dc21fb3190bb69 diff --git a/app-admin/packagekit-gtk/packagekit-gtk-1.0.11.ebuild b/app-admin/packagekit-gtk/packagekit-gtk-1.0.11.ebuild deleted file mode 100644 index b7492b0b5b04..000000000000 --- a/app-admin/packagekit-gtk/packagekit-gtk-1.0.11.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit eutils - -MY_PN="PackageKit" -MY_P=${MY_PN}-${PV} - -DESCRIPTION="Gtk3 PackageKit backend library" -HOMEPAGE="http://www.packagekit.org/" -SRC_URI="https://www.freedesktop.org/software/${MY_PN}/releases/${MY_P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="" - -RDEPEND=" - >=dev-libs/glib-2.32:2 - media-libs/fontconfig - >=x11-libs/gtk+-2:2 - >=x11-libs/gtk+-3:3 - x11-libs/pango - ~app-admin/packagekit-base-${PV}[introspection] -" -DEPEND="${RDEPEND} - virtual/pkgconfig -" - -S="${WORKDIR}/${MY_P}" - -src_configure() { - econf \ - --disable-bash-completion \ - --disable-browser-plugin \ - --disable-command-not-found \ - --disable-cron \ - --disable-gstreamer-plugin \ - --disable-gtk-doc \ - --disable-local \ - --disable-man-pages \ - --disable-networkmanager \ - --disable-static \ - --disable-systemd \ - --disable-vala \ - --enable-dummy \ - --enable-gtk-module \ - --enable-introspection=yes \ - --localstatedir=/var -} - -src_compile() { - emake -C contrib/gtk-module -} - -src_install() { - emake -C contrib/gtk-module DESTDIR="${D}" install - prune_libtool_files --all -} diff --git a/app-admin/packagekit-gtk/packagekit-gtk-1.1.1.ebuild b/app-admin/packagekit-gtk/packagekit-gtk-1.1.1.ebuild deleted file mode 100644 index b5886d95bd2d..000000000000 --- a/app-admin/packagekit-gtk/packagekit-gtk-1.1.1.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit eutils - -MY_PN="PackageKit" -MY_P=${MY_PN}-${PV} - -DESCRIPTION="Gtk3 PackageKit backend library" -HOMEPAGE="http://www.packagekit.org/" -SRC_URI="https://www.freedesktop.org/software/${MY_PN}/releases/${MY_P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="" - -RDEPEND=" - >=dev-libs/glib-2.46:2 - media-libs/fontconfig - >=x11-libs/gtk+-2:2 - >=x11-libs/gtk+-3:3 - x11-libs/pango - ~app-admin/packagekit-base-${PV}[introspection] -" -DEPEND="${RDEPEND} - virtual/pkgconfig -" - -S="${WORKDIR}/${MY_P}" - -src_configure() { - econf \ - --disable-bash-completion \ - --disable-command-not-found \ - --disable-cron \ - --disable-gstreamer-plugin \ - --disable-gtk-doc \ - --disable-local \ - --disable-man-pages \ - --disable-networkmanager \ - --disable-static \ - --disable-systemd \ - --disable-vala \ - --enable-dummy \ - --enable-gtk-module \ - --enable-introspection=yes \ - --localstatedir=/var -} - -src_compile() { - emake -C contrib/gtk-module -} - -src_install() { - emake -C contrib/gtk-module DESTDIR="${D}" install - prune_libtool_files --all -} diff --git a/app-admin/packagekit-gtk/packagekit-gtk-1.1.4.ebuild b/app-admin/packagekit-gtk/packagekit-gtk-1.1.4.ebuild deleted file mode 100644 index b5886d95bd2d..000000000000 --- a/app-admin/packagekit-gtk/packagekit-gtk-1.1.4.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit eutils - -MY_PN="PackageKit" -MY_P=${MY_PN}-${PV} - -DESCRIPTION="Gtk3 PackageKit backend library" -HOMEPAGE="http://www.packagekit.org/" -SRC_URI="https://www.freedesktop.org/software/${MY_PN}/releases/${MY_P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="" - -RDEPEND=" - >=dev-libs/glib-2.46:2 - media-libs/fontconfig - >=x11-libs/gtk+-2:2 - >=x11-libs/gtk+-3:3 - x11-libs/pango - ~app-admin/packagekit-base-${PV}[introspection] -" -DEPEND="${RDEPEND} - virtual/pkgconfig -" - -S="${WORKDIR}/${MY_P}" - -src_configure() { - econf \ - --disable-bash-completion \ - --disable-command-not-found \ - --disable-cron \ - --disable-gstreamer-plugin \ - --disable-gtk-doc \ - --disable-local \ - --disable-man-pages \ - --disable-networkmanager \ - --disable-static \ - --disable-systemd \ - --disable-vala \ - --enable-dummy \ - --enable-gtk-module \ - --enable-introspection=yes \ - --localstatedir=/var -} - -src_compile() { - emake -C contrib/gtk-module -} - -src_install() { - emake -C contrib/gtk-module DESTDIR="${D}" install - prune_libtool_files --all -} diff --git a/app-admin/packagekit-gtk/packagekit-gtk-1.1.5.ebuild b/app-admin/packagekit-gtk/packagekit-gtk-1.1.5.ebuild deleted file mode 100644 index b5886d95bd2d..000000000000 --- a/app-admin/packagekit-gtk/packagekit-gtk-1.1.5.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit eutils - -MY_PN="PackageKit" -MY_P=${MY_PN}-${PV} - -DESCRIPTION="Gtk3 PackageKit backend library" -HOMEPAGE="http://www.packagekit.org/" -SRC_URI="https://www.freedesktop.org/software/${MY_PN}/releases/${MY_P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="" - -RDEPEND=" - >=dev-libs/glib-2.46:2 - media-libs/fontconfig - >=x11-libs/gtk+-2:2 - >=x11-libs/gtk+-3:3 - x11-libs/pango - ~app-admin/packagekit-base-${PV}[introspection] -" -DEPEND="${RDEPEND} - virtual/pkgconfig -" - -S="${WORKDIR}/${MY_P}" - -src_configure() { - econf \ - --disable-bash-completion \ - --disable-command-not-found \ - --disable-cron \ - --disable-gstreamer-plugin \ - --disable-gtk-doc \ - --disable-local \ - --disable-man-pages \ - --disable-networkmanager \ - --disable-static \ - --disable-systemd \ - --disable-vala \ - --enable-dummy \ - --enable-gtk-module \ - --enable-introspection=yes \ - --localstatedir=/var -} - -src_compile() { - emake -C contrib/gtk-module -} - -src_install() { - emake -C contrib/gtk-module DESTDIR="${D}" install - prune_libtool_files --all -} diff --git a/app-admin/packagekit-gtk/packagekit-gtk-1.1.7.ebuild b/app-admin/packagekit-gtk/packagekit-gtk-1.1.7.ebuild index 1770ff25ccd9..9fd918b69635 100644 --- a/app-admin/packagekit-gtk/packagekit-gtk-1.1.7.ebuild +++ b/app-admin/packagekit-gtk/packagekit-gtk-1.1.7.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" @@ -9,7 +9,7 @@ MY_PN="PackageKit" MY_P=${MY_PN}-${PV} DESCRIPTION="Gtk3 PackageKit backend library" -HOMEPAGE="http://www.packagekit.org/" +HOMEPAGE="https://www.freedesktop.org/software/PackageKit/" SRC_URI="https://www.freedesktop.org/software/${MY_PN}/releases/${MY_P}.tar.xz" LICENSE="GPL-2" diff --git a/app-admin/packagekit-qt/Manifest b/app-admin/packagekit-qt/Manifest index 872d7285ec6e..2726c28b29f5 100644 --- a/app-admin/packagekit-qt/Manifest +++ b/app-admin/packagekit-qt/Manifest @@ -1,5 +1,5 @@ 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-1.0.0.ebuild 571 BLAKE2B c727718b29d9defc285a177eb4eb1c3d4f31d9f153e636efbd1d9d7508b47602d425ea75ad4061b1c8ed7107c1af6a644065564764093497d456327fe03110ee SHA512 e55e2dae9a6bd9a40526eb451f1b2b0a4df166bed31a839e6857311bf25f9a5fdda748935aed51050dd4c956af35a9f70212de63f5abf0cef0f17d66f00994e7 -EBUILD packagekit-qt-1.0.1.ebuild 573 BLAKE2B 00cfe9c488622ff84ef1dd979ef3c0475105a86348eca5d72ff862ef8c5fcee233b78a8f037a55e3b2e4c03d9a900619cacdfc33c5ef9766f1684567752db719 SHA512 73cbce3de7c9f7cef8ab4e08dcb1b70bd7f01ae79609caa9606ac42ac3de7aa3c8ddd67ab0464ad3302ccd3bf4e669248188ace3c5eefc70a786e011ae17f544 +EBUILD packagekit-qt-1.0.0.ebuild 593 BLAKE2B da4d9255ac6569cae36ba9527248fcef33970d0bbc4e210835aaff48fe65262dfd9da204d80ca9faf2833d3130fe5281eeea67d19e4dffa00a71f80239f9ca17 SHA512 b536a04eefaea32a7931851527c296220934718edb1788fe97df4bbe03179d87ba8a92c4808a658de1a1c92621fce670b9b189bc47aa53c4f2a0781091016688 +EBUILD packagekit-qt-1.0.1.ebuild 595 BLAKE2B b96b636dd409d4bc62570c71e5da02febdbb43288ac24e56f7967bb431079669e7710ea9d3c98822b2899c311829e10ff06293289ebac8ce152843a42a0060ca SHA512 2df4c524a82ca80ecedb5905d63925a70a56007bfeade0977ee4e85648d6897a2a061a8916e5efb6bbd8821c1c8c80784a093afca7f128e0df6245df0053a637 MISC metadata.xml 443 BLAKE2B 83c6d5495baf3a9909dbb0ea06f912b92f6faf6f48e6f1da7610a16cca3770c097516a748b44fc0aef99985929e16b7dc20de131bf5404bfd72895acca56f04b SHA512 f63f424329b0ffeac0dcfb50841e94644bd3a44852bebd0834fc36bedbbe4bbbb13bfdfd46e065ca3ddd9cffac1ba86590310267939c486f108913db84e1d093 diff --git a/app-admin/packagekit-qt/packagekit-qt-1.0.0.ebuild b/app-admin/packagekit-qt/packagekit-qt-1.0.0.ebuild index eddd9dc3a44e..8e125d096722 100644 --- a/app-admin/packagekit-qt/packagekit-qt-1.0.0.ebuild +++ b/app-admin/packagekit-qt/packagekit-qt-1.0.0.ebuild @@ -8,7 +8,7 @@ MY_P=${MY_PN}-${PV} inherit cmake-utils DESCRIPTION="Qt PackageKit backend library" -HOMEPAGE="http://www.packagekit.org/" +HOMEPAGE="https://www.freedesktop.org/software/PackageKit/" SRC_URI="https://github.com/hughsie/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="LGPL-2.1" diff --git a/app-admin/packagekit-qt/packagekit-qt-1.0.1.ebuild b/app-admin/packagekit-qt/packagekit-qt-1.0.1.ebuild index eabede432017..5306a1ae4e73 100644 --- a/app-admin/packagekit-qt/packagekit-qt-1.0.1.ebuild +++ b/app-admin/packagekit-qt/packagekit-qt-1.0.1.ebuild @@ -8,7 +8,7 @@ MY_P=${MY_PN}-${PV} inherit cmake-utils DESCRIPTION="Qt PackageKit backend library" -HOMEPAGE="http://www.packagekit.org/" +HOMEPAGE="https://www.freedesktop.org/software/PackageKit/" SRC_URI="https://github.com/hughsie/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="LGPL-2.1" diff --git a/app-admin/packagekit/Manifest b/app-admin/packagekit/Manifest index b31162c08bd2..3ffb673de7cc 100644 --- a/app-admin/packagekit/Manifest +++ b/app-admin/packagekit/Manifest @@ -1,6 +1,2 @@ -EBUILD packagekit-1.0.11-r1.ebuild 421 BLAKE2B ac293ca36f37ecec31339ced2ef5e9d43d905c1d93116e5630ca8c938328a60fc497476ad922623181533058515df2d05aa714d539d1300e637ea7010ec76ae8 SHA512 f8a38a3fd1fee29c4472f79d4d40259c68a7aa8b7a6c1da460f05411dbc454cbeb02ac5fae85ae7ab41d2e7a238ed293e4467a783580de0ba354c18a768a3a26 -EBUILD packagekit-1.1.1.ebuild 421 BLAKE2B ac293ca36f37ecec31339ced2ef5e9d43d905c1d93116e5630ca8c938328a60fc497476ad922623181533058515df2d05aa714d539d1300e637ea7010ec76ae8 SHA512 f8a38a3fd1fee29c4472f79d4d40259c68a7aa8b7a6c1da460f05411dbc454cbeb02ac5fae85ae7ab41d2e7a238ed293e4467a783580de0ba354c18a768a3a26 -EBUILD packagekit-1.1.4.ebuild 421 BLAKE2B ac293ca36f37ecec31339ced2ef5e9d43d905c1d93116e5630ca8c938328a60fc497476ad922623181533058515df2d05aa714d539d1300e637ea7010ec76ae8 SHA512 f8a38a3fd1fee29c4472f79d4d40259c68a7aa8b7a6c1da460f05411dbc454cbeb02ac5fae85ae7ab41d2e7a238ed293e4467a783580de0ba354c18a768a3a26 -EBUILD packagekit-1.1.5.ebuild 421 BLAKE2B 8ab2f31f153e6de1d4e7fda0cb7530159327df662178c672b8a7742d2d1b41623e748e6ca0614ed6ec266c6a39f1612788ef4fdc53764029657b72c2db332c6e SHA512 7da902195434263cb7bc9cc22326b819299055c82f8910d358463969709b17b27a9478ce9a8833a29b9f4108102fdf2704387de8396907f19b727d655a1e438f -EBUILD packagekit-1.1.7.ebuild 421 BLAKE2B 8ab2f31f153e6de1d4e7fda0cb7530159327df662178c672b8a7742d2d1b41623e748e6ca0614ed6ec266c6a39f1612788ef4fdc53764029657b72c2db332c6e SHA512 7da902195434263cb7bc9cc22326b819299055c82f8910d358463969709b17b27a9478ce9a8833a29b9f4108102fdf2704387de8396907f19b727d655a1e438f +EBUILD packagekit-1.1.7.ebuild 443 BLAKE2B bfd8b839f250c3aa17f1eddf1d63c2de14add3da03a9d0215a6672fc417ba789f17568c8735e12bf53e1684c5e458aa320c42dff6c0b001b79c239ba9253eb15 SHA512 a4c9ed4b7efac6398ac6a77487e5ec74a5e612f461356d141fde90e3325ae98cfd31e9887942e8a737f18cbfcd5c2927493424b76a7e4b712c56239f9cf597e0 MISC metadata.xml 365 BLAKE2B 56b0b07f000f1e0960650c60d41063585322a4d4c6067db315c85ae2fb113b747c46e6f89f99183bc607007f9d625d9e45c12d4bb81f82f002eab046e16b3f48 SHA512 7efd2e5bf58f32e97348200e6a891143009398504480ec30a8ee4f71bef600065094a8cb451bf8d5a86342add5251c5b54cd522b9f8b458501dc21fb3190bb69 diff --git a/app-admin/packagekit/packagekit-1.0.11-r1.ebuild b/app-admin/packagekit/packagekit-1.0.11-r1.ebuild deleted file mode 100644 index e0cba926c351..000000000000 --- a/app-admin/packagekit/packagekit-1.0.11-r1.ebuild +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="PackageKit Package Manager interface (meta package)" -HOMEPAGE="http://www.packagekit.org/" -SRC_URI="" - -LICENSE="metapackage" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="gtk qt5" - -RDEPEND="gtk? ( ~app-admin/packagekit-gtk-${PV} ) - qt5? ( >=app-admin/packagekit-qt-0.9.6 )" - -DEPEND="${RDEPEND}" diff --git a/app-admin/packagekit/packagekit-1.1.1.ebuild b/app-admin/packagekit/packagekit-1.1.1.ebuild deleted file mode 100644 index e0cba926c351..000000000000 --- a/app-admin/packagekit/packagekit-1.1.1.ebuild +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="PackageKit Package Manager interface (meta package)" -HOMEPAGE="http://www.packagekit.org/" -SRC_URI="" - -LICENSE="metapackage" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="gtk qt5" - -RDEPEND="gtk? ( ~app-admin/packagekit-gtk-${PV} ) - qt5? ( >=app-admin/packagekit-qt-0.9.6 )" - -DEPEND="${RDEPEND}" diff --git a/app-admin/packagekit/packagekit-1.1.4.ebuild b/app-admin/packagekit/packagekit-1.1.4.ebuild deleted file mode 100644 index e0cba926c351..000000000000 --- a/app-admin/packagekit/packagekit-1.1.4.ebuild +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="PackageKit Package Manager interface (meta package)" -HOMEPAGE="http://www.packagekit.org/" -SRC_URI="" - -LICENSE="metapackage" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="gtk qt5" - -RDEPEND="gtk? ( ~app-admin/packagekit-gtk-${PV} ) - qt5? ( >=app-admin/packagekit-qt-0.9.6 )" - -DEPEND="${RDEPEND}" diff --git a/app-admin/packagekit/packagekit-1.1.5.ebuild b/app-admin/packagekit/packagekit-1.1.5.ebuild deleted file mode 100644 index 8d79dcc1d57c..000000000000 --- a/app-admin/packagekit/packagekit-1.1.5.ebuild +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="PackageKit Package Manager interface (meta package)" -HOMEPAGE="http://www.packagekit.org/" -SRC_URI="" - -LICENSE="metapackage" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="gtk qt5" - -RDEPEND="gtk? ( ~app-admin/packagekit-gtk-${PV} ) - qt5? ( >=app-admin/packagekit-qt-0.9.6 )" - -DEPEND="${RDEPEND}" diff --git a/app-admin/packagekit/packagekit-1.1.7.ebuild b/app-admin/packagekit/packagekit-1.1.7.ebuild index 8d79dcc1d57c..7b3d8c9972a8 100644 --- a/app-admin/packagekit/packagekit-1.1.7.ebuild +++ b/app-admin/packagekit/packagekit-1.1.7.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 DESCRIPTION="PackageKit Package Manager interface (meta package)" -HOMEPAGE="http://www.packagekit.org/" +HOMEPAGE="https://www.freedesktop.org/software/PackageKit/" SRC_URI="" LICENSE="metapackage" diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest index 45f7f90b357c..bad68b8f02ed 100644 --- a/app-admin/rsyslog/Manifest +++ b/app-admin/rsyslog/Manifest @@ -1,48 +1,23 @@ AUX 8-stable/50-default-r1.conf 1952 BLAKE2B dca027ea6073384a2ec5867722028f70599c51fd8c46672ce647e84a7de4b3a0dc5bfaf43f7317eddb902c4987266ae67f88b43375a51e82a3ffefbb61c4d099 SHA512 1bc4d8059d83de57ff44d34265b0c3881bab7889f51c044728ba462c9105c89425187f95b6b01d6d6d103abde22a9dff063e5d6b90027ed87e9f851f9b1ad5b3 AUX 8-stable/50-default.conf 1701 BLAKE2B b14c89f70d405b206818d077190cf8fefd1a01db4cdd38f5012b09b4e3440e16b6a3ca7ff20cfa616622565b3477e7f4d44252d72d1c3cdf148a1b59f629442a SHA512 33e4e63239b9112fec1a37115ac80ab8dbd6e7189d9d29b1bc743c433e0124ea0d1a4cf6f7ada9e5b92e9b0025b6617a1a16f4c491e743bbf4327a5f376a1ea9 AUX 8-stable/README.gentoo 1126 BLAKE2B b7e3881605c2bacda7f415b3f3195e1ef405a8e9fc7fd627fd35b0ab90966cbb29c9a85fcf2df6092062c5af353d44a02d3451e3caa072f4fa44d681702e9807 SHA512 46fdf3350e2005d3ef588d50dfc6d474a1b5d3010329b656879a43cbbd7be0cd91944b88d3838f45f69c830fc28c42e7fac2cd52e0a4b24bb6780562d59ae384 -AUX 8-stable/rsyslog-8.24.0-fix-tcpflood-without-librelp-r1.patch 4660 BLAKE2B 82d7ff7b24049e8d437ad27800d0a6bbd79787311747396578ead38f52ceb37f34abec93f3df15e302676fe0891e9d0729ba8418a01d39bfeb25f0af47bbeeeb SHA512 231030532a126dade0fa2c98d9bd8ef610d3059210cabfc6b0a51adfb610b61eb57b7926a2a51f01f196d196a9134b4c1db7105aeedc4d35eb70abac97301378 -AUX 8-stable/rsyslog-8.26.0-fix-zmq3-format-security.patch 1982 BLAKE2B 5b8c6971231b16e0ba23c20998d05b691b6e73562571fa74453c77691d2d8c2141ba64b87fcdc5786d62a4234b2d35fc45a1309d5b7729dde8e5e5d9efe89644 SHA512 b426c3eaa2adc2de14e129125ccd630e2fa2132c6ca774f3e18ee784f0622573a95339d901a1b9c2877e8b77d00f8be9f9d17f92769136c356aaab58358d2159 -AUX 8-stable/rsyslog-8.27.0-fix-hostname-detection-when-getaddrinfo-fails.patch 990 BLAKE2B e711765882e8bad81101a9b0d6b7d52b6d97ec7877b38584669057fb5bd60dca5a9d9a0ef46743f34060c3a19a7982b4add710418a6cd2a580b1ea56ae4f1157 SHA512 95d72879973c9d20c4c0c66e3e065590475d0aae96680a627b05735c8a66b69bf9b9a93888fa6a802e094bf37ac90099c7e6732699d439d44d6c39d461201351 -AUX 8-stable/rsyslog-8.27.0-fix-librdkafka-detection.patch 1556 BLAKE2B b8a7d1ccb3854f91a676b57332d4a944f5c781b82451b2d36f19e4237226da44cb41fc220260b1fd8bb2b46b62cbb81a4d392a1f116d31d50224ca781bb3b10f SHA512 374de4fb9a4e3c3b9e28ff2e5eca48b7744afc9a5ba222508661fdfa30037967b6a2497d0e82266010de27c1a540ebb300c15bf6049a1af9dcf019353c04acdc 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.34.0-fix-issue2612.patch 558 BLAKE2B ad05cd0a3b3570821465faf9f01541164eb18b1355363ad2208d9ee148971e1b86fb47fa2a81da2050a13c750342b3643e24dcb4db78149e6495353805180e10 SHA512 5249be1b70070ae30a41feacce83feea1a97f76eda0b5b60c29e4db6d50f4d27be8ab66de6187343d5b881eaf19414c2b8766fc99523c52e51f6a7c9b62e7d94 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 AUX 8-stable/rsyslog.logrotate 682 BLAKE2B cb6a4a00895c5801c15621e52fb16c4b046a46f27bd21c5e76c253e62421f07826f603ab529e8a95f260925d58948a78c89f41c9b9f61e142217403ab454c02f SHA512 6c58abd2f02157177a61695f53eccbf201c514821b0c551a4812621e8d3dd2da9b5cd651d93860cb51ebdbdc7056d0ef0dde99c2a57ac3c43aa968a141805912 -DIST rsyslog-8.19.0.tar.gz 2279714 BLAKE2B ae736b72e00ba6ba338476d8fc349f2b958f0c8f8b08417ed6cc192fcb17182f4c95018fbe973355b90833fab723211d653f4ac2a0fe9ef385ebe6d34251e4de SHA512 77c40c9d76591ed3561ec76242be2c647848533df5599320ea988cbc200614c47930e0b63f190d31a0c1cec2443d57ca374f07e0909f11eba8a4bd4b8eee0e44 -DIST rsyslog-8.24.0.tar.gz 2374240 BLAKE2B a708ed52dcc0182acbfb6d7adee8f1670c60e65e87b2240f88330622b515dbe1cc45a2bb3233cb630be4658b8cae394bab7839167808dd41d75632c76932a77e SHA512 b25b8ae72133376f732f54863c97aea3c8dfbf37c62c6a61840932996913c9d4e63155a24ffc577db48a18514f3e35b6fb109b1864380ba93ddf3fa6d84d728d -DIST rsyslog-8.25.0.tar.gz 2386720 BLAKE2B 192f0084b0aa9588606c458494634d6f1445598371de4ce160ade647b44abdbd6456125060f46fc62bbaa8f981c31247a91b8dedd41f89e83a4ee021c9828dad SHA512 0e97db84cc8fe9fd6e3ffb5a78b32fd213e22833c6ed605329c579132d127b7d65b3f66c64e6bddeb1967aa9ed90645a7c24b9d5e643f95bdaf48ed9fc82cb5f -DIST rsyslog-8.26.0.tar.gz 2393148 BLAKE2B 660853aae1f0853b0df66755cb64c569692b849816b92d41421c3650502eab069163d65445fe49e7c005a7bba9ead6cfe36b125a715b4fd8cd24a78dae7d2484 SHA512 96cb3af0e05b3e2941f7d2b3558e36836818037ef424f13a8ae2ac8a1e2aa0c7a4eedf3366c8360c7d8eb4515aecc7f3665690646009c650b66689067069af19 -DIST rsyslog-8.27.0.tar.gz 2435123 BLAKE2B ebd95d5995d604a16495c2c760bfc65348a2b696a2aec838ba06d2eac379627d2b8495f03177aa8813d012d6163073cde71d442a63fe2da173bdcb55c90f458a SHA512 dad957c21d9f7ed3a97a1ed87658fe9381dad00365bd2f5af2396dde3dc4a9f96db17c4df9eb9bd02562cc538f99bf8e2ca00229680d6b7892179161265db753 DIST rsyslog-8.28.0.tar.gz 2471122 BLAKE2B 48ed55cbf02eca22591c3d1d59db8f956e4d852cbabb4ae8837767a2c843209a53becbe2a9f595290b44d79c8813414c20954ce1ccaa08bf0786423df79344e3 SHA512 e27ba0ff22e945393536abc5bc6e234d8849db291a5056429b59b47abe15fb060fc5c26efedcfe347b386d438b3f8a029ae4577a1d803666701431677f628cb1 -DIST rsyslog-8.29.0.tar.gz 2447907 BLAKE2B dd3a34e4c1b4edc989d58369933b94b11d89c044ca81715062cebaacae5003463ed233f26358418651f63643bd6d7cdfb4f3192324d59d596c87480e37f40493 SHA512 6e0a69f2ac36fcfd0714b2b7053bd263ca8875d2aba7ad6452223eb8677edfa1cf4978989661614dd65dd1822f0123599d565679c8faa3960f136c8d9472e952 -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.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 -DIST rsyslog-docs-8.26.0.tar.gz 4381345 BLAKE2B d90a4af06b3b48e5bab75751e0bd06564b6a846068ce324aa9e9b26c1e5e1d40841f573806444f290d3227e31d1fb498265437341be946badfe35c8455427352 SHA512 5c05c13b3ae6be431343b7a5b3b2cb8676804d6d58d98826e6b44d685bb30fdaf3ced27d66a29908b40f1839bac45d1834d060ddf05d01477474ab3f45f973c8 -DIST rsyslog-docs-8.27.0.tar.gz 4411093 BLAKE2B 67f6e3cf77973b07c9a19816beb16c9cce4b32b4609ab458501e7b0be9795c2138a83756d9590f03b0acde23f8b762df1c308c0ab7210a24122476ad14860770 SHA512 08d935ecad070d65e7169a56c6a4d35d49e895b4f7cfe4d747939d8a92bdadd0fc3be7cc47d23d233a33b964f2a4d809a34b37419d2e42c3f8c183120412ab2c +DIST rsyslog-8.34.0.tar.gz 2545544 BLAKE2B 66caf277a814563027183ecf267d76067c384adf8d6d7b8543203df9a7c37242722dd35445e4446aacf1e680f5f3957cea40ece8a284ef2a393b4a71e3a2b49c SHA512 69eaececa2f8b98799deac8e6cb2cf635a5117da7a21cbb0b880b7df1d83c6ccf16133dab099a6e5fb865f34c2dad164a1bf1952d16ca116af3b1dd35d15065e DIST rsyslog-docs-8.28.0.tar.gz 4424901 BLAKE2B 9753b1a48b9d3bb045f2d088de5df0bbe5bc9045a82a5cab98b27c2df7648ac312929a173ec34c81ced46cb0eba336d708204b73b57413686769afa882dceaa5 SHA512 c085e09149cfc27ce0cd22edf9ad3f81b111f491fbea79afbc3172882065bd8324e366e3b5d09c885c1a3aa63fe8fbbe154d66488319d4ffc0867f938e1ab07d -DIST rsyslog-docs-8.29.0.tar.gz 4473644 BLAKE2B 18fc4aea0551f1ad770cd882aaf512424f8d4fc9f00ba6c4c8e9bbbcb0ea4d4da4ba31c53bad23e28ed761e27e6378657b085cb0d72cebdc233ba25160023daa SHA512 791633b93693c1eacde965e07ced863b96d1bfa488fc5c4770424825ab702cae7babd5286e552da5e17d1d7779f228c61a1527b9726dffea31bbb3b4e80525dc -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.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 -EBUILD rsyslog-8.26.0-r1.ebuild 12480 BLAKE2B 7c3d7ac596b2abcaa35daac1e917b91a0564f818cb399d560a90ae255dd8b7a7f432c0bf79dcb34db8501a9b2769b58bc0365ec49bb21913797e2ffde086ea98 SHA512 8036baf097b54006d6350a52ab08a222a0896a955c48d5b984f5f284b5603ebcf732a58493cebfa1c8469b7a1f9cbf8bf42d90e44454488c206873243af3630e -EBUILD rsyslog-8.27.0-r1.ebuild 12736 BLAKE2B f12cf7bdba7aba23bffd40a4f625710fd287407eac886d6dba41e63ed256ea1bbed2ff4f5ead966c7101ebbe3fc95ba4c196b7873068744db801ac53005e335c SHA512 497c4df7601980431f093bdbe9e95513374ba171565acc7fe8bb4dda40142ffea1443a4d10d79ae938c423e03879286a1a550abde5be919bb5d6032486425b13 -EBUILD rsyslog-8.28.0.ebuild 12504 BLAKE2B 7fbd8ed2298fce7926f40963571d4b38c03a36384c8dd626dc6e94445a8066184191f9103ab11d9a48734575b799e9c77a2b341e523ffdfd99810b26997b5e9e SHA512 e21e89e5c365c3b6de7c7057113010dc5c9f4a6d713ffe52a4a3a6519db85de8ce1c54e7d88b7de47457e4bcc10e9873d52059e4a5b3216f9ad4f9aee66267a5 -EBUILD rsyslog-8.29.0.ebuild 12527 BLAKE2B c992fcb0783af6c15d89f8455ff47dc11248f5245b1a682f62b468150d814c672715d853acf31d3f551cb8c97dec1a02f9a676737033fe3e128d39a4b7412d71 SHA512 8f7593cca44eaa50929e03978dd9f066cc73aa9f725ce36585d274da925e0cc9a6a8791ab199c38b496e857335b8359c8cf19cc9ea3fae2ced4267ae69b05ef8 -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 12702 BLAKE2B 7e534f7d0beeafffbe57c0c9bdc6861d3da9ee978dcd2cec16a544b585a67e83bd82c6df20883dade66b5b5c6c8270b7f52bdf44fb449d71eec508059bd5b3d1 SHA512 1d5d877785061d9188947aae0144eab16b8fa08ad61d8638d4820b7a3f15d16a7ca76d5d0faffa1c38f224d462329f65c013fe1edf00125edbc9a3ee310ee1f6 -EBUILD rsyslog-8.33.1.ebuild 12620 BLAKE2B 6f6c4c1bdeb252bb32eec2764647bf74f4e94a2a88334aa7c4be58f5f77fb7c16c71f3485b4e1311232f035254268405d1bb140384e9160825eb44f8fab0e36b SHA512 2b898600948e94f98051eba4eeb41b409a8616f85c03b7894a1874677f48d4c67ba627612915835ed74114b48db3efd7c287a70b60a5d14c5c6c3102bcd28f3d -MISC metadata.xml 3397 BLAKE2B 368cc15a6a51952b0aeed7314e0d8cf4be6a82f0bb5275f87f09b8707353543d26d839be016e7ae9523e8594e2ddf85f2f26e36ce2332b95131729f4da959a90 SHA512 8d5f78dafe981b3874fe60a54d3f041ab163e3e94a5f3ceb943bfe075e55dbdc260aa2dd035c7d241708f21b8f8f1f9d268ffd65538b0fc5b36c43a59f5a0f27 +DIST rsyslog-docs-8.34.0.tar.gz 7419160 BLAKE2B 928e6a4044d6d2161483f934e6c2cd5e489a3ec95b823419d7d57b98a7dd6c73f4d28d17c238471592fe1c692b626b57c7bf647e926c1c38ff5a774e5d2defd5 SHA512 edf9aa63c777624c3dc27dfd64b38893b9b4c9b56941df1d7a8c6bc3cb4cbbfb83e8c356cbefeab7c688ecb6017b66ed99931cb71b69b7c927b4743548dd40d4 +EBUILD rsyslog-8.28.0-r1.ebuild 12496 BLAKE2B 6389d72e3018fc1df8c7fa1f2a511360f1cd708534eaa2969a8418abdc92cee03934a5e2f9865bfe0ae462a6f3b49e17acf0434403e402f5ed149ae05203a366 SHA512 54e9cdef851779a9b2f8034474fb5c17e66a27679f24c50c6cc74fbdd8ff92a06a30998a40c5264ac4123b9f8860487b6e2a87607d00f38591fe7ac251623bc0 +EBUILD rsyslog-8.32.0-r4.ebuild 12716 BLAKE2B 9bbfe2d1395a6b298dded2c36d0393e1b11f8b11b0b05c87d2fbe7d1d72d52956b46b2a1a65048daed2a21ba2ed897023dc419f7dca242febbc70b54f4dc0112 SHA512 b8b14edcc03b268699a2e727a942ba34706d95a953426c8a9e2fde33f2aab44a4588d8b8c21627b0b8bd2fa95c295d5e1d84f83ccb3de857c46a768a72093451 +EBUILD rsyslog-8.33.1-r1.ebuild 12634 BLAKE2B efd3e3c908e293ff50a3ff7102c42068627403b912393edfd970271e2974083280839a16bce4175ce4cc946f2d01ff2d516428c18c5f157b541d24c2b316e38e SHA512 ac770033e43c6f5d7d9f93c5586a29389436bc4b479ff1d2a81f7b63121ccd3bff3f9726b7395244a5384d4a3844968b9c8f0bd11ea1f56a381616d231b66fbf +EBUILD rsyslog-8.34.0.ebuild 12870 BLAKE2B 89d1341a6aee64b37678048f1682bea4387c08862f5a67a4804210b686486ef5caf8c83fe2e505c77250260912b22f6d43775284a2f0c6565e93f6337d66f93c SHA512 8523e0ca4e1fd67b03b6a2079b8d32b6f31f86795f6115197f6f4a15da3dc6c965079e7747b3624af954a75f995e6017b88efaa560ae897defe063d00bd72788 +MISC metadata.xml 3501 BLAKE2B c9fb5e712f905e55b44cf43322a24bda7d1d0063f560029e0c3fb5da464f9e2f35c5031ab592ff958db262f48b511d8c1a0267ce0d8a9e47a14b03588351bdd4 SHA512 c167c0829aa16e2baf1758a75762cfe7aa1a9c48c6d9cbc32a1a3338ba7c0ba71f112d27173bb126bb1a6fbb75716d478e0b69539a735f8cb8f020a555a5907d diff --git a/app-admin/rsyslog/files/8-stable/rsyslog-8.24.0-fix-tcpflood-without-librelp-r1.patch b/app-admin/rsyslog/files/8-stable/rsyslog-8.24.0-fix-tcpflood-without-librelp-r1.patch deleted file mode 100644 index a03a6562722a..000000000000 --- a/app-admin/rsyslog/files/8-stable/rsyslog-8.24.0-fix-tcpflood-without-librelp-r1.patch +++ /dev/null @@ -1,160 +0,0 @@ -Patch to allow building of tcpflood without librelp - -Cherry pick of -https://github.com/rsyslog/rsyslog/commit/73e3b7ab2f8a3974d31844b492ad02d61ed5727f -https://github.com/rsyslog/rsyslog/pull/1493 - - -Gentoo-Bug: https://bugs.gentoo.org/613264 -Gentoo-Bug: https://bugs.gentoo.org/614424 - -diff -u b/tests/tcpflood.c b/tests/tcpflood.c ---- b/tests/tcpflood.c -+++ b/tests/tcpflood.c -@@ -96,7 +96,9 @@ - #include <string.h> - #include <netinet/in.h> - #include <pthread.h> -+#ifdef ENABLE_RELP - #include <librelp.h> -+#endif - #include <sys/resource.h> - #include <sys/time.h> - #include <errno.h> -@@ -149,7 +151,9 @@ - static int numConnections = 1; /* number of connections to create */ - static int softLimitConnections = 0; /* soft connection limit, see -c option description */ - static int *sockArray; /* array of sockets to use */ -+#ifdef ENABLE_RELP - static relpClt_t **relpCltArray; /* array of sockets to use */ -+#endif - static int msgNum = 0; /* initial message number to start with */ - static int bShowProgress = 1; /* show progress messages */ - static int bSilent = 0; /* completely silent operation */ -@@ -216,6 +220,7 @@ - static int sendTLS(int i, char *buf, int lenBuf); - static void closeTLSSess(int __attribute__((unused)) i); - -+#ifdef ENABLE_RELP - /* RELP subsystem */ - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wformat-security" -@@ -235,6 +240,7 @@ - CHKRELP(relpEngineSetEnableCmd(pRelpEngine, (unsigned char*)"syslog", - eRelpCmdState_Required)); - } -+#endif /* #ifdef ENABLE_RELP */ - - /* prepare send subsystem for UDP send */ - static int -@@ -273,6 +279,7 @@ - port = targetPort; - } - if(transport == TP_RELP_PLAIN) { -+ #ifdef ENABLE_RELP - relpRetVal relp_r; - relpClt_t *relpClt; - char relpPort[16]; -@@ -286,6 +293,7 @@ - return(1); - } - *fd = 1; /* mimic "all ok" state */ -+ #endif - } else { /* TCP, with or without TLS */ - if((sock=socket(AF_INET, SOCK_STREAM, 0))==-1) { - perror("\nsocket()"); -@@ -336,8 +344,10 @@ - sessArray = calloc(numConnections, sizeof(gnutls_session_t)); - # endif - sockArray = calloc(numConnections, sizeof(int)); -+ #ifdef ENABLE_RELP - if(transport == TP_RELP_PLAIN) - relpCltArray = calloc(numConnections, sizeof(relpClt_t*)); -+ #endif - for(i = 0 ; i < numConnections ; ++i) { - if(i % 10 == 0) { - if(bShowProgress) -@@ -356,8 +366,10 @@ - * at least something. - */ - if(transport == TP_RELP_PLAIN) { -+ #ifdef ENABLE_RELP - CHKRELP(relpEngineCltDestruct(pRelpEngine, - relpCltArray+i)); -+ #endif - } else { /* TCP and TLS modes */ - if(transport == TP_TLS) - closeTLSSess(i); -@@ -403,14 +415,13 @@ - - if(bShowProgress) - if(write(1, " close connections", sizeof(" close connections")-1)){} -- //if(transport == TP_RELP_PLAIN) -- //sleep(10); /* we need to let librelp settle a bit */ - for(i = 0 ; i < numConnections ; ++i) { - if(i % 10 == 0 && bShowProgress) { - lenMsg = sprintf(msgBuf, "\r%5.5d", i); - if(write(1, msgBuf, lenMsg)){} - } - if(transport == TP_RELP_PLAIN) { -+ #ifdef ENABLE_RELP - relpRetVal relpr; - if(sockArray[i] != -1) { - relpr = relpEngineCltDestruct(pRelpEngine, relpCltArray+i); -@@ -419,6 +430,7 @@ - } - sockArray[i] = -1; - } -+ #endif - } else { /* TCP and TLS modes */ - if(sockArray[i] != -1) { - /* we try to not overrun the receiver by trying to flush buffers -@@ -610,6 +622,7 @@ - offsSendBuf = lenBuf; - } - } else if(transport == TP_RELP_PLAIN) { -+ #ifdef ENABLE_RELP - relpRetVal relp_ret; - if(sockArray[socknum] == -1) { - /* connection was dropped, need to re-establish */ -@@ -627,6 +640,7 @@ - printf("\nrelpCltSendSyslog() failed with relp error code %d\n", - relp_ret); - } -+ #endif - } - if(lenSend != lenBuf) { - printf("\r%5.5d\n", i); -@@ -1106,7 +1120,9 @@ - transport = TP_RELP_PLAIN; - # else - fprintf(stderr, "compiled without RELP support: " -- "\"-Trelp-plain\" not supported!\n"); -+ "\"-Trelp-plain\" not supported!\n" -+ "(add --enable-relp to ./configure options " -+ "if desired)\n"); - exit(1); - # endif - } else { -@@ -1168,7 +1184,9 @@ - if(transport == TP_TLS) { - initTLS(); - } else if(transport == TP_RELP_PLAIN) { -+ #ifdef ENABLE_RELP - initRELP_PLAIN(); -+ #endif - } - - if(openConnections() != 0) { -@@ -1183,9 +1201,11 @@ - - closeConnections(); /* this is important so that we do not finish too early! */ - -+ #ifdef ENABLE_RELP - if(transport == TP_RELP_PLAIN) { - CHKRELP(relpEngineDestruct(&pRelpEngine)); - } -+ #endif - - if(nConnDrops > 0 && !bSilent) - printf("-D option initiated %ld connection closures\n", nConnDrops); diff --git a/app-admin/rsyslog/files/8-stable/rsyslog-8.26.0-fix-zmq3-format-security.patch b/app-admin/rsyslog/files/8-stable/rsyslog-8.26.0-fix-zmq3-format-security.patch deleted file mode 100644 index b285798bfe45..000000000000 --- a/app-admin/rsyslog/files/8-stable/rsyslog-8.26.0-fix-zmq3-format-security.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- a/contrib/imzmq3/imzmq3.c -+++ b/contrib/imzmq3/imzmq3.c -@@ -403,7 +403,7 @@ static rsRetVal createSocket(instanceConf_t* info, void** sock) { - - /* Do the bind/connect... */ - if (info->action==ACTION_CONNECT) { -- rv = zsocket_connect(*sock, info->description); -+ rv = zsocket_connect(*sock, "%s", info->description); - if (rv == -1) { - errmsg.LogError(0, - RS_RET_INVALID_PARAMS, -@@ -413,7 +413,7 @@ static rsRetVal createSocket(instanceConf_t* info, void** sock) { - } - DBGPRINTF("imzmq3: connect for %s successful\n",info->description); - } else { -- rv = zsocket_bind(*sock, info->description); -+ rv = zsocket_bind(*sock, "%s", info->description); - if (rv == -1) { - errmsg.LogError(0, - RS_RET_INVALID_PARAMS, ---- a/contrib/omzmq3/omzmq3.c -+++ b/contrib/omzmq3/omzmq3.c -@@ -242,14 +242,14 @@ static rsRetVal initZMQ(instanceData* pData) { - if (pData->action == ACTION_BIND) { - /* bind asserts, so no need to test return val here - which isn't the greatest api -- oh well */ -- if(-1 == zsocket_bind(pData->socket, (char*)pData->description)) { -+ if(-1 == zsocket_bind(pData->socket, "%s", (char*)pData->description)) { - errmsg.LogError(0, RS_RET_NO_ERRCODE, "omzmq3: bind failed for %s: %s", - pData->description, zmq_strerror(errno)); - ABORT_FINALIZE(RS_RET_NO_ERRCODE); - } - DBGPRINTF("omzmq3: bind to %s successful\n",pData->description); - } else { -- if(-1 == zsocket_connect(pData->socket, (char*)pData->description)) { -+ if(-1 == zsocket_connect(pData->socket, "%s", (char*)pData->description)) { - errmsg.LogError(0, RS_RET_NO_ERRCODE, "omzmq3: connect failed for %s: %s", - pData->description, zmq_strerror(errno)); - ABORT_FINALIZE(RS_RET_NO_ERRCODE); diff --git a/app-admin/rsyslog/files/8-stable/rsyslog-8.27.0-fix-hostname-detection-when-getaddrinfo-fails.patch b/app-admin/rsyslog/files/8-stable/rsyslog-8.27.0-fix-hostname-detection-when-getaddrinfo-fails.patch deleted file mode 100644 index a9470ccf4b60..000000000000 --- a/app-admin/rsyslog/files/8-stable/rsyslog-8.27.0-fix-hostname-detection-when-getaddrinfo-fails.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 1a7d3a088969b47798bc1da712ca2772f91a7c02 Mon Sep 17 00:00:00 2001 -From: Jiri Vymazal <jvymazal@redhat.com> -Date: Wed, 31 May 2017 16:26:56 +0200 -Subject: [PATCH] Ignoring NONAME error from getaddrinfo so we have hostname - set even without working network - ---- - runtime/net.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/runtime/net.c b/runtime/net.c -index 2d8de9429..edffc677a 100644 ---- a/runtime/net.c -+++ b/runtime/net.c -@@ -1188,7 +1188,11 @@ getLocalHostname(uchar **ppName) - memset(&flags, 0, sizeof(flags)); - flags.ai_flags = AI_CANONNAME; - int error = getaddrinfo((char*)hnbuf, NULL, &flags, &res); -- if (error != 0) { -+ if (error != 0 && -+ error != EAI_NONAME && error != EAI_AGAIN && error != EAI_FAIL) { -+ /* If we get one of errors above, network is probably -+ * not working yet, so we fall back to local hostname below -+ */ - dbgprintf("getaddrinfo: %s\n", gai_strerror(error)); - ABORT_FINALIZE(RS_RET_IO_ERROR); - } diff --git a/app-admin/rsyslog/files/8-stable/rsyslog-8.27.0-fix-librdkafka-detection.patch b/app-admin/rsyslog/files/8-stable/rsyslog-8.27.0-fix-librdkafka-detection.patch deleted file mode 100644 index 366c0afaca84..000000000000 --- a/app-admin/rsyslog/files/8-stable/rsyslog-8.27.0-fix-librdkafka-detection.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -1695,12 +1695,14 @@ AM_CONDITIONAL(ENABLE_KAFKA_TESTS, test x$enable_kafka_tests = xyes) - - # omkafka works with older library - if test "x$enable_omkafka" = "xyes"; then -- PKG_CHECK_MODULES([LIBRDKAFKA], [librdkafka],, [ -- AC_CHECK_LIB([rdkafka], [rd_kafka_produce], [ -- AC_MSG_WARN([librdkafka is missing but library present, using -lrdkafka]) -- LIBRDKAFKA_LIBS=-lrdkafka -- ], [ -- AC_MSG_ERROR([could not find rdkafka library]) -+ PKG_CHECK_MODULES([LIBRDKAFKA], [rdkafka],, [ -+ PKG_CHECK_MODULES([LIBRDKAFKA], [librdkafka],, [ -+ AC_CHECK_LIB([rdkafka], [rd_kafka_produce], [ -+ AC_MSG_WARN([librdkafka is missing but library present, using -lrdkafka]) -+ LIBRDKAFKA_LIBS=-lrdkafka -+ ], [ -+ AC_MSG_ERROR([could not find rdkafka library]) -+ ]) - ]) - ]) - AC_CHECK_HEADERS([librdkafka/rdkafka.h]) -@@ -1708,12 +1710,13 @@ fi - - # imkafka needs newer library - if test "x$enable_imkafka" = "xyes"; then -- PKG_CHECK_MODULES(LIBRDKAFKA, rdkafka >= 0.9.1) -- AC_CHECK_LIB([rdkafka], [rd_kafka_produce], [ -- AC_MSG_WARN([librdkafka is missing but library present, using -lrdkafka]) -- LIBRDKAFKA_LIBS=-lrdkafka -- ], [ -- AC_MSG_ERROR([could not find rdkafka library]) -+ PKG_CHECK_MODULES([LIBRDKAFKA], [rdkafka >= 0.9.1],, [ -+ AC_CHECK_LIB([rdkafka], [rd_kafka_produce], [ -+ AC_MSG_WARN([librdkafka is missing but library present, using -lrdkafka]) -+ LIBRDKAFKA_LIBS=-lrdkafka -+ ], [ -+ AC_MSG_ERROR([could not find rdkafka library]) -+ ]) - ]) - AC_CHECK_HEADERS([librdkafka/rdkafka.h]) - fi diff --git a/app-admin/rsyslog/files/8-stable/rsyslog-8.30.0-fix-kerberos.patch b/app-admin/rsyslog/files/8-stable/rsyslog-8.30.0-fix-kerberos.patch deleted file mode 100644 index a202e633c893..000000000000 --- a/app-admin/rsyslog/files/8-stable/rsyslog-8.30.0-fix-kerberos.patch +++ /dev/null @@ -1,22 +0,0 @@ -https://github.com/rsyslog/rsyslog/issues/1838 - ---- a/plugins/imgssapi/imgssapi.c -+++ b/plugins/imgssapi/imgssapi.c -@@ -291,7 +291,7 @@ finalize_it: - - - static rsRetVal --doRcvData(tcps_sess_t *pSess, char *buf, size_t lenBuf, ssize_t *piLenRcvd) -+doRcvData(tcps_sess_t *pSess, char *buf, size_t lenBuf, ssize_t *piLenRcvd, int *const oserr) - { - DEFiRet; - int allowedMethods; -@@ -307,7 +307,7 @@ doRcvData(tcps_sess_t *pSess, char *buf, size_t lenBuf, ssize_t *piLenRcvd) - CHKiRet(TCPSessGSSRecv(pSess, buf, lenBuf, piLenRcvd)); - } else { - *piLenRcvd = lenBuf; -- CHKiRet(netstrm.Rcv(pSess->pStrm, (uchar*) buf, piLenRcvd) != RS_RET_OK); -+ CHKiRet(netstrm.Rcv(pSess->pStrm, (uchar*) buf, piLenRcvd, oserr)); - } - - finalize_it: diff --git a/app-admin/rsyslog/files/8-stable/rsyslog-8.34.0-fix-issue2612.patch b/app-admin/rsyslog/files/8-stable/rsyslog-8.34.0-fix-issue2612.patch new file mode 100644 index 000000000000..4e9e566e84c7 --- /dev/null +++ b/app-admin/rsyslog/files/8-stable/rsyslog-8.34.0-fix-issue2612.patch @@ -0,0 +1,13 @@ +https://github.com/rsyslog/rsyslog/issues/2612 + +--- a/configure.ac ++++ b/configure.ac +@@ -254,7 +254,7 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM(, return __builtin_expect(main != 0, 1))], + # speeds up processig. + # note that when automic operations are enabled but not available, they + # will silently NOT be used! +-AC_ARG_ENABLE(regexp, ++AC_ARG_ENABLE(atomic_operations, + [AS_HELP_STRING([--enable-atomic-operations],[Enable atomic operation support @<:@default=yes@:>@])], + [case "${enableval}" in + yes) enable_atomic_operations="yes" ;; diff --git a/app-admin/rsyslog/metadata.xml b/app-admin/rsyslog/metadata.xml index 2b738f08d63d..d785e232e0a9 100644 --- a/app-admin/rsyslog/metadata.xml +++ b/app-admin/rsyslog/metadata.xml @@ -14,6 +14,7 @@ <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations.</flag> <flag name="kafka">Build the Apache Kafka input/output module (requires <pkg>dev-libs/librdkafka</pkg>)</flag> <flag name="kerberos">Build the GSSAPI input and output module (requires <pkg>virtual/krb5</pkg>)</flag> + <flag name="kubernetes">Build the kubernetes modify plugin (requires <pkg>net-misc/curl</pkg>)</flag> <flag name="libressl">Use <pkg>dev-libs/libressl</pkg> for building the rfc5424hmac modify module (requires rfc5424hmac USE flag)</flag> <flag name="mdblookup">Build the MaxMind DB lookup message modify plugin using <pkg>dev-libs/libmaxminddb</pkg></flag> <flag name="mongodb">Build the MongoDB output module (requires <pkg>dev-libs/libmongo-client</pkg>)</flag> diff --git a/app-admin/rsyslog/rsyslog-8.19.0.ebuild b/app-admin/rsyslog/rsyslog-8.19.0.ebuild deleted file mode 100644 index 931d37209cb5..000000000000 --- a/app-admin/rsyslog/rsyslog-8.19.0.ebuild +++ /dev/null @@ -1,444 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools eutils linux-info systemd - -DESCRIPTION="An enhanced multi-threaded syslogd with database support and more" -HOMEPAGE="http://www.rsyslog.com/" - -BRANCH="8-stable" - -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git" - - DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git" - - inherit git-r3 -else - MY_PV=${PV%_rc*} - MY_FILENAME="${PN}-${PV}.tar.gz" - MY_FILENAME_DOCS="${PN}-docs-${PV}.tar.gz" - S="${WORKDIR}/${PN}-${MY_PV}" - - # Upstream URL schema: - # RC: http://www.rsyslog.com/files/download/rsyslog/rc/rsyslog-8.18.0.tar.gz - # http://www.rsyslog.com/files/download/rsyslog/rc2/rsyslog-8.18.0.tar.gz - # Release: http://www.rsyslog.com/files/download/rsyslog/rsyslog-8.18.0.tar.gz - - MY_URL_PREFIX= - if [[ ${PV} = *_rc* ]]; then - _tmp_last_index=$(($(get_last_version_component_index ${PV})+1)) - _tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${PV}) - if [[ ${_tmp_suffix} = *rc* ]]; then - MY_URL_PREFIX="${_tmp_suffix}/" - fi - - # Cleaning up temporary variables - unset _tmp_last_index - unset _tmp_suffix - else - KEYWORDS="amd64 arm ~arm64 hppa x86" - fi - - SRC_URI=" - 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} ) - " -fi - -LICENSE="GPL-3 LGPL-3 Apache-2.0" -SLOT="0" -IUSE="dbi debug doc elasticsearch +gcrypt grok jemalloc kafka kerberos libressl mongodb mysql normalize omhttpfs" -IUSE+=" omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid zeromq" - -RDEPEND=" - >=dev-libs/libfastjson-0.99.2:= - >=dev-libs/libestr-0.1.9 - >=dev-libs/liblogging-1.0.1:=[stdlog] - >=sys-libs/zlib-1.2.5 - dbi? ( >=dev-db/libdbi-0.8.3 ) - elasticsearch? ( >=net-misc/curl-7.35.0 ) - gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) - grok? ( >=dev-libs/grok-0.9.2 ) - jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) - kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) - kerberos? ( virtual/krb5 ) - mongodb? ( >=dev-libs/libmongo-client-0.1.4 ) - mysql? ( virtual/mysql ) - normalize? ( - >=dev-libs/libee-0.4.0 - >=dev-libs/liblognorm-2.0.1:= - ) - omhttpfs? ( >=net-misc/curl-7.35.0 ) - omudpspoof? ( >=net-libs/libnet-1.1.6 ) - postgres? ( >=dev-db/postgresql-8.4.20:= ) - rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) - redis? ( >=dev-libs/hiredis-0.11.0:= ) - relp? ( >=dev-libs/librelp-1.2.5:= ) - rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) - rfc5424hmac? ( - !libressl? ( >=dev-libs/openssl-0.9.8y:0= ) - libressl? ( dev-libs/libressl:= ) - ) - snmp? ( >=net-analyzer/net-snmp-5.7.2 ) - ssl? ( >=net-libs/gnutls-2.12.23:0= ) - systemd? ( >=sys-apps/systemd-208 ) - uuid? ( sys-apps/util-linux:0= ) - zeromq? ( - >=net-libs/zeromq-4.1.1:= - >=net-libs/czmq-3.0.0 - )" -DEPEND="${RDEPEND} - virtual/pkgconfig - test? ( sys-libs/libfaketime )" - -if [[ ${PV} == "9999" ]]; then - DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )" - DEPEND+=" >=sys-devel/flex-2.5.39-r1" - DEPEND+=" >=sys-devel/bison-2.4.3" - DEPEND+=" >=dev-python/docutils-0.12" -fi - -CONFIG_CHECK="~INOTIFY_USER" -WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!" - -src_unpack() { - if [[ ${PV} == "9999" ]]; then - git-r3_fetch - git-r3_checkout - else - unpack ${P}.tar.gz - fi - - if use doc; then - if [[ ${PV} == "9999" ]]; then - local _EGIT_BRANCH= - if [[ -n "${EGIT_BRANCH}" ]]; then - # Cannot use rsyslog commits/branches for documentation repository - _EGIT_BRANCH=${EGIT_BRANCH} - unset EGIT_BRANCH - fi - - git-r3_fetch "${DOC_REPO_URI}" - git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs - - if [[ -n "${_EGIT_BRANCH}" ]]; then - # Restore previous EGIT_BRANCH information - EGIT_BRANCH=${_EGIT_BRANCH} - fi - else - cd "${S}" || die "Cannot change dir into '${S}'" - mkdir docs || die "Failed to create docs directory" - cd docs || die "Failed to change dir into '${S}/docs'" - unpack ${MY_FILENAME_DOCS} - fi - fi -} - -src_prepare() { - default - - eautoreconf -} - -src_configure() { - # Maintainer notes: - # * Guardtime support is missing because libgt isn't yet available - # in portage. - # * Hadoop's HDFS file system output module is currently not - # supported in Gentoo because nobody is able to test it - # (JAVA dependency). - # * dev-libs/hiredis doesn't provide pkg-config (see #504614, - # upstream PR 129 and 136) so we need to export HIREDIS_* - # variables because rsyslog's build system depends on pkg-config. - - if use redis; then - export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis" - export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include" - fi - - local myeconfargs=( - --disable-debug-symbols - --disable-generate-man-pages - --without-valgrind-testbench - $(use_enable test testbench) - # Input Plugins without depedencies - --enable-imdiag - --enable-imfile - --enable-impstats - --enable-imptcp - # Message Modificiation Plugins without depedencies - --enable-mmanon - --enable-mmaudit - --enable-mmcount - --enable-mmfields - --enable-mmjsonparse - --enable-mmpstrucdata - --enable-mmsequence - --enable-mmutf8fix - # Output Modification Plugins without dependencies - --enable-mail - --enable-omprog - --enable-omruleset - --enable-omstdout - --enable-omuxsock - # Misc - --enable-pmaixforwardedfrom - --enable-pmciscoios - --enable-pmcisconames - --enable-pmlastmsg - --enable-pmsnare - # DB - $(use_enable dbi libdbi) - $(use_enable mongodb ommongodb) - $(use_enable mysql) - $(use_enable postgres pgsql) - $(use_enable redis omhiredis) - # Debug - $(use_enable debug) - $(use_enable debug diagtools) - $(use_enable debug memcheck) - $(use_enable debug rtinst) - $(use_enable debug valgrind) - # Misc - $(use_enable elasticsearch) - $(use_enable gcrypt libgcrypt) - $(use_enable jemalloc) - $(use_enable kafka omkafka) - $(use_enable kerberos gssapi-krb5) - $(use_enable normalize mmnormalize) - $(use_enable grok mmgrok) - $(use_enable omhttpfs) - $(use_enable omudpspoof) - $(use_enable rabbitmq omrabbitmq) - $(use_enable relp) - $(use_enable rfc3195) - $(use_enable rfc5424hmac mmrfc5424addhmac) - $(use_enable snmp) - $(use_enable snmp mmsnmptrapd) - $(use_enable ssl gnutls) - $(use_enable systemd imjournal) - $(use_enable systemd omjournal) - $(use_enable usertools) - $(use_enable uuid) - $(use_enable zeromq imczmq) - $(use_enable zeromq imzmq3) - $(use_enable zeromq omczmq) - $(use_enable zeromq omzmq3) - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" - ) - - econf "${myeconfargs[@]}" -} - -src_compile() { - default - - if use doc && [[ "${PV}" == "9999" ]]; then - einfo "Building documentation ..." - local doc_dir="${S}/docs" - cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!" - sphinx-build -b html source build || die "Building documentation failed!" - fi -} - -src_test() { - local _has_increased_ulimit= - - # Sometimes tests aren't executable (i.e. when added via patch) - einfo "Adjusting permissions of test scripts ..." - find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \ - die "Failed to adjust test scripts permission" - - if ulimit -n 3072; then - _has_increased_ulimit="true" - fi - - if ! emake --jobs 1 check; then - eerror "Test suite failed! :(" - - if [[ -z "${_has_increased_ulimit}" ]]; then - eerror "Probably because open file limit couldn't be set to 3072." - fi - - if has userpriv ${FEATURES}; then - eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \ - "before you submit a bug report." - fi - - fi -} - -src_install() { - local DOCS=( - AUTHORS - ChangeLog - "${FILESDIR}"/${BRANCH}/README.gentoo - ) - - use doc && local HTML_DOCS=( "${S}/docs/build/." ) - - default - - newconfd "${FILESDIR}/${BRANCH}/${PN}.confd-r1" ${PN} - newinitd "${FILESDIR}/${BRANCH}/${PN}.initd-r1" ${PN} - - keepdir /var/empty/dev - keepdir /var/spool/${PN} - keepdir /etc/ssl/${PN} - keepdir /etc/${PN}.d - - insinto /etc - newins "${FILESDIR}/${BRANCH}/${PN}.conf" ${PN}.conf - - insinto /etc/rsyslog.d/ - doins "${FILESDIR}/${BRANCH}/50-default.conf" - - insinto /etc/logrotate.d/ - newins "${FILESDIR}/${BRANCH}/${PN}.logrotate" ${PN} - - if use mysql; then - insinto /usr/share/doc/${PF}/scripts/mysql - doins plugins/ommysql/createDB.sql - fi - - if use postgres; then - insinto /usr/share/doc/${PF}/scripts/pgsql - doins plugins/ompgsql/createDB.sql - fi - - prune_libtool_files --modules -} - -pkg_postinst() { - local advertise_readme=0 - - if [[ -z "${REPLACING_VERSIONS}" ]]; then - # This is a new installation - - advertise_readme=1 - - if use mysql || use postgres; then - echo - elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:" - elog " /usr/share/doc/${PF}/scripts" - fi - - if use ssl; then - echo - elog "To create a default CA and certificates for your server and clients, run:" - elog " emerge --config =${PF}" - elog "on your logging server. You can run it several times," - elog "once for each logging client. The client certificates will be signed" - elog "using the CA certificate generated during the first run." - fi - fi - - if [[ ${advertise_readme} -gt 0 ]]; then - # We need to show the README file location - - echo "" - elog "Please read" - elog "" - elog " ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*" - elog "" - elog "for more details." - fi -} - -pkg_config() { - if ! use ssl ; then - einfo "There is nothing to configure for rsyslog unless you" - einfo "used USE=ssl to build it." - return 0 - fi - - # Make sure the certificates directory exists - local CERTDIR="${EROOT}/etc/ssl/${PN}" - if [[ ! -d "${CERTDIR}" ]]; then - mkdir "${CERTDIR}" || die - fi - einfo "Your certificates will be stored in ${CERTDIR}" - - # Create a default CA if needed - if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then - einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..." - certtool --generate-privkey \ - --outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null - chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem" - - cat > "${T}/${PF}.$$" <<- _EOF - cn = Portage automated CA - ca - cert_signing_key - expiration_days = 3650 - _EOF - - certtool --generate-self-signed \ - --load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ - --outfile "${CERTDIR}/${PN}_ca.cert.pem" \ - --template "${T}/${PF}.$$" &>/dev/null - chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem" - - # Create the server certificate - echo - einfon "Please type the Common Name of the SERVER you wish to create a certificate for: " - read -r CN - - einfo "Creating private key and certificate for server ${CN}..." - certtool --generate-privkey \ - --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null - chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem" - - cat > "${T}/${PF}.$$" <<- _EOF - cn = ${CN} - tls_www_server - dns_name = ${CN} - expiration_days = 3650 - _EOF - - certtool --generate-certificate \ - --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \ - --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \ - --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \ - --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ - --template "${T}/${PF}.$$" &>/dev/null - chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem" - - else - einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation." - fi - - # Create a client certificate - echo - einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: " - read -r CN - - einfo "Creating private key and certificate for client ${CN}..." - certtool --generate-privkey \ - --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null - chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem" - - cat > "${T}/${PF}.$$" <<- _EOF - cn = ${CN} - tls_www_client - dns_name = ${CN} - expiration_days = 3650 - _EOF - - certtool --generate-certificate \ - --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \ - --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \ - --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \ - --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ - --template "${T}/${PF}.$$" &>/dev/null - chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem" - - rm -f "${T}/${PF}.$$" - - echo - einfo "Here is the documentation on how to encrypt your log traffic:" - einfo " http://www.rsyslog.com/doc/rsyslog_tls.html" -} diff --git a/app-admin/rsyslog/rsyslog-8.24.0-r2.ebuild b/app-admin/rsyslog/rsyslog-8.24.0-r2.ebuild deleted file mode 100644 index 988544873b7a..000000000000 --- a/app-admin/rsyslog/rsyslog-8.24.0-r2.ebuild +++ /dev/null @@ -1,448 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit autotools eutils linux-info systemd - -DESCRIPTION="An enhanced multi-threaded syslogd with database support and more" -HOMEPAGE="http://www.rsyslog.com/" - -BRANCH="8-stable" - -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git" - - DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git" - - inherit git-r3 -else - MY_PV=${PV%_rc*} - MY_FILENAME="${PN}-${PV}.tar.gz" - MY_FILENAME_DOCS="${PN}-docs-${PV}.tar.gz" - S="${WORKDIR}/${PN}-${MY_PV}" - - # Upstream URL schema: - # RC: http://www.rsyslog.com/files/download/rsyslog/rc/rsyslog-8.18.0.tar.gz - # http://www.rsyslog.com/files/download/rsyslog/rc2/rsyslog-8.18.0.tar.gz - # Release: http://www.rsyslog.com/files/download/rsyslog/rsyslog-8.18.0.tar.gz - - MY_URL_PREFIX= - if [[ ${PV} = *_rc* ]]; then - _tmp_last_index=$(($(get_last_version_component_index ${PV})+1)) - _tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${PV}) - if [[ ${_tmp_suffix} = *rc* ]]; then - MY_URL_PREFIX="${_tmp_suffix}/" - fi - - # Cleaning up temporary variables - unset _tmp_last_index - unset _tmp_suffix - else - KEYWORDS="amd64 arm ~arm64 hppa x86" - fi - - SRC_URI=" - 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/${PN}-8.24.0-fix-tcpflood-without-librelp-r1.patch ) -fi - -LICENSE="GPL-3 LGPL-3 Apache-2.0" -SLOT="0" -IUSE="dbi debug doc elasticsearch +gcrypt grok jemalloc kafka kerberos libressl mongodb mysql normalize omhttpfs" -IUSE+=" omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid zeromq" - -RDEPEND=" - >=dev-libs/libfastjson-0.99.3:= - >=dev-libs/libestr-0.1.9 - >=dev-libs/liblogging-1.0.1:=[stdlog] - >=sys-libs/zlib-1.2.5 - dbi? ( >=dev-db/libdbi-0.8.3 ) - elasticsearch? ( >=net-misc/curl-7.35.0 ) - gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) - grok? ( >=dev-libs/grok-0.9.2 ) - jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) - kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) - kerberos? ( virtual/krb5 ) - mongodb? ( >=dev-libs/libmongo-client-0.1.4 ) - mysql? ( virtual/mysql ) - normalize? ( - >=dev-libs/libee-0.4.0 - >=dev-libs/liblognorm-2.0.1:= - ) - omhttpfs? ( >=net-misc/curl-7.35.0 ) - omudpspoof? ( >=net-libs/libnet-1.1.6 ) - postgres? ( >=dev-db/postgresql-8.4.20:= ) - rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) - redis? ( >=dev-libs/hiredis-0.11.0:= ) - relp? ( >=dev-libs/librelp-1.2.12:= ) - rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) - rfc5424hmac? ( - !libressl? ( >=dev-libs/openssl-0.9.8y:0= ) - libressl? ( dev-libs/libressl:= ) - ) - snmp? ( >=net-analyzer/net-snmp-5.7.2 ) - ssl? ( >=net-libs/gnutls-2.12.23:0= ) - systemd? ( >=sys-apps/systemd-208 ) - uuid? ( sys-apps/util-linux:0= ) - zeromq? ( - >=net-libs/zeromq-4.1.1:= - >=net-libs/czmq-3.0.0 - )" -DEPEND="${RDEPEND} - >=sys-devel/autoconf-archive-2015.02.24 - virtual/pkgconfig - test? ( sys-libs/libfaketime )" - -if [[ ${PV} == "9999" ]]; then - DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )" - DEPEND+=" >=sys-devel/flex-2.5.39-r1" - DEPEND+=" >=sys-devel/bison-2.4.3" - DEPEND+=" >=dev-python/docutils-0.12" -fi - -CONFIG_CHECK="~INOTIFY_USER" -WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!" - -src_unpack() { - if [[ ${PV} == "9999" ]]; then - git-r3_fetch - git-r3_checkout - else - unpack ${P}.tar.gz - fi - - if use doc; then - if [[ ${PV} == "9999" ]]; then - local _EGIT_BRANCH= - if [[ -n "${EGIT_BRANCH}" ]]; then - # Cannot use rsyslog commits/branches for documentation repository - _EGIT_BRANCH=${EGIT_BRANCH} - unset EGIT_BRANCH - fi - - git-r3_fetch "${DOC_REPO_URI}" - git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs - - if [[ -n "${_EGIT_BRANCH}" ]]; then - # Restore previous EGIT_BRANCH information - EGIT_BRANCH=${_EGIT_BRANCH} - fi - else - cd "${S}" || die "Cannot change dir into '${S}'" - mkdir docs || die "Failed to create docs directory" - cd docs || die "Failed to change dir into '${S}/docs'" - unpack ${MY_FILENAME_DOCS} - fi - fi -} - -src_prepare() { - default - - eautoreconf -} - -src_configure() { - # Maintainer notes: - # * Guardtime support is missing because libgt isn't yet available - # in portage. - # * Hadoop's HDFS file system output module is currently not - # supported in Gentoo because nobody is able to test it - # (JAVA dependency). - # * dev-libs/hiredis doesn't provide pkg-config (see #504614, - # upstream PR 129 and 136) so we need to export HIREDIS_* - # variables because rsyslog's build system depends on pkg-config. - - if use redis; then - export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis" - export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include" - fi - - local myeconfargs=( - --disable-debug-symbols - --disable-generate-man-pages - --without-valgrind-testbench - $(use_enable test testbench) - # Input Plugins without depedencies - --enable-imdiag - --enable-imfile - --enable-impstats - --enable-imptcp - # Message Modificiation Plugins without depedencies - --enable-mmanon - --enable-mmaudit - --enable-mmcount - --enable-mmfields - --enable-mmjsonparse - --enable-mmpstrucdata - --enable-mmrm1stspace - --enable-mmsequence - --enable-mmutf8fix - # Output Modification Plugins without dependencies - --enable-mail - --enable-omprog - --enable-omruleset - --enable-omstdout - --enable-omuxsock - # Misc - --enable-pmaixforwardedfrom - --enable-pmciscoios - --enable-pmcisconames - --enable-pmlastmsg - --enable-pmsnare - # DB - $(use_enable dbi libdbi) - $(use_enable mongodb ommongodb) - $(use_enable mysql) - $(use_enable postgres pgsql) - $(use_enable redis omhiredis) - # Debug - $(use_enable debug) - $(use_enable debug diagtools) - $(use_enable debug memcheck) - $(use_enable debug rtinst) - $(use_enable debug valgrind) - # Misc - $(use_enable elasticsearch) - $(use_enable gcrypt libgcrypt) - $(use_enable jemalloc) - $(use_enable kafka omkafka) - $(use_enable kerberos gssapi-krb5) - $(use_enable normalize mmnormalize) - $(use_enable grok mmgrok) - $(use_enable omhttpfs) - $(use_enable omudpspoof) - $(use_enable rabbitmq omrabbitmq) - $(use_enable relp) - $(use_enable rfc3195) - $(use_enable rfc5424hmac mmrfc5424addhmac) - $(use_enable snmp) - $(use_enable snmp mmsnmptrapd) - $(use_enable ssl gnutls) - $(use_enable systemd imjournal) - $(use_enable systemd omjournal) - $(use_enable usertools) - $(use_enable uuid) - $(use_enable zeromq imczmq) - $(use_enable zeromq imzmq3) - $(use_enable zeromq omczmq) - $(use_enable zeromq omzmq3) - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" - ) - - econf "${myeconfargs[@]}" -} - -src_compile() { - default - - if use doc && [[ "${PV}" == "9999" ]]; then - einfo "Building documentation ..." - local doc_dir="${S}/docs" - cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!" - sphinx-build -b html source build || die "Building documentation failed!" - fi -} - -src_test() { - local _has_increased_ulimit= - - # Sometimes tests aren't executable (i.e. when added via patch) - einfo "Adjusting permissions of test scripts ..." - find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \ - die "Failed to adjust test scripts permission" - - if ulimit -n 3072; then - _has_increased_ulimit="true" - fi - - if ! emake --jobs 1 check; then - eerror "Test suite failed! :(" - - if [[ -z "${_has_increased_ulimit}" ]]; then - eerror "Probably because open file limit couldn't be set to 3072." - fi - - if has userpriv ${FEATURES}; then - eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \ - "before you submit a bug report." - fi - - fi -} - -src_install() { - local DOCS=( - AUTHORS - ChangeLog - "${FILESDIR}"/${BRANCH}/README.gentoo - ) - - use doc && local HTML_DOCS=( "${S}/docs/build/." ) - - default - - newconfd "${FILESDIR}/${BRANCH}/${PN}.confd-r1" ${PN} - newinitd "${FILESDIR}/${BRANCH}/${PN}.initd-r1" ${PN} - - keepdir /var/empty/dev - keepdir /var/spool/${PN} - keepdir /etc/ssl/${PN} - keepdir /etc/${PN}.d - - insinto /etc - newins "${FILESDIR}/${BRANCH}/${PN}.conf" ${PN}.conf - - insinto /etc/rsyslog.d/ - doins "${FILESDIR}/${BRANCH}/50-default.conf" - - insinto /etc/logrotate.d/ - newins "${FILESDIR}/${BRANCH}/${PN}.logrotate" ${PN} - - if use mysql; then - insinto /usr/share/doc/${PF}/scripts/mysql - doins plugins/ommysql/createDB.sql - fi - - if use postgres; then - insinto /usr/share/doc/${PF}/scripts/pgsql - doins plugins/ompgsql/createDB.sql - fi - - prune_libtool_files --modules -} - -pkg_postinst() { - local advertise_readme=0 - - if [[ -z "${REPLACING_VERSIONS}" ]]; then - # This is a new installation - - advertise_readme=1 - - if use mysql || use postgres; then - echo - elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:" - elog " /usr/share/doc/${PF}/scripts" - fi - - if use ssl; then - echo - elog "To create a default CA and certificates for your server and clients, run:" - elog " emerge --config =${PF}" - elog "on your logging server. You can run it several times," - elog "once for each logging client. The client certificates will be signed" - elog "using the CA certificate generated during the first run." - fi - fi - - if [[ ${advertise_readme} -gt 0 ]]; then - # We need to show the README file location - - echo "" - elog "Please read" - elog "" - elog " ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*" - elog "" - elog "for more details." - fi -} - -pkg_config() { - if ! use ssl ; then - einfo "There is nothing to configure for rsyslog unless you" - einfo "used USE=ssl to build it." - return 0 - fi - - # Make sure the certificates directory exists - local CERTDIR="${EROOT}/etc/ssl/${PN}" - if [[ ! -d "${CERTDIR}" ]]; then - mkdir "${CERTDIR}" || die - fi - einfo "Your certificates will be stored in ${CERTDIR}" - - # Create a default CA if needed - if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then - einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..." - certtool --generate-privkey \ - --outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null - chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem" - - cat > "${T}/${PF}.$$" <<- _EOF - cn = Portage automated CA - ca - cert_signing_key - expiration_days = 3650 - _EOF - - certtool --generate-self-signed \ - --load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ - --outfile "${CERTDIR}/${PN}_ca.cert.pem" \ - --template "${T}/${PF}.$$" &>/dev/null - chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem" - - # Create the server certificate - echo - einfon "Please type the Common Name of the SERVER you wish to create a certificate for: " - read -r CN - - einfo "Creating private key and certificate for server ${CN}..." - certtool --generate-privkey \ - --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null - chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem" - - cat > "${T}/${PF}.$$" <<- _EOF - cn = ${CN} - tls_www_server - dns_name = ${CN} - expiration_days = 3650 - _EOF - - certtool --generate-certificate \ - --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \ - --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \ - --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \ - --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ - --template "${T}/${PF}.$$" &>/dev/null - chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem" - - else - einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation." - fi - - # Create a client certificate - echo - einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: " - read -r CN - - einfo "Creating private key and certificate for client ${CN}..." - certtool --generate-privkey \ - --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null - chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem" - - cat > "${T}/${PF}.$$" <<- _EOF - cn = ${CN} - tls_www_client - dns_name = ${CN} - expiration_days = 3650 - _EOF - - certtool --generate-certificate \ - --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \ - --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \ - --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \ - --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ - --template "${T}/${PF}.$$" &>/dev/null - chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem" - - rm -f "${T}/${PF}.$$" - - echo - einfo "Here is the documentation on how to encrypt your log traffic:" - einfo " http://www.rsyslog.com/doc/rsyslog_tls.html" -} diff --git a/app-admin/rsyslog/rsyslog-8.25.0-r2.ebuild b/app-admin/rsyslog/rsyslog-8.25.0-r2.ebuild deleted file mode 100644 index d6c48ae2a638..000000000000 --- a/app-admin/rsyslog/rsyslog-8.25.0-r2.ebuild +++ /dev/null @@ -1,450 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit autotools eutils linux-info systemd - -DESCRIPTION="An enhanced multi-threaded syslogd with database support and more" -HOMEPAGE="http://www.rsyslog.com/" - -BRANCH="8-stable" - -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git" - - DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git" - - inherit git-r3 -else - MY_PV=${PV%_rc*} - MY_FILENAME="${PN}-${PV}.tar.gz" - MY_FILENAME_DOCS="${PN}-docs-${PV}.tar.gz" - S="${WORKDIR}/${PN}-${MY_PV}" - - # Upstream URL schema: - # RC: http://www.rsyslog.com/files/download/rsyslog/rc/rsyslog-8.18.0.tar.gz - # http://www.rsyslog.com/files/download/rsyslog/rc2/rsyslog-8.18.0.tar.gz - # Release: http://www.rsyslog.com/files/download/rsyslog/rsyslog-8.18.0.tar.gz - - MY_URL_PREFIX= - if [[ ${PV} = *_rc* ]]; then - _tmp_last_index=$(($(get_last_version_component_index ${PV})+1)) - _tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${PV}) - if [[ ${_tmp_suffix} = *rc* ]]; then - MY_URL_PREFIX="${_tmp_suffix}/" - fi - - # Cleaning up temporary variables - unset _tmp_last_index - unset _tmp_suffix - else - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86" - fi - - SRC_URI=" - 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/${PN}-8.24.0-fix-tcpflood-without-librelp-r1.patch ) -fi - -LICENSE="GPL-3 LGPL-3 Apache-2.0" -SLOT="0" -IUSE="dbi debug doc elasticsearch +gcrypt grok jemalloc kafka kerberos libressl mdblookup mongodb mysql normalize omhttpfs" -IUSE+=" omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid zeromq" - -RDEPEND=" - >=dev-libs/libfastjson-0.99.3:= - >=dev-libs/libestr-0.1.9 - >=dev-libs/liblogging-1.0.1:=[stdlog] - >=sys-libs/zlib-1.2.5 - dbi? ( >=dev-db/libdbi-0.8.3 ) - elasticsearch? ( >=net-misc/curl-7.35.0 ) - gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) - grok? ( >=dev-libs/grok-0.9.2 ) - jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) - kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) - kerberos? ( virtual/krb5 ) - mdblookup? ( dev-libs/libmaxminddb:= ) - mongodb? ( >=dev-libs/libmongo-client-0.1.4 ) - mysql? ( virtual/mysql ) - normalize? ( - >=dev-libs/libee-0.4.0 - >=dev-libs/liblognorm-2.0.1:= - ) - omhttpfs? ( >=net-misc/curl-7.35.0 ) - omudpspoof? ( >=net-libs/libnet-1.1.6 ) - postgres? ( >=dev-db/postgresql-8.4.20:= ) - rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) - redis? ( >=dev-libs/hiredis-0.11.0:= ) - relp? ( >=dev-libs/librelp-1.2.12:= ) - rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) - rfc5424hmac? ( - !libressl? ( >=dev-libs/openssl-0.9.8y:0= ) - libressl? ( dev-libs/libressl:= ) - ) - snmp? ( >=net-analyzer/net-snmp-5.7.2 ) - ssl? ( >=net-libs/gnutls-2.12.23:0= ) - systemd? ( >=sys-apps/systemd-208 ) - uuid? ( sys-apps/util-linux:0= ) - zeromq? ( - >=net-libs/zeromq-4.1.1:= - >=net-libs/czmq-3.0.0 - )" -DEPEND="${RDEPEND} - >=sys-devel/autoconf-archive-2015.02.24 - virtual/pkgconfig - test? ( sys-libs/libfaketime )" - -if [[ ${PV} == "9999" ]]; then - DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )" - DEPEND+=" >=sys-devel/flex-2.5.39-r1" - DEPEND+=" >=sys-devel/bison-2.4.3" - DEPEND+=" >=dev-python/docutils-0.12" -fi - -CONFIG_CHECK="~INOTIFY_USER" -WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!" - -src_unpack() { - if [[ ${PV} == "9999" ]]; then - git-r3_fetch - git-r3_checkout - else - unpack ${P}.tar.gz - fi - - if use doc; then - if [[ ${PV} == "9999" ]]; then - local _EGIT_BRANCH= - if [[ -n "${EGIT_BRANCH}" ]]; then - # Cannot use rsyslog commits/branches for documentation repository - _EGIT_BRANCH=${EGIT_BRANCH} - unset EGIT_BRANCH - fi - - git-r3_fetch "${DOC_REPO_URI}" - git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs - - if [[ -n "${_EGIT_BRANCH}" ]]; then - # Restore previous EGIT_BRANCH information - EGIT_BRANCH=${_EGIT_BRANCH} - fi - else - cd "${S}" || die "Cannot change dir into '${S}'" - mkdir docs || die "Failed to create docs directory" - cd docs || die "Failed to change dir into '${S}/docs'" - unpack ${MY_FILENAME_DOCS} - fi - fi -} - -src_prepare() { - default - - eautoreconf -} - -src_configure() { - # Maintainer notes: - # * Guardtime support is missing because libgt isn't yet available - # in portage. - # * Hadoop's HDFS file system output module is currently not - # supported in Gentoo because nobody is able to test it - # (JAVA dependency). - # * dev-libs/hiredis doesn't provide pkg-config (see #504614, - # upstream PR 129 and 136) so we need to export HIREDIS_* - # variables because rsyslog's build system depends on pkg-config. - - if use redis; then - export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis" - export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include" - fi - - local myeconfargs=( - --disable-debug-symbols - --disable-generate-man-pages - --without-valgrind-testbench - $(use_enable test testbench) - # Input Plugins without depedencies - --enable-imdiag - --enable-imfile - --enable-impstats - --enable-imptcp - # Message Modificiation Plugins without depedencies - --enable-mmanon - --enable-mmaudit - --enable-mmcount - --enable-mmfields - --enable-mmjsonparse - --enable-mmpstrucdata - --enable-mmrm1stspace - --enable-mmsequence - --enable-mmutf8fix - # Output Modification Plugins without dependencies - --enable-mail - --enable-omprog - --enable-omruleset - --enable-omstdout - --enable-omuxsock - # Misc - --enable-pmaixforwardedfrom - --enable-pmciscoios - --enable-pmcisconames - --enable-pmlastmsg - --enable-pmsnare - # DB - $(use_enable dbi libdbi) - $(use_enable mongodb ommongodb) - $(use_enable mysql) - $(use_enable postgres pgsql) - $(use_enable redis omhiredis) - # Debug - $(use_enable debug) - $(use_enable debug diagtools) - $(use_enable debug memcheck) - $(use_enable debug rtinst) - $(use_enable debug valgrind) - # Misc - $(use_enable elasticsearch) - $(use_enable gcrypt libgcrypt) - $(use_enable jemalloc) - $(use_enable kafka omkafka) - $(use_enable kerberos gssapi-krb5) - $(use_enable normalize mmnormalize) - $(use_enable mdblookup mmdblookup) - $(use_enable grok mmgrok) - $(use_enable omhttpfs) - $(use_enable omudpspoof) - $(use_enable rabbitmq omrabbitmq) - $(use_enable relp) - $(use_enable rfc3195) - $(use_enable rfc5424hmac mmrfc5424addhmac) - $(use_enable snmp) - $(use_enable snmp mmsnmptrapd) - $(use_enable ssl gnutls) - $(use_enable systemd imjournal) - $(use_enable systemd omjournal) - $(use_enable usertools) - $(use_enable uuid) - $(use_enable zeromq imczmq) - $(use_enable zeromq imzmq3) - $(use_enable zeromq omczmq) - $(use_enable zeromq omzmq3) - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" - ) - - econf "${myeconfargs[@]}" -} - -src_compile() { - default - - if use doc && [[ "${PV}" == "9999" ]]; then - einfo "Building documentation ..." - local doc_dir="${S}/docs" - cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!" - sphinx-build -b html source build || die "Building documentation failed!" - fi -} - -src_test() { - local _has_increased_ulimit= - - # Sometimes tests aren't executable (i.e. when added via patch) - einfo "Adjusting permissions of test scripts ..." - find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \ - die "Failed to adjust test scripts permission" - - if ulimit -n 3072; then - _has_increased_ulimit="true" - fi - - if ! emake --jobs 1 check; then - eerror "Test suite failed! :(" - - if [[ -z "${_has_increased_ulimit}" ]]; then - eerror "Probably because open file limit couldn't be set to 3072." - fi - - if has userpriv ${FEATURES}; then - eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \ - "before you submit a bug report." - fi - - fi -} - -src_install() { - local DOCS=( - AUTHORS - ChangeLog - "${FILESDIR}"/${BRANCH}/README.gentoo - ) - - use doc && local HTML_DOCS=( "${S}/docs/build/." ) - - default - - newconfd "${FILESDIR}/${BRANCH}/${PN}.confd-r1" ${PN} - newinitd "${FILESDIR}/${BRANCH}/${PN}.initd-r1" ${PN} - - keepdir /var/empty/dev - keepdir /var/spool/${PN} - keepdir /etc/ssl/${PN} - keepdir /etc/${PN}.d - - insinto /etc - newins "${FILESDIR}/${BRANCH}/${PN}.conf" ${PN}.conf - - insinto /etc/rsyslog.d/ - doins "${FILESDIR}/${BRANCH}/50-default.conf" - - insinto /etc/logrotate.d/ - newins "${FILESDIR}/${BRANCH}/${PN}.logrotate" ${PN} - - if use mysql; then - insinto /usr/share/doc/${PF}/scripts/mysql - doins plugins/ommysql/createDB.sql - fi - - if use postgres; then - insinto /usr/share/doc/${PF}/scripts/pgsql - doins plugins/ompgsql/createDB.sql - fi - - prune_libtool_files --modules -} - -pkg_postinst() { - local advertise_readme=0 - - if [[ -z "${REPLACING_VERSIONS}" ]]; then - # This is a new installation - - advertise_readme=1 - - if use mysql || use postgres; then - echo - elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:" - elog " /usr/share/doc/${PF}/scripts" - fi - - if use ssl; then - echo - elog "To create a default CA and certificates for your server and clients, run:" - elog " emerge --config =${PF}" - elog "on your logging server. You can run it several times," - elog "once for each logging client. The client certificates will be signed" - elog "using the CA certificate generated during the first run." - fi - fi - - if [[ ${advertise_readme} -gt 0 ]]; then - # We need to show the README file location - - echo "" - elog "Please read" - elog "" - elog " ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*" - elog "" - elog "for more details." - fi -} - -pkg_config() { - if ! use ssl ; then - einfo "There is nothing to configure for rsyslog unless you" - einfo "used USE=ssl to build it." - return 0 - fi - - # Make sure the certificates directory exists - local CERTDIR="${EROOT}/etc/ssl/${PN}" - if [[ ! -d "${CERTDIR}" ]]; then - mkdir "${CERTDIR}" || die - fi - einfo "Your certificates will be stored in ${CERTDIR}" - - # Create a default CA if needed - if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then - einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..." - certtool --generate-privkey \ - --outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null - chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem" - - cat > "${T}/${PF}.$$" <<- _EOF - cn = Portage automated CA - ca - cert_signing_key - expiration_days = 3650 - _EOF - - certtool --generate-self-signed \ - --load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ - --outfile "${CERTDIR}/${PN}_ca.cert.pem" \ - --template "${T}/${PF}.$$" &>/dev/null - chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem" - - # Create the server certificate - echo - einfon "Please type the Common Name of the SERVER you wish to create a certificate for: " - read -r CN - - einfo "Creating private key and certificate for server ${CN}..." - certtool --generate-privkey \ - --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null - chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem" - - cat > "${T}/${PF}.$$" <<- _EOF - cn = ${CN} - tls_www_server - dns_name = ${CN} - expiration_days = 3650 - _EOF - - certtool --generate-certificate \ - --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \ - --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \ - --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \ - --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ - --template "${T}/${PF}.$$" &>/dev/null - chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem" - - else - einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation." - fi - - # Create a client certificate - echo - einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: " - read -r CN - - einfo "Creating private key and certificate for client ${CN}..." - certtool --generate-privkey \ - --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null - chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem" - - cat > "${T}/${PF}.$$" <<- _EOF - cn = ${CN} - tls_www_client - dns_name = ${CN} - expiration_days = 3650 - _EOF - - certtool --generate-certificate \ - --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \ - --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \ - --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \ - --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ - --template "${T}/${PF}.$$" &>/dev/null - chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem" - - rm -f "${T}/${PF}.$$" - - echo - einfo "Here is the documentation on how to encrypt your log traffic:" - einfo " http://www.rsyslog.com/doc/rsyslog_tls.html" -} diff --git a/app-admin/rsyslog/rsyslog-8.26.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.26.0-r1.ebuild deleted file mode 100644 index fe40592d194f..000000000000 --- a/app-admin/rsyslog/rsyslog-8.26.0-r1.ebuild +++ /dev/null @@ -1,452 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit autotools eutils linux-info systemd - -DESCRIPTION="An enhanced multi-threaded syslogd with database support and more" -HOMEPAGE="http://www.rsyslog.com/" - -BRANCH="8-stable" - -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git" - - DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git" - - inherit git-r3 -else - MY_PV=${PV%_rc*} - MY_FILENAME="${PN}-${PV}.tar.gz" - MY_FILENAME_DOCS="${PN}-docs-${PV}.tar.gz" - S="${WORKDIR}/${PN}-${MY_PV}" - - # Upstream URL schema: - # RC: http://www.rsyslog.com/files/download/rsyslog/rc/rsyslog-8.18.0.tar.gz - # http://www.rsyslog.com/files/download/rsyslog/rc2/rsyslog-8.18.0.tar.gz - # Release: http://www.rsyslog.com/files/download/rsyslog/rsyslog-8.18.0.tar.gz - - MY_URL_PREFIX= - if [[ ${PV} = *_rc* ]]; then - _tmp_last_index=$(($(get_last_version_component_index ${PV})+1)) - _tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${PV}) - if [[ ${_tmp_suffix} = *rc* ]]; then - MY_URL_PREFIX="${_tmp_suffix}/" - fi - - # Cleaning up temporary variables - unset _tmp_last_index - unset _tmp_suffix - else - KEYWORDS="amd64 ~arm ~arm64 hppa x86" - fi - - SRC_URI=" - 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/${PN}-8.26.0-fix-zmq3-format-security.patch - ) -fi - -LICENSE="GPL-3 LGPL-3 Apache-2.0" -SLOT="0" -IUSE="dbi debug doc elasticsearch +gcrypt grok jemalloc kafka kerberos libressl mdblookup mongodb mysql normalize omhttpfs" -IUSE+=" omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid zeromq" - -RDEPEND=" - >=dev-libs/libfastjson-0.99.3:= - >=dev-libs/libestr-0.1.9 - >=dev-libs/liblogging-1.0.1:=[stdlog] - >=sys-libs/zlib-1.2.5 - dbi? ( >=dev-db/libdbi-0.8.3 ) - elasticsearch? ( >=net-misc/curl-7.35.0 ) - gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) - grok? ( >=dev-libs/grok-0.9.2 ) - jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) - kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) - kerberos? ( virtual/krb5 ) - mdblookup? ( dev-libs/libmaxminddb:= ) - mongodb? ( >=dev-libs/libmongo-client-0.1.4 ) - mysql? ( virtual/mysql ) - normalize? ( - >=dev-libs/libee-0.4.0 - >=dev-libs/liblognorm-2.0.3:= - ) - omhttpfs? ( >=net-misc/curl-7.35.0 ) - omudpspoof? ( >=net-libs/libnet-1.1.6 ) - postgres? ( >=dev-db/postgresql-8.4.20:= ) - rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) - redis? ( >=dev-libs/hiredis-0.11.0:= ) - relp? ( >=dev-libs/librelp-1.2.12:= ) - rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) - rfc5424hmac? ( - !libressl? ( >=dev-libs/openssl-0.9.8y:0= ) - libressl? ( dev-libs/libressl:= ) - ) - snmp? ( >=net-analyzer/net-snmp-5.7.2 ) - ssl? ( >=net-libs/gnutls-2.12.23:0= ) - systemd? ( >=sys-apps/systemd-208 ) - uuid? ( sys-apps/util-linux:0= ) - zeromq? ( - >=net-libs/zeromq-4.1.1:= - >=net-libs/czmq-3.0.0 - )" -DEPEND="${RDEPEND} - >=sys-devel/autoconf-archive-2015.02.24 - virtual/pkgconfig - test? ( sys-libs/libfaketime )" - -if [[ ${PV} == "9999" ]]; then - DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )" - DEPEND+=" >=sys-devel/flex-2.5.39-r1" - DEPEND+=" >=sys-devel/bison-2.4.3" - DEPEND+=" >=dev-python/docutils-0.12" -fi - -CONFIG_CHECK="~INOTIFY_USER" -WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!" - -src_unpack() { - if [[ ${PV} == "9999" ]]; then - git-r3_fetch - git-r3_checkout - else - unpack ${P}.tar.gz - fi - - if use doc; then - if [[ ${PV} == "9999" ]]; then - local _EGIT_BRANCH= - if [[ -n "${EGIT_BRANCH}" ]]; then - # Cannot use rsyslog commits/branches for documentation repository - _EGIT_BRANCH=${EGIT_BRANCH} - unset EGIT_BRANCH - fi - - git-r3_fetch "${DOC_REPO_URI}" - git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs - - if [[ -n "${_EGIT_BRANCH}" ]]; then - # Restore previous EGIT_BRANCH information - EGIT_BRANCH=${_EGIT_BRANCH} - fi - else - cd "${S}" || die "Cannot change dir into '${S}'" - mkdir docs || die "Failed to create docs directory" - cd docs || die "Failed to change dir into '${S}/docs'" - unpack ${MY_FILENAME_DOCS} - fi - fi -} - -src_prepare() { - default - - eautoreconf -} - -src_configure() { - # Maintainer notes: - # * Guardtime support is missing because libgt isn't yet available - # in portage. - # * Hadoop's HDFS file system output module is currently not - # supported in Gentoo because nobody is able to test it - # (JAVA dependency). - # * dev-libs/hiredis doesn't provide pkg-config (see #504614, - # upstream PR 129 and 136) so we need to export HIREDIS_* - # variables because rsyslog's build system depends on pkg-config. - - if use redis; then - export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis" - export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include" - fi - - local myeconfargs=( - --disable-debug-symbols - --disable-generate-man-pages - --without-valgrind-testbench - $(use_enable test testbench) - # Input Plugins without depedencies - --enable-imdiag - --enable-imfile - --enable-impstats - --enable-imptcp - # Message Modificiation Plugins without depedencies - --enable-mmanon - --enable-mmaudit - --enable-mmcount - --enable-mmfields - --enable-mmjsonparse - --enable-mmpstrucdata - --enable-mmrm1stspace - --enable-mmsequence - --enable-mmutf8fix - # Output Modification Plugins without dependencies - --enable-mail - --enable-omprog - --enable-omruleset - --enable-omstdout - --enable-omuxsock - # Misc - --enable-pmaixforwardedfrom - --enable-pmciscoios - --enable-pmcisconames - --enable-pmlastmsg - --enable-pmsnare - # DB - $(use_enable dbi libdbi) - $(use_enable mongodb ommongodb) - $(use_enable mysql) - $(use_enable postgres pgsql) - $(use_enable redis omhiredis) - # Debug - $(use_enable debug) - $(use_enable debug diagtools) - $(use_enable debug memcheck) - $(use_enable debug rtinst) - $(use_enable debug valgrind) - # Misc - $(use_enable elasticsearch) - $(use_enable gcrypt libgcrypt) - $(use_enable jemalloc) - $(use_enable kafka omkafka) - $(use_enable kerberos gssapi-krb5) - $(use_enable normalize mmnormalize) - $(use_enable mdblookup mmdblookup) - $(use_enable grok mmgrok) - $(use_enable omhttpfs) - $(use_enable omudpspoof) - $(use_enable rabbitmq omrabbitmq) - $(use_enable relp) - $(use_enable rfc3195) - $(use_enable rfc5424hmac mmrfc5424addhmac) - $(use_enable snmp) - $(use_enable snmp mmsnmptrapd) - $(use_enable ssl gnutls) - $(use_enable systemd imjournal) - $(use_enable systemd omjournal) - $(use_enable usertools) - $(use_enable uuid) - $(use_enable zeromq imczmq) - $(use_enable zeromq imzmq3) - $(use_enable zeromq omczmq) - $(use_enable zeromq omzmq3) - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" - ) - - econf "${myeconfargs[@]}" -} - -src_compile() { - default - - if use doc && [[ "${PV}" == "9999" ]]; then - einfo "Building documentation ..." - local doc_dir="${S}/docs" - cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!" - sphinx-build -b html source build || die "Building documentation failed!" - fi -} - -src_test() { - local _has_increased_ulimit= - - # Sometimes tests aren't executable (i.e. when added via patch) - einfo "Adjusting permissions of test scripts ..." - find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \ - die "Failed to adjust test scripts permission" - - if ulimit -n 3072; then - _has_increased_ulimit="true" - fi - - if ! emake --jobs 1 check; then - eerror "Test suite failed! :(" - - if [[ -z "${_has_increased_ulimit}" ]]; then - eerror "Probably because open file limit couldn't be set to 3072." - fi - - if has userpriv ${FEATURES}; then - eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \ - "before you submit a bug report." - fi - - fi -} - -src_install() { - local DOCS=( - AUTHORS - ChangeLog - "${FILESDIR}"/${BRANCH}/README.gentoo - ) - - use doc && local HTML_DOCS=( "${S}/docs/build/." ) - - default - - newconfd "${FILESDIR}/${BRANCH}/${PN}.confd-r1" ${PN} - newinitd "${FILESDIR}/${BRANCH}/${PN}.initd-r1" ${PN} - - keepdir /var/empty/dev - keepdir /var/spool/${PN} - keepdir /etc/ssl/${PN} - keepdir /etc/${PN}.d - - insinto /etc - newins "${FILESDIR}/${BRANCH}/${PN}.conf" ${PN}.conf - - insinto /etc/rsyslog.d/ - doins "${FILESDIR}/${BRANCH}/50-default.conf" - - insinto /etc/logrotate.d/ - newins "${FILESDIR}/${BRANCH}/${PN}.logrotate" ${PN} - - if use mysql; then - insinto /usr/share/doc/${PF}/scripts/mysql - doins plugins/ommysql/createDB.sql - fi - - if use postgres; then - insinto /usr/share/doc/${PF}/scripts/pgsql - doins plugins/ompgsql/createDB.sql - fi - - prune_libtool_files --modules -} - -pkg_postinst() { - local advertise_readme=0 - - if [[ -z "${REPLACING_VERSIONS}" ]]; then - # This is a new installation - - advertise_readme=1 - - if use mysql || use postgres; then - echo - elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:" - elog " /usr/share/doc/${PF}/scripts" - fi - - if use ssl; then - echo - elog "To create a default CA and certificates for your server and clients, run:" - elog " emerge --config =${PF}" - elog "on your logging server. You can run it several times," - elog "once for each logging client. The client certificates will be signed" - elog "using the CA certificate generated during the first run." - fi - fi - - if [[ ${advertise_readme} -gt 0 ]]; then - # We need to show the README file location - - echo "" - elog "Please read" - elog "" - elog " ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*" - elog "" - elog "for more details." - fi -} - -pkg_config() { - if ! use ssl ; then - einfo "There is nothing to configure for rsyslog unless you" - einfo "used USE=ssl to build it." - return 0 - fi - - # Make sure the certificates directory exists - local CERTDIR="${EROOT}/etc/ssl/${PN}" - if [[ ! -d "${CERTDIR}" ]]; then - mkdir "${CERTDIR}" || die - fi - einfo "Your certificates will be stored in ${CERTDIR}" - - # Create a default CA if needed - if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then - einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..." - certtool --generate-privkey \ - --outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null - chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem" - - cat > "${T}/${PF}.$$" <<- _EOF - cn = Portage automated CA - ca - cert_signing_key - expiration_days = 3650 - _EOF - - certtool --generate-self-signed \ - --load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ - --outfile "${CERTDIR}/${PN}_ca.cert.pem" \ - --template "${T}/${PF}.$$" &>/dev/null - chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem" - - # Create the server certificate - echo - einfon "Please type the Common Name of the SERVER you wish to create a certificate for: " - read -r CN - - einfo "Creating private key and certificate for server ${CN}..." - certtool --generate-privkey \ - --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null - chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem" - - cat > "${T}/${PF}.$$" <<- _EOF - cn = ${CN} - tls_www_server - dns_name = ${CN} - expiration_days = 3650 - _EOF - - certtool --generate-certificate \ - --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \ - --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \ - --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \ - --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ - --template "${T}/${PF}.$$" &>/dev/null - chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem" - - else - einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation." - fi - - # Create a client certificate - echo - einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: " - read -r CN - - einfo "Creating private key and certificate for client ${CN}..." - certtool --generate-privkey \ - --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null - chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem" - - cat > "${T}/${PF}.$$" <<- _EOF - cn = ${CN} - tls_www_client - dns_name = ${CN} - expiration_days = 3650 - _EOF - - certtool --generate-certificate \ - --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \ - --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \ - --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \ - --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ - --template "${T}/${PF}.$$" &>/dev/null - chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem" - - rm -f "${T}/${PF}.$$" - - echo - einfo "Here is the documentation on how to encrypt your log traffic:" - einfo " http://www.rsyslog.com/doc/rsyslog_tls.html" -} diff --git a/app-admin/rsyslog/rsyslog-8.27.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.27.0-r1.ebuild deleted file mode 100644 index 129f495b9e7c..000000000000 --- a/app-admin/rsyslog/rsyslog-8.27.0-r1.ebuild +++ /dev/null @@ -1,456 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit autotools eutils linux-info systemd - -DESCRIPTION="An enhanced multi-threaded syslogd with database support and more" -HOMEPAGE="http://www.rsyslog.com/" - -BRANCH="8-stable" - -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git" - - DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git" - - inherit git-r3 -else - MY_PV=${PV%_rc*} - MY_FILENAME="${PN}-${PV}.tar.gz" - MY_FILENAME_DOCS="${PN}-docs-${PV}.tar.gz" - S="${WORKDIR}/${PN}-${MY_PV}" - - # Upstream URL schema: - # RC: http://www.rsyslog.com/files/download/rsyslog/rc/rsyslog-8.18.0.tar.gz - # http://www.rsyslog.com/files/download/rsyslog/rc2/rsyslog-8.18.0.tar.gz - # Release: http://www.rsyslog.com/files/download/rsyslog/rsyslog-8.18.0.tar.gz - - MY_URL_PREFIX= - if [[ ${PV} = *_rc* ]]; then - _tmp_last_index=$(($(get_last_version_component_index ${PV})+1)) - _tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${PV}) - if [[ ${_tmp_suffix} = *rc* ]]; then - MY_URL_PREFIX="${_tmp_suffix}/" - fi - - # Cleaning up temporary variables - unset _tmp_last_index - unset _tmp_suffix - else - KEYWORDS="amd64 ~arm ~arm64 ~hppa x86" - fi - - SRC_URI=" - 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/${PN}-8.26.0-fix-zmq3-format-security.patch - "${FILESDIR}"/8-stable/${PN}-8.27.0-fix-librdkafka-detection.patch - "${FILESDIR}"/8-stable/${PN}-8.27.0-fix-hostname-detection-when-getaddrinfo-fails.patch - "${FILESDIR}"/8-stable/${PN}-8.27.0-fix-mmnormalize-tests.patch - ) -fi - -LICENSE="GPL-3 LGPL-3 Apache-2.0" -SLOT="0" -IUSE="dbi debug doc elasticsearch +gcrypt grok jemalloc kafka kerberos libressl mdblookup mongodb mysql normalize omhttpfs" -IUSE+=" omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid zeromq" - -RDEPEND=" - >=dev-libs/libfastjson-0.99.3:= - >=dev-libs/libestr-0.1.9 - >=dev-libs/liblogging-1.0.1:=[stdlog] - >=sys-libs/zlib-1.2.5 - dbi? ( >=dev-db/libdbi-0.8.3 ) - elasticsearch? ( >=net-misc/curl-7.35.0 ) - gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) - grok? ( >=dev-libs/grok-0.9.2 ) - jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) - kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) - kerberos? ( virtual/krb5 ) - mdblookup? ( dev-libs/libmaxminddb:= ) - mongodb? ( >=dev-libs/libmongo-client-0.1.4 ) - mysql? ( virtual/mysql ) - normalize? ( - >=dev-libs/libee-0.4.0 - >=dev-libs/liblognorm-2.0.3:= - ) - omhttpfs? ( >=net-misc/curl-7.35.0 ) - omudpspoof? ( >=net-libs/libnet-1.1.6 ) - postgres? ( >=dev-db/postgresql-8.4.20:= ) - rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) - redis? ( >=dev-libs/hiredis-0.11.0:= ) - relp? ( >=dev-libs/librelp-1.2.12:= ) - rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) - rfc5424hmac? ( - !libressl? ( >=dev-libs/openssl-0.9.8y:0= ) - libressl? ( dev-libs/libressl:= ) - ) - snmp? ( >=net-analyzer/net-snmp-5.7.2 ) - ssl? ( >=net-libs/gnutls-2.12.23:0= ) - systemd? ( >=sys-apps/systemd-208 ) - uuid? ( sys-apps/util-linux:0= ) - zeromq? ( - >=net-libs/zeromq-4.1.1:= - >=net-libs/czmq-3.0.0 - )" -DEPEND="${RDEPEND} - >=sys-devel/autoconf-archive-2015.02.24 - virtual/pkgconfig - test? ( sys-libs/libfaketime )" - -if [[ ${PV} == "9999" ]]; then - DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )" - DEPEND+=" >=sys-devel/flex-2.5.39-r1" - DEPEND+=" >=sys-devel/bison-2.4.3" - DEPEND+=" >=dev-python/docutils-0.12" -fi - -CONFIG_CHECK="~INOTIFY_USER" -WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!" - -src_unpack() { - if [[ ${PV} == "9999" ]]; then - git-r3_fetch - git-r3_checkout - else - unpack ${P}.tar.gz - fi - - if use doc; then - if [[ ${PV} == "9999" ]]; then - local _EGIT_BRANCH= - if [[ -n "${EGIT_BRANCH}" ]]; then - # Cannot use rsyslog commits/branches for documentation repository - _EGIT_BRANCH=${EGIT_BRANCH} - unset EGIT_BRANCH - fi - - git-r3_fetch "${DOC_REPO_URI}" - git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs - - if [[ -n "${_EGIT_BRANCH}" ]]; then - # Restore previous EGIT_BRANCH information - EGIT_BRANCH=${_EGIT_BRANCH} - fi - else - cd "${S}" || die "Cannot change dir into '${S}'" - mkdir docs || die "Failed to create docs directory" - cd docs || die "Failed to change dir into '${S}/docs'" - unpack ${MY_FILENAME_DOCS} - fi - fi -} - -src_prepare() { - default - - eautoreconf -} - -src_configure() { - # Maintainer notes: - # * Guardtime support is missing because libgt isn't yet available - # in portage. - # * Hadoop's HDFS file system output module is currently not - # supported in Gentoo because nobody is able to test it - # (JAVA dependency). - # * dev-libs/hiredis doesn't provide pkg-config (see #504614, - # upstream PR 129 and 136) so we need to export HIREDIS_* - # variables because rsyslog's build system depends on pkg-config. - - if use redis; then - export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis" - export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include" - fi - - local myeconfargs=( - --disable-debug-symbols - --disable-generate-man-pages - --without-valgrind-testbench - $(use_enable test testbench) - # Input Plugins without depedencies - --enable-imdiag - --enable-imfile - --enable-impstats - --enable-imptcp - # Message Modificiation Plugins without depedencies - --enable-mmanon - --enable-mmaudit - --enable-mmcount - --enable-mmfields - --enable-mmjsonparse - --enable-mmpstrucdata - --enable-mmrm1stspace - --enable-mmsequence - --enable-mmutf8fix - # Output Modification Plugins without dependencies - --enable-mail - --enable-omprog - --enable-omruleset - --enable-omstdout - --enable-omuxsock - # Misc - --enable-pmaixforwardedfrom - --enable-pmciscoios - --enable-pmcisconames - --enable-pmlastmsg - --enable-pmsnare - # DB - $(use_enable dbi libdbi) - $(use_enable mongodb ommongodb) - $(use_enable mysql) - $(use_enable postgres pgsql) - $(use_enable redis omhiredis) - # Debug - $(use_enable debug) - $(use_enable debug diagtools) - $(use_enable debug memcheck) - $(use_enable debug rtinst) - $(use_enable debug valgrind) - # Misc - $(use_enable elasticsearch) - $(use_enable gcrypt libgcrypt) - $(use_enable jemalloc) - $(use_enable kafka imkafka) - $(use_enable kafka omkafka) - $(use_enable kerberos gssapi-krb5) - $(use_enable normalize mmnormalize) - $(use_enable mdblookup mmdblookup) - $(use_enable grok mmgrok) - $(use_enable omhttpfs) - $(use_enable omudpspoof) - $(use_enable rabbitmq omrabbitmq) - $(use_enable relp) - $(use_enable rfc3195) - $(use_enable rfc5424hmac mmrfc5424addhmac) - $(use_enable snmp) - $(use_enable snmp mmsnmptrapd) - $(use_enable ssl gnutls) - $(use_enable systemd imjournal) - $(use_enable systemd omjournal) - $(use_enable usertools) - $(use_enable uuid) - $(use_enable zeromq imczmq) - $(use_enable zeromq imzmq3) - $(use_enable zeromq omczmq) - $(use_enable zeromq omzmq3) - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" - ) - - econf "${myeconfargs[@]}" -} - -src_compile() { - default - - if use doc && [[ "${PV}" == "9999" ]]; then - einfo "Building documentation ..." - local doc_dir="${S}/docs" - cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!" - sphinx-build -b html source build || die "Building documentation failed!" - fi -} - -src_test() { - local _has_increased_ulimit= - - # Sometimes tests aren't executable (i.e. when added via patch) - einfo "Adjusting permissions of test scripts ..." - find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \ - die "Failed to adjust test scripts permission" - - if ulimit -n 3072; then - _has_increased_ulimit="true" - fi - - if ! emake --jobs 1 check; then - eerror "Test suite failed! :(" - - if [[ -z "${_has_increased_ulimit}" ]]; then - eerror "Probably because open file limit couldn't be set to 3072." - fi - - if has userpriv ${FEATURES}; then - eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \ - "before you submit a bug report." - fi - - fi -} - -src_install() { - local DOCS=( - AUTHORS - ChangeLog - "${FILESDIR}"/${BRANCH}/README.gentoo - ) - - use doc && local HTML_DOCS=( "${S}/docs/build/." ) - - default - - newconfd "${FILESDIR}/${BRANCH}/${PN}.confd-r1" ${PN} - newinitd "${FILESDIR}/${BRANCH}/${PN}.initd-r1" ${PN} - - keepdir /var/empty/dev - keepdir /var/spool/${PN} - keepdir /etc/ssl/${PN} - keepdir /etc/${PN}.d - - insinto /etc - newins "${FILESDIR}/${BRANCH}/${PN}.conf" ${PN}.conf - - insinto /etc/rsyslog.d/ - doins "${FILESDIR}/${BRANCH}/50-default.conf" - - insinto /etc/logrotate.d/ - newins "${FILESDIR}/${BRANCH}/${PN}.logrotate" ${PN} - - if use mysql; then - insinto /usr/share/doc/${PF}/scripts/mysql - doins plugins/ommysql/createDB.sql - fi - - if use postgres; then - insinto /usr/share/doc/${PF}/scripts/pgsql - doins plugins/ompgsql/createDB.sql - fi - - prune_libtool_files --modules -} - -pkg_postinst() { - local advertise_readme=0 - - if [[ -z "${REPLACING_VERSIONS}" ]]; then - # This is a new installation - - advertise_readme=1 - - if use mysql || use postgres; then - echo - elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:" - elog " /usr/share/doc/${PF}/scripts" - fi - - if use ssl; then - echo - elog "To create a default CA and certificates for your server and clients, run:" - elog " emerge --config =${PF}" - elog "on your logging server. You can run it several times," - elog "once for each logging client. The client certificates will be signed" - elog "using the CA certificate generated during the first run." - fi - fi - - if [[ ${advertise_readme} -gt 0 ]]; then - # We need to show the README file location - - echo "" - elog "Please read" - elog "" - elog " ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*" - elog "" - elog "for more details." - fi -} - -pkg_config() { - if ! use ssl ; then - einfo "There is nothing to configure for rsyslog unless you" - einfo "used USE=ssl to build it." - return 0 - fi - - # Make sure the certificates directory exists - local CERTDIR="${EROOT}/etc/ssl/${PN}" - if [[ ! -d "${CERTDIR}" ]]; then - mkdir "${CERTDIR}" || die - fi - einfo "Your certificates will be stored in ${CERTDIR}" - - # Create a default CA if needed - if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then - einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..." - certtool --generate-privkey \ - --outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null - chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem" - - cat > "${T}/${PF}.$$" <<- _EOF - cn = Portage automated CA - ca - cert_signing_key - expiration_days = 3650 - _EOF - - certtool --generate-self-signed \ - --load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ - --outfile "${CERTDIR}/${PN}_ca.cert.pem" \ - --template "${T}/${PF}.$$" &>/dev/null - chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem" - - # Create the server certificate - echo - einfon "Please type the Common Name of the SERVER you wish to create a certificate for: " - read -r CN - - einfo "Creating private key and certificate for server ${CN}..." - certtool --generate-privkey \ - --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null - chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem" - - cat > "${T}/${PF}.$$" <<- _EOF - cn = ${CN} - tls_www_server - dns_name = ${CN} - expiration_days = 3650 - _EOF - - certtool --generate-certificate \ - --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \ - --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \ - --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \ - --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ - --template "${T}/${PF}.$$" &>/dev/null - chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem" - - else - einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation." - fi - - # Create a client certificate - echo - einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: " - read -r CN - - einfo "Creating private key and certificate for client ${CN}..." - certtool --generate-privkey \ - --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null - chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem" - - cat > "${T}/${PF}.$$" <<- _EOF - cn = ${CN} - tls_www_client - dns_name = ${CN} - expiration_days = 3650 - _EOF - - certtool --generate-certificate \ - --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \ - --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \ - --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \ - --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ - --template "${T}/${PF}.$$" &>/dev/null - chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem" - - rm -f "${T}/${PF}.$$" - - echo - einfo "Here is the documentation on how to encrypt your log traffic:" - einfo " http://www.rsyslog.com/doc/rsyslog_tls.html" -} diff --git a/app-admin/rsyslog/rsyslog-8.28.0.ebuild b/app-admin/rsyslog/rsyslog-8.28.0-r1.ebuild index 82440812ddfd..7a47099a780b 100644 --- a/app-admin/rsyslog/rsyslog-8.28.0.ebuild +++ b/app-admin/rsyslog/rsyslog-8.28.0-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="6" @@ -6,7 +6,7 @@ EAPI="6" inherit autotools eutils linux-info systemd DESCRIPTION="An enhanced multi-threaded syslogd with database support and more" -HOMEPAGE="http://www.rsyslog.com/" +HOMEPAGE="https://www.rsyslog.com/" BRANCH="8-stable" @@ -39,12 +39,12 @@ else unset _tmp_last_index unset _tmp_suffix else - KEYWORDS="amd64 ~arm ~arm64 hppa x86" + KEYWORDS="hppa" fi SRC_URI=" - 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} ) + https://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-${MY_PV}.tar.gz -> ${MY_FILENAME} + doc? ( https://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-doc-${MY_PV}.tar.gz -> ${MY_FILENAME_DOCS} ) " PATCHES=( "${FILESDIR}"/8-stable/${PN}-8.27.0-fix-mmnormalize-tests.patch ) @@ -69,7 +69,7 @@ RDEPEND=" kerberos? ( virtual/krb5 ) mdblookup? ( dev-libs/libmaxminddb:= ) mongodb? ( >=dev-libs/libmongo-client-0.1.4 ) - mysql? ( virtual/mysql ) + mysql? ( virtual/libmysqlclient:= ) normalize? ( >=dev-libs/libee-0.4.0 >=dev-libs/liblognorm-2.0.3:= diff --git a/app-admin/rsyslog/rsyslog-8.29.0.ebuild b/app-admin/rsyslog/rsyslog-8.29.0.ebuild deleted file mode 100644 index d8b4b91b0336..000000000000 --- a/app-admin/rsyslog/rsyslog-8.29.0.ebuild +++ /dev/null @@ -1,451 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit autotools eutils linux-info systemd - -DESCRIPTION="An enhanced multi-threaded syslogd with database support and more" -HOMEPAGE="http://www.rsyslog.com/" - -BRANCH="8-stable" - -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git" - - DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git" - - inherit git-r3 -else - MY_PV=${PV%_rc*} - MY_FILENAME="${PN}-${PV}.tar.gz" - MY_FILENAME_DOCS="${PN}-docs-${PV}.tar.gz" - S="${WORKDIR}/${PN}-${MY_PV}" - - # Upstream URL schema: - # RC: http://www.rsyslog.com/files/download/rsyslog/rc/rsyslog-8.18.0.tar.gz - # http://www.rsyslog.com/files/download/rsyslog/rc2/rsyslog-8.18.0.tar.gz - # Release: http://www.rsyslog.com/files/download/rsyslog/rsyslog-8.18.0.tar.gz - - MY_URL_PREFIX= - if [[ ${PV} = *_rc* ]]; then - _tmp_last_index=$(($(get_last_version_component_index ${PV})+1)) - _tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${PV}) - if [[ ${_tmp_suffix} = *rc* ]]; then - MY_URL_PREFIX="${_tmp_suffix}/" - fi - - # Cleaning up temporary variables - unset _tmp_last_index - unset _tmp_suffix - else - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86" - fi - - SRC_URI=" - 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/${PN}-8.27.0-fix-mmnormalize-tests.patch ) -fi - -LICENSE="GPL-3 LGPL-3 Apache-2.0" -SLOT="0" -IUSE="dbi debug doc elasticsearch +gcrypt grok jemalloc kafka kerberos libressl mdblookup mongodb mysql normalize omhttpfs" -IUSE+=" omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid zeromq" - -RDEPEND=" - >=dev-libs/libfastjson-0.99.3:= - >=dev-libs/libestr-0.1.9 - >=dev-libs/liblogging-1.0.1:=[stdlog] - >=sys-libs/zlib-1.2.5 - dbi? ( >=dev-db/libdbi-0.8.3 ) - elasticsearch? ( >=net-misc/curl-7.35.0 ) - gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) - grok? ( >=dev-libs/grok-0.9.2 ) - jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) - kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) - kerberos? ( virtual/krb5 ) - mdblookup? ( dev-libs/libmaxminddb:= ) - mongodb? ( >=dev-libs/libmongo-client-0.1.4 ) - mysql? ( virtual/mysql ) - normalize? ( - >=dev-libs/libee-0.4.0 - >=dev-libs/liblognorm-2.0.3:= - ) - omhttpfs? ( >=net-misc/curl-7.35.0 ) - omudpspoof? ( >=net-libs/libnet-1.1.6 ) - postgres? ( >=dev-db/postgresql-8.4.20:= ) - rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) - redis? ( >=dev-libs/hiredis-0.11.0:= ) - relp? ( >=dev-libs/librelp-1.2.14:= ) - rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) - rfc5424hmac? ( - !libressl? ( >=dev-libs/openssl-0.9.8y:0= ) - libressl? ( dev-libs/libressl:= ) - ) - snmp? ( >=net-analyzer/net-snmp-5.7.2 ) - ssl? ( >=net-libs/gnutls-2.12.23:0= ) - systemd? ( >=sys-apps/systemd-208 ) - uuid? ( sys-apps/util-linux:0= ) - zeromq? ( - >=net-libs/zeromq-4.1.1:= - >=net-libs/czmq-3.0.0 - )" -DEPEND="${RDEPEND} - >=sys-devel/autoconf-archive-2015.02.24 - virtual/pkgconfig - test? ( sys-libs/libfaketime )" - -if [[ ${PV} == "9999" ]]; then - DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )" - DEPEND+=" >=sys-devel/flex-2.5.39-r1" - DEPEND+=" >=sys-devel/bison-2.4.3" - DEPEND+=" >=dev-python/docutils-0.12" -fi - -CONFIG_CHECK="~INOTIFY_USER" -WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!" - -src_unpack() { - if [[ ${PV} == "9999" ]]; then - git-r3_fetch - git-r3_checkout - else - unpack ${P}.tar.gz - fi - - if use doc; then - if [[ ${PV} == "9999" ]]; then - local _EGIT_BRANCH= - if [[ -n "${EGIT_BRANCH}" ]]; then - # Cannot use rsyslog commits/branches for documentation repository - _EGIT_BRANCH=${EGIT_BRANCH} - unset EGIT_BRANCH - fi - - git-r3_fetch "${DOC_REPO_URI}" - git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs - - if [[ -n "${_EGIT_BRANCH}" ]]; then - # Restore previous EGIT_BRANCH information - EGIT_BRANCH=${_EGIT_BRANCH} - fi - else - cd "${S}" || die "Cannot change dir into '${S}'" - mkdir docs || die "Failed to create docs directory" - cd docs || die "Failed to change dir into '${S}/docs'" - unpack ${MY_FILENAME_DOCS} - fi - fi -} - -src_prepare() { - default - - eautoreconf -} - -src_configure() { - # Maintainer notes: - # * Guardtime support is missing because libgt isn't yet available - # in portage. - # * Hadoop's HDFS file system output module is currently not - # supported in Gentoo because nobody is able to test it - # (JAVA dependency). - # * dev-libs/hiredis doesn't provide pkg-config (see #504614, - # upstream PR 129 and 136) so we need to export HIREDIS_* - # variables because rsyslog's build system depends on pkg-config. - - if use redis; then - export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis" - export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include" - fi - - local myeconfargs=( - --disable-debug-symbols - --disable-generate-man-pages - --without-valgrind-testbench - $(use_enable test testbench) - # Input Plugins without depedencies - --enable-imdiag - --enable-imfile - --enable-impstats - --enable-imptcp - # Message Modificiation Plugins without depedencies - --enable-mmanon - --enable-mmaudit - --enable-mmcount - --enable-mmfields - --enable-mmjsonparse - --enable-mmpstrucdata - --enable-mmrm1stspace - --enable-mmsequence - --enable-mmutf8fix - # Output Modification Plugins without dependencies - --enable-mail - --enable-omprog - --enable-omruleset - --enable-omstdout - --enable-omuxsock - # Misc - --enable-pmaixforwardedfrom - --enable-pmciscoios - --enable-pmcisconames - --enable-pmlastmsg - --enable-pmsnare - # DB - $(use_enable dbi libdbi) - $(use_enable mongodb ommongodb) - $(use_enable mysql) - $(use_enable postgres pgsql) - $(use_enable redis omhiredis) - # Debug - $(use_enable debug) - $(use_enable debug diagtools) - $(use_enable debug memcheck) - $(use_enable debug rtinst) - $(use_enable debug valgrind) - # Misc - $(use_enable elasticsearch) - $(use_enable gcrypt libgcrypt) - $(use_enable jemalloc) - $(use_enable kafka imkafka) - $(use_enable kafka omkafka) - $(use_enable kerberos gssapi-krb5) - $(use_enable normalize mmnormalize) - $(use_enable mdblookup mmdblookup) - $(use_enable grok mmgrok) - $(use_enable omhttpfs) - $(use_enable omudpspoof) - $(use_enable rabbitmq omrabbitmq) - $(use_enable relp) - $(use_enable rfc3195) - $(use_enable rfc5424hmac mmrfc5424addhmac) - $(use_enable snmp) - $(use_enable snmp mmsnmptrapd) - $(use_enable ssl gnutls) - $(use_enable systemd imjournal) - $(use_enable systemd omjournal) - $(use_enable usertools) - $(use_enable uuid) - $(use_enable zeromq imczmq) - $(use_enable zeromq imzmq3) - $(use_enable zeromq omczmq) - $(use_enable zeromq omzmq3) - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" - ) - - econf "${myeconfargs[@]}" -} - -src_compile() { - default - - if use doc && [[ "${PV}" == "9999" ]]; then - einfo "Building documentation ..." - local doc_dir="${S}/docs" - cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!" - sphinx-build -b html source build || die "Building documentation failed!" - fi -} - -src_test() { - local _has_increased_ulimit= - - # Sometimes tests aren't executable (i.e. when added via patch) - einfo "Adjusting permissions of test scripts ..." - find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \ - die "Failed to adjust test scripts permission" - - if ulimit -n 3072; then - _has_increased_ulimit="true" - fi - - if ! emake --jobs 1 check; then - eerror "Test suite failed! :(" - - if [[ -z "${_has_increased_ulimit}" ]]; then - eerror "Probably because open file limit couldn't be set to 3072." - fi - - if has userpriv ${FEATURES}; then - eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \ - "before you submit a bug report." - fi - - fi -} - -src_install() { - local DOCS=( - AUTHORS - ChangeLog - "${FILESDIR}"/${BRANCH}/README.gentoo - ) - - use doc && local HTML_DOCS=( "${S}/docs/build/." ) - - default - - newconfd "${FILESDIR}/${BRANCH}/${PN}.confd-r1" ${PN} - newinitd "${FILESDIR}/${BRANCH}/${PN}.initd-r1" ${PN} - - keepdir /var/empty/dev - keepdir /var/spool/${PN} - keepdir /etc/ssl/${PN} - keepdir /etc/${PN}.d - - insinto /etc - newins "${FILESDIR}/${BRANCH}/${PN}.conf" ${PN}.conf - - insinto /etc/rsyslog.d/ - newins "${FILESDIR}/${BRANCH}/50-default-r1.conf" 50-default.conf - - insinto /etc/logrotate.d/ - newins "${FILESDIR}/${BRANCH}/${PN}.logrotate" ${PN} - - if use mysql; then - insinto /usr/share/doc/${PF}/scripts/mysql - doins plugins/ommysql/createDB.sql - fi - - if use postgres; then - insinto /usr/share/doc/${PF}/scripts/pgsql - doins plugins/ompgsql/createDB.sql - fi - - prune_libtool_files --modules -} - -pkg_postinst() { - local advertise_readme=0 - - if [[ -z "${REPLACING_VERSIONS}" ]]; then - # This is a new installation - - advertise_readme=1 - - if use mysql || use postgres; then - echo - elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:" - elog " /usr/share/doc/${PF}/scripts" - fi - - if use ssl; then - echo - elog "To create a default CA and certificates for your server and clients, run:" - elog " emerge --config =${PF}" - elog "on your logging server. You can run it several times," - elog "once for each logging client. The client certificates will be signed" - elog "using the CA certificate generated during the first run." - fi - fi - - if [[ ${advertise_readme} -gt 0 ]]; then - # We need to show the README file location - - echo "" - elog "Please read" - elog "" - elog " ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*" - elog "" - elog "for more details." - fi -} - -pkg_config() { - if ! use ssl ; then - einfo "There is nothing to configure for rsyslog unless you" - einfo "used USE=ssl to build it." - return 0 - fi - - # Make sure the certificates directory exists - local CERTDIR="${EROOT}/etc/ssl/${PN}" - if [[ ! -d "${CERTDIR}" ]]; then - mkdir "${CERTDIR}" || die - fi - einfo "Your certificates will be stored in ${CERTDIR}" - - # Create a default CA if needed - if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then - einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..." - certtool --generate-privkey \ - --outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null - chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem" - - cat > "${T}/${PF}.$$" <<- _EOF - cn = Portage automated CA - ca - cert_signing_key - expiration_days = 3650 - _EOF - - certtool --generate-self-signed \ - --load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ - --outfile "${CERTDIR}/${PN}_ca.cert.pem" \ - --template "${T}/${PF}.$$" &>/dev/null - chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem" - - # Create the server certificate - echo - einfon "Please type the Common Name of the SERVER you wish to create a certificate for: " - read -r CN - - einfo "Creating private key and certificate for server ${CN}..." - certtool --generate-privkey \ - --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null - chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem" - - cat > "${T}/${PF}.$$" <<- _EOF - cn = ${CN} - tls_www_server - dns_name = ${CN} - expiration_days = 3650 - _EOF - - certtool --generate-certificate \ - --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \ - --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \ - --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \ - --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ - --template "${T}/${PF}.$$" &>/dev/null - chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem" - - else - einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation." - fi - - # Create a client certificate - echo - einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: " - read -r CN - - einfo "Creating private key and certificate for client ${CN}..." - certtool --generate-privkey \ - --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null - chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem" - - cat > "${T}/${PF}.$$" <<- _EOF - cn = ${CN} - tls_www_client - dns_name = ${CN} - expiration_days = 3650 - _EOF - - certtool --generate-certificate \ - --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \ - --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \ - --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \ - --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ - --template "${T}/${PF}.$$" &>/dev/null - chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem" - - rm -f "${T}/${PF}.$$" - - echo - einfo "Here is the documentation on how to encrypt your log traffic:" - einfo " http://www.rsyslog.com/doc/rsyslog_tls.html" -} diff --git a/app-admin/rsyslog/rsyslog-8.30.0.ebuild b/app-admin/rsyslog/rsyslog-8.30.0.ebuild deleted file mode 100644 index db0da41604dc..000000000000 --- a/app-admin/rsyslog/rsyslog-8.30.0.ebuild +++ /dev/null @@ -1,451 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit autotools eutils linux-info systemd - -DESCRIPTION="An enhanced multi-threaded syslogd with database support and more" -HOMEPAGE="http://www.rsyslog.com/" - -BRANCH="8-stable" - -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git" - - DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git" - - inherit git-r3 -else - MY_PV=${PV%_rc*} - MY_FILENAME="${PN}-${PV}.tar.gz" - MY_FILENAME_DOCS="${PN}-docs-${PV}.tar.gz" - S="${WORKDIR}/${PN}-${MY_PV}" - - # Upstream URL schema: - # RC: http://www.rsyslog.com/files/download/rsyslog/rc/rsyslog-8.18.0.tar.gz - # http://www.rsyslog.com/files/download/rsyslog/rc2/rsyslog-8.18.0.tar.gz - # Release: http://www.rsyslog.com/files/download/rsyslog/rsyslog-8.18.0.tar.gz - - MY_URL_PREFIX= - if [[ ${PV} = *_rc* ]]; then - _tmp_last_index=$(($(get_last_version_component_index ${PV})+1)) - _tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${PV}) - if [[ ${_tmp_suffix} = *rc* ]]; then - MY_URL_PREFIX="${_tmp_suffix}/" - fi - - # Cleaning up temporary variables - unset _tmp_last_index - unset _tmp_suffix - else - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86" - fi - - SRC_URI=" - 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/${PN}-8.30.0-fix-kerberos.patch ) -fi - -LICENSE="GPL-3 LGPL-3 Apache-2.0" -SLOT="0" -IUSE="dbi debug doc elasticsearch +gcrypt grok jemalloc kafka kerberos libressl mdblookup mongodb mysql normalize omhttpfs" -IUSE+=" omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid zeromq" - -RDEPEND=" - >=dev-libs/libfastjson-0.99.7:= - >=dev-libs/libestr-0.1.9 - >=dev-libs/liblogging-1.0.1:=[stdlog] - >=sys-libs/zlib-1.2.5 - dbi? ( >=dev-db/libdbi-0.8.3 ) - elasticsearch? ( >=net-misc/curl-7.35.0 ) - gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) - grok? ( >=dev-libs/grok-0.9.2 ) - jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) - kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) - kerberos? ( virtual/krb5 ) - mdblookup? ( dev-libs/libmaxminddb:= ) - mongodb? ( >=dev-libs/libmongo-client-0.1.4 ) - mysql? ( virtual/mysql ) - normalize? ( - >=dev-libs/libee-0.4.0 - >=dev-libs/liblognorm-2.0.3:= - ) - omhttpfs? ( >=net-misc/curl-7.35.0 ) - omudpspoof? ( >=net-libs/libnet-1.1.6 ) - postgres? ( >=dev-db/postgresql-8.4.20:= ) - rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) - redis? ( >=dev-libs/hiredis-0.11.0:= ) - relp? ( >=dev-libs/librelp-1.2.14:= ) - rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) - rfc5424hmac? ( - !libressl? ( >=dev-libs/openssl-0.9.8y:0= ) - libressl? ( dev-libs/libressl:= ) - ) - snmp? ( >=net-analyzer/net-snmp-5.7.2 ) - ssl? ( >=net-libs/gnutls-2.12.23:0= ) - systemd? ( >=sys-apps/systemd-234 ) - uuid? ( sys-apps/util-linux:0= ) - zeromq? ( - >=net-libs/zeromq-4.1.1:= - >=net-libs/czmq-3.0.0 - )" -DEPEND="${RDEPEND} - >=sys-devel/autoconf-archive-2015.02.24 - virtual/pkgconfig - test? ( sys-libs/libfaketime )" - -if [[ ${PV} == "9999" ]]; then - DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )" - DEPEND+=" >=sys-devel/flex-2.5.39-r1" - DEPEND+=" >=sys-devel/bison-2.4.3" - DEPEND+=" >=dev-python/docutils-0.12" -fi - -CONFIG_CHECK="~INOTIFY_USER" -WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!" - -src_unpack() { - if [[ ${PV} == "9999" ]]; then - git-r3_fetch - git-r3_checkout - else - unpack ${P}.tar.gz - fi - - if use doc; then - if [[ ${PV} == "9999" ]]; then - local _EGIT_BRANCH= - if [[ -n "${EGIT_BRANCH}" ]]; then - # Cannot use rsyslog commits/branches for documentation repository - _EGIT_BRANCH=${EGIT_BRANCH} - unset EGIT_BRANCH - fi - - git-r3_fetch "${DOC_REPO_URI}" - git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs - - if [[ -n "${_EGIT_BRANCH}" ]]; then - # Restore previous EGIT_BRANCH information - EGIT_BRANCH=${_EGIT_BRANCH} - fi - else - cd "${S}" || die "Cannot change dir into '${S}'" - mkdir docs || die "Failed to create docs directory" - cd docs || die "Failed to change dir into '${S}/docs'" - unpack ${MY_FILENAME_DOCS} - fi - fi -} - -src_prepare() { - default - - eautoreconf -} - -src_configure() { - # Maintainer notes: - # * Guardtime support is missing because libgt isn't yet available - # in portage. - # * Hadoop's HDFS file system output module is currently not - # supported in Gentoo because nobody is able to test it - # (JAVA dependency). - # * dev-libs/hiredis doesn't provide pkg-config (see #504614, - # upstream PR 129 and 136) so we need to export HIREDIS_* - # variables because rsyslog's build system depends on pkg-config. - - if use redis; then - export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis" - export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include" - fi - - local myeconfargs=( - --disable-debug-symbols - --disable-generate-man-pages - --without-valgrind-testbench - $(use_enable test testbench) - # Input Plugins without depedencies - --enable-imdiag - --enable-imfile - --enable-impstats - --enable-imptcp - # Message Modificiation Plugins without depedencies - --enable-mmanon - --enable-mmaudit - --enable-mmcount - --enable-mmfields - --enable-mmjsonparse - --enable-mmpstrucdata - --enable-mmrm1stspace - --enable-mmsequence - --enable-mmutf8fix - # Output Modification Plugins without dependencies - --enable-mail - --enable-omprog - --enable-omruleset - --enable-omstdout - --enable-omuxsock - # Misc - --enable-pmaixforwardedfrom - --enable-pmciscoios - --enable-pmcisconames - --enable-pmlastmsg - --enable-pmsnare - # DB - $(use_enable dbi libdbi) - $(use_enable mongodb ommongodb) - $(use_enable mysql) - $(use_enable postgres pgsql) - $(use_enable redis omhiredis) - # Debug - $(use_enable debug) - $(use_enable debug diagtools) - $(use_enable debug memcheck) - $(use_enable debug rtinst) - $(use_enable debug valgrind) - # Misc - $(use_enable elasticsearch) - $(use_enable gcrypt libgcrypt) - $(use_enable jemalloc) - $(use_enable kafka imkafka) - $(use_enable kafka omkafka) - $(use_enable kerberos gssapi-krb5) - $(use_enable normalize mmnormalize) - $(use_enable mdblookup mmdblookup) - $(use_enable grok mmgrok) - $(use_enable omhttpfs) - $(use_enable omudpspoof) - $(use_enable rabbitmq omrabbitmq) - $(use_enable relp) - $(use_enable rfc3195) - $(use_enable rfc5424hmac mmrfc5424addhmac) - $(use_enable snmp) - $(use_enable snmp mmsnmptrapd) - $(use_enable ssl gnutls) - $(use_enable systemd imjournal) - $(use_enable systemd omjournal) - $(use_enable usertools) - $(use_enable uuid) - $(use_enable zeromq imczmq) - $(use_enable zeromq imzmq3) - $(use_enable zeromq omczmq) - $(use_enable zeromq omzmq3) - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" - ) - - econf "${myeconfargs[@]}" -} - -src_compile() { - default - - if use doc && [[ "${PV}" == "9999" ]]; then - einfo "Building documentation ..." - local doc_dir="${S}/docs" - cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!" - sphinx-build -b html source build || die "Building documentation failed!" - fi -} - -src_test() { - local _has_increased_ulimit= - - # Sometimes tests aren't executable (i.e. when added via patch) - einfo "Adjusting permissions of test scripts ..." - find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \ - die "Failed to adjust test scripts permission" - - if ulimit -n 3072; then - _has_increased_ulimit="true" - fi - - if ! emake --jobs 1 check; then - eerror "Test suite failed! :(" - - if [[ -z "${_has_increased_ulimit}" ]]; then - eerror "Probably because open file limit couldn't be set to 3072." - fi - - if has userpriv ${FEATURES}; then - eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \ - "before you submit a bug report." - fi - - fi -} - -src_install() { - local DOCS=( - AUTHORS - ChangeLog - "${FILESDIR}"/${BRANCH}/README.gentoo - ) - - use doc && local HTML_DOCS=( "${S}/docs/build/." ) - - default - - newconfd "${FILESDIR}/${BRANCH}/${PN}.confd-r1" ${PN} - newinitd "${FILESDIR}/${BRANCH}/${PN}.initd-r1" ${PN} - - keepdir /var/empty/dev - keepdir /var/spool/${PN} - keepdir /etc/ssl/${PN} - keepdir /etc/${PN}.d - - insinto /etc - newins "${FILESDIR}/${BRANCH}/${PN}.conf" ${PN}.conf - - insinto /etc/rsyslog.d/ - newins "${FILESDIR}/${BRANCH}/50-default-r1.conf" 50-default.conf - - insinto /etc/logrotate.d/ - newins "${FILESDIR}/${BRANCH}/${PN}.logrotate" ${PN} - - if use mysql; then - insinto /usr/share/doc/${PF}/scripts/mysql - doins plugins/ommysql/createDB.sql - fi - - if use postgres; then - insinto /usr/share/doc/${PF}/scripts/pgsql - doins plugins/ompgsql/createDB.sql - fi - - prune_libtool_files --modules -} - -pkg_postinst() { - local advertise_readme=0 - - if [[ -z "${REPLACING_VERSIONS}" ]]; then - # This is a new installation - - advertise_readme=1 - - if use mysql || use postgres; then - echo - elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:" - elog " /usr/share/doc/${PF}/scripts" - fi - - if use ssl; then - echo - elog "To create a default CA and certificates for your server and clients, run:" - elog " emerge --config =${PF}" - elog "on your logging server. You can run it several times," - elog "once for each logging client. The client certificates will be signed" - elog "using the CA certificate generated during the first run." - fi - fi - - if [[ ${advertise_readme} -gt 0 ]]; then - # We need to show the README file location - - echo "" - elog "Please read" - elog "" - elog " ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*" - elog "" - elog "for more details." - fi -} - -pkg_config() { - if ! use ssl ; then - einfo "There is nothing to configure for rsyslog unless you" - einfo "used USE=ssl to build it." - return 0 - fi - - # Make sure the certificates directory exists - local CERTDIR="${EROOT}/etc/ssl/${PN}" - if [[ ! -d "${CERTDIR}" ]]; then - mkdir "${CERTDIR}" || die - fi - einfo "Your certificates will be stored in ${CERTDIR}" - - # Create a default CA if needed - if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then - einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..." - certtool --generate-privkey \ - --outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null - chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem" - - cat > "${T}/${PF}.$$" <<- _EOF - cn = Portage automated CA - ca - cert_signing_key - expiration_days = 3650 - _EOF - - certtool --generate-self-signed \ - --load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ - --outfile "${CERTDIR}/${PN}_ca.cert.pem" \ - --template "${T}/${PF}.$$" &>/dev/null - chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem" - - # Create the server certificate - echo - einfon "Please type the Common Name of the SERVER you wish to create a certificate for: " - read -r CN - - einfo "Creating private key and certificate for server ${CN}..." - certtool --generate-privkey \ - --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null - chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem" - - cat > "${T}/${PF}.$$" <<- _EOF - cn = ${CN} - tls_www_server - dns_name = ${CN} - expiration_days = 3650 - _EOF - - certtool --generate-certificate \ - --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \ - --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \ - --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \ - --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ - --template "${T}/${PF}.$$" &>/dev/null - chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem" - - else - einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation." - fi - - # Create a client certificate - echo - einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: " - read -r CN - - einfo "Creating private key and certificate for client ${CN}..." - certtool --generate-privkey \ - --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null - chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem" - - cat > "${T}/${PF}.$$" <<- _EOF - cn = ${CN} - tls_www_client - dns_name = ${CN} - expiration_days = 3650 - _EOF - - certtool --generate-certificate \ - --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \ - --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \ - --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \ - --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ - --template "${T}/${PF}.$$" &>/dev/null - chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem" - - rm -f "${T}/${PF}.$$" - - echo - einfo "Here is the documentation on how to encrypt your log traffic:" - einfo " http://www.rsyslog.com/doc/rsyslog_tls.html" -} diff --git a/app-admin/rsyslog/rsyslog-8.32.0-r3.ebuild b/app-admin/rsyslog/rsyslog-8.32.0-r4.ebuild index ed1912a926d1..8174b04b23ed 100644 --- a/app-admin/rsyslog/rsyslog-8.32.0-r3.ebuild +++ b/app-admin/rsyslog/rsyslog-8.32.0-r4.ebuild @@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) inherit autotools eutils linux-info python-any-r1 systemd DESCRIPTION="An enhanced multi-threaded syslogd with database support and more" -HOMEPAGE="http://www.rsyslog.com/" +HOMEPAGE="https://www.rsyslog.com/" BRANCH="8-stable" @@ -44,8 +44,8 @@ else fi SRC_URI=" - 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} ) + https://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-${MY_PV}.tar.gz -> ${MY_FILENAME} + doc? ( https://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-doc-${MY_PV}.tar.gz -> ${MY_FILENAME_DOCS} ) " PATCHES=( "${FILESDIR}"/8-stable/${PN}-8.32.0-fix-building-without-curl-r3.patch ) @@ -71,7 +71,7 @@ RDEPEND=" kerberos? ( virtual/krb5 ) mdblookup? ( dev-libs/libmaxminddb:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) - mysql? ( virtual/mysql ) + mysql? ( virtual/libmysqlclient:= ) normalize? ( >=dev-libs/libee-0.4.0 >=dev-libs/liblognorm-2.0.3:= diff --git a/app-admin/rsyslog/rsyslog-8.33.1.ebuild b/app-admin/rsyslog/rsyslog-8.33.1-r1.ebuild index 7dafd1e2920f..c9aecb5b0713 100644 --- a/app-admin/rsyslog/rsyslog-8.33.1.ebuild +++ b/app-admin/rsyslog/rsyslog-8.33.1-r1.ebuild @@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) inherit autotools eutils linux-info python-any-r1 systemd DESCRIPTION="An enhanced multi-threaded syslogd with database support and more" -HOMEPAGE="http://www.rsyslog.com/" +HOMEPAGE="https://www.rsyslog.com/" BRANCH="8-stable" @@ -44,8 +44,8 @@ else fi SRC_URI=" - 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} ) + https://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-${MY_PV}.tar.gz -> ${MY_FILENAME} + doc? ( https://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-doc-${MY_PV}.tar.gz -> ${MY_FILENAME_DOCS} ) " fi @@ -69,7 +69,7 @@ RDEPEND=" kerberos? ( virtual/krb5 ) mdblookup? ( dev-libs/libmaxminddb:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) - mysql? ( virtual/mysql ) + mysql? ( virtual/libmysqlclient:= ) normalize? ( >=dev-libs/libee-0.4.0 >=dev-libs/liblognorm-2.0.3:= diff --git a/app-admin/rsyslog/rsyslog-8.31.0.ebuild b/app-admin/rsyslog/rsyslog-8.34.0.ebuild index 6dbc3b101758..4e1cc2861048 100644 --- a/app-admin/rsyslog/rsyslog-8.31.0.ebuild +++ b/app-admin/rsyslog/rsyslog-8.34.0.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" @@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) inherit autotools eutils linux-info python-any-r1 systemd DESCRIPTION="An enhanced multi-threaded syslogd with database support and more" -HOMEPAGE="http://www.rsyslog.com/" +HOMEPAGE="https://www.rsyslog.com/" BRANCH="8-stable" @@ -24,9 +24,9 @@ else S="${WORKDIR}/${PN}-${MY_PV}" # Upstream URL schema: - # RC: http://www.rsyslog.com/files/download/rsyslog/rc/rsyslog-8.18.0.tar.gz - # http://www.rsyslog.com/files/download/rsyslog/rc2/rsyslog-8.18.0.tar.gz - # Release: http://www.rsyslog.com/files/download/rsyslog/rsyslog-8.18.0.tar.gz + # RC: https://www.rsyslog.com/files/download/rsyslog/rc/rsyslog-8.18.0.tar.gz + # https://www.rsyslog.com/files/download/rsyslog/rc2/rsyslog-8.18.0.tar.gz + # Release: https://www.rsyslog.com/files/download/rsyslog/rsyslog-8.18.0.tar.gz MY_URL_PREFIX= if [[ ${PV} = *_rc* ]]; then @@ -44,23 +44,24 @@ else fi SRC_URI=" - 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} ) + https://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-${MY_PV}.tar.gz -> ${MY_FILENAME} + doc? ( https://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-doc-${MY_PV}.tar.gz -> ${MY_FILENAME_DOCS} ) " - PATCHES=() + PATCHES=( "${FILESDIR}"/${BRANCH}/${PN}-8.34.0-fix-issue2612.patch ) fi LICENSE="GPL-3 LGPL-3 Apache-2.0" SLOT="0" -IUSE="dbi debug doc elasticsearch +gcrypt grok jemalloc kafka kerberos libressl mdblookup mongodb mysql normalize omhttpfs" -IUSE+=" omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid zeromq" +IUSE="curl dbi debug doc elasticsearch +gcrypt grok jemalloc kafka kerberos kubernetes libressl mdblookup mongodb mysql" +IUSE+=" normalize omhttpfs omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid zeromq" RDEPEND=" - >=dev-libs/libfastjson-0.99.7:= + >=dev-libs/libfastjson-0.99.8:= >=dev-libs/libestr-0.1.9 >=dev-libs/liblogging-1.0.1:=[stdlog] >=sys-libs/zlib-1.2.5 + curl? ( >=net-misc/curl-7.35.0 ) dbi? ( >=dev-db/libdbi-0.8.3 ) elasticsearch? ( >=net-misc/curl-7.35.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) @@ -68,9 +69,10 @@ RDEPEND=" jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) kerberos? ( virtual/krb5 ) + kubernetes? ( >=net-misc/curl-7.35.0 ) mdblookup? ( dev-libs/libmaxminddb:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) - mysql? ( virtual/mysql ) + mysql? ( virtual/libmysqlclient:= ) normalize? ( >=dev-libs/libee-0.4.0 >=dev-libs/liblognorm-2.0.3:= @@ -102,6 +104,8 @@ DEPEND="${RDEPEND} ${PYTHON_DEPS} )" +REQUIRED_USE="kubernetes? ( normalize )" + if [[ ${PV} == "9999" ]]; then DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )" DEPEND+=" >=sys-devel/flex-2.5.39-r1" @@ -176,6 +180,7 @@ src_configure() { --disable-generate-man-pages --without-valgrind-testbench $(use_enable test testbench) + $(use_enable curl libcurl) # Input Plugins without depedencies --enable-imdiag --enable-imfile @@ -216,12 +221,14 @@ src_configure() { $(use_enable debug rtinst) $(use_enable debug valgrind) # Misc + $(use_enable curl fmhttp) $(use_enable elasticsearch) $(use_enable gcrypt libgcrypt) $(use_enable jemalloc) $(use_enable kafka imkafka) $(use_enable kafka omkafka) $(use_enable kerberos gssapi-krb5) + $(use_enable kubernetes mmkubernetes) $(use_enable normalize mmnormalize) $(use_enable mdblookup mmdblookup) $(use_enable grok mmgrok) @@ -453,5 +460,5 @@ pkg_config() { echo einfo "Here is the documentation on how to encrypt your log traffic:" - einfo " http://www.rsyslog.com/doc/rsyslog_tls.html" + einfo " https://www.rsyslog.com/doc/rsyslog_tls.html" } diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest index 94c0d9c5b972..221a89363be0 100644 --- a/app-admin/salt/Manifest +++ b/app-admin/salt/Manifest @@ -4,24 +4,11 @@ AUX master-confd-1 188 BLAKE2B 8ac416a7ff64c73556f07a08268ea7d91547e242becd345ac AUX master-initd-4 311 BLAKE2B 302e71b0328d47addd1508e1992ee56c719463d4b99af37b626835fefd28f9c3184e8441035f055992489b1084f1fdd45542466b359c206305e8174fef853478 SHA512 d44ea9fdf962ded6d0c6ac5a1f89ec8729a9a70517ba0f132c54696d32bc96030c64af09f48037867006bd3acdf4b6db759ca873717cd5a88701e42d06885bcc AUX minion-confd-1 188 BLAKE2B ad20094c30f9aa573397d347f9fb11acafba2f724b6c836d7ec57f10d4182c300a4b0ec572b5f3301174febdfc69c30752c3b0eabdfdf9f4963b03531db23523 SHA512 0051e13351cef8db81dc075a194bb384723f07d5591b5b4d3f3adf4180afaf7beced470ab79ceca9d1ec0dae62dbd72084eb76af009fc78411a011050a94a2ed AUX minion-initd-4 317 BLAKE2B 4c207bd26a72d5dded38e40f7869f46263272a841b978f138248d016a06e837c3aebebabd15314e3896b404058c3f5dd5e6a1cca48450b07b88b6edef6a8d7d2 SHA512 80790ed1b5f86b713ca6384d60253676b16b10c122810ed07b7119c3860bedfe40102f6b7de86d832f084d84f87bf9405ec282629f981767a534d2a53144845f -AUX salt-2014.7.1-remove-pydsl-includes-test.patch 3605 BLAKE2B 1e43a692afebee14ec62873ad718126be09447eeeb949074d5aa6c6186cad4aa4cea2a3df814ce150414b8ec200b996fad6c21eca66d1a1dbe0e3de9e7660e39 SHA512 fe56cb6b5f91586e9acba136601c9380f158a4dc3a0316a00b23703a5e5de7b8ae3cec7b3bd606e0b7a927f8a7fc28c57e5dd5f10755f34e9dbd6052c9dc9b50 -AUX salt-2015.5.10-buggy-tests.patch 2034 BLAKE2B c3437ec0686a026c2d50ae758ae550b5d61005a638745c64a0fc81995606d9938c585f092012e164c5387141a8aef7aae7da46d5dd8a467042328f671eaccf50 SHA512 f848262c8ce2338cc847b5c8038eb40f6ec15f4ce07d58e9a70503fcbe2b8651edb411621697a1c5aaf663e4dd821b396ca16088846e3ec6f2a64c78ecf9ac64 -AUX salt-2015.5.5-auth-tests.patch 1572 BLAKE2B 59584a38091cbff17bcbf5fd1cb54d6ba2c4e720a9b5c2d45d00bf2f8bd60ec2b326970cf99944d62bb2d0a6357a2d8ed8ef26097355ad3bae56be02aaa213b5 SHA512 6cab8a7c2a405420f6b2df7cd21773852ef1582f8a2f54bcbd120fa4966ac390447e907555b4b82764d8ae406cee095b5dd1dd0070d5a67a4ab10329bed39c3a -AUX salt-2015.5.5-cron-tests.patch 961 BLAKE2B 018aa48d769e2d6a822310f4941952260b6e4882b8f87964431bcb3eb02fb649ff3a9086c7db7b861bc609ce62d64eceae7aed2a40a7e2ea78f0bf8791e8b87c SHA512 d6ddb67d91ac0ec8c9256dba6e7d9efd15c892b6a8396b571b6aa849393d19e3a74e48906e1e03ddc9301b8fe7e1811eb1c88048daedcd8737e5edf0c4e62d74 -AUX salt-2015.5.5-remove-buggy-tests.patch 2114 BLAKE2B 10e699b5d0cb78e2421f69ac232f42c79369218d89aaed9c13ab56c7cb677e66f0963d26936c5573bec0e5e472c3b61d94794222e28fe7c2382167857f1ed029 SHA512 8669e2ffa926578e238cc8f18fbbc6e691cf9a4029e4a90c92214bfbd99c878efe749041912c7ad6ba90afee2baa8a4047318105b579babbf349186c8b9302a9 -AUX salt-2015.5.7-tmpdir.patch 1489 BLAKE2B c52240ef70302e31e6f4d3e84230e99c660f9a5979dde3efe5d17e9251d2f84113e309f16077865078bec4909d6d5753e11630bb99372b2045378caccff99664 SHA512 37d2af5375384dfe1e0b5d45eb6a51576767420e0bacd13f7ea5da801c359743ac420c0d6b258aa237d4dab82290a832b3ea6c96aa7547ecc8eb8f0c0f047b4a -AUX salt-2015.8.0-remove-buggy-tests.patch 2552 BLAKE2B 10c4d615e76f64c0f3504e3999509cc4947cdbef4c4d33180f9dc27c12f17353ca614fbca8dcf9ad06ba07bf7be163a706a8503c8717f800bcf88117d9a025e0 SHA512 31b8509feb6262e3211263571d9a006879a136c8c0ea5202ebf314ea6aeb3279b0ac63bb3800244ddb6ba9eb9159ee3ad8e389fa3e68f4d414d89cddb792a056 -AUX salt-2015.8.10-remove-failing-boto-test.patch 2058 BLAKE2B 33b72ed7f5eee1f7e5a9ae82da022244887e736979122b13f777dafd94e0130fb663d28804985bbd8c8d55aadb005e72099cdf283c00a12fc27cc23eb2cc269a SHA512 98aed5c1ba1fc2647ed4771a57b7d2fe0f66e4da7936bf013c305f014e5c9f7158e9d966b961b9d6ba4fba57a1c8101d3c053598f0ebcac023016e9dbb1e765f -AUX salt-2015.8.13-failing-gateway-tests.patch 3539 BLAKE2B 0f25e5edb41cd932fe8c0a06c4022b8b9b612a7022578002f64885cb71689e914e455e4404d1840a1ce1b9432a450361399f1da0934e55a0b455722092250cac SHA512 577825438e0193edc7df0234fba66dc61e56c74ae6e50b998072374a93052151d987def04d3a618c5a68b9ef2c8e84559adfcc25428b701418521d5f01a57466 -AUX salt-2015.8.13-sanitize-minion-name.patch 1003 BLAKE2B 0446565484fbf00dc3fe9acd72b90353447b6e892172111c794a3475a03132183d2bd8ec6c6b60cb84863dd366e3e1fae84d7ad41dca3c9530d78ee4a37ffd3c SHA512 04f50936896b83804cc25ca329cb32a7f388be9ec5fd6f9d0cf452e3af3f6c8c3f025c119ed29a2399e11669b9eec373d77fce17d1ea64107f9268f9741cb73c -AUX salt-2015.8.2-tmpdir.patch 2502 BLAKE2B 97cd158e92cde16d653f590a3902471e46b2c6f9c522fbccf42c09288388a56539eb518309db448f3698e5cab042affb80b34cc528bbbc65ea51be6d34ab2ffc SHA512 ed8eed9e2fa36718d7320e1ae650a990ae2d95d7c6a544ffd96f358750158231c334ab1eee6fe3e5e6a25d3b62c1fc0a149508eb3bd23f7ad152a82ec7efa1ac AUX salt-2016.11.0-broken-tests.patch 1092 BLAKE2B 5ab3cccc024b5cdc4e6eecd5f164c9f931aa25b23264151ef15645e63e1586f2a093f29a9835685482d831b98e131a385799d39b9158c865af83724a994bbdb1 SHA512 d23c16a5ed8c0fbd4287d73e45b700d465224c5f3b32c47bb2994703a4b4c261053b9c79444973cfaf86afa2850b8499a6b7923317fde3de43840a575ada74b4 AUX salt-2016.11.0-remove-file-tree-test.patch 1480 BLAKE2B ad2285dd37d5a727feac291c5598b4dc56c98674566c3816fb17577ce44da4d20ddb60c1f0b8a8c8f7d2fe6f33918d00e5010c47c4441728f6a1a9ca94cf4015 SHA512 0503b4ecd16c2f67b53f1ce52b5f77cacf8de420024c5c7751d3caa06de2d1e685eef8d4021dfe86a5850ac23f58705a375e87922b3c5fbeb8c11290690624bc AUX salt-2016.11.0-tmpdir.patch 1480 BLAKE2B c5501459ba32a5ef08317f4e1a247a7ac2ad563be100f80bfb97a14821af43134dce76d46d9c9431f8b2866eec0272e6de62e281c9a469f8177f214e7c5f6a7e SHA512 ef654d871178618dab68ad9b4062560cfa57fa421834b142639a11d12679ebc97afc27fa572dd77b74d86ba722bb8575b64045bbf3cab9f2d0e2cefeca38c4bd AUX salt-2016.3.1-dont-realpath-tmpdir.patch 853 BLAKE2B e78c50d1050adad0d21523229034a24f1fd2c977172f3135dbf09440ed6d7e292f0dd9c267c3277edfe8528bf38d269939d068b4af8671da08c64f5712c0d7e1 SHA512 a6bc22959975ac25df84c54437a1638e95d78c057920ced38b0accddca11eb33ad39f2a43dd05648584cd10b140f7ee509a8c6739c4d89d30500452c91795b79 -AUX salt-2016.3.4-dont-test-ordering.patch 1485 BLAKE2B 4075d7c43d7f6b419357aed1f6a3efd82a4bdace1416f3702e3d51bcd5e4d359d20fd6e2f584a6faee30c4f14d993ae58f4b4f0241bfa8eff0c081c7c6b395c3 SHA512 4cc5a4d4380e6ae795aed7650667f1ea89315b429c495128f3e6eb311977bfb713d3d4536785ff1f087188ed14e81792daf73225cdce0fcb4ff0ffa170f1cbe3 AUX salt-2016.3.4-test-nonexist-dirs.patch 1655 BLAKE2B 5e7907e0a10c4ee78b599ec98d38088c97889ae2002602db0c207fb210e2960e7b4b92c08f027854e6dd9205b000bb09e7b243346af755e6824561752e3ef2e9 SHA512 ee81b8104f066e1d161207fe82d8349eb8c40701544784a2b6e66842fe9e07d7edffa24cad8c5d2037e2e7fa0368c614ed177fdf7359c89255d068767968e8fd -AUX salt-2016.3.5-tmpdir.patch 1982 BLAKE2B b8d587e6139ac49b78892572070d0985fb78de3986fedfc8df04276da69a6f7f0c28fcb1f41df282747c80bfaba266fdcfeb58890e494f32873d870add388d98 SHA512 755ac34298c6cbc57cf7404b209bd45ad216c07bb55b303e97375e1912aead765dddddbe3331314e4f245c6848e62447a5bb16b04367f20bb8387e89d0254859 AUX salt-2017.7.0-dont-realpath-tmpdir.patch 834 BLAKE2B e70496f3ab18b954e7cacd29dbdee6ccbe0a07f139903360312db247926867a78513cd9022f492ce370eeafcc81bc4db545359036f8f5b0d2d64d3c5bb8aefc0 SHA512 33b69954e8112c0f76654d507df74a4cdd37e8227848f2ce0652b3ecee8b847253ccad33cada0e3dd1471c54c780dcc12d5e546c4ec43868511b95b0c7f71e17 AUX salt-2017.7.2-fix_disk_format.patch 2111 BLAKE2B e8a1c24cd780e29092e3112256bbe3cf518dac49479abfcac0b2432b8528c448241bfc0cce5bbf20b1be674cd49766c151547cfb4d5ef0894b3c9a1d28ad332e SHA512 33c73a70e163135c238b85ad6a0beaed5ed5d339fee19dfa15f7dd073200cb788ec5234d89939eab1a8b080ccd0b22ed0a5409cfaad27ac1abbbda3f018f3d75 AUX salt-2017.7.3-tests.patch 3096 BLAKE2B bde978ec7d9ca3f303e859d8ecc728ee16e6b1753afe2325f95b0938ed2828ac5b3f80ac92451f6ab4bf7f08f141b71df88641da9694828657dd358059df9826 SHA512 0db8e8dffeabd9f7c0c619480425c58f4b58a486e1866062c8a482489bb79fd6f31c06020ed83e1903a346cbacb221ba541a2363d4e983e583313adb4652d22f @@ -31,12 +18,10 @@ AUX salt-minion.service 162 BLAKE2B 6f7b6b72e26d1651dbcb324b1e0cfef9f4b5a794f405 AUX salt-syndic.service 169 BLAKE2B 0d00f20b4663804eaa4b6a1a1b32ed87b04d1f4df6a8e8e0b2a0e3d17f71e1bb53f71f6168446aaf3765692cd540217c4cdf5ab8dd9cb7032801aa798d8a9bc3 SHA512 b45509a22a18f573726a868fda1591eaf42ef44220960dda698274ba8ff1db8cdc302605133ab61b188e15017ba15c5f409f3ee64e026b635ac359eea7aad7d0 AUX syndic-confd-1 188 BLAKE2B ad20094c30f9aa573397d347f9fb11acafba2f724b6c836d7ec57f10d4182c300a4b0ec572b5f3301174febdfc69c30752c3b0eabdfdf9f4963b03531db23523 SHA512 0051e13351cef8db81dc075a194bb384723f07d5591b5b4d3f3adf4180afaf7beced470ab79ceca9d1ec0dae62dbd72084eb76af009fc78411a011050a94a2ed AUX syndic-initd-4 311 BLAKE2B aab3b44f65dedb30ea4eb573872c0253e4d7b438a533f22a4e887c1e6487682efce7f5b75d3bcf366ef706a9fb1578dce537ac5b50324239378cecbd0715ad5d SHA512 69cc10fa7d9f0f4a68d223272c08ee33af242a50eb9bbea919d61f6cb5baf1ce986b07d69fc0e47e2f6dffc0a11100c3bc0d836d2938c46aa364beecb47f07ef -DIST salt-2016.11.8.tar.gz 10142142 BLAKE2B e6805dae84c0d2e39109c95f603fcb54e1b7d7ff6c27ce555379b69274b3a5d72a1e372081a62c18440deb0955c1ef24a41c5d855a5e622f2ffe51276bd87b25 SHA512 0adc544ca460d13d2adb11b04575bd079a3dad1be3468bea7d32d0b74416b78546e4c86c75551bba09786be8e9810a6e30232414c4f5851cbc9a0fb4b894e0de DIST salt-2016.11.9.tar.gz 10062996 BLAKE2B 5176d04d07a69de21c9c136c201d334614c5675fd78e306a0160fae829b633441cd859f4ba1a0822dfbb9ae716475c53f6eb058187d4acc8a5770dd4ceace577 SHA512 896fd27c111e926e246b51d00b69d41c8f4d25ec0c034c9ff3dc5414f5e93592fd637cdeaecf02b3b98a4e5a7ce478bfda86b15497961078374608d76516593d -DIST salt-2017.7.2.tar.gz 11471191 BLAKE2B 0b7184eb4dcb29f2a9603117d1c6fb9c729093c1ff11e18370929ec3fdbfe7bf8c0914f17260c3f613842c23359205a4a84d3e0bcd67476705e50f805bcd7b69 SHA512 959cec404f0fa7c00f78427cba902b8b9c2c0d95016fc70925d8da6d0b97a0284fc034ac92a5c5c313763db4fdcbd1b0391318596b77fe8e0cd1c7e4b3fa928b -DIST salt-2017.7.4.tar.gz 11718327 BLAKE2B c197284ee56d039ee7942534af979f0606093ebdf40e0b11a55ca28a2f64c4b584b09b0901d5cb2c350f4ede52636e7927bbed48355d731472970eda5e32632f SHA512 79d7853c2614ed581e441babe6fbb73809816ec53aa47016b5066b771de449d4dcc999927d7e1c92c5ca68c816d27779e34e31ec1408d473a07120d62846de73 -EBUILD salt-2016.11.8-r1.ebuild 4715 BLAKE2B 32ce9ffe4698b20c9d0d73acc56ed01cf9bcc232c14b509a406f31ddadceed70e30ecd03368768f7e2c41e280adb5a8486e825d4597bbbff309f73e3b724b8c4 SHA512 e0a194c95bdc17e92d481612f171876925aea54eead946206e4b65632bde29b4da15d8ea7951e617aebf888958d708f5f3c9a6fde0004d56822ad6da8fcc209f +DIST salt-2017.7.5.tar.gz 11043026 BLAKE2B 9cae4e6ca3b0bac0dc0b9b9a5ae01e0bfb8e8b899aa029b324ac10c8c84024bbc419ace068cd0d2bff84ec6ddf1d13faf68ce34c68c19892c700c38e81da8c7c SHA512 684ffde7d98c73349b386c94de3d9fc09631a78c5d74e37e6dfd90fbb0c94decc529f56b1eba1559ce9932b16083f88e6495ff6cdf071b32a23028e9db47cc3d +DIST salt-2018.3.0.tar.gz 13448567 BLAKE2B 9048f9e507ded238bfd54d0aabfefb56522b20ba2479c3bf5aefc47fff0b6ce516709ad6e9109441941a60596d4f06a43c1448a149225f3f87715327a190d313 SHA512 3d64a4d12d4ff7effe644b682b138d8f49fd00523e9cfe3e80bebff9c944a089fb41cbac92e63139633425f49c1eebeb99145290a0bdd1b4f306da86abe9b2e5 EBUILD salt-2016.11.9-r1.ebuild 4715 BLAKE2B 32ce9ffe4698b20c9d0d73acc56ed01cf9bcc232c14b509a406f31ddadceed70e30ecd03368768f7e2c41e280adb5a8486e825d4597bbbff309f73e3b724b8c4 SHA512 e0a194c95bdc17e92d481612f171876925aea54eead946206e4b65632bde29b4da15d8ea7951e617aebf888958d708f5f3c9a6fde0004d56822ad6da8fcc209f -EBUILD salt-2017.7.2-r2.ebuild 4472 BLAKE2B 53e91df5216b70e39b0fb37d607f912f781cc784e95ad70c4ffd52dbb6d335121ea84ed77dc0067f7777362a623773332959731420db6bd45e31ff5ee7d0e852 SHA512 a77a72b91b62c7ec615c79a1634cd869d881b9fffe34d3fd5965a1a21e59a87b76298623c89f65b1e4afb590f7f75de4b20cdc47ae29fcb022d427e9ca03dd82 -EBUILD salt-2017.7.4-r2.ebuild 4617 BLAKE2B 6998d5cf0e486f5941f25ac22f949239f15ee896d74845e3ff8701b49d07fcd1ce5e4c2b87acc2e856ac4ea242c206c00196c05f9a0fefb12af0c49ff182e6ea SHA512 113d6ca37a3829b024588827876ae2b7c03ebe47b9bf6ce484a7a7e454844ba8895dd53ea09d7910c2afc967eaebe5ad44ae1a9381c7c5e391f59318640fea0b +EBUILD salt-2017.7.5.ebuild 4727 BLAKE2B 2b1a53cca64ed98ae9999f84bbb7da5dafad5e9b74b4248bf3728a07db3bff77c5ac959ebadb907ae31a15569390c2f01bfe288ea296e7f27df169258643836c SHA512 013670dec20115ca9e23e8f545abd3dbd66af5ab1b09a4c6118f3106caa2747b3000ffa47928427a5b8690e1e9bb647e44f8000275dcc07cee949915b3821ea4 +EBUILD salt-2018.3.0.ebuild 4892 BLAKE2B dffbb8de5ed43477c02b177e80528ed2c51f66e59f033da4d7e57bc2af13dab6a854cc3025d4cdcd63446ed7f873e3db1f2216bfe82802428d6d5f0fc598088c SHA512 8862e90908e207ef72fa7783739a279cf8315de4c2c76fb3624043cfd0e8f8adb23885d40a7e66b2dce26a1c7f1b9f55b86e5a8c0a5dd51ca53575d0dc13d497 MISC metadata.xml 2288 BLAKE2B dbe7f76af8cd8a97d852536684e914e3759bd1f17e4bdea3c8c16da7c6485eee08151a8d4e41919c1ae89ba4f786783f899e23147159a4bade0009c7a668f741 SHA512 fdcea2f80fc87ab2a0db1643d71dd6d54e91d898594570af6a7505343c5d9a5a0ce4803d11460d7d3f6f533509b072819f958cbe31ca9183fabf811982526969 diff --git a/app-admin/salt/files/salt-2014.7.1-remove-pydsl-includes-test.patch b/app-admin/salt/files/salt-2014.7.1-remove-pydsl-includes-test.patch deleted file mode 100644 index 7c33c12f5c71..000000000000 --- a/app-admin/salt/files/salt-2014.7.1-remove-pydsl-includes-test.patch +++ /dev/null @@ -1,104 +0,0 @@ -diff --git a/tests/unit/pydsl_test.py b/tests/unit/pydsl_test.py -index 57ba81e..b26154e 100644 ---- a/tests/unit/pydsl_test.py -+++ b/tests/unit/pydsl_test.py -@@ -298,99 +298,6 @@ class PyDSLRendererTestCase(TestCase): - finally: - shutil.rmtree(dirpath, ignore_errors=True) - -- def test_rendering_includes(self): -- dirpath = tempfile.mkdtemp(dir=integration.SYS_TMP_DIR) -- if not os.path.isdir(dirpath): -- self.skipTest( -- 'The temporary directory {0!r} was not created'.format( -- dirpath -- ) -- ) -- output = os.path.join(dirpath, 'output') -- try: -- write_to(os.path.join(dirpath, 'aaa.sls'), textwrap.dedent('''\ -- #!pydsl|stateconf -ps -- -- include('xxx') -- yyy = include('yyy') -- -- # ensure states in xxx are run first, then those in yyy and then those in aaa last. -- extend(state('yyy::start').stateconf.require(stateconf='xxx::goal')) -- extend(state('.start').stateconf.require(stateconf='yyy::goal')) -- -- extend(state('yyy::Y2').cmd.run('echo Y2 extended >> {0}')) -- -- __pydsl__.set(ordered=True) -- -- yyy.hello('red', 1) -- yyy.hello('green', 2) -- yyy.hello('blue', 3) -- '''.format(output))) -- -- write_to(os.path.join(dirpath, 'xxx.sls'), textwrap.dedent('''\ -- #!stateconf -os yaml . jinja -- -- include: -- - yyy -- -- extend: -- yyy::start: -- stateconf.set: -- - require: -- - stateconf: .goal -- -- yyy::Y1: -- cmd.run: -- - name: 'echo Y1 extended >> {0}' -- -- .X1: -- cmd.run: -- - name: echo X1 >> {1} -- - cwd: / -- .X2: -- cmd.run: -- - name: echo X2 >> {2} -- - cwd: / -- .X3: -- cmd.run: -- - name: echo X3 >> {3} -- - cwd: / -- -- '''.format(output, output, output, output))) -- -- write_to(os.path.join(dirpath, 'yyy.sls'), textwrap.dedent('''\ -- #!pydsl|stateconf -ps -- -- include('xxx') -- __pydsl__.set(ordered=True) -- -- state('.Y1').cmd.run('echo Y1 >> {0}', cwd='/') -- state('.Y2').cmd.run('echo Y2 >> {1}', cwd='/') -- state('.Y3').cmd.run('echo Y3 >> {2}', cwd='/') -- -- def hello(color, number): -- state(color).cmd.run('echo hello '+color+' '+str(number)+' >> {3}', cwd='/') -- '''.format(output, output, output, output))) -- -- state_highstate({'base': ['aaa']}, dirpath) -- expected = textwrap.dedent('''\ -- X1 -- X2 -- X3 -- Y1 extended -- Y2 extended -- Y3 -- hello red 1 -- hello green 2 -- hello blue 3 -- ''') -- -- with salt.utils.fopen(output, 'r') as f: -- self.assertEqual(sorted(f.read()), sorted(expected)) -- -- finally: -- shutil.rmtree(dirpath, ignore_errors=True) -- - def test_compile_time_state_execution(self): - if not sys.stdin.isatty(): - self.skipTest('Not attached to a TTY') diff --git a/app-admin/salt/files/salt-2015.5.10-buggy-tests.patch b/app-admin/salt/files/salt-2015.5.10-buggy-tests.patch deleted file mode 100644 index e9330bd255b5..000000000000 --- a/app-admin/salt/files/salt-2015.5.10-buggy-tests.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/tests/unit/modules/boto_vpc_test.py b/tests/unit/modules/boto_vpc_test.py -index 82dfe28..ced9ee5 100644 ---- a/tests/unit/modules/boto_vpc_test.py -+++ b/tests/unit/modules/boto_vpc_test.py -@@ -441,9 +441,9 @@ class BotoVpcTestCase(BotoVpcTestCaseBase): - describe_vpc = boto_vpc.describe(vpc_id=vpc.id, **conn_parameters) - - vpc_properties = dict(cidr_block=unicode(cidr_block), -- is_default=None, -+ is_default=False, - state=u'available', -- tags={'Name': 'test', 'test': 'testvalue'}, -+ tags={u'Name': u'test', u'test': u'testvalue'}, - dhcp_options_id=u'dopt-7a8b9c2d', - instance_tenancy=u'default') - -diff --git a/tests/unit/states/pip_test.py b/tests/unit/states/pip_test.py -index 6e7d083..9a83951 100644 ---- a/tests/unit/states/pip_test.py -+++ b/tests/unit/states/pip_test.py -@@ -37,17 +37,6 @@ class PipStateTest(TestCase, integration.SaltReturnAssertsMixIn): - def test_install_requirements_parsing(self): - mock = MagicMock(return_value={'retcode': 0, 'stdout': ''}) - pip_list = MagicMock(return_value={'pep8': '1.3.3'}) -- with patch.dict(pip_state.__salt__, {'cmd.run_all': mock, -- 'pip.list': pip_list}): -- with patch.dict(pip_state.__opts__, {'test': True}): -- ret = pip_state.installed('pep8=1.3.2') -- self.assertSaltFalseReturn({'test': ret}) -- self.assertInSaltComment( -- 'Invalid version specification in package pep8=1.3.2. ' -- '\'=\' is not supported, use \'==\' instead.', -- {'test': ret} -- ) -- - mock = MagicMock(return_value={'retcode': 0, 'stdout': ''}) - pip_list = MagicMock(return_value={'pep8': '1.3.3'}) - pip_install = MagicMock(return_value={'retcode': 0}) diff --git a/app-admin/salt/files/salt-2015.5.5-auth-tests.patch b/app-admin/salt/files/salt-2015.5.5-auth-tests.patch deleted file mode 100644 index fa092d1f3eaf..000000000000 --- a/app-admin/salt/files/salt-2015.5.5-auth-tests.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/tests/unit/auth_test.py b/tests/unit/auth_test.py -index 10b77e9..c40f439 100644 ---- a/tests/unit/auth_test.py -+++ b/tests/unit/auth_test.py -@@ -38,12 +38,12 @@ class LoadAuthTestCase(TestCase): - - # Test a case with valid params - with patch('salt.utils.format_call') as format_call_mock: -- expected_ret = call('fake_func_str', { -+ expected_ret = [call('fake_func_str', { - 'username': 'test_user', - 'test_password': '', - 'show_timeout': False, - 'eauth': 'pam' -- }, expected_extra_kws=auth.AUTH_INTERNAL_KEYWORDS) -+ }, expected_extra_kws=auth.AUTH_INTERNAL_KEYWORDS)] - ret = self.lauth.load_name(valid_eauth_load) - format_call_mock.assert_has_calls(expected_ret) - -@@ -53,12 +53,12 @@ class LoadAuthTestCase(TestCase): - 'test_password': '', - 'eauth': 'pam'} - with patch('salt.utils.format_call') as format_call_mock: -- expected_ret = call('fake_groups_function_str', { -+ expected_ret = [call('fake_groups_function_str', { - 'username': 'test_user', - 'test_password': '', - 'show_timeout': False, - 'eauth': 'pam' -- }, expected_extra_kws=auth.AUTH_INTERNAL_KEYWORDS) -+ }, expected_extra_kws=auth.AUTH_INTERNAL_KEYWORDS)] - self.lauth.get_groups(valid_eauth_load) - format_call_mock.assert_has_calls(expected_ret) - diff --git a/app-admin/salt/files/salt-2015.5.5-cron-tests.patch b/app-admin/salt/files/salt-2015.5.5-cron-tests.patch deleted file mode 100644 index d0c4ffc92df1..000000000000 --- a/app-admin/salt/files/salt-2015.5.5-cron-tests.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/tests/unit/modules/cron_test.py b/tests/unit/modules/cron_test.py -index 017eabd..dac0122 100644 ---- a/tests/unit/modules/cron_test.py -+++ b/tests/unit/modules/cron_test.py -@@ -573,10 +573,10 @@ class PsTestCase(TestCase): - @patch('salt.modules.cron._write_cron_lines') - @patch('salt.modules.cron.list_tab', new=MagicMock(return_value=STUB_SIMPLE_CRON_DICT)) - def test_set_special(self, write_cron_lines_mock): -- expected_write_call = call('DUMMY_USER', -+ expected_write_call = [call('DUMMY_USER', - ['5 0 * * * /tmp/no_script.sh\n', - '# Lines below here are managed by Salt, do not edit\n', -- '@hourly echo Hi!\n']) -+ '@hourly echo Hi!\n'])] - ret = cron.set_special('DUMMY_USER', '@hourly', 'echo Hi!') - write_cron_lines_mock.assert_has_calls(expected_write_call) - diff --git a/app-admin/salt/files/salt-2015.5.5-remove-buggy-tests.patch b/app-admin/salt/files/salt-2015.5.5-remove-buggy-tests.patch deleted file mode 100644 index b36e35fb9a58..000000000000 --- a/app-admin/salt/files/salt-2015.5.5-remove-buggy-tests.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff --git a/tests/unit/modules/darwin_sysctl_test.py b/tests/unit/modules/darwin_sysctl_test.py -index 51e8f23..36d005f 100644 ---- a/tests/unit/modules/darwin_sysctl_test.py -+++ b/tests/unit/modules/darwin_sysctl_test.py -@@ -64,18 +64,6 @@ class DarwinSysctlTestCase(TestCase): - 'net.inet.icmp.icmplim', 50), ret) - - @patch('os.path.isfile', MagicMock(return_value=False)) -- def test_persist_no_conf_failure(self): -- ''' -- Tests adding of config file failure -- ''' -- with patch('salt.utils.fopen', mock_open()) as m_open: -- helper_open = m_open() -- helper_open.write.assertRaises(CommandExecutionError, -- darwin_sysctl.persist, -- 'net.inet.icmp.icmplim', -- 50, config=None) -- -- @patch('os.path.isfile', MagicMock(return_value=False)) - def test_persist_no_conf_success(self): - ''' - Tests successful add of config file when previously not one -diff --git a/tests/unit/modules/linux_sysctl_test.py b/tests/unit/modules/linux_sysctl_test.py -index 08fc80f..c6e40b8 100644 ---- a/tests/unit/modules/linux_sysctl_test.py -+++ b/tests/unit/modules/linux_sysctl_test.py -@@ -82,18 +82,6 @@ class LinuxSysctlTestCase(TestCase): - 'net.ipv4.ip_forward', 1), ret) - - @patch('os.path.isfile', MagicMock(return_value=False)) -- def test_persist_no_conf_failure(self): -- ''' -- Tests adding of config file failure -- ''' -- with patch('salt.utils.fopen', mock_open()) as m_open: -- helper_open = m_open() -- helper_open.write.assertRaises(CommandExecutionError, -- linux_sysctl.persist, -- 'net.ipv4.ip_forward', -- 1, config=None) -- -- @patch('os.path.isfile', MagicMock(return_value=False)) - def test_persist_no_conf_success(self): - ''' - Tests successful add of config file when previously not one diff --git a/app-admin/salt/files/salt-2015.5.7-tmpdir.patch b/app-admin/salt/files/salt-2015.5.7-tmpdir.patch deleted file mode 100644 index 8a19c32e0f71..000000000000 --- a/app-admin/salt/files/salt-2015.5.7-tmpdir.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/tests/unit/modules/grains_test.py b/tests/unit/modules/grains_test.py -index 3473c03..ea37d66 100644 ---- a/tests/unit/modules/grains_test.py -+++ b/tests/unit/modules/grains_test.py -@@ -1,6 +1,8 @@ - # -*- coding: utf-8 -*- - - import copy -+import os.path -+import tempfile - - # Import Salt Testing libs - from salttesting import TestCase, skipIf -@@ -20,8 +22,8 @@ from salt.modules import grains as grainsmod - from salt.utils import dictupdate - - grainsmod.__opts__ = { -- 'conf_file': '/tmp/__salt_test_grains', -- 'cachedir': '/tmp/__salt_test_grains_cache_dir' -+ 'conf_file': os.path.join(tempfile.gettempdir(), '__salt_test_grains'), -+ 'cachedir': os.path.join(tempfile.gettempdir(), '__salt_test_grains_cache_dir') - } - - grainsmod.__salt__ = {} -diff --git a/tests/unit/states/archive_test.py b/tests/unit/states/archive_test.py -index 3cfb2f0..b3f3bee 100644 ---- a/tests/unit/states/archive_test.py -+++ b/tests/unit/states/archive_test.py -@@ -69,7 +69,7 @@ class ArchiveTest(TestCase): - 'cmd.run_all': mock_run}): - filename = os.path.join( - tmp_dir, -- 'files/test/_tmp_test_archive_.tar' -+ 'files/test/' + tempfile.gettempdir().replace('/', '_') + '_test_archive_.tar' - ) - for test_opts, ret_opts in zip(test_tar_opts, ret_tar_opts): - ret = archive.extracted(tmp_dir, diff --git a/app-admin/salt/files/salt-2015.8.0-remove-buggy-tests.patch b/app-admin/salt/files/salt-2015.8.0-remove-buggy-tests.patch deleted file mode 100644 index 92ab0624e595..000000000000 --- a/app-admin/salt/files/salt-2015.8.0-remove-buggy-tests.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff --git a/tests/unit/modules/mount_test.py b/tests/unit/modules/mount_test.py -index 282539d..c88a7a8 100644 ---- a/tests/unit/modules/mount_test.py -+++ b/tests/unit/modules/mount_test.py -@@ -103,12 +103,6 @@ class MountTestCase(TestCase): - self.assertTrue(mount.rm_fstab('name', 'device')) - - mock = MagicMock(return_value={'name': 'name'}) -- with patch.object(mount, 'fstab', mock): -- with patch('salt.utils.fopen', mock_open()) as m_open: -- helper_open = m_open() -- helper_open.write.assertRaises(CommandExecutionError, -- mount.rm_fstab, -- config=None) - - def test_set_fstab(self): - ''' -@@ -143,12 +137,6 @@ class MountTestCase(TestCase): - self.assertTrue(mount.rm_automaster('name', 'device')) - - mock = MagicMock(return_value={'name': 'name'}) -- with patch.object(mount, 'fstab', mock): -- with patch('salt.utils.fopen', mock_open()) as m_open: -- helper_open = m_open() -- helper_open.write.assertRaises(CommandExecutionError, -- mount.rm_automaster, -- 'name', 'device') - - def test_set_automaster(self): - ''' -diff --git a/tests/unit/modules/puppet_test.py b/tests/unit/modules/puppet_test.py -index 6a43fd4..3be039c 100644 ---- a/tests/unit/modules/puppet_test.py -+++ b/tests/unit/modules/puppet_test.py -@@ -91,10 +91,6 @@ class PuppetTestCase(TestCase): - with patch('salt.utils.fopen', mock_open()): - self.assertTrue(puppet.disable()) - -- with patch('salt.utils.fopen', mock_open()) as m_open: -- helper_open = m_open() -- helper_open.write.assertRaises(CommandExecutionError, -- puppet.disable) - - def test_status(self): - ''' -@@ -154,10 +150,6 @@ class PuppetTestCase(TestCase): - mock_open(read_data="resources: 1")): - self.assertDictEqual(puppet.summary(), {'resources': 1}) - -- with patch('salt.utils.fopen', mock_open()) as m_open: -- helper_open = m_open() -- helper_open.write.assertRaises(CommandExecutionError, -- puppet.summary) - - def test_plugin_sync(self): - ''' diff --git a/app-admin/salt/files/salt-2015.8.10-remove-failing-boto-test.patch b/app-admin/salt/files/salt-2015.8.10-remove-failing-boto-test.patch deleted file mode 100644 index 5a4d273d7848..000000000000 --- a/app-admin/salt/files/salt-2015.8.10-remove-failing-boto-test.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/tests/unit/modules/boto_secgroup_test.py b/tests/unit/modules/boto_secgroup_test.py -index f1c6bb1..07fd8ec 100644 ---- a/tests/unit/modules/boto_secgroup_test.py -+++ b/tests/unit/modules/boto_secgroup_test.py -@@ -192,30 +192,6 @@ class BotoSecgroupTestCase(TestCase): - **conn_parameters) - self.assertEqual(group_vpc.id, retrieved_group_id) - -- @mock_ec2 -- def test_get_config_single_rule_group_name(self): -- ''' -- tests return of 'config' when given group name. get_config returns an OrderedDict. -- ''' -- group_name = _random_group_name() -- ip_protocol = u'tcp' -- from_port = 22 -- to_port = 22 -- cidr_ip = u'0.0.0.0/0' -- rules_egress = [{'to_port': -1, 'from_port': -1, 'ip_protocol': u'-1', 'cidr_ip': u'0.0.0.0/0'}] -- -- conn = boto.ec2.connect_to_region(region, **boto_conn_parameters) -- group = conn.create_security_group(name=group_name, description=group_name) -- group.authorize(ip_protocol=ip_protocol, from_port=from_port, to_port=to_port, cidr_ip=cidr_ip) -- # setup the expected get_config result -- expected_get_config_result = OrderedDict([('name', group.name), ('group_id', group.id), ('owner_id', u'111122223333'), -- ('description', group.description), -- ('rules', [{'to_port': to_port, 'from_port': from_port, -- 'ip_protocol': ip_protocol, 'cidr_ip': cidr_ip}]), -- ('rules_egress', rules_egress)]) -- secgroup_get_config_result = boto_secgroup.get_config(group_id=group.id, **conn_parameters) -- self.assertEqual(expected_get_config_result, secgroup_get_config_result) -- - @skipIf(True, 'test skipped due to error in moto return - fixed in ' - 'https://github.com/spulec/moto/commit/cc0166964371f7b5247a49d45637a8f936ccbe6f') - @mock_ec2 diff --git a/app-admin/salt/files/salt-2015.8.13-failing-gateway-tests.patch b/app-admin/salt/files/salt-2015.8.13-failing-gateway-tests.patch deleted file mode 100644 index 7d8512b14ef4..000000000000 --- a/app-admin/salt/files/salt-2015.8.13-failing-gateway-tests.patch +++ /dev/null @@ -1,69 +0,0 @@ -diff --git a/tests/unit/states/boto_vpc_test.py b/tests/unit/states/boto_vpc_test.py -index 53b6a24e4d..96b5630627 100644 ---- a/tests/unit/states/boto_vpc_test.py -+++ b/tests/unit/states/boto_vpc_test.py -@@ -179,16 +179,6 @@ class BotoVpcResourceTestCaseMixin(BotoVpcTestCaseMixin): - self.assertTrue(exists) - - @mock_ec2 -- def test_present_when_resource_exists(self): -- vpc = self._create_vpc(name='test') -- resource = self._create_resource(vpc_id=vpc.id, name='test') -- with patch.dict('salt.utils.boto.__salt__', funcs): -- resource_present_result = salt_states['boto_vpc.{0}_present'.format(self.resource_type)]( -- name='test', vpc_name='test', **self.extra_kwargs) -- self.assertTrue(resource_present_result['result']) -- self.assertEqual(resource_present_result['changes'], {}) -- -- @mock_ec2 - @skipIf(True, 'Disabled pending https://github.com/spulec/moto/issues/493') - def test_present_with_failure(self): - vpc = self._create_vpc(name='test') -@@ -210,18 +200,6 @@ class BotoVpcResourceTestCaseMixin(BotoVpcTestCaseMixin): - self.assertEqual(resource_absent_result['changes'], {}) - - @mock_ec2 -- def test_absent_when_resource_exists(self): -- vpc = self._create_vpc(name='test') -- self._create_resource(vpc_id=vpc.id, name='test') -- -- with patch.dict('salt.utils.boto.__salt__', funcs): -- resource_absent_result = salt_states['boto_vpc.{0}_absent'.format(self.resource_type)]('test') -- self.assertTrue(resource_absent_result['result']) -- self.assertEqual(resource_absent_result['changes']['new'][self.resource_type], None) -- exists = funcs['boto_vpc.resource_exists'](self.resource_type, 'test').get('exists') -- self.assertFalse(exists) -- -- @mock_ec2 - @skipIf(True, 'Disabled pending https://github.com/spulec/moto/issues/493') - def test_absent_with_failure(self): - vpc = self._create_vpc(name='test') -@@ -293,28 +271,3 @@ class BotoVpcRouteTableTestCase(BotoVpcStateTestCaseBase, BotoVpcResourceTestCas - - new_subnets = changes['new']['subnets_associations'] - self.assertEqual(new_subnets[0]['subnet_id'], subnet2.id) -- -- @mock_ec2 -- def test_present_with_routes(self): -- vpc = self._create_vpc(name='test') -- igw = self._create_internet_gateway(name='test', vpc_id=vpc.id) -- -- route_table_present_result = salt_states['boto_vpc.route_table_present']( -- name='test', vpc_name='test', routes=[{'destination_cidr_block': '0.0.0.0/0', -- 'gateway_id': igw.id}, -- {'destination_cidr_block': '10.0.0.0/24', -- 'gateway_id': 'local'}]) -- routes = [x['gateway_id'] for x in route_table_present_result['changes']['new']['routes']] -- -- self.assertEqual(set(routes), set(['local', igw.id])) -- -- route_table_present_result = salt_states['boto_vpc.route_table_present']( -- name='test', vpc_name='test', routes=[{'destination_cidr_block': '10.0.0.0/24', -- 'gateway_id': 'local'}]) -- -- changes = route_table_present_result['changes'] -- -- old_routes = [x['gateway_id'] for x in changes['old']['routes']] -- self.assertEqual(set(routes), set(old_routes)) -- -- self.assertEqual(changes['new']['routes'][0]['gateway_id'], 'local') diff --git a/app-admin/salt/files/salt-2015.8.13-sanitize-minion-name.patch b/app-admin/salt/files/salt-2015.8.13-sanitize-minion-name.patch deleted file mode 100644 index df9e0f66d005..000000000000 --- a/app-admin/salt/files/salt-2015.8.13-sanitize-minion-name.patch +++ /dev/null @@ -1,36 +0,0 @@ -From aa87d67258a5b6742fc53d06c7bdac0f643bc9f1 Mon Sep 17 00:00:00 2001 -From: Ch3LL <megan.wilhite@gmail.com> -Date: Tue, 1 Aug 2017 13:44:32 -0400 -Subject: [PATCH] Add clean_id function to salt.utils.verify.py - ---- - salt/utils/verify.py | 11 ++++++++++- - 1 file changed, 10 insertions(+), 1 deletion(-) - -diff --git a/salt/utils/verify.py b/salt/utils/verify.py -index 5cac0fa651b..a3dc67db336 100644 ---- a/salt/utils/verify.py -+++ b/salt/utils/verify.py -@@ -484,12 +484,21 @@ def clean_path(root, path, subdir=False): - return '' - - -+def clean_id(id_): -+ ''' -+ Returns if the passed id is clean. -+ ''' -+ if re.search(r'\.\.{sep}'.format(sep=os.sep), id_): -+ return False -+ return True -+ -+ - def valid_id(opts, id_): - ''' - Returns if the passed id is valid - ''' - try: -- return bool(clean_path(opts['pki_dir'], id_)) -+ return bool(clean_path(opts['pki_dir'], id_)) and clean_id(id_) - except (AttributeError, KeyError) as e: - return False - diff --git a/app-admin/salt/files/salt-2015.8.2-tmpdir.patch b/app-admin/salt/files/salt-2015.8.2-tmpdir.patch deleted file mode 100644 index 871551e0e508..000000000000 --- a/app-admin/salt/files/salt-2015.8.2-tmpdir.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff --git a/tests/unit/modules/qemu_nbd_test.py b/tests/unit/modules/qemu_nbd_test.py -index 615e6b5..fbd24aa 100644 ---- a/tests/unit/modules/qemu_nbd_test.py -+++ b/tests/unit/modules/qemu_nbd_test.py -@@ -77,6 +77,7 @@ class QemuNbdTestCase(TestCase): - Test if it mount the named image via qemu-nbd - and return the mounted roots - ''' -+ tmpdir = os.environ.get('TMPDIR', '/tmp') - mock = MagicMock(return_value=True) - with patch.dict(qemu_nbd.__salt__, {'cmd.run': mock}): - self.assertEqual(qemu_nbd.init('/srv/image.qcow2'), '') -@@ -89,7 +90,7 @@ class QemuNbdTestCase(TestCase): - 'mount.mount': mock, - 'cmd.retcode': MagicMock(side_effect=[1, 0])}): - self.assertDictEqual(qemu_nbd.init('/srv/image.qcow2'), -- {'/tmp/nbd/nbd0/nbd0': '/dev/nbd0'}) -+ {os.path.join(tmpdir, 'nbd/nbd0/nbd0'): '/dev/nbd0'}) - - # 'clear' function tests: 1 - -diff --git a/tests/unit/states/archive_test.py b/tests/unit/states/archive_test.py -index 63e4a53..20b196f 100644 ---- a/tests/unit/states/archive_test.py -+++ b/tests/unit/states/archive_test.py -@@ -26,7 +26,7 @@ from salt.ext.six.moves import zip # pylint: disable=import-error,redefined-bui - - # Globals - archive.__salt__ = {} --archive.__opts__ = {"cachedir": "/tmp", "test": False} -+archive.__opts__ = {"cachedir": os.environ.get('TMPDIR', "/tmp"), "test": False} - archive.__env__ = 'test' - - -@@ -75,7 +75,7 @@ class ArchiveTestCase(TestCase): - 'cmd.run_all': mock_run}): - filename = os.path.join( - tmp_dir, -- 'files/test/_tmp_test_archive_.tar' -+ 'files/test/' + tempfile.gettempdir().replace('/', '_') + '_test_archive_.tar' - ) - for test_opts, ret_opts in zip(test_tar_opts, ret_tar_opts): - ret = archive.extracted(tmp_dir, -diff --git a/tests/unit/utils/context_test.py b/tests/unit/utils/context_test.py -index 71e4330..d6f3f30 100644 ---- a/tests/unit/utils/context_test.py -+++ b/tests/unit/utils/context_test.py -@@ -18,7 +18,7 @@ import salt.payload - import salt.utils - - __context__ = {'a': 'b'} --__opts__ = {'cachedir': '/tmp'} -+__opts__ = {'cachedir': os.environ.get('TMPDIR', '/tmp')} - - - @skipIf(NO_MOCK, NO_MOCK_REASON) diff --git a/app-admin/salt/files/salt-2016.3.4-dont-test-ordering.patch b/app-admin/salt/files/salt-2016.3.4-dont-test-ordering.patch deleted file mode 100644 index c27227571ad2..000000000000 --- a/app-admin/salt/files/salt-2016.3.4-dont-test-ordering.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/tests/unit/modules/inspect_collector_test.py b/tests/unit/modules/inspect_collector_test.py -index 9d2fa3ada7..710bbd75a5 100644 ---- a/tests/unit/modules/inspect_collector_test.py -+++ b/tests/unit/modules/inspect_collector_test.py -@@ -36,28 +36,6 @@ class InspectorCollectorTestCase(TestCase): - self.assertEqual(inspector.dbfile, '/foo/cache/_minion_collector.db') - self.assertEqual(inspector.pidfile, '/foo/pid/bar.pid') - -- def test_file_tree(self): -- ''' -- Test file tree. -- -- :return: -- ''' -- -- inspector = Inspector(cachedir='/test', piddir='/test', pidfilename='bar.pid') -- tree_root = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'inspectlib', 'tree_test') -- expected_tree = (['/a/a/dummy.a', '/a/b/dummy.b', '/b/b.1', '/b/b.2', '/b/b.3'], -- ['/a', '/a/a', '/a/b', '/a/c', '/b', '/c'], -- ['/a/a/dummy.ln.a', '/a/b/dummy.ln.b', '/a/c/b.1', '/b/b.4', -- '/b/b.5', '/c/b.1', '/c/b.2', '/c/b.3']) -- tree_result = [] -- for chunk in inspector._get_all_files(tree_root): -- buff = [] -- for pth in chunk: -- buff.append(pth.replace(tree_root, '')) -- tree_result.append(buff) -- tree_result = tuple(tree_result) -- self.assertEqual(expected_tree, tree_result) -- - def test_get_unmanaged_files(self): - ''' - Test get_unmanaged_files. diff --git a/app-admin/salt/files/salt-2016.3.5-tmpdir.patch b/app-admin/salt/files/salt-2016.3.5-tmpdir.patch deleted file mode 100644 index dce4f09f2a0f..000000000000 --- a/app-admin/salt/files/salt-2016.3.5-tmpdir.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff --git a/tests/unit/modules/qemu_nbd_test.py b/tests/unit/modules/qemu_nbd_test.py -index 615e6b5670..fbd24aab86 100644 ---- a/tests/unit/modules/qemu_nbd_test.py -+++ b/tests/unit/modules/qemu_nbd_test.py -@@ -77,6 +77,7 @@ class QemuNbdTestCase(TestCase): - Test if it mount the named image via qemu-nbd - and return the mounted roots - ''' -+ tmpdir = os.environ.get('TMPDIR', '/tmp') - mock = MagicMock(return_value=True) - with patch.dict(qemu_nbd.__salt__, {'cmd.run': mock}): - self.assertEqual(qemu_nbd.init('/srv/image.qcow2'), '') -@@ -89,7 +90,7 @@ class QemuNbdTestCase(TestCase): - 'mount.mount': mock, - 'cmd.retcode': MagicMock(side_effect=[1, 0])}): - self.assertDictEqual(qemu_nbd.init('/srv/image.qcow2'), -- {'/tmp/nbd/nbd0/nbd0': '/dev/nbd0'}) -+ {os.path.join(tmpdir, 'nbd/nbd0/nbd0'): '/dev/nbd0'}) - - # 'clear' function tests: 1 - -diff --git a/tests/unit/states/archive_test.py b/tests/unit/states/archive_test.py -index e699362d8a..c7c7e8a965 100644 ---- a/tests/unit/states/archive_test.py -+++ b/tests/unit/states/archive_test.py -@@ -25,7 +25,7 @@ from salt.ext.six.moves import zip # pylint: disable=import-error,redefined-bui - - # Globals - archive.__salt__ = {} --archive.__opts__ = {"cachedir": "/tmp", "test": False} -+archive.__opts__ = {"cachedir": os.environ.get('TMPDIR', "/tmp"), "test": False} - archive.__env__ = 'test' - - -diff --git a/tests/unit/utils/context_test.py b/tests/unit/utils/context_test.py -index 5249d56747..a27ee9ab61 100644 ---- a/tests/unit/utils/context_test.py -+++ b/tests/unit/utils/context_test.py -@@ -18,7 +18,7 @@ import salt.payload - import salt.utils - - __context__ = {'a': 'b'} --__opts__ = {'cachedir': '/tmp'} -+__opts__ = {'cachedir': os.environ.get('TMPDIR', '/tmp')} - - - @skipIf(NO_MOCK, NO_MOCK_REASON) diff --git a/app-admin/salt/salt-2016.11.8-r1.ebuild b/app-admin/salt/salt-2016.11.8-r1.ebuild deleted file mode 100644 index 9376c0488269..000000000000 --- a/app-admin/salt/salt-2016.11.8-r1.ebuild +++ /dev/null @@ -1,149 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) - -inherit eutils systemd distutils-r1 - -DESCRIPTION="Salt is a remote execution and configuration manager" -HOMEPAGE="https://saltstack.com/community/" - -if [[ ${PV} == 9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git" - EGIT_BRANCH="develop" - SRC_URI="" - KEYWORDS="" -else - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - KEYWORDS="~x86 ~amd64" -fi - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova" -IUSE+=" openssl portage profile redis selinux test timelib raet +zeromq vim-syntax" - -RDEPEND="sys-apps/pciutils - dev-python/jinja[${PYTHON_USEDEP}] - >=dev-python/msgpack-0.3[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/markupsafe[${PYTHON_USEDEP}] - >=dev-python/requests-1.0.0[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - >=www-servers/tornado-4.2.1[${PYTHON_USEDEP}] - virtual/python-futures[${PYTHON_USEDEP}] - libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] ) - mako? ( dev-python/mako[${PYTHON_USEDEP}] ) - ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) - libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] ) - openssl? ( - dev-libs/openssl:*[-bindist] - dev-python/pyopenssl[${PYTHON_USEDEP}] - ) - raet? ( - >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}] - >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}] - >=dev-python/raet-0.6.0[${PYTHON_USEDEP}] - ) - zeromq? ( - >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] - >=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}] - ) - cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] ) - mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) - portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) - keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) - mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] ) - redis? ( dev-python/redis-py[${PYTHON_USEDEP}] ) - selinux? ( sec-policy/selinux-salt ) - timelib? ( dev-python/timelib[${PYTHON_USEDEP}] ) - nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] ) - neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] ) - gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) - profile? ( dev-python/yappi[${PYTHON_USEDEP}] ) - vim-syntax? ( app-vim/salt-vim )" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - test? ( - dev-python/psutil[${PYTHON_USEDEP}] - dev-python/pip[${PYTHON_USEDEP}] - dev-python/virtualenv[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] - dev-python/timelib[${PYTHON_USEDEP}] - >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] - !x86? ( dev-python/boto3[${PYTHON_USEDEP}] ) - >=dev-python/moto-0.3.6[${PYTHON_USEDEP}] - >=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}] - >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] - ${RDEPEND} - )" - -DOCS=( README.rst AUTHORS ) - -REQUIRED_USE="|| ( raet zeromq )" -RESTRICT="x86? ( test )" - -PATCHES=( - "${FILESDIR}/${PN}-2016.11.0-tmpdir.patch" - "${FILESDIR}/${PN}-2016.3.1-dont-realpath-tmpdir.patch" - "${FILESDIR}/${PN}-2016.3.4-test-nonexist-dirs.patch" - "${FILESDIR}/${PN}-2016.11.0-remove-file-tree-test.patch" - "${FILESDIR}/${PN}-2016.11.0-broken-tests.patch" -) - -python_prepare() { - # this test fails because it trys to "pip install distribute" - rm tests/unit/{modules,states}/zcbuildout_test.py \ - tests/unit/modules/{rh_ip,win_network,random_org}_test.py || die - - # https://github.com/saltstack/salt/issues/39095 - rm tests/unit/utils/parsers_test.py - - # apparently libcloud does not know about this? - rm tests/unit/cloud/clouds/dimensiondata_test.py || die - - # seriously? "ValueError: Missing (or not readable) key file: '/home/dany/PRIVKEY.pem'" - rm tests/unit/cloud/clouds/gce_test.py || die - - # allow the use of the renamed msgpack - sed -i '/^msgpack/d' requirements/base.txt || die -} - -python_install_all() { - local svc - USE_SETUPTOOLS=1 distutils-r1_python_install_all - - for svc in minion master syndic api; do - newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc} - newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc} - systemd_dounit "${FILESDIR}"/salt-${svc}.service - done - - insinto /etc/${PN} - doins -r conf/* -} - -python_test() { - local tempdir - # testsuite likes lots of files - ulimit -n 3072 || die - - # ${T} is too long a path for the tests to work - tempdir="$(mktemp -dup /tmp salt-XXX)" - mkdir "${T}/$(basename "${tempdir}")" - - ( - cleanup() { rm -f "${tempdir}"; } - trap cleanup EXIT - - addwrite "${tempdir}" - ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" - - USE_SETUPTOOLS=1 SHELL="/bin/bash" \ - TMPDIR="${tempdir}" \ - ${EPYTHON} tests/runtests.py \ - --unit-tests --no-report --verbose - - ) || die "testing failed" -} diff --git a/app-admin/salt/salt-2017.7.4-r2.ebuild b/app-admin/salt/salt-2017.7.5.ebuild index 025aeabac2d4..90c568f5533f 100644 --- a/app-admin/salt/salt-2017.7.4-r2.ebuild +++ b/app-admin/salt/salt-2017.7.5.ebuild @@ -28,6 +28,7 @@ IUSE+=" openssl portage profile redis selinux test timelib raet +zeromq vim-synt RDEPEND="sys-apps/pciutils dev-python/jinja[${PYTHON_USEDEP}] >=dev-python/msgpack-0.3[${PYTHON_USEDEP}] + <dev-python/msgpack-0.5.5[${PYTHON_USEDEP}] dev-python/pyyaml[${PYTHON_USEDEP}] dev-python/markupsafe[${PYTHON_USEDEP}] >=dev-python/requests-1.0.0[${PYTHON_USEDEP}] @@ -50,7 +51,10 @@ RDEPEND="sys-apps/pciutils ) zeromq? ( >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] - >=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}] + || ( + dev-python/pycryptodome[${PYTHON_USEDEP}] + >=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}] + ) ) cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] ) mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) @@ -77,7 +81,7 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] dev-python/pytest[${PYTHON_USEDEP}] dev-python/pip[${PYTHON_USEDEP}] dev-python/virtualenv[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] + >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] dev-python/timelib[${PYTHON_USEDEP}] >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] !x86? ( >=dev-python/boto3-1.2.1[${PYTHON_USEDEP}] ) diff --git a/app-admin/salt/salt-2017.7.2-r2.ebuild b/app-admin/salt/salt-2018.3.0.ebuild index 19e8be7ea3d4..a9d68684042c 100644 --- a/app-admin/salt/salt-2017.7.2-r2.ebuild +++ b/app-admin/salt/salt-2018.3.0.ebuild @@ -27,12 +27,15 @@ IUSE+=" openssl portage profile redis selinux test timelib raet +zeromq vim-synt RDEPEND="sys-apps/pciutils dev-python/jinja[${PYTHON_USEDEP}] + dev-python/libnacl[${PYTHON_USEDEP}] >=dev-python/msgpack-0.3[${PYTHON_USEDEP}] + <dev-python/msgpack-0.5.5[${PYTHON_USEDEP}] dev-python/pyyaml[${PYTHON_USEDEP}] dev-python/markupsafe[${PYTHON_USEDEP}] >=dev-python/requests-1.0.0[${PYTHON_USEDEP}] dev-python/setuptools[${PYTHON_USEDEP}] >=www-servers/tornado-4.2.1[${PYTHON_USEDEP}] + <www-servers/tornado-5.0[${PYTHON_USEDEP}] virtual/python-futures[${PYTHON_USEDEP}] libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] ) mako? ( dev-python/mako[${PYTHON_USEDEP}] ) @@ -49,11 +52,19 @@ RDEPEND="sys-apps/pciutils ) zeromq? ( >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] - >=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}] + || ( + dev-python/pycryptodome[${PYTHON_USEDEP}] + >=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}] + ) ) cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] ) mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) - portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) + portage? ( + || ( + sys-apps/portage[${PYTHON_USEDEP}] + sys-apps/portage-mgorny[${PYTHON_USEDEP}] + ) + ) keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] ) redis? ( dev-python/redis-py[${PYTHON_USEDEP}] ) @@ -69,9 +80,10 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] dev-python/pytest-salt[${PYTHON_USEDEP}] dev-python/psutil[${PYTHON_USEDEP}] dev-python/pytest[${PYTHON_USEDEP}] + dev-python/pytest-catchlog[${PYTHON_USEDEP}] dev-python/pip[${PYTHON_USEDEP}] dev-python/virtualenv[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] + >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] dev-python/timelib[${PYTHON_USEDEP}] >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] !x86? ( >=dev-python/boto3-1.2.1[${PYTHON_USEDEP}] ) @@ -87,14 +99,17 @@ REQUIRED_USE="|| ( raet zeromq )" RESTRICT="x86? ( test )" PATCHES=( - "${FILESDIR}/salt-2017.7.0-dont-realpath-tmpdir.patch" - "${FILESDIR}/salt-2017.7.2-fix_disk_format.patch" + "${FILESDIR}/${PN}-2017.7.0-dont-realpath-tmpdir.patch" + "${FILESDIR}/${PN}-2017.7.3-tests.patch" ) python_prepare() { + # remove tests with external dependencies that may not be available rm tests/unit/{test_zypp_plugins.py,utils/test_extend.py} || die rm tests/unit/modules/test_boto_{vpc,secgroup,elb}.py || die rm tests/unit/states/test_boto_vpc.py || die + rm tests/unit/modules/test_{kubernetes,vsphere}.py || die + # allow the use of the renamed msgpack sed -i '/^msgpack/d' requirements/base.txt || die } diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest index e8f99d56d73b..b7f948522578 100644 --- a/app-admin/syslog-ng/Manifest +++ b/app-admin/syslog-ng/Manifest @@ -15,6 +15,7 @@ AUX 3.7/syslog-ng.confd 1492 BLAKE2B 8df9e16ec0fd8de141d1624f7451fefe19c49b2ba91 AUX 3.7/syslog-ng.rc6 1919 BLAKE2B 5769cd9f4464dbdde9a8af7b700292f59772132b3f32cf542b4cb4f596541c7f244c906d236650f09921c131e84722813578493b36e8d8281df401a1d127d3c9 SHA512 2681f6b1c4acd9fbb9e29b4b732c09b8384ffdb501aed15bbaac97409cc79269f2e5068dac5746bfcc52751c5943279c3cce5d3f869b4c6ec2cc5f23d2ad3b04 AUX README.hardened 358 BLAKE2B a816cf461b4c3553e979c309ced21537841e24ad805b67f43d5bf06fb77b86959a75c7680df87e7ded7fd72073ad469a06bdec1e739784c82776d04a91bd3add SHA512 75b4af1543436506e28d9b0e2625985ab864d1452604b1514ec030df822c36d90ae062508381610cc1f750082a52545f8678102dc475abff15f0f3c9a838128e AUX patches/syslog-ng-3.12.1-json-c-0.13+.patch 862 BLAKE2B aeab5c994f0c9e5c3909300f5f8b56ed22194746f95b6cc2f6e600dbe04c9f4016b3f1d085c222f0d7d6922765f71c56d1bd3ac1757b1ca07d11c9d15a6fc1b4 SHA512 ded991eeee706e4d51f48e803db75d39e907f83aaf9cb9994eef146ba8d7cc784e5d3890eb18acdb4ff2702dcf8291686c6975ba3b0c4f0d3817a301ae81a641 +AUX patches/syslog-ng-3.14.1-fix-automake-1.16-build.patch 929 BLAKE2B d3d0b94c30364e9663b2c7d672f24c03643a0fe0e5954df3a4b90f7108321858e529b22fc596ea85caf34ff5fd78b01cd6e4f2233fe282816e844b6194040948 SHA512 744c4b16df09ae14a09211d7e7a19e02723be2464a81d16586273e88973e7dbe0e2803326b7171a043889f127a8bb976fc0266d826e5632bd498f736e4d5acca AUX patches/syslog-ng-3.14.1-fix-tls-client.patch 6248 BLAKE2B 8671b724886a62bbd9e61987a6e7e95ed5773278b6fd8cb1c2ba3285ba4c6589190484386da9d8865326f3588937b825a738462e7a935363d103942982c68dd4 SHA512 1999cc1107d8b22a58f5919a8bc0f8930d0c60170bb9f23a20e25f49f84f8d10ceecd6903de9cd7cc738dbc8cdec690880be400f5dafc3b06ae88681d4848694 AUX syslog-ng.logrotate 231 BLAKE2B ede8c2e3bd6fa67b2740bca74fa45e799a88dcb9aac456df4fbad5db919f0ac8671b7e073efa1d7fdf1f2c119521d6fe8d5e6d4209b0fb09062e8499bd3377be SHA512 f8dfdbc4ea59c4cbb500b9ac0d4f8c7e33d0510049c7945ee1ae50039dc011b1ca2835c18ee145bf3d9ca306aca0d0de879735c3298b8a0f944db6ba4747ab1b AUX syslog-ng.logrotate.hardened 1614 BLAKE2B c9845bb43bd09a210f06912131dd2ba88164f0dc58f9d81455c13bba0ee923d1b9a6025f6b8e5fd066254bf6d0c81588b8d515aa055da157c29aaa0aa63fd700 SHA512 141b0ce95ca8ea6a9faf1f94ae1feffceffae19dbd4337c55d7dd4e554d41b7b8846680fab77f361ff4bf6093e3fe239fd3cec32dbb56ddc7b5e0f40bc054760 @@ -24,6 +25,6 @@ DIST syslog-ng-3.13.2.tar.gz 9047998 BLAKE2B a18b11a31e1bf4c981071e7509ff154f080 DIST syslog-ng-3.14.1.tar.gz 9039910 BLAKE2B 688eb52557c41a2556835978809b74ef4cc6b78e54580c4f349a8b9ebc07a6cf5ab99d8cda2a0212cb0186fe9e0a276d46ab9846c5ed1c391d734596ccc2d0a9 SHA512 86e5b59f76de3f585781accc9e426b2f74a73a560a6b49364e3f2b71b6fdd382b8473b468ac396e09c1dd0e00aa525a25874af67ce6c81978df2995c9b920aa7 DIST syslog-ng-3.7.3.tar.gz 3511155 BLAKE2B 25ba2ca241a5847c75792c78d39a4667f55cf1fcff46be5102256ee6a9d2f39e2042ac00fa0b1559f94e0df80a0853249692b443b565dd4f46f0354c453cacaf SHA512 e58d793bd1a8b48c5836090ee244f6e8b223f234f5a27fbf81f6a838b9b1e3e45f73a66dab2bc58a0bba230bd778a247ae22bf529a28fb2e9fee52b8181d304b EBUILD syslog-ng-3.13.2.ebuild 4685 BLAKE2B f497b4bea1bfbcdab65fb1dca5e4c2577663b130c4e99075c3b6920e4f2007d9cf899db0f75019cfcca186cf43aad90b07f766de67dbdd4152e8ebfac156467c SHA512 19d1786805b88a121078b9a8ce356320d50539be067ee5ef901ef773719763db8a3918051faf13eb814ed81cae9b066b0857572927ea660986ea06d56a04cefc -EBUILD syslog-ng-3.14.1.ebuild 4717 BLAKE2B 44b38eb5dc36710bd83235fb0184729beed95a5678eb9c19b2bad055ce8d87df425ac850077f2e65346c9dcdfaa320e2b8fdad9b8001dfe1391d8a7c706a5978 SHA512 dabf2993c03b9f11420a77b03f3c986436e4f42d73cd64ba99ac4d12897de63c0fec28979c9d60c2df05868fff0df764a67c3b6fac5786cdacbd47c6587bf1a0 +EBUILD syslog-ng-3.14.1.ebuild 4783 BLAKE2B 1239742c75804885aff783ed7ef9948e3337f268863726e458f2740b4c59204def5512301b565f7467afb59038269ea1b2684aee4eaf56e079ac448bf53bd44a SHA512 792ed2978916574e495e150edddc526cd88da38dc3ee62a10777d4703f14adeb7902318f08dec030a342096dccfd9e36cbef92aed3c793c32a8cadcc737e3470 EBUILD syslog-ng-3.7.3.ebuild 3974 BLAKE2B caa4bbf5823b17ebd2a7409294508712c16927ae7211b364b0462edfbd954d97c83b223a84a0370b54daa819d6490c92c0d88d657948cd3ec6d11f0da011a59d SHA512 1d8cd3d4e81963d0edbfde50d8c137d70fc8cce664cb1696504111d50a355659d87e3ad5d85040b4b89c026a57931ad2184adffb3b7642319cc3f317fc63a158 MISC metadata.xml 1080 BLAKE2B 913203dd1c18414dfb03794e9053151638c56bbb306b9da3c731c64e392a126a30adc38f8516b99c3c5cec024675e9779a10bdd5178f8e87f8bee2ad0b08044b SHA512 4d776d710534634a84d1415f93e3412a580319bf2580451fb27581ca498d2ca81747d3247aaaadde10319b82cefd36e9d29899778ce918838a583aec17130f00 diff --git a/app-admin/syslog-ng/files/patches/syslog-ng-3.14.1-fix-automake-1.16-build.patch b/app-admin/syslog-ng/files/patches/syslog-ng-3.14.1-fix-automake-1.16-build.patch new file mode 100644 index 000000000000..4339612f58c8 --- /dev/null +++ b/app-admin/syslog-ng/files/patches/syslog-ng-3.14.1-fix-automake-1.16-build.patch @@ -0,0 +1,23 @@ +From 41dd64e7b11d527f8f3cc6ae13067d0225191538 Mon Sep 17 00:00:00 2001 +From: kokan <peter.kokai@balabit.com> +Date: Sat, 31 Mar 2018 15:36:08 +0200 +Subject: [PATCH] libsyslog-ng: missing dependency libsecret-storage + +Signed-off-by: kokan <peter.kokai@balabit.com> +--- + lib/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/Makefile.am b/lib/Makefile.am +index af2f44ece2..4a0b11c92f 100644 +--- a/lib/Makefile.am ++++ b/lib/Makefile.am +@@ -47,7 +47,7 @@ lib_libsyslog_ng_la_LDFLAGS = -no-undefined -release ${LSNG_RELEASE} \ + + lib_test_subdirs = lib_filter lib_logproto lib_parser lib_rewrite lib_template lib_stats lib_control + +-lib_libsyslog_ng_la_DEPENDENCIES = lib/eventlog/src/libevtlog.la ++lib_libsyslog_ng_la_DEPENDENCIES = lib/eventlog/src/libevtlog.la lib/secret-storage/libsecret-storage.la + + if IVYKIS_INTERNAL + lib_libsyslog_ng_la_DEPENDENCIES += lib/ivykis/src/libivykis.la diff --git a/app-admin/syslog-ng/syslog-ng-3.14.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.14.1.ebuild index 72d1d861d3a5..cde6394672d0 100644 --- a/app-admin/syslog-ng/syslog-ng-3.14.1.ebuild +++ b/app-admin/syslog-ng/syslog-ng-3.14.1.ebuild @@ -45,6 +45,7 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}/patches/${PN}-3.14.1-fix-tls-client.patch" + "${FILESDIR}/patches/${PN}-3.14.1-fix-automake-1.16-build.patch" ) DOCS=( AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf.{HP-UX,RedHat,SunOS,doc} diff --git a/app-admin/systemrescuecd-x86/Manifest b/app-admin/systemrescuecd-x86/Manifest index 1a2bb92874d4..0048149cf723 100644 --- a/app-admin/systemrescuecd-x86/Manifest +++ b/app-admin/systemrescuecd-x86/Manifest @@ -31,6 +31,7 @@ DIST systemrescuecd-x86-5.1.1.iso 517359616 BLAKE2B f139a521076f0345a65bddfd999f DIST systemrescuecd-x86-5.1.2.iso 523479040 BLAKE2B abf6f1e3e05e382b48dcfd4ecde9f70896462418cf36057e3a42dc2366e0b56133deeb6f00363d15d94238c22fb8ac5c88b57ca6c213c9dcc299fa04def5e2cd SHA512 516e60632459dd5408f83035aa265ed4169b13f978a23960a85837c9c8b5bbab70776e22a6e6727184bd9df81cbbeff4a5819d5927ff0ff3a79036bc4c54cfdc DIST systemrescuecd-x86-5.2.0.iso 569669632 BLAKE2B fe31a68df650b46bd875b91c643c8f1daaa60042ea6c59ac452bb99a2792dcdcee62f1b60c329a70c95689af22c1a0fc52a966631af347258d665f55d2f6d8c0 SHA512 42da80a419aa27bea891339dc163a62bff8ba34d74c202a7fd0317592e8870a71ddc7fa9e9ded5e9d2f75dc36ec8417673074ffde60ea472815405456e34876c DIST systemrescuecd-x86-5.2.1.iso 570523648 BLAKE2B 9bb6b2ff7b9930f658baddbf60ef89e86171febcfb48eb0a6ce1bfea8fd3348773a9da948370f9f310dd0e992c40aa64a4ef1442f5cd7f408f847d147074cf1f SHA512 6820f079c9e97ac0d383ed9096a120e7e31771e1d41465f4cf7f5db36a7cb83ccfaae5c5e561181c3b3cb169d4cc4a9a6904a707ecde06a6de4f2456d2a658e4 +DIST systemrescuecd-x86-5.2.2.iso 572006400 BLAKE2B 2cc95acc529ae8e0525664ffbdfefaf6e4513e8135fa6af120121b0b7930b0203bd17d5d70ccafacfe0064bb8615f45aa22b6e6e3fcee8a005a0315fd9b5cf62 SHA512 7dd1ccd63775e35f6589808416468c4a9314f4a7a5d0cb1f2bc34ffb9eef3a450b0da244dfc9e325d828c39404c0cdcce27cc990eade33762c17a1e32f8db9b5 EBUILD systemrescuecd-x86-4.4.1.ebuild 1590 BLAKE2B 70a1114c8833e2df3fe54905b8dfd91abedc3873c59cc585617330e89295de77652af349c5d1ce113ee60c0b0d3249b6415c5c70fe8bf65ff790db85241b440c SHA512 0e2debd506ab3d084bc463f84b8db6a0cd6c8e3d9d162b27b30eb3f4a04513702fa4d343fc3eeb248f69e7ef1539854c6e8c0d88c81d75663b86c8e824180860 EBUILD systemrescuecd-x86-4.5.0.ebuild 1590 BLAKE2B 70a1114c8833e2df3fe54905b8dfd91abedc3873c59cc585617330e89295de77652af349c5d1ce113ee60c0b0d3249b6415c5c70fe8bf65ff790db85241b440c SHA512 0e2debd506ab3d084bc463f84b8db6a0cd6c8e3d9d162b27b30eb3f4a04513702fa4d343fc3eeb248f69e7ef1539854c6e8c0d88c81d75663b86c8e824180860 EBUILD systemrescuecd-x86-4.5.1.ebuild 1590 BLAKE2B 70a1114c8833e2df3fe54905b8dfd91abedc3873c59cc585617330e89295de77652af349c5d1ce113ee60c0b0d3249b6415c5c70fe8bf65ff790db85241b440c SHA512 0e2debd506ab3d084bc463f84b8db6a0cd6c8e3d9d162b27b30eb3f4a04513702fa4d343fc3eeb248f69e7ef1539854c6e8c0d88c81d75663b86c8e824180860 @@ -64,4 +65,5 @@ EBUILD systemrescuecd-x86-5.1.1.ebuild 1590 BLAKE2B 8addcff756be5ff7bc9359ed5f0e EBUILD systemrescuecd-x86-5.1.2.ebuild 1588 BLAKE2B 88c93971c0fd71928de91c7d2d37079ef46537e92abdf7f8aeba30b272325ab3cd889a64f16aef63226bc59dd690ec9b545c0c78cba361a1c156a45560aaab5d SHA512 0a36c0954f88b29305844d133ee8d3171a8be0bbc66e22595daca50568a9ba50d715829d0deec34babeba5791819d89a767c1a197c7efd64b776b3c2f5f1fa5d EBUILD systemrescuecd-x86-5.2.0.ebuild 1590 BLAKE2B 5d509c43812e1012ecd4ae154caf450b27713e03a0005926aff8995d098bf49ce487c4f090b5032b5e2bf25fe03174199e7af1ad4608de955e8aadc464b86ed4 SHA512 087629ec3bee8ab3326df039262db4a07ebf9bbb98ebc9cfa00056f4fdc08f069c49a8cfecc5b2e6bb0c355037b1d34a754294339a8df9a3f0db9619117761f6 EBUILD systemrescuecd-x86-5.2.1.ebuild 1588 BLAKE2B 88c93971c0fd71928de91c7d2d37079ef46537e92abdf7f8aeba30b272325ab3cd889a64f16aef63226bc59dd690ec9b545c0c78cba361a1c156a45560aaab5d SHA512 0a36c0954f88b29305844d133ee8d3171a8be0bbc66e22595daca50568a9ba50d715829d0deec34babeba5791819d89a767c1a197c7efd64b776b3c2f5f1fa5d +EBUILD systemrescuecd-x86-5.2.2.ebuild 1590 BLAKE2B 5d509c43812e1012ecd4ae154caf450b27713e03a0005926aff8995d098bf49ce487c4f090b5032b5e2bf25fe03174199e7af1ad4608de955e8aadc464b86ed4 SHA512 087629ec3bee8ab3326df039262db4a07ebf9bbb98ebc9cfa00056f4fdc08f069c49a8cfecc5b2e6bb0c355037b1d34a754294339a8df9a3f0db9619117761f6 MISC metadata.xml 585 BLAKE2B e0ce16c78e84339e1171bbf2e0aee7e27c3c32d4f795b1d176d872596330c531e6f960acd52526707464da2ad8d058035c42f3b9ff440bce139ce4b5703933d6 SHA512 51a7820398c4c637017c4a38bc0cd7b8b157e5dca57af0495a05c3df0bf09662287954bc04b24995585e8ecf3ff510177561db4dae3fadc64490d184319c18b6 diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.2.2.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.2.2.ebuild new file mode 100644 index 000000000000..7bfc35a7dd27 --- /dev/null +++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.2.2.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant" +HOMEPAGE="http://www.sysresccd.org/" +# Large ISO mirroring explicitly approved by infra in bug #588766 +SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso" + +LICENSE="GPL-2" +SLOT="${PV}" +KEYWORDS="~amd64 ~x86" +IUSE="+isohybrid" + +DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )" + +S=${WORKDIR} + +src_install() { + insinto "/usr/share/${PN%-*}" + doins "${DISTDIR}/${P}.iso" + + if use isohybrid; then + set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso" + echo "${@}" + "${@}" || die "${*} failed" + fi +} + +pkg_postinst() { + local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso + + # no version newer than ours? we're the newest! + if ! has_version ">${CATEGORY}/${PF}"; then + ln -f -s -v "${P}.iso" "${f}" || die + fi +} + +pkg_postrm() { + local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso + + # if there is no version newer than ours installed + if ! has_version ">${CATEGORY}/${PF}"; then + # and we are truly and completely uninstalled... + if [[ ! ${REPLACED_BY_VERSION} ]]; then + # then find an older version to set the symlink to + local newest_version=$(best_version "<${CATEGORY}/${PF}") + + if [[ ${newest_version} ]]; then + # update the symlink + ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die + else + # last version removed? clean up the symlink + rm -v "${f}" || die + # and the parent directory + rmdir "${f%/*}" || die + fi + fi + fi +} diff --git a/app-admin/webalizer/Manifest b/app-admin/webalizer/Manifest index 478a75127fb9..0d3ef0600844 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 4224 BLAKE2B 19a96d20869d1db268dabe85ab7b9a7048f21ec069ca1f503630deeffd274586cf2144b3e027f1f49081a9f0231550d02bf0dc85607ec7ad5a904f8efbe57040 SHA512 c69ce61d87fe6733bfb6b081edebadcd90465b12da6b506687887d82ac11aaf36cc17db05b9ed1e4b0766f34dbc231f5ff8c1e97da302955ad3ecbbc8c8ac3b4 +EBUILD webalizer-2.23.08.ebuild 4223 BLAKE2B f5d63d82b6ed773db575df4753eb5a09c7a81ff062d8091d853a7d40b6301fd873d814ead75ccbaaf323bb4729488a900de9f20337551236f74c6748bc95285e SHA512 984725647e329236b7867edcb2b72dfd66e34b055d85a209c1b465f78195076d4e387ad47b9529b9150f5d877adb62b78371b4d7ae010a88307d740278cc7c98 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 2f0d935eab3d..e7680d49d8e4 100644 --- a/app-admin/webalizer/webalizer-2.23.08.ebuild +++ b/app-admin/webalizer/webalizer-2.23.08.ebuild @@ -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" |