From 7932d472a02d4c016ff7dff4b7a5479ab9d1883d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 17 Jun 2021 17:57:35 +0100 Subject: gentoo resync : 17.06.2021 --- app-admin/Manifest.gz | Bin 32690 -> 32698 bytes app-admin/ansible-base/Manifest | 4 +- app-admin/ansible-base/ansible-base-2.11.1.ebuild | 3 +- app-admin/ansible-base/ansible-base-9999.ebuild | 3 +- app-admin/awscli/Manifest | 4 + app-admin/awscli/awscli-1.19.95.ebuild | 58 + app-admin/awscli/awscli-1.19.96.ebuild | 58 + app-admin/filebeat/Manifest | 110 ++ app-admin/filebeat/filebeat-7.13.2.ebuild | 1173 +++++++++++++++++++++ app-admin/logstash-bin/Manifest | 6 + app-admin/logstash-bin/logstash-bin-6.8.16.ebuild | 73 ++ app-admin/logstash-bin/logstash-bin-7.13.2.ebuild | 88 ++ app-admin/rsyslog/Manifest | 3 + app-admin/rsyslog/rsyslog-8.2106.0.ebuild | 483 +++++++++ app-admin/syslog-ng/Manifest | 4 +- app-admin/syslog-ng/syslog-ng-3.30.1-r1.ebuild | 2 +- app-admin/syslog-ng/syslog-ng-3.32.1.ebuild | 173 +++ 17 files changed, 2239 insertions(+), 6 deletions(-) create mode 100644 app-admin/awscli/awscli-1.19.95.ebuild create mode 100644 app-admin/awscli/awscli-1.19.96.ebuild create mode 100644 app-admin/filebeat/filebeat-7.13.2.ebuild create mode 100644 app-admin/logstash-bin/logstash-bin-6.8.16.ebuild create mode 100644 app-admin/logstash-bin/logstash-bin-7.13.2.ebuild create mode 100644 app-admin/rsyslog/rsyslog-8.2106.0.ebuild create mode 100644 app-admin/syslog-ng/syslog-ng-3.32.1.ebuild (limited to 'app-admin') diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz index 75ac7515d664..c3ad9e337db9 100644 Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ diff --git a/app-admin/ansible-base/Manifest b/app-admin/ansible-base/Manifest index ef501213e66c..1610672fff56 100644 --- a/app-admin/ansible-base/Manifest +++ b/app-admin/ansible-base/Manifest @@ -3,6 +3,6 @@ DIST ansible-base-2.10.9.tar.gz 6039597 BLAKE2B de455cc402ae4c5c4acd6b1c3d3f2e16 DIST ansible-core-2.11.1.tar.gz 6148111 BLAKE2B 46b1553542adbebfb0b0756be99a81d20cce2978a59766c65632b40413a851ad3c9de12df67959c0557584c5209ecd4f3c94381ae0a1e6987bd3cfb237de5a85 SHA512 1362754dde0a88ca8f6323d87cc6f4bf5f93b189b8d45fcb435d3fb289c359da128e7688a92107ade2c54828d4c4deb3ded9e01e18d19c503306924aa189a381 EBUILD ansible-base-2.10.10.ebuild 1674 BLAKE2B 00a56fbe3fabbadfec92bc38e7a7af99468f2d55ac66362fb39958a343b3a1f863f722665ca2d48ba97b8e8a4735a405af010ca65ef35232dcd5bc6574acead5 SHA512 188194e7c129d2f8b4c071107cc20557d0f8f6b689eb74099d5e76b12a82ba8d572a612a3feb1fdc4c35cf9a8c9243337abab185107bd8f3c560e36dbf713ffc EBUILD ansible-base-2.10.9.ebuild 1671 BLAKE2B 15a11fb545630d1556f315b4d658919c4246c73fccd5bf0c43523ee237b014a5ddd0481367844c123fe2d16d160d12d8f9e77629d35334672e861424ce087f26 SHA512 a620337d5a5cf5deadc308d99dc52cb508cb5746a9be8d23f2f3c14a571e0e8ccfa537ada1503e29e5b63b4b60c2cbb17784dd9bf5a330e4ea1407dc129a1586 -EBUILD ansible-base-2.11.1.ebuild 1591 BLAKE2B 65152605faa707e8c5e3da6e6e044172351a4a9034cc4535073d67d5afd8b8aea86cd9369502b6ee2f786673bc3776f8f2021a7ffc662b00dfbfe2e2cc30a3c7 SHA512 469406aa1aad73e0abdf2e7d56587047d561746581bcc0722d5eb894c9514de818ff0e9c9e43b1bfda3628e294cc84550dda19052cc36e2f943424723497df3b -EBUILD ansible-base-9999.ebuild 1591 BLAKE2B 65152605faa707e8c5e3da6e6e044172351a4a9034cc4535073d67d5afd8b8aea86cd9369502b6ee2f786673bc3776f8f2021a7ffc662b00dfbfe2e2cc30a3c7 SHA512 469406aa1aad73e0abdf2e7d56587047d561746581bcc0722d5eb894c9514de818ff0e9c9e43b1bfda3628e294cc84550dda19052cc36e2f943424723497df3b +EBUILD ansible-base-2.11.1.ebuild 1647 BLAKE2B 320f16170478e1119a66a154f67e1693f86fb0860c22e04bc56a21153acb3606841a174fd8dfa283533788d8d33eb8c775e0b372c410a276cf03a58669cc47ab SHA512 4de0f4bb88189e0ec7a6de6b4c9b6d9b175a3e043f5a7b716f2ca5a32206f76fe6581f6ac12a4d8b4ff8c1cc31e47a3f3ec630178d9988bf870303420feb9fde +EBUILD ansible-base-9999.ebuild 1647 BLAKE2B 320f16170478e1119a66a154f67e1693f86fb0860c22e04bc56a21153acb3606841a174fd8dfa283533788d8d33eb8c775e0b372c410a276cf03a58669cc47ab SHA512 4de0f4bb88189e0ec7a6de6b4c9b6d9b175a3e043f5a7b716f2ca5a32206f76fe6581f6ac12a4d8b4ff8c1cc31e47a3f3ec630178d9988bf870303420feb9fde MISC metadata.xml 1039 BLAKE2B f5dae1c1a1b61e63b24a07d2de97caa4e50b7ef0d5d19b094e917d31e24fe7eb187505fd2841cd6e5a3ad20461a0f645b30732d7ac909503f35cdfb1f2bd3316 SHA512 6431f60bcde845ad153894cb4149418918a2250f7011ca73794635334ca12a1e550c40d002eaf45ae725d0ff510b8fb3b0815e94df69b744f027ffa797534a32 diff --git a/app-admin/ansible-base/ansible-base-2.11.1.ebuild b/app-admin/ansible-base/ansible-base-2.11.1.ebuild index 466c8bf7fc59..57eb3a160f1d 100644 --- a/app-admin/ansible-base/ansible-base-2.11.1.ebuild +++ b/app-admin/ansible-base/ansible-base-2.11.1.ebuild @@ -37,7 +37,8 @@ RDEPEND=" dev-python/six[${PYTHON_USEDEP}] dev-python/netaddr[${PYTHON_USEDEP}] dev-python/pexpect[${PYTHON_USEDEP}] - dev-python/resolvelib[${PYTHON_USEDEP}] + >=dev-python/resolvelib-0.5.3[${PYTHON_USEDEP}] + /dev/null; then + die "certtool not found! Is net-libs/gnutls[tools] is installed?" + 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" || die + 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}.$$" || die + 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" || die + 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" || die + 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}.$$" || die + 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 " https://www.rsyslog.com/doc/rsyslog_tls.html" +} diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest index 2333e8565643..7d65c439676c 100644 --- a/app-admin/syslog-ng/Manifest +++ b/app-admin/syslog-ng/Manifest @@ -9,7 +9,9 @@ AUX syslog-ng.logrotate.in 237 BLAKE2B dd2851749f3f56b2099442610fcd85cbfd50a52a8 AUX syslog-ng.rc 1891 BLAKE2B ff17e5b3a999813e869d3142ae6800b80a1569e7344f8b65a007d8f4978e1bbd4ce1f1e8f9daefb60c586aa58756d7d98ca59a869ae8e3f4addac732b6086ba5 SHA512 9e21637b684a48093d00ad9b5d4dbb79178ea8cc280cb03dbce235193e916bf3bd10b091a901cf13842f1c080b707a36efe8833bbde9d2721245598a3fe038df DIST syslog-ng-3.30.1.tar.gz 5707042 BLAKE2B 3e6ee58b3732ae4863de43c7d22799a74074e94dbbf735368c09c11382b641a5554a4a25ad836b4ac25c8a4f64781dbfb1d9ddd6961ba3aa70c4213cfec81bfd SHA512 ac7ed4978c6db9464add30aa7aeb71a646f841593b02884c8d4ad34c0508c8d3243bcbe6ee98e81c04698895305334eadd9e624ba71e510c14d79155723efb52 DIST syslog-ng-3.31.2.tar.gz 5727835 BLAKE2B a71190fe1580702a4d904c8a4d31a123d2aa0d01bb5a6e21f32f8502ec99f6109b45537c1a5022b0baeae89456b4b919bb8c88077d00aa9724398b7588254d89 SHA512 22a647c37f87fb1a45c8c69c2b0a022d1886cde5b0d585c3384b606d967c3f320a18e34810655174e82c797c0dc23c481732ecefd5be16da8fba4983b2ed0385 -EBUILD syslog-ng-3.30.1-r1.ebuild 4915 BLAKE2B 486d6ab3bfc3710a8e06e4301e0ec00771ba451613a205f3c914f5905079ed833d8a59f17df9698f72a8964ca2cc9fae25501b8a6f5339b030cf95c6b3f98bfd SHA512 164db058356bc4fc5c68783ed9f97ba85166ef306f63c186c53c7538100254f2e4cd47fdc5e037a91308e3e4880d8f2d6d4e50ed6193b0e7f37c52076af44eff +DIST syslog-ng-3.32.1.tar.gz 5782744 BLAKE2B 43600ac7bf3bcd090353aa5a3d3b3c7701b8794328a111a0ef306dffbf5462880ef3e86f4f8b63580402848b7a4e333112ae1c5514c5e8d41103db4a0d4de159 SHA512 c5a72e4815c2791cb609cbb93993cbb2c52f3ac869e062984b6a359f11232f523c5db3555857f0fef0071764a677f1efdb2aa1f24b4abe7cea13590973d09280 +EBUILD syslog-ng-3.30.1-r1.ebuild 4914 BLAKE2B a3d036b879ab3e3a8c6354318da4e7f6c16121e58f3de6f34c074c5540d11f2123a2833f16530c215ce9ef625d5857b71d19f223bf95831e24ac6887ebd27210 SHA512 777e922d766b42e848ba1459a63869f68cfbbd7b874da8b6cfec86d00d8bb3fab25e944bbeb8cc7c8442817bf6e672cdd3d944b60eab5aa5008c9b19a9a63d89 EBUILD syslog-ng-3.30.1.ebuild 4837 BLAKE2B d58b8f79ac4f99867cc6b1bd4774a95f4dc1c9d91c68b87bec0719dc55d9741e2475f7deca471f908627c5bc914ad30c006c31d3e8ff87ecaf43bd1a66ce536a SHA512 eff8014d2f648e799ee0b090cd24d82ad610b022d1eb023de5d4f19b0f8138ee7b2993a2d067486ab7a532fed474288da1c413562ced38c32f3981886813cad2 EBUILD syslog-ng-3.31.2.ebuild 4933 BLAKE2B d1493e6465cf83b3f08da8b57e8c8622d31ea7f56f550e789f9575287654e511a80a37e7f19bacedbfcea3b1b271ccff5c974c4e16d09323254b26ffa398b05e SHA512 5bb0cf89069dc0da0772cc0545dcf5eb4a8cca650e0b1e762f1199ef0cdcdac43680eda2e37f0d9c47faa7c8b0aa813d149df40840ee3aa5a63aa1fd7a21e8ee +EBUILD syslog-ng-3.32.1.ebuild 4934 BLAKE2B 91e7b7124580298ef3247316ca1c8b665e4260baac5deb277b9da67463ceac5df19de83275c0d46ef4474ea4d63d728e6d23efe4d1ba013937b0cd0999ce4fa8 SHA512 bbb1be3acb51d64acd12246e8f16a7d38f42c42feb13d770bed6e1e01dfdf87f406fdf35a2a09e9d767629ae3b7a85b60c980abb3a19a1676e85631b510e28a2 MISC metadata.xml 1282 BLAKE2B ddf01d9efaf2b8ad6aacbbb5a27299f14a5bd2656139960b61fb8855286c23a1a736ad4d543d16bfe50d277d20cce51249f572d3bbb428060a07c23ab78d90fd SHA512 7eeeb124214ae491905e42d726d2d167168425a66eb59802c9bb364f3a14337d0732afbb6cde7254a49e259573ca6eb5ced4dd737718d6a0bab450f7f3498964 diff --git a/app-admin/syslog-ng/syslog-ng-3.30.1-r1.ebuild b/app-admin/syslog-ng/syslog-ng-3.30.1-r1.ebuild index 2c85e035f7e0..38194a59211c 100644 --- a/app-admin/syslog-ng/syslog-ng-3.30.1-r1.ebuild +++ b/app-admin/syslog-ng/syslog-ng-3.30.1-r1.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz LICENSE="GPL-2+ LGPL-2.1+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86" IUSE="amqp caps dbi geoip2 http ipv6 json kafka mongodb pacct python redis smtp snmp test spoof-source systemd tcpd" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RESTRICT="!test? ( test )" diff --git a/app-admin/syslog-ng/syslog-ng-3.32.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.32.1.ebuild new file mode 100644 index 000000000000..c99ac514b585 --- /dev/null +++ b/app-admin/syslog-ng/syslog-ng-3.32.1.ebuild @@ -0,0 +1,173 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..10} ) +inherit autotools python-single-r1 systemd + +MY_PV_MM=$(ver_cut 1-2) +DESCRIPTION="syslog replacement with advanced filtering features" +HOMEPAGE="https://syslog-ng.com/open-source-log-management" +SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz" + +LICENSE="GPL-2+ LGPL-2.1+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE="amqp caps dbi geoip2 http ipv6 json kafka mongodb pacct python redis smtp snmp test spoof-source systemd tcpd" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) + test? ( python )" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-libs/glib-2.10.1:2 + >=dev-libs/ivykis-0.42.4 + >=dev-libs/libpcre-6.1:= + !dev-libs/eventlog + amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] ) + caps? ( sys-libs/libcap ) + dbi? ( >=dev-db/libdbi-0.9.0 ) + geoip2? ( dev-libs/libmaxminddb:= ) + http? ( net-misc/curl ) + json? ( >=dev-libs/json-c-0.9:= ) + kafka? ( >=dev-libs/librdkafka-1.0.0:= ) + mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) + python? ( ${PYTHON_DEPS} ) + redis? ( >=dev-libs/hiredis-0.11.0:= ) + smtp? ( >=net-libs/libesmtp-1.0.6_p20200824:= ) + snmp? ( net-analyzer/net-snmp:0= ) + spoof-source? ( net-libs/libnet:1.1= ) + systemd? ( sys-apps/systemd:= ) + tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) + dev-libs/openssl:0=" +DEPEND="${RDEPEND} + test? ( dev-libs/criterion )" +BDEPEND=" + sys-devel/flex + virtual/pkgconfig" + +DOCS=( AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf.{HP-UX,RedHat,SunOS,doc} + contrib/syslog2ng "${T}/syslog-ng.conf.gentoo.hardened" + "${T}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened" ) +PATCHES=( + "${FILESDIR}"/${PN}-3.28.1-net-snmp.patch + "${FILESDIR}"/${PN}-3.30.1-esmtp-pkgconfig.patch +) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + local f + + use python && python_fix_shebang . + + # remove bundled libs + rm -r lib/ivykis || die + + # drop scl modules requiring json + if use !json; then + sed -i -r '/cim|elasticsearch|ewmm|graylog2|loggly|logmatic|netskope|nodejs|osquery|slack/d' scl/Makefile.am || die + fi + + # drop scl modules requiring http + if use !http; then + sed -i -r '/slack|telegram/d' scl/Makefile.am || die + fi + + # use gentoo default path + if use systemd; then + sed -e 's@/etc/syslog-ng.conf@/etc/syslog-ng/syslog-ng.conf@g;s@/var/run@/run@g' \ + -i contrib/systemd/syslog-ng@default || die + fi + + for f in syslog-ng.logrotate.hardened.in syslog-ng.logrotate.in; do + sed \ + -e "s#@GENTOO_RESTART@#$(usex systemd "systemctl kill -s HUP syslog-ng@default" \ + "/etc/init.d/syslog-ng reload")#g" \ + "${FILESDIR}/${f}" > "${T}/${f/.in/}" || die + done + + for f in syslog-ng.conf.gentoo.hardened.in \ + syslog-ng.conf.gentoo.in; do + sed -e "s/@SYSLOGNG_VERSION@/${MY_PV_MM}/g" "${FILESDIR}/${f}" > "${T}/${f/.in/}" || die + done + + default + eautoreconf +} + +src_configure() { + local myconf=( + --disable-docs + --disable-java + --disable-java-modules + --disable-riemann + --enable-manpages + --localstatedir=/var/lib/syslog-ng + --sysconfdir=/etc/syslog-ng + --with-embedded-crypto + --with-ivykis=system + --with-module-dir=/usr/$(get_libdir)/syslog-ng + --with-pidfile-dir=/var/run + --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" + $(use_enable amqp) + $(usex amqp --with-librabbitmq-client=system --without-librabbitmq-client) + $(use_enable caps linux-caps) + $(use_enable dbi sql) + $(use_enable geoip2) + $(use_enable http) + $(use_enable ipv6) + $(use_enable json) + $(use_enable kafka) + $(use_enable mongodb) + $(usex mongodb --with-mongoc=system "--without-mongoc --disable-legacy-mongodb-options") + $(use_enable pacct) + $(use_enable python) + $(use_enable redis) + $(use_enable smtp) + $(use_enable snmp afsnmp) + $(use_enable spoof-source) + $(use_enable systemd) + $(use_enable tcpd tcp-wrapper) + ) + + econf "${myconf[@]}" +} + +src_install() { + default + + # Install default configuration + insinto /etc/default + doins contrib/systemd/syslog-ng@default + + insinto /etc/syslog-ng + newins "${T}/syslog-ng.conf.gentoo" syslog-ng.conf + + insinto /etc/logrotate.d + newins "${T}/syslog-ng.logrotate" syslog-ng + + newinitd "${FILESDIR}/syslog-ng.rc" syslog-ng + newconfd "${FILESDIR}/syslog-ng.confd" syslog-ng + keepdir /etc/syslog-ng/patterndb.d /var/lib/syslog-ng + find "${D}" -name '*.la' -delete || die + + use python && python_optimize +} + +pkg_postinst() { + # bug #355257 + if ! has_version app-admin/logrotate ; then + elog "It is highly recommended that app-admin/logrotate be emerged to" + elog "manage the log files. ${PN} installs a file in /etc/logrotate.d" + elog "for logrotate to use." + fi + + if use systemd; then + ewarn "The service file for systemd has changed to support multiple instances." + ewarn "To start the default instance issue:" + ewarn "# systemctl start syslog-ng@default" + fi +} -- cgit v1.2.3