commit: 7676816593b960e7026bc42251b6fc07cc5dd8ea Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> AuthorDate: Sat Dec 29 14:59:36 2018 +0000 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> CommitDate: Sat Dec 29 14:59:36 2018 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=76768165
app-admin/rsyslog: sync with upstream Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 app-admin/rsyslog/Manifest | 8 +- .../files/{8-stable => }/50-default-r1.conf | 0 app-admin/rsyslog/files/8-stable/50-default.conf | 95 ----- .../files/8-stable/rsyslog-8.18.0-musl-fix.patch | 10 - ...og-8.24.0-fix-tcpflood-without-librelp-r1.patch | 160 ------- .../rsyslog-8.26.0-fix-zmq3-format-security.patch | 39 -- .../rsyslog-8.27.0-fix-mmnormalize-tests.patch | 23 - ...yslog-8.32.0-fix-building-without-curl-r3.patch | 137 ------ .../8-stable/rsyslog-8.34.0-fix-issue2612.patch | 13 - .../rsyslog/files/{8-stable => }/README.gentoo | 0 .../files/rsyslog-8.40.0-fix-omusrmsg.patch | 13 + .../rsyslog.logrotate => rsyslog-r1.logrotate} | 12 +- .../rsyslog/files/{8-stable => }/rsyslog.conf | 0 .../rsyslog/files/{8-stable => }/rsyslog.confd-r1 | 0 .../rsyslog/files/{8-stable => }/rsyslog.initd-r1 | 2 +- app-admin/rsyslog/metadata.xml | 7 +- app-admin/rsyslog/rsyslog-8.32.0-r4.ebuild | 463 -------------------- app-admin/rsyslog/rsyslog-8.34.0.ebuild | 468 --------------------- ...g-8.33.1-r1.ebuild => rsyslog-8.40.0-r1.ebuild} | 97 +++-- 19 files changed, 78 insertions(+), 1469 deletions(-) diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest index c2217cd..bd5a10e 100644 --- a/app-admin/rsyslog/Manifest +++ b/app-admin/rsyslog/Manifest @@ -1,6 +1,2 @@ -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 +DIST rsyslog-8.40.0.tar.gz 2726022 BLAKE2B 33f7f2018200a20b01dbfabeeab592aa09d530edd313bb13f16c47cf3f67aebd9c465af3f1e468ca3d352cd83e4f4eee567c6fd54bbaee1723bee56f4631b440 SHA512 3d5d4f92e37ad9bf3767d5d7fc87fcb7956656f676a9495c78abd12fe9072ec8763b50543b198308a71d5d919721fb9b84b6725dd83a9d9b8a1639d81382c0dd +DIST rsyslog-doc-8.40.0.tar.gz 7709769 BLAKE2B cda3bbd005120e7100bb36cf4c0f99d3a037525c5451ead5957f4dfe06eaceeba8fb2e266f53203bee6fae97898774ee17862a52ca1dae99aeb3534bbfadcd60 SHA512 2e2f37336948984a8cf0e098eb46e61fe4de6366d63a98204ecd558f4e21b7c1f222659f7bdecdd22e0a61d34c442b4734dbe72a72e8716c768a900b954d473f diff --git a/app-admin/rsyslog/files/8-stable/50-default-r1.conf b/app-admin/rsyslog/files/50-default-r1.conf similarity index 100% rename from app-admin/rsyslog/files/8-stable/50-default-r1.conf rename to app-admin/rsyslog/files/50-default-r1.conf diff --git a/app-admin/rsyslog/files/8-stable/50-default.conf b/app-admin/rsyslog/files/8-stable/50-default.conf deleted file mode 100644 index 9ae8578..0000000 --- a/app-admin/rsyslog/files/8-stable/50-default.conf +++ /dev/null @@ -1,95 +0,0 @@ -####################### -### DEFAULT ACTIONS ### -####################### - -auth,authpriv.* action( - type="omfile" - File="/var/log/auth.log" - FileCreateMode="0600" - FileOwner="root" - FileGroup="adm" - Sync="off" -) - -cron.* action( - type="omfile" - File="/var/log/cron.log" - FileOwner="root" - FileGroup="adm" -) - -daemon.* action( - type="omfile" - File="/var/log/daemon.log" - FileOwner="root" - FileGroup="adm" -) - -kern.* action( - type="omfile" - File="/var/log/kern.log" - FileOwner="root" - FileGroup="adm" -) - -lpr.* action( - type="omfile" - File="/var/log/lpr.log" - FileOwner="root" - FileGroup="adm" -) - -mail.* action( - type="omfile" - File="/var/log/mail.log" - FileOwner="root" - FileGroup="adm" -) - -news.* action( - type="omfile" - File="/var/log/news.log" - FileOwner="root" - FileGroup="adm" -) - -user.* action( - type="omfile" - File="/var/log/user.log" - FileOwner="root" - FileGroup="adm" -) - -*.=debug;auth,authpriv,news,mail.none action( - type="omfile" - File="/var/log/debug.log" - FileOwner="root" - FileGroup="adm" -) - -*.info;auth,authpriv,cron,daemon,lpr,mail,news.none action( - type="omfile" - File="/var/log/messages" - FileOwner="root" - FileGroup="adm" -) - -# Uncomment the following directive to re-enable the -# deprecated "/var/log/syslog" log file (don't forget to re-enable log -# rotation in "/etc/logrotate.d/rsyslog" if you do that!) -#*.*;auth,authpriv.none action( -# type="omfile" -# File="/var/log/syslog" -# FileOwner="root" -# FileGroup="adm" -#) - -*.emerg action( - type="omusrmsg" - Users="*" - action.execOnlyOnceEveryInterval="10" -) - -# Create an additional socket for the default chroot location -# (used by net-misc/openssh[hpn], see https://bugs.gentoo.org/490744) -input(type="imuxsock" Socket="/var/empty/dev/log") diff --git a/app-admin/rsyslog/files/8-stable/rsyslog-8.18.0-musl-fix.patch b/app-admin/rsyslog/files/8-stable/rsyslog-8.18.0-musl-fix.patch deleted file mode 100644 index 3c5681d..0000000 --- a/app-admin/rsyslog/files/8-stable/rsyslog-8.18.0-musl-fix.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/runtime/rsyslog.h -+++ b/runtime/rsyslog.h -@@ -643,3 +643,7 @@ - #endif - - #endif /* multi-include protection */ -+ -+#ifndef GLOB_BRACE -+#define GLOB_BRACE 0 -+#endif diff --git a/app-admin/rsyslog/files/8-stable/rsyslog-8.24.0-fix-tcpflood-without-librelp-r1.patch b/app-admin/rsyslog/files/8-stable/rsyslog-8.24.0-fix-tcpflood-without-librelp-r1.patch deleted file mode 100644 index a03a656..0000000 --- a/app-admin/rsyslog/files/8-stable/rsyslog-8.24.0-fix-tcpflood-without-librelp-r1.patch +++ /dev/null @@ -1,160 +0,0 @@ -Patch to allow building of tcpflood without librelp - -Cherry pick of -https://github.com/rsyslog/rsyslog/commit/73e3b7ab2f8a3974d31844b492ad02d61ed5727f -https://github.com/rsyslog/rsyslog/pull/1493 - - -Gentoo-Bug: https://bugs.gentoo.org/613264 -Gentoo-Bug: https://bugs.gentoo.org/614424 - -diff -u b/tests/tcpflood.c b/tests/tcpflood.c ---- b/tests/tcpflood.c -+++ b/tests/tcpflood.c -@@ -96,7 +96,9 @@ - #include <string.h> - #include <netinet/in.h> - #include <pthread.h> -+#ifdef ENABLE_RELP - #include <librelp.h> -+#endif - #include <sys/resource.h> - #include <sys/time.h> - #include <errno.h> -@@ -149,7 +151,9 @@ - static int numConnections = 1; /* number of connections to create */ - static int softLimitConnections = 0; /* soft connection limit, see -c option description */ - static int *sockArray; /* array of sockets to use */ -+#ifdef ENABLE_RELP - static relpClt_t **relpCltArray; /* array of sockets to use */ -+#endif - static int msgNum = 0; /* initial message number to start with */ - static int bShowProgress = 1; /* show progress messages */ - static int bSilent = 0; /* completely silent operation */ -@@ -216,6 +220,7 @@ - static int sendTLS(int i, char *buf, int lenBuf); - static void closeTLSSess(int __attribute__((unused)) i); - -+#ifdef ENABLE_RELP - /* RELP subsystem */ - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wformat-security" -@@ -235,6 +240,7 @@ - CHKRELP(relpEngineSetEnableCmd(pRelpEngine, (unsigned char*)"syslog", - eRelpCmdState_Required)); - } -+#endif /* #ifdef ENABLE_RELP */ - - /* prepare send subsystem for UDP send */ - static int -@@ -273,6 +279,7 @@ - port = targetPort; - } - if(transport == TP_RELP_PLAIN) { -+ #ifdef ENABLE_RELP - relpRetVal relp_r; - relpClt_t *relpClt; - char relpPort[16]; -@@ -286,6 +293,7 @@ - return(1); - } - *fd = 1; /* mimic "all ok" state */ -+ #endif - } else { /* TCP, with or without TLS */ - if((sock=socket(AF_INET, SOCK_STREAM, 0))==-1) { - perror("\nsocket()"); -@@ -336,8 +344,10 @@ - sessArray = calloc(numConnections, sizeof(gnutls_session_t)); - # endif - sockArray = calloc(numConnections, sizeof(int)); -+ #ifdef ENABLE_RELP - if(transport == TP_RELP_PLAIN) - relpCltArray = calloc(numConnections, sizeof(relpClt_t*)); -+ #endif - for(i = 0 ; i < numConnections ; ++i) { - if(i % 10 == 0) { - if(bShowProgress) -@@ -356,8 +366,10 @@ - * at least something. - */ - if(transport == TP_RELP_PLAIN) { -+ #ifdef ENABLE_RELP - CHKRELP(relpEngineCltDestruct(pRelpEngine, - relpCltArray+i)); -+ #endif - } else { /* TCP and TLS modes */ - if(transport == TP_TLS) - closeTLSSess(i); -@@ -403,14 +415,13 @@ - - if(bShowProgress) - if(write(1, " close connections", sizeof(" close connections")-1)){} -- //if(transport == TP_RELP_PLAIN) -- //sleep(10); /* we need to let librelp settle a bit */ - for(i = 0 ; i < numConnections ; ++i) { - if(i % 10 == 0 && bShowProgress) { - lenMsg = sprintf(msgBuf, "\r%5.5d", i); - if(write(1, msgBuf, lenMsg)){} - } - if(transport == TP_RELP_PLAIN) { -+ #ifdef ENABLE_RELP - relpRetVal relpr; - if(sockArray[i] != -1) { - relpr = relpEngineCltDestruct(pRelpEngine, relpCltArray+i); -@@ -419,6 +430,7 @@ - } - sockArray[i] = -1; - } -+ #endif - } else { /* TCP and TLS modes */ - if(sockArray[i] != -1) { - /* we try to not overrun the receiver by trying to flush buffers -@@ -610,6 +622,7 @@ - offsSendBuf = lenBuf; - } - } else if(transport == TP_RELP_PLAIN) { -+ #ifdef ENABLE_RELP - relpRetVal relp_ret; - if(sockArray[socknum] == -1) { - /* connection was dropped, need to re-establish */ -@@ -627,6 +640,7 @@ - printf("\nrelpCltSendSyslog() failed with relp error code %d\n", - relp_ret); - } -+ #endif - } - if(lenSend != lenBuf) { - printf("\r%5.5d\n", i); -@@ -1106,7 +1120,9 @@ - transport = TP_RELP_PLAIN; - # else - fprintf(stderr, "compiled without RELP support: " -- "\"-Trelp-plain\" not supported!\n"); -+ "\"-Trelp-plain\" not supported!\n" -+ "(add --enable-relp to ./configure options " -+ "if desired)\n"); - exit(1); - # endif - } else { -@@ -1168,7 +1184,9 @@ - if(transport == TP_TLS) { - initTLS(); - } else if(transport == TP_RELP_PLAIN) { -+ #ifdef ENABLE_RELP - initRELP_PLAIN(); -+ #endif - } - - if(openConnections() != 0) { -@@ -1183,9 +1201,11 @@ - - closeConnections(); /* this is important so that we do not finish too early! */ - -+ #ifdef ENABLE_RELP - if(transport == TP_RELP_PLAIN) { - CHKRELP(relpEngineDestruct(&pRelpEngine)); - } -+ #endif - - if(nConnDrops > 0 && !bSilent) - printf("-D option initiated %ld connection closures\n", nConnDrops); diff --git a/app-admin/rsyslog/files/8-stable/rsyslog-8.26.0-fix-zmq3-format-security.patch b/app-admin/rsyslog/files/8-stable/rsyslog-8.26.0-fix-zmq3-format-security.patch deleted file mode 100644 index b285798..0000000 --- a/app-admin/rsyslog/files/8-stable/rsyslog-8.26.0-fix-zmq3-format-security.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- a/contrib/imzmq3/imzmq3.c -+++ b/contrib/imzmq3/imzmq3.c -@@ -403,7 +403,7 @@ static rsRetVal createSocket(instanceConf_t* info, void** sock) { - - /* Do the bind/connect... */ - if (info->action==ACTION_CONNECT) { -- rv = zsocket_connect(*sock, info->description); -+ rv = zsocket_connect(*sock, "%s", info->description); - if (rv == -1) { - errmsg.LogError(0, - RS_RET_INVALID_PARAMS, -@@ -413,7 +413,7 @@ static rsRetVal createSocket(instanceConf_t* info, void** sock) { - } - DBGPRINTF("imzmq3: connect for %s successful\n",info->description); - } else { -- rv = zsocket_bind(*sock, info->description); -+ rv = zsocket_bind(*sock, "%s", info->description); - if (rv == -1) { - errmsg.LogError(0, - RS_RET_INVALID_PARAMS, ---- a/contrib/omzmq3/omzmq3.c -+++ b/contrib/omzmq3/omzmq3.c -@@ -242,14 +242,14 @@ static rsRetVal initZMQ(instanceData* pData) { - if (pData->action == ACTION_BIND) { - /* bind asserts, so no need to test return val here - which isn't the greatest api -- oh well */ -- if(-1 == zsocket_bind(pData->socket, (char*)pData->description)) { -+ if(-1 == zsocket_bind(pData->socket, "%s", (char*)pData->description)) { - errmsg.LogError(0, RS_RET_NO_ERRCODE, "omzmq3: bind failed for %s: %s", - pData->description, zmq_strerror(errno)); - ABORT_FINALIZE(RS_RET_NO_ERRCODE); - } - DBGPRINTF("omzmq3: bind to %s successful\n",pData->description); - } else { -- if(-1 == zsocket_connect(pData->socket, (char*)pData->description)) { -+ if(-1 == zsocket_connect(pData->socket, "%s", (char*)pData->description)) { - errmsg.LogError(0, RS_RET_NO_ERRCODE, "omzmq3: connect failed for %s: %s", - pData->description, zmq_strerror(errno)); - ABORT_FINALIZE(RS_RET_NO_ERRCODE); diff --git a/app-admin/rsyslog/files/8-stable/rsyslog-8.27.0-fix-mmnormalize-tests.patch b/app-admin/rsyslog/files/8-stable/rsyslog-8.27.0-fix-mmnormalize-tests.patch deleted file mode 100644 index 6ef7e64..0000000 --- a/app-admin/rsyslog/files/8-stable/rsyslog-8.27.0-fix-mmnormalize-tests.patch +++ /dev/null @@ -1,23 +0,0 @@ -https://github.com/rsyslog/rsyslog/pull/1791 ---- - tests/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -498,7 +498,6 @@ TESTS += msgvar-concurrency-array.sh \ - mmnormalize_processing_test2.sh \ - mmnormalize_processing_test3.sh \ - mmnormalize_processing_test4.sh --endif - - if ENABLE_IMPTCP - TESTS += \ -@@ -512,6 +511,7 @@ if LOGNORM_REGEX_SUPPORTED - TESTS += \ - mmnormalize_regex.sh - endif -+endif - - if ENABLE_MMJSONPARSE - TESTS += \ 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 deleted file mode 100644 index 534183a..0000000 --- a/app-admin/rsyslog/files/8-stable/rsyslog-8.32.0-fix-building-without-curl-r3.patch +++ /dev/null @@ -1,137 +0,0 @@ -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 deleted file mode 100644 index 4e9e566..0000000 --- a/app-admin/rsyslog/files/8-stable/rsyslog-8.34.0-fix-issue2612.patch +++ /dev/null @@ -1,13 +0,0 @@ -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/files/8-stable/README.gentoo b/app-admin/rsyslog/files/README.gentoo similarity index 100% rename from app-admin/rsyslog/files/8-stable/README.gentoo rename to app-admin/rsyslog/files/README.gentoo diff --git a/app-admin/rsyslog/files/rsyslog-8.40.0-fix-omusrmsg.patch b/app-admin/rsyslog/files/rsyslog-8.40.0-fix-omusrmsg.patch new file mode 100644 index 0000000..9247d0b --- /dev/null +++ b/app-admin/rsyslog/files/rsyslog-8.40.0-fix-omusrmsg.patch @@ -0,0 +1,13 @@ +https://github.com/rsyslog/rsyslog/issues/3346 + +--- a/tools/omusrmsg.c ++++ b/tools/omusrmsg.c +@@ -261,7 +261,7 @@ static rsRetVal wallmsg(uchar* pMsg, instanceData *pData) + + /* compute the device name */ + strcpy(p, _PATH_DEV); +- memcpy(p, ut.ut_line, UNAMESZ); ++ strncat(p, ut.ut_line, UNAMESZ); + + /* we must be careful when writing to the terminal. A terminal may block + * (for example, a user has pressed <ctl>-s). In that case, we can not diff --git a/app-admin/rsyslog/files/8-stable/rsyslog.logrotate b/app-admin/rsyslog/files/rsyslog-r1.logrotate similarity index 52% rename from app-admin/rsyslog/files/8-stable/rsyslog.logrotate rename to app-admin/rsyslog/files/rsyslog-r1.logrotate index 1eae30e..3a92ba3 100644 --- a/app-admin/rsyslog/files/8-stable/rsyslog.logrotate +++ b/app-admin/rsyslog/files/rsyslog-r1.logrotate @@ -9,7 +9,11 @@ # delaycompress # compress # postrotate -# test -r /run/rsyslogd.pid && kill -HUP $(cat /run/rsyslogd.pid) &>/dev/null +# if type -p systemctl 2>&1 1>/dev/null && systemctl is-system-running 2>&1 1>/dev/null ; then +# systemctl kill -s HUP rsyslog.service +# else +# test -r /run/rsyslogd.pid && kill -HUP $(cat /run/rsyslogd.pid) 2>&1 1>/dev/null +# fi # endscript #} @@ -32,6 +36,10 @@ delaycompress sharedscripts postrotate - test -r /run/rsyslogd.pid && kill -HUP $(cat /run/rsyslogd.pid) &>/dev/null + if type -p systemctl 2>&1 1>/dev/null && systemctl is-system-running 2>&1 1>/dev/null ; then + systemctl kill -s HUP rsyslog.service + else + test -r /run/rsyslogd.pid && kill -HUP $(cat /run/rsyslogd.pid) 2>&1 1>/dev/null + fi endscript } diff --git a/app-admin/rsyslog/files/8-stable/rsyslog.conf b/app-admin/rsyslog/files/rsyslog.conf similarity index 100% rename from app-admin/rsyslog/files/8-stable/rsyslog.conf rename to app-admin/rsyslog/files/rsyslog.conf diff --git a/app-admin/rsyslog/files/8-stable/rsyslog.confd-r1 b/app-admin/rsyslog/files/rsyslog.confd-r1 similarity index 100% rename from app-admin/rsyslog/files/8-stable/rsyslog.confd-r1 rename to app-admin/rsyslog/files/rsyslog.confd-r1 diff --git a/app-admin/rsyslog/files/8-stable/rsyslog.initd-r1 b/app-admin/rsyslog/files/rsyslog.initd-r1 similarity index 97% rename from app-admin/rsyslog/files/8-stable/rsyslog.initd-r1 rename to app-admin/rsyslog/files/rsyslog.initd-r1 index 7d7aa4b..8d2ff8e 100644 --- a/app-admin/rsyslog/files/8-stable/rsyslog.initd-r1 +++ b/app-admin/rsyslog/files/rsyslog.initd-r1 @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 RSYSLOG_CONFIGFILE=${RSYSLOG_CONFIGFILE:-"/etc/rsyslog.conf"} diff --git a/app-admin/rsyslog/metadata.xml b/app-admin/rsyslog/metadata.xml index d785e23..ba4e59d 100644 --- a/app-admin/rsyslog/metadata.xml +++ b/app-admin/rsyslog/metadata.xml @@ -10,18 +10,20 @@ <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> + <flag name="gnutls">Build the GnuTLS network stream driver (requires <pkg>net-libs/gnutls</pkg>)</flag> <flag name="grok">Build the grok modify module (requires <pkg>dev-libs/grok</pkg>)</flag> - <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="libressl">Use <pkg>dev-libs/libressl</pkg> instead of <pkg>dev-libs/openssl</pkg> (you still need to enable functionality which requires OpenSSL)</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> <flag name="mysql">Build the MySQL database output module (requires <pkg>virtual/mysql</pkg>)</flag> <flag name="normalize">Build the normalize modify module (requires <pkg>dev-libs/libee</pkg> and <pkg>dev-libs/liblognorm</pkg>)</flag> + <flag name="omhttp">Build the http output module (requires <pkg>net-misc/curl</pkg>)</flag> <flag name="omhttpfs">Build the httpfs output module (requires <pkg>net-misc/curl</pkg>)</flag> <flag name="omudpspoof">Build the udpspoof output module (requires <pkg>net-libs/libnet</pkg>)</flag> + <flag name="openssl">Build the OpenSSL network stream driver (requires <pkg>dev-libs/openssl</pkg>)</flag> <flag name="postgres">Build the PostgreSQL database output module (requires <pkg>dev-db/postgresql</pkg>)</flag> <flag name="rabbitmq">Build the RabbitMQ output module (requires <pkg>net-libs/rabbitmq-c</pkg>)</flag> <flag name="redis">Build the Redis output module using (requires <pkg>dev-libs/hiredis</pkg>)</flag> @@ -33,6 +35,7 @@ <flag name="systemd">Build the journal input and output module (requires <pkg>sys-apps/systemd</pkg>)</flag> <flag name="uuid">Include UUIDs in messages (requires <pkg>sys-apps/util-linux</pkg>)</flag> <flag name="usertools">Installs the user tools (rsgtutil, rscryutil...) corresponding to the set USE flags</flag> + <flag name="xxhash">Enable xxHash support in fmhash module (requires <pkg>dev-libs/xxhash</pkg>)</flag> <flag name="zeromq">Build the ZeroMQ input and output modules (requires <pkg>net-libs/czmq</pkg>)</flag> </use> <upstream> diff --git a/app-admin/rsyslog/rsyslog-8.32.0-r4.ebuild b/app-admin/rsyslog/rsyslog-8.32.0-r4.ebuild deleted file mode 100644 index 908fa22..0000000 --- a/app-admin/rsyslog/rsyslog-8.32.0-r4.ebuild +++ /dev/null @@ -1,463 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) - -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/" - -BRANCH="8-stable" - -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git" - - DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git" - - inherit git-r3 -else - MY_PV=${PV%_rc*} - MY_FILENAME="${PN}-${PV}.tar.gz" - MY_FILENAME_DOCS="${PN}-docs-${PV}.tar.gz" - S="${WORKDIR}/${PN}-${MY_PV}" - - # Upstream URL schema: - # RC: http://www.rsyslog.com/files/download/rsyslog/rc/rsyslog-8.18.0.tar.gz - # http://www.rsyslog.com/files/download/rsyslog/rc2/rsyslog-8.18.0.tar.gz - # Release: http://www.rsyslog.com/files/download/rsyslog/rsyslog-8.18.0.tar.gz - - MY_URL_PREFIX= - if [[ ${PV} = *_rc* ]]; then - _tmp_last_index=$(($(get_last_version_component_index ${PV})+1)) - _tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${PV}) - if [[ ${_tmp_suffix} = *rc* ]]; then - MY_URL_PREFIX="${_tmp_suffix}/" - fi - - # Cleaning up temporary variables - unset _tmp_last_index - unset _tmp_suffix - else - KEYWORDS="amd64 arm arm64 x86" - fi - - SRC_URI=" - https://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-${MY_PV}.tar.gz -> ${MY_FILENAME} - doc? ( https://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-doc-${MY_PV}.tar.gz -> ${MY_FILENAME_DOCS} ) - " - - PATCHES=( - "${FILESDIR}"/8-stable/${PN}-8.32.0-fix-building-without-curl-r3.patch - "${FILESDIR}"/8-stable/${PN}-8.18.0-musl-fix.patch - ) -fi - -LICENSE="GPL-3 LGPL-3 Apache-2.0" -SLOT="0" -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.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:= ) - grok? ( >=dev-libs/grok-0.9.2 ) - jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) - kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) - kerberos? ( virtual/krb5 ) - mdblookup? ( dev-libs/libmaxminddb:= ) - mongodb? ( >=dev-libs/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? ( >=net-libs/gnutls-2.12.23:0= ) - systemd? ( >=sys-apps/systemd-234 ) - uuid? ( sys-apps/util-linux:0= ) - zeromq? ( - >=net-libs/czmq-3.0.2 - )" -DEPEND="${RDEPEND} - >=sys-devel/autoconf-archive-2015.02.24 - virtual/pkgconfig - elibc_musl? ( sys-libs/queue ) - 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 )" - 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 ${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) - $(use_enable curl libcurl) - # Input Plugins without depedencies - --enable-imdiag - --enable-imfile - --enable-impstats - --enable-imptcp - # Message Modificiation Plugins without depedencies - --enable-mmanon - --enable-mmaudit - --enable-mmcount - --enable-mmfields - --enable-mmjsonparse - --enable-mmpstrucdata - --enable-mmrm1stspace - --enable-mmsequence - --enable-mmutf8fix - # Output Modification Plugins without dependencies - --enable-mail - --enable-omprog - --enable-omruleset - --enable-omstdout - --enable-omuxsock - # Misc - --enable-pmaixforwardedfrom - --enable-pmciscoios - --enable-pmcisconames - --enable-pmlastmsg - --enable-pmsnare - # DB - $(use_enable dbi libdbi) - $(use_enable mongodb ommongodb) - $(use_enable mysql) - $(use_enable postgres pgsql) - $(use_enable redis omhiredis) - # Debug - $(use_enable debug) - $(use_enable debug diagtools) - $(use_enable debug memcheck) - $(use_enable debug rtinst) - $(use_enable debug valgrind) - # Misc - $(use_enable elasticsearch) - $(use_enable gcrypt libgcrypt) - $(use_enable jemalloc) - $(use_enable kafka imkafka) - $(use_enable kafka omkafka) - $(use_enable kerberos gssapi-krb5) - $(use_enable normalize mmnormalize) - $(use_enable mdblookup mmdblookup) - $(use_enable grok mmgrok) - $(use_enable omhttpfs) - $(use_enable omudpspoof) - $(use_enable rabbitmq omrabbitmq) - $(use_enable relp) - $(use_enable rfc3195) - $(use_enable rfc5424hmac mmrfc5424addhmac) - $(use_enable snmp) - $(use_enable snmp mmsnmptrapd) - $(use_enable ssl gnutls) - $(use_enable systemd imjournal) - $(use_enable systemd omjournal) - $(use_enable usertools) - $(use_enable uuid) - $(use_enable zeromq imczmq) - $(use_enable zeromq 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}"/${BRANCH}/README.gentoo - ) - - use doc && local HTML_DOCS=( "${S}/docs/build/." ) - - default - - newconfd "${FILESDIR}/${BRANCH}/${PN}.confd-r1" ${PN} - newinitd "${FILESDIR}/${BRANCH}/${PN}.initd-r1" ${PN} - - keepdir /var/empty/dev - keepdir /var/spool/${PN} - keepdir /etc/ssl/${PN} - keepdir /etc/${PN}.d - - insinto /etc - newins "${FILESDIR}/${BRANCH}/${PN}.conf" ${PN}.conf - - insinto /etc/rsyslog.d/ - newins "${FILESDIR}/${BRANCH}/50-default-r1.conf" 50-default.conf - - insinto /etc/logrotate.d/ - newins "${FILESDIR}/${BRANCH}/${PN}.logrotate" ${PN} - - if use mysql; then - insinto /usr/share/doc/${PF}/scripts/mysql - doins plugins/ommysql/createDB.sql - fi - - if use postgres; then - insinto /usr/share/doc/${PF}/scripts/pgsql - doins plugins/ompgsql/createDB.sql - fi - - prune_libtool_files --modules -} - -pkg_postinst() { - local advertise_readme=0 - - if [[ -z "${REPLACING_VERSIONS}" ]]; then - # This is a new installation - - advertise_readme=1 - - if use mysql || use postgres; then - echo - elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:" - elog " /usr/share/doc/${PF}/scripts" - fi - - if use ssl; then - echo - elog "To create a default CA and certificates for your server and clients, run:" - elog " emerge --config =${PF}" - elog "on your logging server. You can run it several times," - elog "once for each logging client. The client certificates will be signed" - elog "using the CA certificate generated during the first run." - fi - fi - - if [[ ${advertise_readme} -gt 0 ]]; then - # We need to show the README file location - - echo "" - elog "Please read" - elog "" - elog " ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*" - elog "" - elog "for more details." - fi -} - -pkg_config() { - if ! use ssl ; then - einfo "There is nothing to configure for rsyslog unless you" - einfo "used USE=ssl to build it." - return 0 - fi - - # Make sure the certificates directory exists - local CERTDIR="${EROOT}/etc/ssl/${PN}" - if [[ ! -d "${CERTDIR}" ]]; then - mkdir "${CERTDIR}" || die - fi - einfo "Your certificates will be stored in ${CERTDIR}" - - # Create a default CA if needed - if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then - einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..." - certtool --generate-privkey \ - --outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null - chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem" - - cat > "${T}/${PF}.$$" <<- _EOF - cn = Portage automated CA - ca - cert_signing_key - expiration_days = 3650 - _EOF - - certtool --generate-self-signed \ - --load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ - --outfile "${CERTDIR}/${PN}_ca.cert.pem" \ - --template "${T}/${PF}.$$" &>/dev/null - chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem" - - # Create the server certificate - echo - einfon "Please type the Common Name of the SERVER you wish to create a certificate for: " - read -r CN - - einfo "Creating private key and certificate for server ${CN}..." - certtool --generate-privkey \ - --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null - chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem" - - cat > "${T}/${PF}.$$" <<- _EOF - cn = ${CN} - tls_www_server - dns_name = ${CN} - expiration_days = 3650 - _EOF - - certtool --generate-certificate \ - --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \ - --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \ - --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \ - --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ - --template "${T}/${PF}.$$" &>/dev/null - chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem" - - else - einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation." - fi - - # Create a client certificate - echo - einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: " - read -r CN - - einfo "Creating private key and certificate for client ${CN}..." - certtool --generate-privkey \ - --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null - chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem" - - cat > "${T}/${PF}.$$" <<- _EOF - cn = ${CN} - tls_www_client - dns_name = ${CN} - expiration_days = 3650 - _EOF - - certtool --generate-certificate \ - --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \ - --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \ - --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \ - --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ - --template "${T}/${PF}.$$" &>/dev/null - chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem" - - rm -f "${T}/${PF}.$$" - - echo - einfo "Here is the documentation on how to encrypt your log traffic:" - einfo " http://www.rsyslog.com/doc/rsyslog_tls.html" -} diff --git a/app-admin/rsyslog/rsyslog-8.34.0.ebuild b/app-admin/rsyslog/rsyslog-8.34.0.ebuild deleted file mode 100644 index f47e7b9..0000000 --- a/app-admin/rsyslog/rsyslog-8.34.0.ebuild +++ /dev/null @@ -1,468 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) - -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/" - -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: 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 - _tmp_last_index=$(($(get_last_version_component_index ${PV})+1)) - _tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${PV}) - if [[ ${_tmp_suffix} = *rc* ]]; then - MY_URL_PREFIX="${_tmp_suffix}/" - fi - - # Cleaning up temporary variables - unset _tmp_last_index - unset _tmp_suffix - else - KEYWORDS="~amd64 ~arm ~arm64 ~x86" - fi - - SRC_URI=" - 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}"/${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="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.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:= ) - 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? ( >=net-libs/gnutls-2.12.23:0= ) - systemd? ( >=sys-apps/systemd-234 ) - uuid? ( sys-apps/util-linux:0= ) - zeromq? ( - >=net-libs/czmq-3.0.2 - )" -DEPEND="${RDEPEND} - >=sys-devel/autoconf-archive-2015.02.24 - virtual/pkgconfig - elibc_musl? ( sys-libs/queue ) - 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 )" - 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 ${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) - $(use_enable curl libcurl) - # 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 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 ssl gnutls) - $(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}"/${BRANCH}/README.gentoo - ) - - use doc && local HTML_DOCS=( "${S}/docs/build/." ) - - default - - newconfd "${FILESDIR}/${BRANCH}/${PN}.confd-r1" ${PN} - newinitd "${FILESDIR}/${BRANCH}/${PN}.initd-r1" ${PN} - - keepdir /var/empty/dev - keepdir /var/spool/${PN} - keepdir /etc/ssl/${PN} - keepdir /etc/${PN}.d - - insinto /etc - newins "${FILESDIR}/${BRANCH}/${PN}.conf" ${PN}.conf - - insinto /etc/rsyslog.d/ - newins "${FILESDIR}/${BRANCH}/50-default-r1.conf" 50-default.conf - - insinto /etc/logrotate.d/ - newins "${FILESDIR}/${BRANCH}/${PN}.logrotate" ${PN} - - if use mysql; then - insinto /usr/share/doc/${PF}/scripts/mysql - doins plugins/ommysql/createDB.sql - fi - - if use postgres; then - insinto /usr/share/doc/${PF}/scripts/pgsql - doins plugins/ompgsql/createDB.sql - fi - - prune_libtool_files --modules -} - -pkg_postinst() { - local advertise_readme=0 - - if [[ -z "${REPLACING_VERSIONS}" ]]; then - # This is a new installation - - advertise_readme=1 - - if use mysql || use postgres; then - echo - elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:" - elog " /usr/share/doc/${PF}/scripts" - fi - - if use ssl; then - echo - elog "To create a default CA and certificates for your server and clients, run:" - elog " emerge --config =${PF}" - elog "on your logging server. You can run it several times," - elog "once for each logging client. The client certificates will be signed" - elog "using the CA certificate generated during the first run." - fi - fi - - if [[ ${advertise_readme} -gt 0 ]]; then - # We need to show the README file location - - echo "" - elog "Please read" - elog "" - elog " ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*" - elog "" - elog "for more details." - fi -} - -pkg_config() { - if ! use ssl ; then - einfo "There is nothing to configure for rsyslog unless you" - einfo "used USE=ssl to build it." - return 0 - fi - - # Make sure the certificates directory exists - local CERTDIR="${EROOT}/etc/ssl/${PN}" - if [[ ! -d "${CERTDIR}" ]]; then - mkdir "${CERTDIR}" || die - fi - einfo "Your certificates will be stored in ${CERTDIR}" - - # Create a default CA if needed - if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then - einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..." - certtool --generate-privkey \ - --outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null - chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem" - - cat > "${T}/${PF}.$$" <<- _EOF - cn = Portage automated CA - ca - cert_signing_key - expiration_days = 3650 - _EOF - - certtool --generate-self-signed \ - --load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ - --outfile "${CERTDIR}/${PN}_ca.cert.pem" \ - --template "${T}/${PF}.$$" &>/dev/null - chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem" - - # Create the server certificate - echo - einfon "Please type the Common Name of the SERVER you wish to create a certificate for: " - read -r CN - - einfo "Creating private key and certificate for server ${CN}..." - certtool --generate-privkey \ - --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null - chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem" - - cat > "${T}/${PF}.$$" <<- _EOF - cn = ${CN} - tls_www_server - dns_name = ${CN} - expiration_days = 3650 - _EOF - - certtool --generate-certificate \ - --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \ - --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \ - --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \ - --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ - --template "${T}/${PF}.$$" &>/dev/null - chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem" - - else - einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation." - fi - - # Create a client certificate - echo - einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: " - read -r CN - - einfo "Creating private key and certificate for client ${CN}..." - certtool --generate-privkey \ - --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null - chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem" - - cat > "${T}/${PF}.$$" <<- _EOF - cn = ${CN} - tls_www_client - dns_name = ${CN} - expiration_days = 3650 - _EOF - - certtool --generate-certificate \ - --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \ - --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \ - --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \ - --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ - --template "${T}/${PF}.$$" &>/dev/null - chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem" - - rm -f "${T}/${PF}.$$" - - echo - einfo "Here is the documentation on how to encrypt your log traffic:" - einfo " https://www.rsyslog.com/doc/rsyslog_tls.html" -} diff --git a/app-admin/rsyslog/rsyslog-8.33.1-r1.ebuild b/app-admin/rsyslog/rsyslog-8.40.0-r1.ebuild similarity index 83% rename from app-admin/rsyslog/rsyslog-8.33.1-r1.ebuild rename to app-admin/rsyslog/rsyslog-8.40.0-r1.ebuild index 9cf86ba..86fbb36 100644 --- a/app-admin/rsyslog/rsyslog-8.33.1-r1.ebuild +++ b/app-admin/rsyslog/rsyslog-8.40.0-r1.ebuild @@ -1,16 +1,14 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_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/" -BRANCH="8-stable" - if [[ ${PV} == "9999" ]]; then EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git" @@ -18,50 +16,26 @@ if [[ ${PV} == "9999" ]]; then inherit git-r3 else - MY_PV=${PV%_rc*} - MY_FILENAME="${PN}-${PV}.tar.gz" - MY_FILENAME_DOCS="${PN}-docs-${PV}.tar.gz" - S="${WORKDIR}/${PN}-${MY_PV}" - - # Upstream URL schema: - # RC: http://www.rsyslog.com/files/download/rsyslog/rc/rsyslog-8.18.0.tar.gz - # http://www.rsyslog.com/files/download/rsyslog/rc2/rsyslog-8.18.0.tar.gz - # Release: http://www.rsyslog.com/files/download/rsyslog/rsyslog-8.18.0.tar.gz - - MY_URL_PREFIX= - if [[ ${PV} = *_rc* ]]; then - _tmp_last_index=$(($(get_last_version_component_index ${PV})+1)) - _tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${PV}) - if [[ ${_tmp_suffix} = *rc* ]]; then - MY_URL_PREFIX="${_tmp_suffix}/" - fi - - # Cleaning up temporary variables - unset _tmp_last_index - unset _tmp_suffix - else - KEYWORDS="~amd64 ~arm ~arm64 ~x86" - fi + KEYWORDS="~amd64 ~arm ~x86" SRC_URI=" - 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} ) + https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz + doc? ( https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz ) " - PATCHES=( - "${FILESDIR}"/8-stable/${PN}-8.18.0-musl-fix.patch - ) + PATCHES=( "${FILESDIR}"/${PN}-8.40.0-fix-omusrmsg.patch ) fi LICENSE="GPL-3 LGPL-3 Apache-2.0" SLOT="0" -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" +IUSE="curl dbi debug doc elasticsearch +gcrypt grok gnutls jemalloc kafka kerberos kubernetes libressl mdblookup" +IUSE+=" mongodb mysql normalize omhttp 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 - >=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 ) @@ -71,6 +45,7 @@ RDEPEND=" jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) kerberos? ( virtual/krb5 ) + kubernetes? ( >=net-misc/curl-7.35.0 ) mdblookup? ( dev-libs/libmaxminddb:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) mysql? ( virtual/libmysqlclient:= ) @@ -83,16 +58,23 @@ 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.14:= ) + relp? ( >=dev-libs/librelp-1.2.17:= ) 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= ) + 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 )" @@ -101,11 +83,17 @@ DEPEND="${RDEPEND} virtual/pkgconfig elibc_musl? ( sys-libs/queue ) test? ( + >=dev-libs/liblogging-1.0.1[stdlog] 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" @@ -148,7 +136,7 @@ src_unpack() { 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} + unpack ${PN}-doc-${PV}.tar.gz fi fi } @@ -179,8 +167,10 @@ src_configure() { --disable-debug-symbols --disable-generate-man-pages --without-valgrind-testbench + --disable-liblogging-stdlog $(use_enable test testbench) - $(use_enable curl libcurl) + $(use_enable test libfaketime) + $(use_enable test extended-tests) # Input Plugins without depedencies --enable-imdiag --enable-imfile @@ -203,10 +193,15 @@ src_configure() { --enable-omstdout --enable-omuxsock # Misc + --enable-fmhash + $(use_enable xxhash fmhash-xxhash) --enable-pmaixforwardedfrom --enable-pmciscoios --enable-pmcisconames --enable-pmlastmsg + $(use_enable normalize pmnormalize) + --enable-pmnull + --enable-pmpanngfw --enable-pmsnare # DB $(use_enable dbi libdbi) @@ -217,19 +212,20 @@ src_configure() { # Debug $(use_enable debug) $(use_enable debug diagtools) - $(use_enable debug memcheck) - $(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) + $(use_enable omhttp) $(use_enable omhttpfs) $(use_enable omudpspoof) $(use_enable rabbitmq omrabbitmq) @@ -238,7 +234,8 @@ src_configure() { $(use_enable rfc5424hmac mmrfc5424addhmac) $(use_enable snmp) $(use_enable snmp mmsnmptrapd) - $(use_enable ssl gnutls) + $(use_enable gnutls) + $(use_enable openssl) $(use_enable systemd imjournal) $(use_enable systemd omjournal) $(use_enable usertools) @@ -293,15 +290,15 @@ src_install() { local DOCS=( AUTHORS ChangeLog - "${FILESDIR}"/${BRANCH}/README.gentoo + "${FILESDIR}"/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} + newconfd "${FILESDIR}/${PN}.confd-r1" ${PN} + newinitd "${FILESDIR}/${PN}.initd-r1" ${PN} keepdir /var/empty/dev keepdir /var/spool/${PN} @@ -309,13 +306,13 @@ src_install() { keepdir /etc/${PN}.d insinto /etc - newins "${FILESDIR}/${BRANCH}/${PN}.conf" ${PN}.conf + newins "${FILESDIR}/${PN}.conf" ${PN}.conf insinto /etc/rsyslog.d/ - newins "${FILESDIR}/${BRANCH}/50-default-r1.conf" 50-default.conf + newins "${FILESDIR}/50-default-r1.conf" 50-default.conf insinto /etc/logrotate.d/ - newins "${FILESDIR}/${BRANCH}/${PN}.logrotate" ${PN} + newins "${FILESDIR}/${PN}-r1.logrotate" ${PN} if use mysql; then insinto /usr/share/doc/${PF}/scripts/mysql @@ -458,5 +455,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" }