commit:     cf1621a5856629ac838a61591d2225c7f84ae070
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  7 20:59:52 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Aug  7 21:38:44 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf1621a5

app-admin/rsyslog: bump v8.37.0

Package-Manager: Portage-2.3.44, Repoman-2.3.10

 app-admin/rsyslog/Manifest              |   2 +
 app-admin/rsyslog/rsyslog-8.37.0.ebuild | 454 ++++++++++++++++++++++++++++++++
 2 files changed, 456 insertions(+)

diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index 48e4d0a3f28..c43d25535ad 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -1,4 +1,6 @@
 DIST rsyslog-8.35.0.tar.gz 2590108 BLAKE2B 
e201c1366b8ab96c070829d51de079212e82216a793eb7622aa91c66e2330981de8be547b1ee7f102ed7d8c8de054d58ba151e95238146a61fba8fe908c5f929
 SHA512 
3b8845fc057147c2dd740b3bb432e7fb101ad60be5c6bc86a2c2796bcd3f3526c617d45b9e8301388d51047a125ca18ba4ac54f8be2a13eabbbe8fb9361beecc
 DIST rsyslog-8.36.0.tar.gz 2639477 BLAKE2B 
9c7343d853f79e2955a8999e2871a2a9b008cb3ef75b94e2381a3a0ff3e49445593d852d7de3819851dc0d4c17a91d966ca2fbfd52e8215ebdbaf6b7ccd68bdf
 SHA512 
b0c8689374b5b0fb5ad9675ad8983ce67bd04d34ad07d39cf8f91498fd2fd21a173f1077e5fa1b66a89a9d93ab011fc6345ac1a3be9961f4794fc9e152c32a50
+DIST rsyslog-8.37.0.tar.gz 2697435 BLAKE2B 
d88a06e8a5da15ed88d0d6c92032f71be10c2b77970e26b8fe5258e116f8f635c2e359408260b8e486401b8d9ea0e234e22070f520d42bb7884923df4f216ee3
 SHA512 
2989eb7ed3333151e979a720fa0e95e330bda9b40f65009f7969069bcbbeee8f493c6a3189f67bbbc2529d3a2ac14a022d7e8c4f2d0dae42b67d7508d7611fa0
 DIST rsyslog-doc-8.35.0.tar.gz 7427270 BLAKE2B 
5441080c07a8398cd5d513ba6abe0335f62762f105354105549f0440c0429c62a4f28a4cc84a71d049bc8134cd64bda2c2210a2f30fd5b94f53e0bc783e7c8d1
 SHA512 
f78d0451eef789d60f7c5ae1eed46c4a9f7a6ade73b829f65aa2373aa786b00e84e8957089532b1b652838bd9f62b41d92530276a0d27e21b8e94d5f0e4728a6
 DIST rsyslog-doc-8.36.0.tar.gz 7570338 BLAKE2B 
031f94b88fb97e6c8b01d224279138c371a5f54ecc5d7a9298b4ec6351c5d380065877888ab1969386b76b9e715937b7335bee59c3d5b8ddd4910392a58d08cb
 SHA512 
a93f56c9c9464a9ca87f61169c6fcfaa94608f31210eaac77e882e64bf5f514c887765db6bb57e4defafeb2a6e552506f0274c1ed275306efc1656f5520b5efa
+DIST rsyslog-doc-8.37.0.tar.gz 7587722 BLAKE2B 
266e5be77e4ca91e3777ee4f2c999986ee7318287546c1fb84ee21f1f4995907fa8caac84ef47cec2665ef29f34151b4b22ed6c35ea1ffe0c4ddff8d05e23136
 SHA512 
827ac6762ad9257d9499201d5dc3d110c65f11891ab58d36dce568ffa5f8b57fe10505bc2c7b0743dcca319f294ba6418a880b7ca787eb19dcc1f262ba0f3b59

diff --git a/app-admin/rsyslog/rsyslog-8.37.0.ebuild 
b/app-admin/rsyslog/rsyslog-8.37.0.ebuild
new file mode 100644
index 00000000000..b4a87abfe6d
--- /dev/null
+++ b/app-admin/rsyslog/rsyslog-8.37.0.ebuild
@@ -0,0 +1,454 @@
+# 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,3_7} )
+
+inherit autotools eutils linux-info python-any-r1 systemd
+
+DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
+HOMEPAGE="https://www.rsyslog.com/";
+
+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
+       KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+
+       SRC_URI="
+               https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
+               doc? ( 
https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz )
+       "
+
+       PATCHES=()
+fi
+
+LICENSE="GPL-3 LGPL-3 Apache-2.0"
+SLOT="0"
+IUSE="curl dbi debug doc elasticsearch +gcrypt grok gnutls jemalloc kafka 
kerberos kubernetes libressl mdblookup"
+IUSE+=" mongodb mysql normalize omhttpfs omudpspoof openssl postgres rabbitmq 
redis relp rfc3195 rfc5424hmac"
+IUSE+=" snmp ssl systemd test usertools +uuid xxhash zeromq"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+       >=dev-libs/libfastjson-0.99.8:=
+       >=dev-libs/libestr-0.1.9
+       >=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:= )
+       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 )
+       kubernetes? ( >=net-misc/curl-7.35.0 )
+       mdblookup? ( dev-libs/libmaxminddb:= )
+       mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= )
+       mysql? ( virtual/libmysqlclient:= )
+       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? (
+               gnutls? ( >=net-libs/gnutls-2.12.23:0= )
+               openssl? (
+                       !libressl? ( dev-libs/openssl:0= )
+                       libressl? ( dev-libs/libressl:0= )
+               )
+       )
+       systemd? ( >=sys-apps/systemd-234 )
+       uuid? ( sys-apps/util-linux:0= )
+       xxhash? ( dev-libs/xxhash:= )
+       zeromq? (
+               >=net-libs/czmq-3.0.2
+       )"
+DEPEND="${RDEPEND}
+       >=sys-devel/autoconf-archive-2015.02.24
+       virtual/pkgconfig
+       test? (
+               jemalloc? ( <sys-libs/libfaketime-0.9.7 )
+               !jemalloc? ( sys-libs/libfaketime )
+               ${PYTHON_DEPS}
+       )"
+
+REQUIRED_USE="
+       kubernetes? ( normalize )
+       ssl? ( || ( gnutls openssl ) )
+"
+
+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!"
+
+pkg_setup() {
+       use test && python-any-r1_pkg_setup
+}
+
+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 ${PN}-doc-${PV}.tar.gz
+               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
+               --disable-liblogging-stdlog
+               $(use_enable test testbench)
+               $(use_enable test libfaketime)
+               $(use_enable test extended-tests)
+               # 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-fmhash
+               $(use_enable xxhash fmhash-xxhash)
+               --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 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)
+               $(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 gnutls)
+               $(use_enable openssl)
+               $(use_enable systemd imjournal)
+               $(use_enable systemd omjournal)
+               $(use_enable usertools)
+               $(use_enable uuid)
+               $(use_enable zeromq imczmq)
+               $(use_enable zeromq omczmq)
+               --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}"/README.gentoo
+       )
+
+       use doc && local HTML_DOCS=( "${S}/docs/build/." )
+
+       default
+
+       newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
+       newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
+
+       keepdir /var/empty/dev
+       keepdir /var/spool/${PN}
+       keepdir /etc/ssl/${PN}
+       keepdir /etc/${PN}.d
+
+       insinto /etc
+       newins "${FILESDIR}/${PN}.conf" ${PN}.conf
+
+       insinto /etc/rsyslog.d/
+       newins "${FILESDIR}/50-default-r1.conf" 50-default.conf
+
+       insinto /etc/logrotate.d/
+       newins "${FILESDIR}/${PN}-r1.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 " https://www.rsyslog.com/doc/rsyslog_tls.html";
+}

Reply via email to