commit: 736df1f8aedae24bd7b9041c354823cda71eae79 Author: Thomas Deutschmann <whissi <AT> whissi <DOT> de> AuthorDate: Sat Jun 11 23:59:32 2016 +0000 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> CommitDate: Sun Jun 12 17:24:23 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=736df1f8
app-admin/rsyslog: Remove old Package-Manager: portage-2.3.0_rc1 Closes: https://github.com/gentoo/gentoo/pull/1659 Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org> app-admin/rsyslog/Manifest | 2 - .../50-rsyslog-8.12.0-fix-re_extract.patch | 130 ------- ...rsyslog-8.13.0-lookup-table-reload-bugfix.patch | 141 ------- app-admin/rsyslog/rsyslog-8.13.0.ebuild | 423 --------------------- 4 files changed, 696 deletions(-) diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest index 034e443..1701cf1 100644 --- a/app-admin/rsyslog/Manifest +++ b/app-admin/rsyslog/Manifest @@ -1,8 +1,6 @@ -DIST rsyslog-8.13.0.tar.gz 2077267 SHA256 b182bd0a7686bef093be570bfb850417191292522fb58e0ad32f2c824f754a33 SHA512 a3245e5b10ae96e6df981291f55a43fa9a8258db213e33a36d7b5a620ea7daaac04a1f93a56304105c4fd10e546f92789831f5b2188b418b4b3b248a4e7795c9 WHIRLPOOL 8473e2c272182d84c629175aafd185cfa6fcafad8a028fd212de118f2e9abf458e062c6065dc5ebb1df27e81546a37387944ad1b3f0d16a38ee25a409b51b1c7 DIST rsyslog-8.16.0.tar.gz 2132012 SHA256 4fe4f97c10899086d98b9401d7e8d2bcff61c7c3f7cde8627891e36fc6ec1b76 SHA512 e45acc16078d83937edd7e22f916fe050b62aa057ca4dd980823850f2195213c12db36f759c528b5fe6f1b061a61e2117fca6086245bc248392cc4e61b2383dc WHIRLPOOL 809035873565645cea5896fb19882239a0d70776ea0b948739440f7a28baf6df4bf4e958de7506d289355eadc26e1fba7e9cd8df315339f18f89acaecc462eaa DIST rsyslog-8.18.0.tar.gz 2261731 SHA256 94346237ecfa22c9f78cebc3f18d59056f5d9846eb906c75beaa7e486f02c695 SHA512 6b159ba23100b4675576f5b247d2bf482bab0beaa071c26c692c99e50f202b0b272b7a64ba2b7c726390d663677b7a6d68666b06f73825e35605b13ae0930fc7 WHIRLPOOL 8efa5d7639b2c5978bdbbcf9837ca87d91a1ccf37dfa5b66e5aa05221d4a31ff57093eb5d604d036f3fd7cafb394f25eaf9302cf2143402d2a9255f4fc53b196 DIST rsyslog-8.19.0.tar.gz 2279714 SHA256 3379b30f2e6ef05a0f1c7327c73923fa5877a80b984506cdf48ed068c94a575e SHA512 77c40c9d76591ed3561ec76242be2c647848533df5599320ea988cbc200614c47930e0b63f190d31a0c1cec2443d57ca374f07e0909f11eba8a4bd4b8eee0e44 WHIRLPOOL 3f7d7134a0c6a475453828440a87d0fa68e7afc583ef12556f3b60f3e07621011b4f48e8c4dfbe46cef2bf2decee3827c42bd4ba481611e7cb76a695dcec5c7b -DIST rsyslog-doc-8.13.0.tar.gz 4147364 SHA256 3da9a1446686d1cfa82c123a610f2c30f4dc1cbfa608f44ded2baf168e86b67b SHA512 6676533b1e4884f18e583be19c5a50b8f12017ecc2c6860d54dcc72d64e7eafe20a2af3a22817226df123a7a193c7090097502f287455488dd8806b7aac0a5cd WHIRLPOOL 1231580f2bf8af42a7dd34f0a88315ff56324eb64d1259a281a5266fdbe7a472f596d66a5b6d1f5cbf19fdb6f76a2083753e0de224a07653454178128de4fead DIST rsyslog-doc-8.16.0.tar.gz 4174347 SHA256 03033d264b29fd791299d5d618bd061853c008ac8087f3b6c4870e1b8f6abc39 SHA512 746e4de102f15ea10085ca21eeed74dd8264742ba7029cb54caf87b72070ab6a73e79af46d97717323be1e68d9d1fa78807d5d4446d15524aa4c565650f7b0d0 WHIRLPOOL ff8dfcc3dd7e87a7316f94a3b8f199cd902cbf99772bb97147b9af37b8c6941f13341438450b3dbf3139d5518488e74df6b77c1eec3182e92a9476ccb951ec5b DIST rsyslog-docs-8.18.0.tar.gz 4269339 SHA256 8de82dece85a9a83d9c1feaf7fdfb883c2bfe5a82d84b846161bec0b9dba22c6 SHA512 c560f6a8c05f951d245b8bf96e3c58f9023761edf0e5e25b4a01dab934c1db8ad74baf7e90bd1139d3c6b5af396fca525a7818e87fcbf161317c21e005aae0b2 WHIRLPOOL 2d133a86d3a2abf5f4e3c57e0b65015ed3ad4770b4dfcd34420395fc11ab7d5752811afcb83a776bc51d665b75729bd76a0d94793d508e28aebeb815884dceff DIST rsyslog-docs-8.19.0.tar.gz 4271094 SHA256 f76958d2fbcbb3a2db531ec3878d6d9a8c4a622e457b9c97b7c7dcca0ddd6512 SHA512 120f229a641119649fc897948fb0934039a95d0ef63e68b10ab635620d84988d794fd5dc33617353028e786513a86b3a1cd0c4fef9c755dab5bedd8e0246532e WHIRLPOOL fc0642eef4e686fc653db6a654f96fd9037e083a02e06d64b7b2a2e0292d745ca6e24821df3b9825e0eba2c4808b2755dfaeb90b62a49662ab22a171ffe2e63b diff --git a/app-admin/rsyslog/files/8-stable/50-rsyslog-8.12.0-fix-re_extract.patch b/app-admin/rsyslog/files/8-stable/50-rsyslog-8.12.0-fix-re_extract.patch deleted file mode 100644 index f049d53..0000000 --- a/app-admin/rsyslog/files/8-stable/50-rsyslog-8.12.0-fix-re_extract.patch +++ /dev/null @@ -1,130 +0,0 @@ -From a88d67df6e55e0a5f484f6aff8aa6e9813c5c31a Mon Sep 17 00:00:00 2001 -From: Janmejay Singh <singh.janme...@gmail.com> -Date: Mon, 28 Sep 2015 20:38:05 +0530 -Subject: [PATCH] fixed re_extract bug, which fails the regex-compile for - extract as fn-init fails when fn does not have exactly 2 args - - -Fixes: https://github.com/rsyslog/rsyslog/issues/499 - ---- - grammar/rainerscript.c | 2 +- - tests/Makefile.am | 6 ++++++ - tests/rscript_re_extract.sh | 14 ++++++++++++++ - tests/rscript_re_match.sh | 14 ++++++++++++++ - tests/testsuites/rscript_re_extract.conf | 9 +++++++++ - tests/testsuites/rscript_re_match.conf | 10 ++++++++++ - 6 files changed, 54 insertions(+), 1 deletion(-) - create mode 100755 tests/rscript_re_extract.sh - create mode 100755 tests/rscript_re_match.sh - create mode 100644 tests/testsuites/rscript_re_extract.conf - create mode 100644 tests/testsuites/rscript_re_match.conf - -diff --git a/grammar/rainerscript.c b/grammar/rainerscript.c -index f02e1fe..17f785e 100644 ---- a/grammar/rainerscript.c -+++ b/grammar/rainerscript.c -@@ -3747,7 +3747,7 @@ initFunc_re_match(struct cnffunc *func) - regex_t *re; - DEFiRet; - -- if(func->nParams != 2) { -+ if(func->nParams < 2) { - parser_errmsg("rsyslog logic error in line %d of file %s\n", - __LINE__, __FILE__); - FINALIZE; -diff --git a/tests/Makefile.am b/tests/Makefile.am -index 914d947..d77728a 100644 ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -120,6 +120,8 @@ TESTS += \ - rscript_replace_complex.sh \ - rscript_wrap2.sh \ - rscript_wrap3.sh \ -+ rscript_re_extract.sh \ -+ rscript_re_match.sh \ - rs_optimizer_pri.sh \ - cee_simple.sh \ - cee_diskqueue.sh \ -@@ -854,6 +856,10 @@ EXTRA_DIST= \ - testsuites/stop_when_array_has_element.conf \ - key_dereference_on_uninitialized_variable_space.sh \ - testsuites/key_dereference_on_uninitialized_variable_space.conf \ -+ rscript_re_extract.sh \ -+ testsuites/rscript_re_extract.conf \ -+ rscript_re_match.sh \ -+ testsuites/rscript_re_match.conf \ - cfg.sh - - # TODO: re-enable -diff --git a/tests/rscript_re_extract.sh b/tests/rscript_re_extract.sh -new file mode 100755 -index 0000000..930448c ---- /dev/null -+++ b/tests/rscript_re_extract.sh -@@ -0,0 +1,14 @@ -+#!/bin/bash -+# added 2015-09-29 by singh.janmejay -+# This file is part of the rsyslog project, released under ASL 2.0 -+echo =============================================================================== -+echo \[rscript_re_extract.sh\]: test re_extract rscript-fn -+. $srcdir/diag.sh init -+. $srcdir/diag.sh startup rscript_re_extract.conf -+. $srcdir/diag.sh tcpflood -m 1 -I $srcdir/testsuites/date_time_msg -+echo doing shutdown -+. $srcdir/diag.sh shutdown-when-empty -+echo wait on shutdown -+. $srcdir/diag.sh wait-shutdown -+. $srcdir/diag.sh content-check "*Number is 19597*" -+. $srcdir/diag.sh exit -diff --git a/tests/rscript_re_match.sh b/tests/rscript_re_match.sh -new file mode 100755 -index 0000000..d2e212d ---- /dev/null -+++ b/tests/rscript_re_match.sh -@@ -0,0 +1,14 @@ -+#!/bin/bash -+# added 2015-09-29 by singh.janmejay -+# This file is part of the rsyslog project, released under ASL 2.0 -+echo =============================================================================== -+echo \[rscript_re_match.sh\]: test re_match rscript-fn -+. $srcdir/diag.sh init -+. $srcdir/diag.sh startup rscript_re_match.conf -+. $srcdir/diag.sh tcpflood -m 1 -I $srcdir/testsuites/date_time_msg -+echo doing shutdown -+. $srcdir/diag.sh shutdown-when-empty -+echo wait on shutdown -+. $srcdir/diag.sh wait-shutdown -+. $srcdir/diag.sh content-check "*Matched*" -+. $srcdir/diag.sh exit -diff --git a/tests/testsuites/rscript_re_extract.conf b/tests/testsuites/rscript_re_extract.conf -new file mode 100644 -index 0000000..6c71e53 ---- /dev/null -+++ b/tests/testsuites/rscript_re_extract.conf -@@ -0,0 +1,9 @@ -+$IncludeConfig diag-common.conf -+template(name="outfmt" type="string" string="*Number is %$.number%*\n") -+ -+module(load="../plugins/imtcp/.libs/imtcp") -+input(type="imtcp" port="13514") -+ -+set $.number = re_extract($msg, '.* ([0-9]+)$', 0, 1, 'none'); -+ -+action(type="omfile" file="./rsyslog.out.log" template="outfmt") -diff --git a/tests/testsuites/rscript_re_match.conf b/tests/testsuites/rscript_re_match.conf -new file mode 100644 -index 0000000..3e0f36f ---- /dev/null -+++ b/tests/testsuites/rscript_re_match.conf -@@ -0,0 +1,10 @@ -+$IncludeConfig diag-common.conf -+template(name="outfmt" type="string" string="*Matched*\n") -+ -+module(load="../plugins/imtcp/.libs/imtcp") -+input(type="imtcp" port="13514") -+ -+if (re_match($msg, '.* ([0-9]+)$')) then { -+ action(type="omfile" file="./rsyslog.out.log" template="outfmt") -+} -+ diff --git a/app-admin/rsyslog/files/8-stable/50-rsyslog-8.13.0-lookup-table-reload-bugfix.patch b/app-admin/rsyslog/files/8-stable/50-rsyslog-8.13.0-lookup-table-reload-bugfix.patch deleted file mode 100644 index b426180..0000000 --- a/app-admin/rsyslog/files/8-stable/50-rsyslog-8.13.0-lookup-table-reload-bugfix.patch +++ /dev/null @@ -1,141 +0,0 @@ -From 3a10a78edeef9725f69a24d633bb394e365145f0 Mon Sep 17 00:00:00 2001 -From: Janmejay Singh <singh.janme...@gmail.com> -Date: Wed, 30 Sep 2015 17:24:38 +0530 -Subject: [PATCH] Fixed lookup-table reload bug, which ignored table-length of - reloaded table, resulting in additional entries being invisible while - looking-up (binary-search would work with old-table-length). This would be a - security-issue or may cause a crash if reloaded table is actually smaller - (memory access beyond table). - ---- - runtime/lookup.c | 1 + - tests/Makefile.am | 5 +++++ - tests/diag.sh | 4 ++++ - tests/lookup_table.sh | 24 ++++++++++++++++++++++++ - tests/testsuites/lookup_table.conf | 9 +++++++++ - tests/testsuites/xlate.lkp_tbl | 5 +++++ - tests/testsuites/xlate_more.lkp_tbl | 6 ++++++ - 7 files changed, 55 insertions(+) - create mode 100755 tests/lookup_table.sh - create mode 100644 tests/testsuites/lookup_table.conf - create mode 100644 tests/testsuites/xlate.lkp_tbl - create mode 100644 tests/testsuites/xlate_more.lkp_tbl - -diff --git a/runtime/lookup.c b/runtime/lookup.c -index 096bf09..5aa00b9 100644 ---- a/runtime/lookup.c -+++ b/runtime/lookup.c -@@ -203,6 +203,7 @@ lookupReload(lookup_t *pThis) - } - free(pThis->d.strtab); - pThis->d.strtab = newlu.d.strtab; /* hand table AND ALL STRINGS over! */ -+ pThis->nmemb = newlu.nmemb; - pthread_rwlock_unlock(&pThis->rwlock); - errmsg.LogError(0, RS_RET_OK, "lookup table '%s' reloaded from file '%s'", - pThis->name, pThis->filename); -diff --git a/tests/Makefile.am b/tests/Makefile.am -index d77728a..49cb641 100644 ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -130,6 +130,7 @@ TESTS += \ - incltest_dir_wildcard.sh \ - incltest_dir_empty_wildcard.sh \ - linkedlistqueue.sh \ -+ lookup_table.sh \ - key_dereference_on_uninitialized_variable_space.sh - - -@@ -860,6 +861,10 @@ EXTRA_DIST= \ - testsuites/rscript_re_extract.conf \ - rscript_re_match.sh \ - testsuites/rscript_re_match.conf \ -+ lookup_table.sh \ -+ testsuites/lookup_table.conf \ -+ testsuites/xlate.lkp_tbl \ -+ testsuites/xlate_more.lkp_tbl \ - cfg.sh - - # TODO: re-enable -diff --git a/tests/diag.sh b/tests/diag.sh -index 95d6adb..c489fff 100755 ---- a/tests/diag.sh -+++ b/tests/diag.sh -@@ -195,6 +195,10 @@ case $1 in - echo WaitMainQueueEmpty | ./diagtalker || . $srcdir/diag.sh error-exit $? - fi - ;; -+ 'issue-HUP') # shut rsyslogd down when main queue is empty. $2 is the instance. -+ kill -HUP `cat rsyslog$2.pid` -+ ./msleep 1000 -+ ;; - 'shutdown-when-empty') # shut rsyslogd down when main queue is empty. $2 is the instance. - if [ "$2" == "2" ] - then -diff --git a/tests/lookup_table.sh b/tests/lookup_table.sh -new file mode 100755 -index 0000000..fae2fab ---- /dev/null -+++ b/tests/lookup_table.sh -@@ -0,0 +1,24 @@ -+#!/bin/bash -+# added 2015-09-30 by singh.janmejay -+# This file is part of the rsyslog project, released under ASL 2.0 -+echo =============================================================================== -+echo \[lookup_table_reload.sh\]: test for lookup-table and HUP based reloading of it -+. $srcdir/diag.sh init -+cp $srcdir/testsuites/xlate.lkp_tbl $srcdir/xlate.lkp_tbl -+. $srcdir/diag.sh startup lookup_table.conf -+. $srcdir/diag.sh injectmsg 0 3 -+. $srcdir/diag.sh wait-queueempty -+. $srcdir/diag.sh content-check "msgnum:00000000: foo_old" -+. $srcdir/diag.sh content-check "msgnum:00000001: bar_old" -+. $srcdir/diag.sh assert-content-missing "baz" -+cp $srcdir/testsuites/xlate_more.lkp_tbl $srcdir/xlate.lkp_tbl -+. $srcdir/diag.sh issue-HUP -+. $srcdir/diag.sh injectmsg 0 3 -+echo doing shutdown -+. $srcdir/diag.sh shutdown-when-empty -+echo wait on shutdown -+. $srcdir/diag.sh wait-shutdown -+. $srcdir/diag.sh content-check "msgnum:00000000: foo_new" -+. $srcdir/diag.sh content-check "msgnum:00000001: bar_new" -+. $srcdir/diag.sh content-check "msgnum:00000002: baz" -+. $srcdir/diag.sh exit -diff --git a/tests/testsuites/lookup_table.conf b/tests/testsuites/lookup_table.conf -new file mode 100644 -index 0000000..29bd805 ---- /dev/null -+++ b/tests/testsuites/lookup_table.conf -@@ -0,0 +1,9 @@ -+$IncludeConfig diag-common.conf -+ -+lookup_table(name="xlate" file="xlate.lkp_tbl") -+ -+template(name="outfmt" type="string" string="- %msg% %$.lkp%\n") -+ -+set $.lkp = lookup("xlate", $msg); -+ -+action(type="omfile" file="./rsyslog.out.log" template="outfmt") -diff --git a/tests/testsuites/xlate.lkp_tbl b/tests/testsuites/xlate.lkp_tbl -new file mode 100644 -index 0000000..30e2796 ---- /dev/null -+++ b/tests/testsuites/xlate.lkp_tbl -@@ -0,0 +1,5 @@ -+{ -+ "table":[ -+ {"index":" msgnum:00000000:", "value":"foo_old" }, -+ {"index":" msgnum:00000001:", "value":"bar_old" }] -+} -diff --git a/tests/testsuites/xlate_more.lkp_tbl b/tests/testsuites/xlate_more.lkp_tbl -new file mode 100644 -index 0000000..2d3f452 ---- /dev/null -+++ b/tests/testsuites/xlate_more.lkp_tbl -@@ -0,0 +1,6 @@ -+{ -+ "table":[ -+ {"index":" msgnum:00000000:", "value":"foo_new" }, -+ {"index":" msgnum:00000001:", "value":"bar_new" }, -+ {"index":" msgnum:00000002:", "value":"baz" }] -+} diff --git a/app-admin/rsyslog/rsyslog-8.13.0.ebuild b/app-admin/rsyslog/rsyslog-8.13.0.ebuild deleted file mode 100644 index d99d7c1..0000000 --- a/app-admin/rsyslog/rsyslog-8.13.0.ebuild +++ /dev/null @@ -1,423 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -AUTOTOOLS_AUTORECONF=1 - -inherit autotools-utils eutils systemd - -DESCRIPTION="An enhanced multi-threaded syslogd with database support and more" -HOMEPAGE="http://www.rsyslog.com/"; - -BRANCH="8-stable" - -PATCHES=() - -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI=" - git://github.com/rsyslog/${PN}.git - https://github.com/rsyslog/${PN}.git - " - - DOC_REPO_URI=" - git://github.com/rsyslog/${PN}-doc.git - https://github.com/rsyslog/${PN}-doc.git - " - - inherit git-r3 -else - SRC_URI=" - http://www.rsyslog.com/files/download/${PN}/${P}.tar.gz - doc? ( http://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz ) - " - KEYWORDS="amd64 ~arm hppa x86" - - PATCHES+=( "${FILESDIR}"/${BRANCH}/50-${PN}-8.12.0-fix-re_extract.patch ) - PATCHES+=( "${FILESDIR}"/${BRANCH}/50-${PN}-8.13.0-lookup-table-reload-bugfix.patch ) -fi - -LICENSE="GPL-3 LGPL-3 Apache-2.0" -SLOT="0" -IUSE="dbi debug doc elasticsearch +gcrypt jemalloc kerberos libressl mongodb mysql normalize omudpspoof" -IUSE+=" postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools zeromq" - -RDEPEND=" - >=dev-libs/json-c-0.11:= - >=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:= ) - jemalloc? ( >=dev-libs/jemalloc-3.3.1 ) - kerberos? ( virtual/krb5 ) - mongodb? ( >=dev-libs/libmongo-client-0.1.4 ) - mysql? ( virtual/mysql ) - normalize? ( - >=dev-libs/libee-0.4.0 - >=dev-libs/liblognorm-1.1.2:= - ) - 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= ) - libressl? ( dev-libs/libressl:0= ) - ) - snmp? ( >=net-analyzer/net-snmp-5.7.2 ) - ssl? ( >=net-libs/gnutls-2.12.23 ) - systemd? ( >=sys-apps/systemd-208 ) - zeromq? ( >=net-libs/czmq-1.2.0 )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -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 - -# Maitainer note : open a bug to upstream -# showing that building in a separate dir fails -AUTOTOOLS_IN_SOURCE_BUILD=1 - -AUTOTOOLS_PRUNE_LIBTOOL_FILES="modules" - -DOCS=( - AUTHORS - ChangeLog - "${FILESDIR}"/${BRANCH}/README.gentoo -) - -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 - local doc_tarball="${PN}-doc-${PV}.tar.gz" - - 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 ${doc_tarball} - fi - fi -} - -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-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 kerberos gssapi-krb5) - $(use_enable normalize mmnormalize) - $(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 zeromq imzmq3) - $(use_enable zeromq omzmq3) - "$(systemd_with_unitdir)" - ) - - autotools-utils_src_configure -} - -src_compile() { - autotools-utils_src_compile - - 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= - - # When adding new tests via patches we have to make them executable - 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() { - use doc && HTML_DOCS=( "${S}/docs/build/" ) - autotools-utils_src_install - - 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 -} - -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 [[ -z "${REPLACING_VERSIONS}" ]] || [[ ${REPLACING_VERSIONS} < 8.0 ]]; then - # Show this message until rsyslog-8.x - echo - elog "Since ${PN}-7.6.3 we no longer use the catch-all log target" - elog "\"/var/log/syslog\" due to its redundancy to the other log targets." - - advertise_readme=1 - 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 - 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"; -}
