commit: edfdf8e302ba6e6e92644800768be419a5ccd395 Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> AuthorDate: Mon May 14 18:49:05 2018 +0000 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> CommitDate: Mon May 14 18:50:30 2018 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=edfdf8e3
app-admin/rsyslog: sync with upstream Package-Manager: Portage-2.3.24, Repoman-2.3.6 app-admin/rsyslog/Manifest | 14 +- ...yslog-8.32.0-fix-building-without-curl-r3.patch | 137 +++++++ .../8-stable/rsyslog-8.34.0-fix-issue2612.patch | 13 + app-admin/rsyslog/metadata.xml | 3 +- app-admin/rsyslog/rsyslog-8.24.0-r2.ebuild | 452 --------------------- ...slog-8.28.0.ebuild => rsyslog-8.32.0-r4.ebuild} | 44 +- ...slog-8.31.0.ebuild => rsyslog-8.33.1-r1.ebuild} | 20 +- ...slog-8.26.0-r1.ebuild => rsyslog-8.34.0.ebuild} | 62 +-- 8 files changed, 234 insertions(+), 511 deletions(-) diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest index 0b9cbc9..c2217cd 100644 --- a/app-admin/rsyslog/Manifest +++ b/app-admin/rsyslog/Manifest @@ -1,8 +1,6 @@ -DIST rsyslog-8.24.0.tar.gz 2374240 SHA256 37f32ce33e32a88e1bea0511e8e557d90b7378b81520e3236a9af5ba6ea993d7 SHA512 b25b8ae72133376f732f54863c97aea3c8dfbf37c62c6a61840932996913c9d4e63155a24ffc577db48a18514f3e35b6fb109b1864380ba93ddf3fa6d84d728d WHIRLPOOL c5895d50143c21d446d760f5179b47fdae4ec34867711c942cd671b88789588e7244fb8511745efdb701954f7bc390403d30736a1e54af13dca4876f989928df -DIST rsyslog-8.26.0.tar.gz 2393148 SHA256 637d43c4384f8b96dda873a0b8384045f72cb43139808dadd9e0a94dccf25916 SHA512 96cb3af0e05b3e2941f7d2b3558e36836818037ef424f13a8ae2ac8a1e2aa0c7a4eedf3366c8360c7d8eb4515aecc7f3665690646009c650b66689067069af19 WHIRLPOOL dc267dfdbbcfe5b5354d200a2e337dada22a0aa943e71998e1462bc23d38bb8e3f2b16162108831f12cfa3eec0d462d40a5e6a598f26b2edcef7c71ad56a1c3f -DIST rsyslog-8.28.0.tar.gz 2471122 SHA256 4ca5405908d612d45da700e36856430510875518eb8028d296d1ee4d2c44678e SHA512 e27ba0ff22e945393536abc5bc6e234d8849db291a5056429b59b47abe15fb060fc5c26efedcfe347b386d438b3f8a029ae4577a1d803666701431677f628cb1 WHIRLPOOL b3c07391b9730498aff9ca30a407bd18d5faea07ec37d389dc59daef595318aa11e66fa153a452f48a55df4a2c15789569b845a831266d702b4801b39856a208 -DIST rsyslog-8.31.0.tar.gz 2498675 BLAKE2B 8b80394ea3919dba29a431f3c5c1fc337a9e60a886a3c258c3895eb4341a941d8af6370ceb0d2e212934f64ab38c7238e99f40e1dc27e648bd4b75e158586a28 SHA512 aab888dda8df3ad7ff404767a58539cdc0bb92d0e537b703cf5833555688dd6d8223889b8d70bf8c594339a51831b57df7a65b397d8b40cded608dfb007befe7 -DIST rsyslog-docs-8.24.0.tar.gz 4344877 SHA256 f5e3c27c5b65abdd600b8ad8d99d1f2fe9f0ffca02d6af3c12db5fc10dd889b2 SHA512 b55cde1485a7baec6d4c4928107c22a078cf412a2994c0dfcbb12c47b49c3b263af8a64011b1329567cf86e04927b9e383581dc868eaea81d554adada6b3786b WHIRLPOOL e8b2d10b0de3c33189f859f08db58e319730e709e5a5008909f2166a061952290b0bf96163cdf6e0b3829896916f712ba5d8a2a98f02d796e9174d8919190f8d -DIST rsyslog-docs-8.26.0.tar.gz 4381345 SHA256 4d3b46e6c06fecbd4100fad118c22569e6b0d23b0f5cfb1fbcf501bfc9d115bb SHA512 5c05c13b3ae6be431343b7a5b3b2cb8676804d6d58d98826e6b44d685bb30fdaf3ced27d66a29908b40f1839bac45d1834d060ddf05d01477474ab3f45f973c8 WHIRLPOOL a01c661bea94a38af755803d385250d8f394064c2f1450c5a8b2b0e9e6879565219c84ded70c40300d2bbf524a30bf152bc5502f65917d757b0552920f6a7cd8 -DIST rsyslog-docs-8.28.0.tar.gz 4424901 SHA256 f6c41f7c3fca369dd28a72133b03693ad5c37252375ecadc6184ff1a954764db SHA512 c085e09149cfc27ce0cd22edf9ad3f81b111f491fbea79afbc3172882065bd8324e366e3b5d09c885c1a3aa63fe8fbbe154d66488319d4ffc0867f938e1ab07d WHIRLPOOL f6636ba7196c689e42651ac9c847b05f3eafdbe87186fad478c47d55f2856e5b200d2871612ca046c6d9c06ad2d80838ad226510ba59a3f2cfe234626ca8c75f -DIST rsyslog-docs-8.31.0.tar.gz 4484950 BLAKE2B 8ee4346a095942133bb473509f275c625fdb4a1aa81293a15604bdb95670ff0676677fe5481be3bc2ea7097b2c8de7fd3b0eb8033701522b372bffe44325a10a SHA512 51a63fa520d8176e183afa44ccf889374810dddfd5fdb363ed06b134bfbe0d1a94085e4836cf3bb2a07cb83564bbb87cef3763ac9429a5efc50aff276542defa +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-8.34.0.tar.gz 2545544 BLAKE2B 66caf277a814563027183ecf267d76067c384adf8d6d7b8543203df9a7c37242722dd35445e4446aacf1e680f5f3957cea40ece8a284ef2a393b4a71e3a2b49c SHA512 69eaececa2f8b98799deac8e6cb2cf635a5117da7a21cbb0b880b7df1d83c6ccf16133dab099a6e5fb865f34c2dad164a1bf1952d16ca116af3b1dd35d15065e +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 +DIST rsyslog-docs-8.34.0.tar.gz 7419160 BLAKE2B 928e6a4044d6d2161483f934e6c2cd5e489a3ec95b823419d7d57b98a7dd6c73f4d28d17c238471592fe1c692b626b57c7bf647e926c1c38ff5a774e5d2defd5 SHA512 edf9aa63c777624c3dc27dfd64b38893b9b4c9b56941df1d7a8c6bc3cb4cbbfb83e8c356cbefeab7c688ecb6017b66ed99931cb71b69b7c927b4743548dd40d4 diff --git a/app-admin/rsyslog/files/8-stable/rsyslog-8.32.0-fix-building-without-curl-r3.patch b/app-admin/rsyslog/files/8-stable/rsyslog-8.32.0-fix-building-without-curl-r3.patch new file mode 100644 index 0000000..534183a --- /dev/null +++ b/app-admin/rsyslog/files/8-stable/rsyslog-8.32.0-fix-building-without-curl-r3.patch @@ -0,0 +1,137 @@ +https://github.com/rsyslog/rsyslog/commit/d9475f133e3c79875a7c4ccd92038b7123c1f155 +https://github.com/rsyslog/rsyslog/commit/468eeb79b8da91fb71dfef6bfb25476b2a37f446 +https://github.com/rsyslog/rsyslog/commit/50205ced0fc22e74f26f2a07b557b69c5d30e168 + +--- a/grammar/rainerscript.c ++++ b/grammar/rainerscript.c +@@ -1935,6 +1935,7 @@ num2ipv4(struct svar *__restrict__ const sourceVal) { + return(estr); + } + ++#ifdef HAVE_LIBCURL + /* curl callback for doFunc_http_request */ + static size_t + curlResult(void *ptr, size_t size, size_t nmemb, void *userdata) +@@ -2010,6 +2011,7 @@ doFunc_http_request(struct cnffunc *__restrict__ const func, + } + RETiRet; + } ++#endif + + static int ATTR_NONNULL(1,3,4) + doFunc_is_time(const char *__restrict__ const str, +@@ -2513,11 +2515,16 @@ doFuncCall(struct cnffunc *__restrict__ const func, struct svar *__restrict__ co + if(bMustFree2) free(str2); + break; + case CNFFUNC_HTTP_REQUEST: ++#ifdef HAVE_LIBCURL + cnfexprEval(func->expr[0], &r[0], usrptr, pWti); + str = (char*) var2CString(&r[0], &bMustFree); + doFunc_http_request(func, ret, str); + if(bMustFree) free(str); + varFreeMembers(&r[0]); ++#else ++ LogError(0, RS_RET_INTERNAL_ERROR, ++ "rainerscript: internal error: HTTP_Fetch not supported, not built with libcurl support"); ++#endif + break; + default: + if(Debug) { + +--- a/configure.ac ++++ b/configure.ac +@@ -454,6 +454,8 @@ if test "$enable_libcurl" = "yes"; then + ) + fi + ++AM_CONDITIONAL(ENABLE_LIBCURL, test "x${enable_libcurl}" = "xyes") ++ + # klog + AC_ARG_ENABLE(klog, + [AS_HELP_STRING([--enable-klog],[Integrated klog functionality @<:@default=yes@:>@])], + +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -226,7 +226,6 @@ TESTS += \ + rscript_contains.sh \ + rscript_bare_var_root.sh \ + rscript_bare_var_root-empty.sh \ +- rscript_http_request.sh \ + rscript_ipv42num.sh \ + rscript_field.sh \ + rscript_stop.sh \ +@@ -305,7 +304,11 @@ TESTS += \ + lookup_table_rscript_reload.sh \ + lookup_table_rscript_reload_without_stub.sh \ + multiple_lookup_tables.sh +-endif ++if ENABLE_LIBCURL ++TESTS += \ ++ rscript_http_request.sh ++endif # ENABLE_LIBCURL ++endif # ENABLE_TESTBENCH2 + + if HAVE_VALGRIND + TESTS += \ +@@ -313,7 +316,6 @@ TESTS += \ + mmexternal-InvldProg-vg.sh \ + internal-errmsg-memleak-vg.sh \ + rscript_set_memleak-vg.sh \ +- rscript_http_request-vg.sh \ + no-parser-vg.sh \ + discard-rptdmsg-vg.sh \ + discard-allmark-vg.sh \ +@@ -338,6 +340,10 @@ TESTS += \ + multiple_lookup_tables-vg.sh \ + fac_local0-vg.sh \ + rscript_trim-vg.sh ++if ENABLE_LIBCURL ++TESTS += \ ++ rscript_http_request-vg.sh ++endif # ENABLE_LIBCURL + endif # HAVE_VALGRIND + + if ENABLE_ROOT_TESTS + +--- a/grammar/Makefile.am ++++ b/grammar/Makefile.am +@@ -12,8 +12,11 @@ libgrammar_la_SOURCES = \ + parserif.h \ + grammar.h + libgrammar_la_CPPFLAGS = $(RSRT_CFLAGS) $(LIBLOGGING_STDLOG_CFLAGS) +-#libgrammar_la_LIBADD = $(CURL_LIBS) $(RSRT_LIBS) $(SOL_LIBS) +-libgrammar_la_LIBADD = $(CURL_LIBS) ++libgrammar_la_LIBADD = ++if ENABLE_LIBCURL ++libgrammar_la_CPPFLAGS += $(CURL_CFLAGS) ++libgrammar_la_LIBADD += $(CURL_LIBS) ++endif + + #testdriver_SOURCES = testdriver.c libgrammar.la + #testdriver_CPPFLAGS = $(RSRT_CFLAGS) + +--- a/plugins/omelasticsearch/Makefile.am ++++ b/plugins/omelasticsearch/Makefile.am +@@ -1,7 +1,7 @@ + pkglib_LTLIBRARIES = omelasticsearch.la + + omelasticsearch_la_SOURCES = omelasticsearch.c +-omelasticsearch_la_CPPFLAGS = $(RSRT_CFLAGS) $(PTHREADS_CFLAGS) ++omelasticsearch_la_CPPFLAGS = $(RSRT_CFLAGS) $(PTHREADS_CFLAGS) $(CURL_CFLAGS) + omelasticsearch_la_LDFLAGS = -module -avoid-version + omelasticsearch_la_LIBADD = $(CURL_LIBS) $(LIBM) + +--- a/grammar/rainerscript.c ++++ b/grammar/rainerscript.c +@@ -36,7 +36,11 @@ + #include <sys/types.h> + #include <libestr.h> + #include <time.h> ++ ++#ifdef HAVE_LIBCURL + #include <curl/curl.h> ++#endif ++ + #include "rsyslog.h" + #include "rainerscript.h" + #include "conf.h" 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 0000000..4e9e566 --- /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 855ee26..d785e23 100644 --- a/app-admin/rsyslog/metadata.xml +++ b/app-admin/rsyslog/metadata.xml @@ -4,9 +4,9 @@ <maintainer type="person"> <email>[email protected]</email> <name>Thomas Deutschmann</name> - <description>Primary Maintainer</description> </maintainer> <use> + <flag name="curl">Enable http_request() function in RainerScript (requires <pkg>net-misc/curl</pkg>)</flag> <flag name="dbi">Build the general database output module (requires <pkg>dev-db/libdbi</pkg>)</flag> <flag name="elasticsearch">Build the Elasticsearch output module (requires <pkg>net-misc/curl</pkg>)</flag> <flag name="gcrypt">Add support for encrypted log files using <pkg>dev-libs/libgcrypt</pkg></flag> @@ -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.24.0-r2.ebuild b/app-admin/rsyslog/rsyslog-8.24.0-r2.ebuild deleted file mode 100644 index 1f86fc7..0000000 --- a/app-admin/rsyslog/rsyslog-8.24.0-r2.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 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 - "${FILESDIR}"/8-stable/${PN}-8.18.0-musl-fix.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 - elibc_musl? ( sys-libs/queue ) - 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.28.0.ebuild b/app-admin/rsyslog/rsyslog-8.32.0-r4.ebuild similarity index 91% rename from app-admin/rsyslog/rsyslog-8.28.0.ebuild rename to app-admin/rsyslog/rsyslog-8.32.0-r4.ebuild index 39dc3b5..2eba275 100644 --- a/app-admin/rsyslog/rsyslog-8.28.0.ebuild +++ b/app-admin/rsyslog/rsyslog-8.32.0-r4.ebuild @@ -1,12 +1,13 @@ -# Copyright 1999-2017 Gentoo Foundation +# 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} ) -inherit autotools eutils linux-info systemd +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" @@ -39,30 +40,31 @@ else unset _tmp_last_index unset _tmp_suffix else - KEYWORDS="amd64 ~arm x86" + KEYWORDS="~amd64 ~arm ~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} ) + 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 + "${FILESDIR}"/8-stable/${PN}-8.32.0-fix-building-without-curl-r3.patch "${FILESDIR}"/8-stable/${PN}-8.18.0-musl-fix.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="curl 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/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:= ) @@ -71,8 +73,8 @@ RDEPEND=" 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 ) + 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:= @@ -90,17 +92,20 @@ RDEPEND=" ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( >=net-libs/gnutls-2.12.23:0= ) - systemd? ( >=sys-apps/systemd-208 ) + systemd? ( >=sys-apps/systemd-234 ) uuid? ( sys-apps/util-linux:0= ) zeromq? ( - >=net-libs/zeromq-4.1.1:= - >=net-libs/czmq-3.0.0 + >=net-libs/czmq-3.0.2 )" DEPEND="${RDEPEND} >=sys-devel/autoconf-archive-2015.02.24 virtual/pkgconfig elibc_musl? ( sys-libs/queue ) - test? ( sys-libs/libfaketime )" + test? ( + jemalloc? ( <sys-libs/libfaketime-0.9.7 ) + !jemalloc? ( sys-libs/libfaketime ) + ${PYTHON_DEPS} + )" if [[ ${PV} == "9999" ]]; then DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )" @@ -112,6 +117,10 @@ 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 @@ -172,6 +181,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 @@ -235,9 +245,7 @@ src_configure() { $(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)" ) @@ -305,7 +313,7 @@ src_install() { newins "${FILESDIR}/${BRANCH}/${PN}.conf" ${PN}.conf insinto /etc/rsyslog.d/ - doins "${FILESDIR}/${BRANCH}/50-default.conf" + newins "${FILESDIR}/${BRANCH}/50-default-r1.conf" 50-default.conf insinto /etc/logrotate.d/ newins "${FILESDIR}/${BRANCH}/${PN}.logrotate" ${PN} diff --git a/app-admin/rsyslog/rsyslog-8.31.0.ebuild b/app-admin/rsyslog/rsyslog-8.33.1-r1.ebuild similarity index 95% rename from app-admin/rsyslog/rsyslog-8.31.0.ebuild rename to app-admin/rsyslog/rsyslog-8.33.1-r1.ebuild index f7edab9..42a1393 100644 --- a/app-admin/rsyslog/rsyslog-8.31.0.ebuild +++ b/app-admin/rsyslog/rsyslog-8.33.1-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" @@ -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,23 +44,26 @@ 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.18.0-musl-fix.patch ) + PATCHES=( + "${FILESDIR}"/8-stable/${PN}-8.18.0-musl-fix.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="curl 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/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:= ) @@ -70,7 +73,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:= @@ -177,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 diff --git a/app-admin/rsyslog/rsyslog-8.26.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.34.0.ebuild similarity index 86% rename from app-admin/rsyslog/rsyslog-8.26.0-r1.ebuild rename to app-admin/rsyslog/rsyslog-8.34.0.ebuild index c85f1b1..9392678 100644 --- a/app-admin/rsyslog/rsyslog-8.26.0-r1.ebuild +++ b/app-admin/rsyslog/rsyslog-8.34.0.ebuild @@ -1,12 +1,13 @@ -# Copyright 1999-2017 Gentoo Foundation +# 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} ) -inherit autotools eutils linux-info systemd +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" @@ -23,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 @@ -39,30 +40,31 @@ else unset _tmp_last_index unset _tmp_suffix else - KEYWORDS="amd64 ~arm x86" + KEYWORDS="~amd64 ~arm ~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} ) + 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.26.0-fix-zmq3-format-security.patch + "${FILESDIR}"/${BRANCH}/${PN}-8.34.0-fix-issue2612.patch "${FILESDIR}"/8-stable/${PN}-8.18.0-musl-fix.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.3:= + >=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:= ) @@ -70,9 +72,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/libmongo-client-0.1.4 ) - mysql? ( virtual/mysql ) + 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:= @@ -82,7 +85,7 @@ RDEPEND=" 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:= ) + relp? ( >=dev-libs/librelp-1.2.14:= ) rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) rfc5424hmac? ( !libressl? ( >=dev-libs/openssl-0.9.8y:0= ) @@ -90,17 +93,22 @@ RDEPEND=" ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( >=net-libs/gnutls-2.12.23:0= ) - systemd? ( >=sys-apps/systemd-208 ) + systemd? ( >=sys-apps/systemd-234 ) uuid? ( sys-apps/util-linux:0= ) zeromq? ( - >=net-libs/zeromq-4.1.1:= - >=net-libs/czmq-3.0.0 + >=net-libs/czmq-3.0.2 )" DEPEND="${RDEPEND} >=sys-devel/autoconf-archive-2015.02.24 virtual/pkgconfig elibc_musl? ( sys-libs/queue ) - test? ( sys-libs/libfaketime )" + test? ( + jemalloc? ( <sys-libs/libfaketime-0.9.7 ) + !jemalloc? ( sys-libs/libfaketime ) + ${PYTHON_DEPS} + )" + +REQUIRED_USE="kubernetes? ( normalize )" if [[ ${PV} == "9999" ]]; then DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )" @@ -112,6 +120,10 @@ 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 @@ -172,6 +184,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 @@ -212,11 +225,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) @@ -234,9 +250,7 @@ src_configure() { $(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)" ) @@ -304,7 +318,7 @@ src_install() { newins "${FILESDIR}/${BRANCH}/${PN}.conf" ${PN}.conf insinto /etc/rsyslog.d/ - doins "${FILESDIR}/${BRANCH}/50-default.conf" + newins "${FILESDIR}/${BRANCH}/50-default-r1.conf" 50-default.conf insinto /etc/logrotate.d/ newins "${FILESDIR}/${BRANCH}/${PN}.logrotate" ${PN} @@ -450,5 +464,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"; }
