* [gentoo-commits] proj/musl:master commit in: app-admin/rsyslog/, app-admin/rsyslog/files/8-stable/
@ 2017-03-31 18:14 Aric Belsito
0 siblings, 0 replies; 5+ messages in thread
From: Aric Belsito @ 2017-03-31 18:14 UTC (permalink / raw
To: gentoo-commits
commit: 865d33fa1c82dc1f6fed608780ea5c911087b6a1
Author: callmetango <callmetango <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Thu Mar 30 07:29:34 2017 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Fri Mar 31 05:28:30 2017 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=865d33fa
app-admin/rsyslog: version bump to 8.25.0-r1
app-admin/rsyslog/Manifest | 3 +-
...yslog-8.24.0-fix-tcpflood-without-librelp.patch | 152 +++++++++++++++++++++
...slog-8.25.0.ebuild => rsyslog-8.25.0-r1.ebuild} | 12 +-
3 files changed, 160 insertions(+), 7 deletions(-)
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index 1d71d97..91e9443 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -2,11 +2,12 @@ AUX 8-stable/50-default.conf 1701 SHA256 61c1dd1450f574a21a8d8375faaf3e42f9856df
AUX 8-stable/50-rsyslog-8.18.0-musl-fix.patch 300 SHA256 5b8420570bef57aeba55965bbbddb29f966b60a33ef9e7fc5f921820274080b0 SHA512 20967235e8233588210071a7157a81fe02a1e88d7c7f55855fcc2fe34295269a6e3e3bfccb3d4dd83a6a48da28948c92d6ce47a0c5d817f6b6a4030635f4f896 WHIRLPOOL e8a07737f7e282905bf92112b2d94303605cb2f8da0d5c0598f41bdb8d060a18f5d6f2b70a8f5f3feec5cb0a24109fdf4f2e1ebd0517e8063d72c763e345501f
AUX 8-stable/50-rsyslog-8.18.0-musl-imptcp-queue.patch 20588 SHA256 8d6dda439c79dffac2a5d17e3d9a28355cfb8fc264175a871e27304ace259daa SHA512 de8b82781af2dfef67b2215782721cca2ee5db9d08ed3260f4e3390353a59bf4bd76701df682c4bf537ce817eabf79b062c4b2a3e20e4175e7d77ca08c5a700f WHIRLPOOL cf1d3c2e434c7843e9874b8138ecb3777cc4e384477b2c3936b9d5c10e13e2493461c433c58760a35ba20638c5acd1e03c7fae718f5d2a6b0017ea34e66b0a67
AUX 8-stable/README.gentoo 1126 SHA256 29b4c68f521f2f1f138f44c4635da1a270fed9cbd4a780569754080987aa777c SHA512 46fdf3350e2005d3ef588d50dfc6d474a1b5d3010329b656879a43cbbd7be0cd91944b88d3838f45f69c830fc28c42e7fac2cd52e0a4b24bb6780562d59ae384 WHIRLPOOL a1a3ec8b887110a01e8c1c1320f25493dd8ff343e4b08780c30c9bc3bb842afa0ef79db08195db876697c1a69807f49a8b3793609d25f78559fa534507fc195e
+AUX 8-stable/rsyslog-8.24.0-fix-tcpflood-without-librelp.patch 5081 SHA256 a851f854e232276a60ea85dbb42d61218f2b3056c57a6421043b2263946d26bc SHA512 70487aa33dcb5c541620e04cc11003b74acb1047c40b984e14a9f95b1d9c19cbbb47b5948d9b5a7ccb053af77e309c3f613dfa7439dcc75b51a6da3b3a54d2ff WHIRLPOOL ffa2f35565afe13e632466c43bdca64dddf09abed93947407372b697810ef097c8501e6c8d1cda16db7adf5b89a85664bc24fdbcad97f284b71388d4b650763a
AUX 8-stable/rsyslog.conf 1562 SHA256 fc70a94213b5eb519febf9aa7d758ee9526433bcc5683bcb7451d16e65a2f5b0 SHA512 1720174fab020e2de590f3d6bbb03784aca1928fe05f7e75e02fb4597cb8b2ee755e6deb8e8f989060511044ae483f791f496f24e0eecaf27eb9e0b5e20a2c7a WHIRLPOOL 97cf3fdee62a9339b412ebe93b71b2d6804df60aad9cb7e71779fcaddb01d489e38bbb353557864ea38aba384e664e6da636812c3c078ed9e22e261ed7b78cba
AUX 8-stable/rsyslog.confd-r1 1145 SHA256 0be3575df8010523de6b37e98c417192e8ec481292ca9fb47c8d2211795e03a6 SHA512 a7f8621bdd490596b09f9a7583dd0c992006c55335b2e6e687bef4141bb18cd4bb43e23f590a138e9c8d5a3cbac0cc46c3b01c7d3ff9f9dd3c53418b13b0dd4a WHIRLPOOL 05079ab1a55aca9b68c81c8b7da66ff029f72c7168bd15faebf7d7172dddc69f6ffb2864e1fcd8c1f2dbb51416bea89fab3667a34ed7295b3abafc6a93883d3e
AUX 8-stable/rsyslog.initd-r1 1765 SHA256 2c8800c31b8411899b49036bd51ed58a625ee8b7bd523b18d6ad8b7399da0324 SHA512 07a73ddd6e50b9d4ae7d9633c71b6e96e86f3348e242506d9f6a86a0f367e6bc671bed559f9d69232096e7dce7a062be7107794fc2564829d53f42d4d30d8daf WHIRLPOOL 734780723ae73f573c3104c35460e8ef9e5915433012c1a2ca987bea7de37a3a423315ca6f1da06dbf0af6fabc14051c89f7e682592d6ccaa1e39432d5648477
AUX 8-stable/rsyslog.logrotate 682 SHA256 89cc8f13c1f7a3ae446b40da7b31cdf471e2c9e2d3d5b8f48e524f7a82fbff89 SHA512 6c58abd2f02157177a61695f53eccbf201c514821b0c551a4812621e8d3dd2da9b5cd651d93860cb51ebdbdc7056d0ef0dde99c2a57ac3c43aa968a141805912 WHIRLPOOL 9d29c2c9351252887c3dad78962df942bb1cd7387eb44e3c98764319f82d90c42d255a5642c55bb37811fb903e1c5314ca536bc9d32ccfd0535f0579f4e25ff0
DIST rsyslog-8.25.0.tar.gz 2386720 SHA256 c756f16a083e5d4081fb9bfb236303a839cdca0a2c00017bd770b2e2e9677427 SHA512 0e97db84cc8fe9fd6e3ffb5a78b32fd213e22833c6ed605329c579132d127b7d65b3f66c64e6bddeb1967aa9ed90645a7c24b9d5e643f95bdaf48ed9fc82cb5f WHIRLPOOL 2c4925fda01e49f95ed3d2f43898cdf8f6d679ace5c2a1d1d330dfc422936ae7751cfefa480359b26d2cb782a8217865336f5e04e65e81ffce565b3388c2ff01
DIST rsyslog-docs-8.25.0.tar.gz 4359583 SHA256 3fa96f85ca31b09b16dcc4b184f9beeb5fb06ba463b0ced7046ec2a471b7d3ad SHA512 e0068ec00bbda2d1cf7f14105ad83e82bea9291ed5d5fda3ffcff2db32747b65e7b6d65743a3221aeca03be9c6efcee1db7f03c2da115a3aed60848556befa71 WHIRLPOOL 8c2ae0afe5fb1f81b33ecb83df420a7bbc8c147eac5854a57ba1c5341bb42d9dd4a3976a472445d19a45eb09258bc3be1b9065d79fd679095cbf24cbfddb1756
-EBUILD rsyslog-8.25.0.ebuild 12626 SHA256 b785b88911eee95aad965342ad1f61724c43fd55feb9a0e3f7afe6b43f81ccc0 SHA512 07ab08de84f75614fc13d050688ea07723ec46abf17a21d135e07ded3c8e4aa2c34934651c127a52c700da7082afbb831365620bc128bdd0556012fba7243cae WHIRLPOOL 33b784d382a10957a2c1156c223c7477f0ac7fb0fca0fe9cd3a61317ebde9c1b701ab25c128fcc275c5e00d5cbfb6b03189f30667fd4257dbe69a6523a839b96
+EBUILD rsyslog-8.25.0-r1.ebuild 12696 SHA256 1f320048f4015489ced52a06975657aa3fe2fe78ffa81bce6462842fc56d9c8a SHA512 5609c411a8148bf2acdb6ce572e178b1e40834269a36d4a406eaa9776df5c134d66a9d5bacaa84874b0da2879046b7ea42713d8faff1f7e40267dc1c0bbdc187 WHIRLPOOL caf8faee011a243ee31a688d240c3fa039b71cc51b2997837bc18eced808802f8af950ffca24191dbc4e335339b97d0ce662aeb9086ce572745c21fb159b0fa3
MISC metadata.xml 3329 SHA256 c757c77e3d9c766d901ac9737ea16ecd4bc836585df84c745d9ab2b160baebce SHA512 a128d327fdd7e46e9fc22605589d0a05462dce15870e3a9371a83d47e2616eb0ea4e54c6f813eb7c87d24ad8cc456883a145c73425e6bd9483f4dfd82c4377cd WHIRLPOOL 921eb979cdf8efdf2bb0fab33e6b4d774a870a86e243af21b73a127376d843bf1400007d1f72026713f344ce1ee67456d5a7d1f182d8f5ef59679debc178a357
diff --git a/app-admin/rsyslog/files/8-stable/rsyslog-8.24.0-fix-tcpflood-without-librelp.patch b/app-admin/rsyslog/files/8-stable/rsyslog-8.24.0-fix-tcpflood-without-librelp.patch
new file mode 100644
index 0000000..c328706
--- /dev/null
+++ b/app-admin/rsyslog/files/8-stable/rsyslog-8.24.0-fix-tcpflood-without-librelp.patch
@@ -0,0 +1,152 @@
+From 73e3b7ab2f8a3974d31844b492ad02d61ed5727f Mon Sep 17 00:00:00 2001
+From: Rainer Gerhards <rgerhards@adiscon.com>
+Date: Thu, 23 Feb 2017 13:18:44 +0100
+Subject: [PATCH] testbench: tcpflood failed to build if RELP support was
+ disabled
+
+closes https://github.com/rsyslog/rsyslog/issues/1426
+---
+ tests/tcpflood.c | 24 +++++++++++++++++++++---
+ 1 file changed, 21 insertions(+), 3 deletions(-)
+
+diff --git a/tests/tcpflood.c b/tests/tcpflood.c
+index c500a51..aa79794 100644
+--- a/tests/tcpflood.c
++++ b/tests/tcpflood.c
+@@ -149,7 +149,9 @@ static int numMsgsToSend = 1; /* number of messages to send */
+ 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 +218,7 @@ static void initTLSSess(int);
+ 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 +238,7 @@ initRELP_PLAIN(void)
+ CHKRELP(relpEngineSetEnableCmd(pRelpEngine, (unsigned char*)"syslog",
+ eRelpCmdState_Required));
+ }
++#endif /* #ifdef ENABLE_RELP */
+
+ /* prepare send subsystem for UDP send */
+ static int
+@@ -273,6 +277,7 @@ int openConn(int *fd, const int connIdx)
+ port = targetPort;
+ }
+ if(transport == TP_RELP_PLAIN) {
++ #ifdef ENABLE_RELP
+ relpRetVal relp_r;
+ relpClt_t *relpClt;
+ char relpPort[16];
+@@ -286,6 +291,7 @@ int openConn(int *fd, const int connIdx)
+ 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 +342,10 @@ int openConnections(void)
+ 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 +364,10 @@ int openConnections(void)
+ * 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 +413,13 @@ void closeConnections(void)
+
+ 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 +428,7 @@ void closeConnections(void)
+ }
+ 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 +620,7 @@ int sendMessages(struct instdata *inst)
+ 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 +638,7 @@ int sendMessages(struct instdata *inst)
+ printf("\nrelpCltSendSyslog() failed with relp error code %d\n",
+ relp_ret);
+ }
++ #endif
+ }
+ if(lenSend != lenBuf) {
+ printf("\r%5.5d\n", i);
+@@ -1106,7 +1118,9 @@ int main(int argc, char *argv[])
+ 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 +1182,9 @@ int main(int argc, char *argv[])
+ if(transport == TP_TLS) {
+ initTLS();
+ } else if(transport == TP_RELP_PLAIN) {
++ #ifdef ENABLE_RELP
+ initRELP_PLAIN();
++ #endif
+ }
+
+ if(openConnections() != 0) {
+@@ -1183,9 +1199,11 @@ int main(int argc, char *argv[])
+
+ 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/rsyslog-8.25.0.ebuild b/app-admin/rsyslog/rsyslog-8.25.0-r1.ebuild
similarity index 98%
rename from app-admin/rsyslog/rsyslog-8.25.0.ebuild
rename to app-admin/rsyslog/rsyslog-8.25.0-r1.ebuild
index 0ec7494..0b079ae 100644
--- a/app-admin/rsyslog/rsyslog-8.25.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.25.0-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="6"
@@ -53,6 +52,12 @@ else
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.patch"
+ "${FILESDIR}/8-stable/50-${PN}-8.18.0-musl-fix.patch"
+ "${FILESDIR}/8-stable/50-${PN}-8.18.0-musl-imptcp-queue.patch"
+ )
fi
LICENSE="GPL-3 LGPL-3 Apache-2.0"
@@ -110,11 +115,6 @@ if [[ ${PV} == "9999" ]]; then
DEPEND+=" >=dev-python/docutils-0.12"
fi
-PATCHES=(
- "${FILESDIR}/8-stable/50-${PN}-8.18.0-musl-fix.patch"
- "${FILESDIR}/8-stable/50-${PN}-8.18.0-musl-imptcp-queue.patch"
-)
-
CONFIG_CHECK="~INOTIFY_USER"
WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/musl:master commit in: app-admin/rsyslog/, app-admin/rsyslog/files/8-stable/
@ 2017-05-18 2:04 Aric Belsito
0 siblings, 0 replies; 5+ messages in thread
From: Aric Belsito @ 2017-05-18 2:04 UTC (permalink / raw
To: gentoo-commits
commit: cdc783eb47a95af670bcf7b45794dd4952ab22e1
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Thu May 18 02:03:40 2017 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Thu May 18 02:03:40 2017 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=cdc783eb
app-admin/rsyslog: version bump to 8.27.0
app-admin/rsyslog/Manifest | 10 +++--
.../rsyslog-8.26.0-fix-zmq3-format-security.patch | 39 ++++++++++++++++++++
.../rsyslog-8.27.0-fix-librdkafka-detection.patch | 43 ++++++++++++++++++++++
app-admin/rsyslog/metadata.xml | 2 +-
...rsyslog-8.26.0.ebuild => rsyslog-8.27.0.ebuild} | 5 ++-
5 files changed, 93 insertions(+), 6 deletions(-)
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index 271f6aa..1a9ac6e 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -2,14 +2,16 @@ AUX 8-stable/50-default.conf 1701 SHA256 61c1dd1450f574a21a8d8375faaf3e42f9856df
AUX 8-stable/50-rsyslog-8.18.0-musl-fix.patch 168 SHA256 5806738195b8155bbb19e3fb0db84f59668f5cf0c303d0f3c1e15a4ac31f8997 SHA512 8ab680645e59392ce164e8b46b3c6b64def1fa08f83fca3feb1065d0f1a663f5cf34600aec86190edcd06d364399efaa04b372310f76f263d11cb179e3a840fa WHIRLPOOL e70fededf8f540d77628d26b9d28512ee7b1b6ca6bd0e13b644c6f7665c2a91c85a6602e7b22e5a404e758caf6a71393d0abfff3b2a6e98519ffa2399c1ec778
AUX 8-stable/README.gentoo 1126 SHA256 29b4c68f521f2f1f138f44c4635da1a270fed9cbd4a780569754080987aa777c SHA512 46fdf3350e2005d3ef588d50dfc6d474a1b5d3010329b656879a43cbbd7be0cd91944b88d3838f45f69c830fc28c42e7fac2cd52e0a4b24bb6780562d59ae384 WHIRLPOOL a1a3ec8b887110a01e8c1c1320f25493dd8ff343e4b08780c30c9bc3bb842afa0ef79db08195db876697c1a69807f49a8b3793609d25f78559fa534507fc195e
AUX 8-stable/rsyslog-8.24.0-fix-tcpflood-without-librelp-r1.patch 4660 SHA256 f50685f76004298a8a77ee6eb88868ff0f8fb8eb7ca5ce0f6809c4db9c42474d SHA512 231030532a126dade0fa2c98d9bd8ef610d3059210cabfc6b0a51adfb610b61eb57b7926a2a51f01f196d196a9134b4c1db7105aeedc4d35eb70abac97301378 WHIRLPOOL 88a9ebe6e3dbeca7b55e16192e6be6d862241a17402c2abf0bcdad4f16fed5fa11f7c140ac0de1655a52d43ad18eaa493b3e2426e1b3c80d1be119dffdc9cd15
+AUX 8-stable/rsyslog-8.26.0-fix-zmq3-format-security.patch 1982 SHA256 abf1b264e7de3a86c2f6cec86d59496bd865fcce5e691b71c7b2c977bdf7358d SHA512 b426c3eaa2adc2de14e129125ccd630e2fa2132c6ca774f3e18ee784f0622573a95339d901a1b9c2877e8b77d00f8be9f9d17f92769136c356aaab58358d2159 WHIRLPOOL e327d0d8f5e3aab078233324359f42fd21aba2cb65927097acdbbf9dbac296a84fcfad71de228a9b2868f229d7f2260742f4180b677ef2a961a47d81db65a2bb
+AUX 8-stable/rsyslog-8.27.0-fix-librdkafka-detection.patch 1556 SHA256 638f22781452c361ae4021d66bf8faf78767752a62bf16588e310d3fc855753c SHA512 374de4fb9a4e3c3b9e28ff2e5eca48b7744afc9a5ba222508661fdfa30037967b6a2497d0e82266010de27c1a540ebb300c15bf6049a1af9dcf019353c04acdc WHIRLPOOL bad8fc8d88ea42defef922b67cbf0e66706dfd71d01249dbc82e49bfba787056e1e641e58dd2ba22250073aacba8afb8445d5d8610f095a961f47286ea4a7562
AUX 8-stable/rsyslog.conf 1562 SHA256 fc70a94213b5eb519febf9aa7d758ee9526433bcc5683bcb7451d16e65a2f5b0 SHA512 1720174fab020e2de590f3d6bbb03784aca1928fe05f7e75e02fb4597cb8b2ee755e6deb8e8f989060511044ae483f791f496f24e0eecaf27eb9e0b5e20a2c7a WHIRLPOOL 97cf3fdee62a9339b412ebe93b71b2d6804df60aad9cb7e71779fcaddb01d489e38bbb353557864ea38aba384e664e6da636812c3c078ed9e22e261ed7b78cba
AUX 8-stable/rsyslog.confd-r1 1145 SHA256 0be3575df8010523de6b37e98c417192e8ec481292ca9fb47c8d2211795e03a6 SHA512 a7f8621bdd490596b09f9a7583dd0c992006c55335b2e6e687bef4141bb18cd4bb43e23f590a138e9c8d5a3cbac0cc46c3b01c7d3ff9f9dd3c53418b13b0dd4a WHIRLPOOL 05079ab1a55aca9b68c81c8b7da66ff029f72c7168bd15faebf7d7172dddc69f6ffb2864e1fcd8c1f2dbb51416bea89fab3667a34ed7295b3abafc6a93883d3e
AUX 8-stable/rsyslog.initd-r1 1758 SHA256 93044cc5fc344cd90d17cbb5cebee3c60ebf674e53c8b9efc6e758d53912d343 SHA512 0ddd385e77759370344032f52f945b1e90d4961140db63e2562e4be78dfc2bae16ac9439d40fe078110593999b5c5efd7680b402fc0771b1261ff28b1725e265 WHIRLPOOL 14918404976219e379f80d67fe47a0f6e9d51938061c9f5d205bbcd7cedbda96825f75fd64f2fcc446d96292710a5ea375e117f621c33c9df7352e27286c91ae
AUX 8-stable/rsyslog.logrotate 682 SHA256 89cc8f13c1f7a3ae446b40da7b31cdf471e2c9e2d3d5b8f48e524f7a82fbff89 SHA512 6c58abd2f02157177a61695f53eccbf201c514821b0c551a4812621e8d3dd2da9b5cd651d93860cb51ebdbdc7056d0ef0dde99c2a57ac3c43aa968a141805912 WHIRLPOOL 9d29c2c9351252887c3dad78962df942bb1cd7387eb44e3c98764319f82d90c42d255a5642c55bb37811fb903e1c5314ca536bc9d32ccfd0535f0579f4e25ff0
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.27.0.tar.gz 2435123 SHA256 02aefbba59324a6d8b70036a67686bed5f0c7be4ced62c039af6ee694cb5b1fd SHA512 dad957c21d9f7ed3a97a1ed87658fe9381dad00365bd2f5af2396dde3dc4a9f96db17c4df9eb9bd02562cc538f99bf8e2ca00229680d6b7892179161265db753 WHIRLPOOL 1ece4fa5bd453e1bcd4da9501fa93be7f3ea0eb87f7e60bb788d7c90c740566cc07351eb2d7730ac081b2564bde9a79dff7ac1b5012326cc8b0331539b2b5b01
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.27.0.tar.gz 4411093 SHA256 f799eba43ff73c14865cbc3f7105d54afec021430827e6d6da7b51f45cfbedb0 SHA512 08d935ecad070d65e7169a56c6a4d35d49e895b4f7cfe4d747939d8a92bdadd0fc3be7cc47d23d233a33b964f2a4d809a34b37419d2e42c3f8c183120412ab2c WHIRLPOOL 1a7eeadc0667580ab14ae5857fc61f7eb5553bad00d7b59ed3e70aa3a2f75550872a110c6149b4bd69778c990ec3c57e625cc08a716792731d456d875e8a9e8b
EBUILD rsyslog-8.24.0-r2.ebuild 12575 SHA256 7725f8cf5aed2092ecc4d7534d4491dd6a28ec84c3e3a3d60b9dd0e87cf395c3 SHA512 de77eaa59232ad924fdc059ee287448196e0a750a92e783ecc7fe29656f09a1110e4e47c78b8ebfff085b34838d1f23a5fccd79aaea50998a5c33497a9220e7a WHIRLPOOL 53d1532b60e73032df6938873ce43ffbf692f42abbd39bc3e3b9596360dd6c9dd0a6d030251ceabec20493a282ee153a036c1481537394e601ad9dd7c83c54cb
-EBUILD rsyslog-8.26.0.ebuild 12590 SHA256 3674e361c102228eeb45506ff7a21bc72acd391fe8b5ee3b464c88cf382273fb SHA512 541d2488f65e4c3c3c61e13e3e733eab465fff4adff818912195a3ce25267fa58ca72bc5bd00dab6937816e2b16e322935c1e921e70ae0ae1be64b919cdb2025 WHIRLPOOL 375652534d65e6e86f88680072a4619cfade4f8f006a92414c288aadcc0c46dba81349d1bea5150c2f6776de8b7973cbc1ac880ee118a45a466d15655d4426de
-MISC metadata.xml 3329 SHA256 c757c77e3d9c766d901ac9737ea16ecd4bc836585df84c745d9ab2b160baebce SHA512 a128d327fdd7e46e9fc22605589d0a05462dce15870e3a9371a83d47e2616eb0ea4e54c6f813eb7c87d24ad8cc456883a145c73425e6bd9483f4dfd82c4377cd WHIRLPOOL 921eb979cdf8efdf2bb0fab33e6b4d774a870a86e243af21b73a127376d843bf1400007d1f72026713f344ce1ee67456d5a7d1f182d8f5ef59679debc178a357
+EBUILD rsyslog-8.27.0.ebuild 12758 SHA256 9b60a0403f79b834910e269d1f48bccb158260bfae04927744c6a3a44597ae26 SHA512 04b49a36c930c9725f8d0140af57ac912a82e13c340ad164e5235e7f78fa9542328c8093cd8474860514480e3e5b5b3d4a197e9428f064fabda77238ed6518ed WHIRLPOOL 6bb68fa5ef5c51be5403c1ea2c3f98e2b9283121599a452d4c8195536466f334c427d6c9a1dc76542a0836dd298bef9a4890442da9ad92cf29357387f337afcf
+MISC metadata.xml 3335 SHA256 e4b519c8c8cf1d559aeb5151eca28d5057174d3bfcef2d74985c0ae20ea5adc7 SHA512 bfa3a8fbb502f6fdc110e8aa6b7394449329c29a63fc71c615317c97deb4e48f6e9f952bf492cc96be15fffb514f281a0d19de697bfddab4d4c7acf3c535c6a1 WHIRLPOOL 5ef1bccf69bbc7c5fd7dc88e8850e54fac881c24abfd07b05ca69e7213914d639a6254ae583a6436dfb4d784fe27b4fbfee6f1b9aeebccc7afb276ffb0cf4f93
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
new file mode 100644
index 0000000..b285798
--- /dev/null
+++ b/app-admin/rsyslog/files/8-stable/rsyslog-8.26.0-fix-zmq3-format-security.patch
@@ -0,0 +1,39 @@
+--- 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-librdkafka-detection.patch b/app-admin/rsyslog/files/8-stable/rsyslog-8.27.0-fix-librdkafka-detection.patch
new file mode 100644
index 0000000..366c0af
--- /dev/null
+++ b/app-admin/rsyslog/files/8-stable/rsyslog-8.27.0-fix-librdkafka-detection.patch
@@ -0,0 +1,43 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -1695,12 +1695,14 @@ AM_CONDITIONAL(ENABLE_KAFKA_TESTS, test x$enable_kafka_tests = xyes)
+
+ # omkafka works with older library
+ if test "x$enable_omkafka" = "xyes"; then
+- PKG_CHECK_MODULES([LIBRDKAFKA], [librdkafka],, [
+- AC_CHECK_LIB([rdkafka], [rd_kafka_produce], [
+- AC_MSG_WARN([librdkafka is missing but library present, using -lrdkafka])
+- LIBRDKAFKA_LIBS=-lrdkafka
+- ], [
+- AC_MSG_ERROR([could not find rdkafka library])
++ PKG_CHECK_MODULES([LIBRDKAFKA], [rdkafka],, [
++ PKG_CHECK_MODULES([LIBRDKAFKA], [librdkafka],, [
++ AC_CHECK_LIB([rdkafka], [rd_kafka_produce], [
++ AC_MSG_WARN([librdkafka is missing but library present, using -lrdkafka])
++ LIBRDKAFKA_LIBS=-lrdkafka
++ ], [
++ AC_MSG_ERROR([could not find rdkafka library])
++ ])
+ ])
+ ])
+ AC_CHECK_HEADERS([librdkafka/rdkafka.h])
+@@ -1708,12 +1710,13 @@ fi
+
+ # imkafka needs newer library
+ if test "x$enable_imkafka" = "xyes"; then
+- PKG_CHECK_MODULES(LIBRDKAFKA, rdkafka >= 0.9.1)
+- AC_CHECK_LIB([rdkafka], [rd_kafka_produce], [
+- AC_MSG_WARN([librdkafka is missing but library present, using -lrdkafka])
+- LIBRDKAFKA_LIBS=-lrdkafka
+- ], [
+- AC_MSG_ERROR([could not find rdkafka library])
++ PKG_CHECK_MODULES([LIBRDKAFKA], [rdkafka >= 0.9.1],, [
++ AC_CHECK_LIB([rdkafka], [rd_kafka_produce], [
++ AC_MSG_WARN([librdkafka is missing but library present, using -lrdkafka])
++ LIBRDKAFKA_LIBS=-lrdkafka
++ ], [
++ AC_MSG_ERROR([could not find rdkafka library])
++ ])
+ ])
+ AC_CHECK_HEADERS([librdkafka/rdkafka.h])
+ fi
diff --git a/app-admin/rsyslog/metadata.xml b/app-admin/rsyslog/metadata.xml
index a933e8b..855ee26 100644
--- a/app-admin/rsyslog/metadata.xml
+++ b/app-admin/rsyslog/metadata.xml
@@ -12,7 +12,7 @@
<flag name="gcrypt">Add support for encrypted log files using <pkg>dev-libs/libgcrypt</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 output module (requires <pkg>dev-libs/librdkafka</pkg>)</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="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>
diff --git a/app-admin/rsyslog/rsyslog-8.26.0.ebuild b/app-admin/rsyslog/rsyslog-8.27.0.ebuild
similarity index 98%
rename from app-admin/rsyslog/rsyslog-8.26.0.ebuild
rename to app-admin/rsyslog/rsyslog-8.27.0.ebuild
index 71f2bcf..94cd757 100644
--- a/app-admin/rsyslog/rsyslog-8.26.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.27.0.ebuild
@@ -54,7 +54,9 @@ else
"
PATCHES=(
- "${FILESDIR}/8-stable/50-${PN}-8.18.0-musl-fix.patch"
+ "${FILESDIR}"/8-stable/${PN}-8.26.0-fix-zmq3-format-security.patch
+ "${FILESDIR}"/8-stable/${PN}-8.27.0-fix-librdkafka-detection.patch
+ "${FILESDIR}"/8-stable/50-${PN}-8.18.0-musl-fix.patch
)
fi
@@ -220,6 +222,7 @@ src_configure() {
$(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)
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/musl:master commit in: app-admin/rsyslog/, app-admin/rsyslog/files/8-stable/
@ 2017-09-05 19:05 Aric Belsito
0 siblings, 0 replies; 5+ messages in thread
From: Aric Belsito @ 2017-09-05 19:05 UTC (permalink / raw
To: gentoo-commits
commit: 93e2b32fc3b9e1b741780e17a7e271462189a2cb
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Tue Sep 5 19:03:37 2017 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Tue Sep 5 19:03:37 2017 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=93e2b32f
app-admin/rsyslog: version bump to 8.29.0
Include stable versions
app-admin/rsyslog/Manifest | 16 ++-
.../rsyslog/files/8-stable/50-default-r1.conf | 107 +++++++++++++++++++++
.../rsyslog-8.27.0-fix-librdkafka-detection.patch | 43 ---------
app-admin/rsyslog/rsyslog-8.24.0-r2.ebuild | 10 +-
...slog-8.27.0.ebuild => rsyslog-8.26.0-r1.ebuild} | 16 +--
...rsyslog-8.27.0.ebuild => rsyslog-8.28.0.ebuild} | 21 +---
...rsyslog-8.27.0.ebuild => rsyslog-8.29.0.ebuild} | 20 +---
7 files changed, 134 insertions(+), 99 deletions(-)
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index 1a9ac6e..c9d694c 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -1,17 +1,23 @@
+AUX 8-stable/50-default-r1.conf 1952 SHA256 2ff8a047f14e7fc259c2d09195ced208f27503ca21efba8663df8c2aa05fda1c SHA512 1bc4d8059d83de57ff44d34265b0c3881bab7889f51c044728ba462c9105c89425187f95b6b01d6d6d103abde22a9dff063e5d6b90027ed87e9f851f9b1ad5b3 WHIRLPOOL bb6f12f9874e43702f69d1abb5c656dcbe12c8d81e936eb3d121078ebbdbfa259a45aace60e35a90b0445c9b03682faea4e1a808d3e8c55e01ed62577abeca7c
AUX 8-stable/50-default.conf 1701 SHA256 61c1dd1450f574a21a8d8375faaf3e42f9856df91011150ff13c0cfddc86ed41 SHA512 33e4e63239b9112fec1a37115ac80ab8dbd6e7189d9d29b1bc743c433e0124ea0d1a4cf6f7ada9e5b92e9b0025b6617a1a16f4c491e743bbf4327a5f376a1ea9 WHIRLPOOL d33b83bb690e78b5e5f7cfc090d21da03615c891a287b1f3a92a51514dcad1f5dfe8d2ceed867b3007768d47f48d207fac43a1ff33a85b24c21a5531cdf9d311
AUX 8-stable/50-rsyslog-8.18.0-musl-fix.patch 168 SHA256 5806738195b8155bbb19e3fb0db84f59668f5cf0c303d0f3c1e15a4ac31f8997 SHA512 8ab680645e59392ce164e8b46b3c6b64def1fa08f83fca3feb1065d0f1a663f5cf34600aec86190edcd06d364399efaa04b372310f76f263d11cb179e3a840fa WHIRLPOOL e70fededf8f540d77628d26b9d28512ee7b1b6ca6bd0e13b644c6f7665c2a91c85a6602e7b22e5a404e758caf6a71393d0abfff3b2a6e98519ffa2399c1ec778
AUX 8-stable/README.gentoo 1126 SHA256 29b4c68f521f2f1f138f44c4635da1a270fed9cbd4a780569754080987aa777c SHA512 46fdf3350e2005d3ef588d50dfc6d474a1b5d3010329b656879a43cbbd7be0cd91944b88d3838f45f69c830fc28c42e7fac2cd52e0a4b24bb6780562d59ae384 WHIRLPOOL a1a3ec8b887110a01e8c1c1320f25493dd8ff343e4b08780c30c9bc3bb842afa0ef79db08195db876697c1a69807f49a8b3793609d25f78559fa534507fc195e
AUX 8-stable/rsyslog-8.24.0-fix-tcpflood-without-librelp-r1.patch 4660 SHA256 f50685f76004298a8a77ee6eb88868ff0f8fb8eb7ca5ce0f6809c4db9c42474d SHA512 231030532a126dade0fa2c98d9bd8ef610d3059210cabfc6b0a51adfb610b61eb57b7926a2a51f01f196d196a9134b4c1db7105aeedc4d35eb70abac97301378 WHIRLPOOL 88a9ebe6e3dbeca7b55e16192e6be6d862241a17402c2abf0bcdad4f16fed5fa11f7c140ac0de1655a52d43ad18eaa493b3e2426e1b3c80d1be119dffdc9cd15
AUX 8-stable/rsyslog-8.26.0-fix-zmq3-format-security.patch 1982 SHA256 abf1b264e7de3a86c2f6cec86d59496bd865fcce5e691b71c7b2c977bdf7358d SHA512 b426c3eaa2adc2de14e129125ccd630e2fa2132c6ca774f3e18ee784f0622573a95339d901a1b9c2877e8b77d00f8be9f9d17f92769136c356aaab58358d2159 WHIRLPOOL e327d0d8f5e3aab078233324359f42fd21aba2cb65927097acdbbf9dbac296a84fcfad71de228a9b2868f229d7f2260742f4180b677ef2a961a47d81db65a2bb
-AUX 8-stable/rsyslog-8.27.0-fix-librdkafka-detection.patch 1556 SHA256 638f22781452c361ae4021d66bf8faf78767752a62bf16588e310d3fc855753c SHA512 374de4fb9a4e3c3b9e28ff2e5eca48b7744afc9a5ba222508661fdfa30037967b6a2497d0e82266010de27c1a540ebb300c15bf6049a1af9dcf019353c04acdc WHIRLPOOL bad8fc8d88ea42defef922b67cbf0e66706dfd71d01249dbc82e49bfba787056e1e641e58dd2ba22250073aacba8afb8445d5d8610f095a961f47286ea4a7562
AUX 8-stable/rsyslog.conf 1562 SHA256 fc70a94213b5eb519febf9aa7d758ee9526433bcc5683bcb7451d16e65a2f5b0 SHA512 1720174fab020e2de590f3d6bbb03784aca1928fe05f7e75e02fb4597cb8b2ee755e6deb8e8f989060511044ae483f791f496f24e0eecaf27eb9e0b5e20a2c7a WHIRLPOOL 97cf3fdee62a9339b412ebe93b71b2d6804df60aad9cb7e71779fcaddb01d489e38bbb353557864ea38aba384e664e6da636812c3c078ed9e22e261ed7b78cba
AUX 8-stable/rsyslog.confd-r1 1145 SHA256 0be3575df8010523de6b37e98c417192e8ec481292ca9fb47c8d2211795e03a6 SHA512 a7f8621bdd490596b09f9a7583dd0c992006c55335b2e6e687bef4141bb18cd4bb43e23f590a138e9c8d5a3cbac0cc46c3b01c7d3ff9f9dd3c53418b13b0dd4a WHIRLPOOL 05079ab1a55aca9b68c81c8b7da66ff029f72c7168bd15faebf7d7172dddc69f6ffb2864e1fcd8c1f2dbb51416bea89fab3667a34ed7295b3abafc6a93883d3e
AUX 8-stable/rsyslog.initd-r1 1758 SHA256 93044cc5fc344cd90d17cbb5cebee3c60ebf674e53c8b9efc6e758d53912d343 SHA512 0ddd385e77759370344032f52f945b1e90d4961140db63e2562e4be78dfc2bae16ac9439d40fe078110593999b5c5efd7680b402fc0771b1261ff28b1725e265 WHIRLPOOL 14918404976219e379f80d67fe47a0f6e9d51938061c9f5d205bbcd7cedbda96825f75fd64f2fcc446d96292710a5ea375e117f621c33c9df7352e27286c91ae
AUX 8-stable/rsyslog.logrotate 682 SHA256 89cc8f13c1f7a3ae446b40da7b31cdf471e2c9e2d3d5b8f48e524f7a82fbff89 SHA512 6c58abd2f02157177a61695f53eccbf201c514821b0c551a4812621e8d3dd2da9b5cd651d93860cb51ebdbdc7056d0ef0dde99c2a57ac3c43aa968a141805912 WHIRLPOOL 9d29c2c9351252887c3dad78962df942bb1cd7387eb44e3c98764319f82d90c42d255a5642c55bb37811fb903e1c5314ca536bc9d32ccfd0535f0579f4e25ff0
DIST rsyslog-8.24.0.tar.gz 2374240 SHA256 37f32ce33e32a88e1bea0511e8e557d90b7378b81520e3236a9af5ba6ea993d7 SHA512 b25b8ae72133376f732f54863c97aea3c8dfbf37c62c6a61840932996913c9d4e63155a24ffc577db48a18514f3e35b6fb109b1864380ba93ddf3fa6d84d728d WHIRLPOOL c5895d50143c21d446d760f5179b47fdae4ec34867711c942cd671b88789588e7244fb8511745efdb701954f7bc390403d30736a1e54af13dca4876f989928df
-DIST rsyslog-8.27.0.tar.gz 2435123 SHA256 02aefbba59324a6d8b70036a67686bed5f0c7be4ced62c039af6ee694cb5b1fd SHA512 dad957c21d9f7ed3a97a1ed87658fe9381dad00365bd2f5af2396dde3dc4a9f96db17c4df9eb9bd02562cc538f99bf8e2ca00229680d6b7892179161265db753 WHIRLPOOL 1ece4fa5bd453e1bcd4da9501fa93be7f3ea0eb87f7e60bb788d7c90c740566cc07351eb2d7730ac081b2564bde9a79dff7ac1b5012326cc8b0331539b2b5b01
+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.29.0.tar.gz 2447907 SHA256 220ba30b5afb0f3ddb328613fea7aa3966b01e4d0c52d6de9ab27b0858f19738 SHA512 6e0a69f2ac36fcfd0714b2b7053bd263ca8875d2aba7ad6452223eb8677edfa1cf4978989661614dd65dd1822f0123599d565679c8faa3960f136c8d9472e952 WHIRLPOOL e82a07b18481b49a2b41ba2fc40b3d0715ebdfec7508592b09f154c10ce36cf079714683e1deb94f13ebbe20fbe242cd695d547e6dbb23ec6939ccdb67540173
DIST rsyslog-docs-8.24.0.tar.gz 4344877 SHA256 f5e3c27c5b65abdd600b8ad8d99d1f2fe9f0ffca02d6af3c12db5fc10dd889b2 SHA512 b55cde1485a7baec6d4c4928107c22a078cf412a2994c0dfcbb12c47b49c3b263af8a64011b1329567cf86e04927b9e383581dc868eaea81d554adada6b3786b WHIRLPOOL e8b2d10b0de3c33189f859f08db58e319730e709e5a5008909f2166a061952290b0bf96163cdf6e0b3829896916f712ba5d8a2a98f02d796e9174d8919190f8d
-DIST rsyslog-docs-8.27.0.tar.gz 4411093 SHA256 f799eba43ff73c14865cbc3f7105d54afec021430827e6d6da7b51f45cfbedb0 SHA512 08d935ecad070d65e7169a56c6a4d35d49e895b4f7cfe4d747939d8a92bdadd0fc3be7cc47d23d233a33b964f2a4d809a34b37419d2e42c3f8c183120412ab2c WHIRLPOOL 1a7eeadc0667580ab14ae5857fc61f7eb5553bad00d7b59ed3e70aa3a2f75550872a110c6149b4bd69778c990ec3c57e625cc08a716792731d456d875e8a9e8b
-EBUILD rsyslog-8.24.0-r2.ebuild 12575 SHA256 7725f8cf5aed2092ecc4d7534d4491dd6a28ec84c3e3a3d60b9dd0e87cf395c3 SHA512 de77eaa59232ad924fdc059ee287448196e0a750a92e783ecc7fe29656f09a1110e4e47c78b8ebfff085b34838d1f23a5fccd79aaea50998a5c33497a9220e7a WHIRLPOOL 53d1532b60e73032df6938873ce43ffbf692f42abbd39bc3e3b9596360dd6c9dd0a6d030251ceabec20493a282ee153a036c1481537394e601ad9dd7c83c54cb
-EBUILD rsyslog-8.27.0.ebuild 12758 SHA256 9b60a0403f79b834910e269d1f48bccb158260bfae04927744c6a3a44597ae26 SHA512 04b49a36c930c9725f8d0140af57ac912a82e13c340ad164e5235e7f78fa9542328c8093cd8474860514480e3e5b5b3d4a197e9428f064fabda77238ed6518ed WHIRLPOOL 6bb68fa5ef5c51be5403c1ea2c3f98e2b9283121599a452d4c8195536466f334c427d6c9a1dc76542a0836dd298bef9a4890442da9ad92cf29357387f337afcf
+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.29.0.tar.gz 4473644 SHA256 ca3f6a11a165221b4e5e189d9b86ea146245d7ad892758ef9c543db73a914663 SHA512 791633b93693c1eacde965e07ced863b96d1bfa488fc5c4770424825ab702cae7babd5286e552da5e17d1d7779f228c61a1527b9726dffea31bbb3b4e80525dc WHIRLPOOL 74f4fccfa14e44a574590110bf3d0591555b6bb0685fd65a575b002e503d61996a593d51dbedbc9ff390d9bef1942d1b3fa55e7eb334a6bf5cabb3c2c9a2e5a1
+EBUILD rsyslog-8.24.0-r2.ebuild 12487 SHA256 b360a351b9dceb3bb73bfb3c77b7474922b7280422c98f41ddb9043e91e2d1e3 SHA512 c2677eb079e5a82209d32e6b1548a5a831a72daa4ae50b80017db223985581e2725c435e897243f907384763c63133263fee2473cf1a45dc4cdb47879a7537d1 WHIRLPOOL 48a2fc336ba0f77428066ac0205abf43b8297b0c62fc00bac242942943e73dc12f14cf35ae36ba5564c90c695ef81345a8dc64aa151190374cbacf7645bba772
+EBUILD rsyslog-8.26.0-r1.ebuild 12568 SHA256 19c3608ba64abd648bc4072505f24164fa9ad86baecce8919dd17603499ac5e7 SHA512 6e274ecf2955f83befe6a68e2ccbc25c79f12ad1942f798d0d2a115f63d3ae611e161d4994013408ba91140bfbddc73afa16d0588c4755256d5b0e9587e6dc02 WHIRLPOOL 996b3ddedde04defe88218e707f93b6a056c4cafb870fa747f3e7cdd08552062e43aa6d311318882c5664a277cac3a07177287b4f8fbe2ce083c095238a35e4b
+EBUILD rsyslog-8.28.0.ebuild 12526 SHA256 77c508b8b827a056dca4938827601f601ae1d7bb0d61fdce113e4712524b94ff SHA512 65e291593b43760e38376854c71e4d8f21a97963154f387772b2f13b7c1be490e85f535e50c05ddf9089c14a6bbb240dd74fc798320a95dd0f7a52afbd1f3ed3 WHIRLPOOL f9ad12e3b6ce44b77dc0205371ccfb51821f763da1d6b1117ee33f7889ae083553e6623f59a9dd2c43d9a509426cc70b8bf7456e1d761d2675bd15641c8bb9a6
+EBUILD rsyslog-8.29.0.ebuild 12549 SHA256 c1acf42a15744e8b099ee81ec6538ca822a67aefb3210143ee1ba88d6bf32eeb SHA512 7007a8ddb849d54a3790f62b9db601215668079ff2900f223b9eeca35de170910f459ea3664e2d144e60154c62c30547e729f58e501ef29bf49ff828d69c78c1 WHIRLPOOL 763ba286c44c40e9f3ff7930756b187f47f3a7f9963808e90b9e3a59197baee796ed8cab6884e9246e751fe5f3a27e253abfe23c7317383f1c6576fa61d5eda5
MISC metadata.xml 3335 SHA256 e4b519c8c8cf1d559aeb5151eca28d5057174d3bfcef2d74985c0ae20ea5adc7 SHA512 bfa3a8fbb502f6fdc110e8aa6b7394449329c29a63fc71c615317c97deb4e48f6e9f952bf492cc96be15fffb514f281a0d19de697bfddab4d4c7acf3c535c6a1 WHIRLPOOL 5ef1bccf69bbc7c5fd7dc88e8850e54fac881c24abfd07b05ca69e7213914d639a6254ae583a6436dfb4d784fe27b4fbfee6f1b9aeebccc7afb276ffb0cf4f93
diff --git a/app-admin/rsyslog/files/8-stable/50-default-r1.conf b/app-admin/rsyslog/files/8-stable/50-default-r1.conf
new file mode 100644
index 0000000..920c214
--- /dev/null
+++ b/app-admin/rsyslog/files/8-stable/50-default-r1.conf
@@ -0,0 +1,107 @@
+#######################
+### DEFAULT ACTIONS ###
+#######################
+
+auth,authpriv.* action(
+ name="action_auth"
+ type="omfile"
+ File="/var/log/auth.log"
+ FileCreateMode="0600"
+ FileOwner="root"
+ FileGroup="adm"
+ Sync="off"
+)
+
+cron.* action(
+ name="action_cron"
+ type="omfile"
+ File="/var/log/cron.log"
+ FileOwner="root"
+ FileGroup="adm"
+)
+
+daemon.* action(
+ name="action_daemon"
+ type="omfile"
+ File="/var/log/daemon.log"
+ FileOwner="root"
+ FileGroup="adm"
+)
+
+kern.* action(
+ name="action_kern"
+ type="omfile"
+ File="/var/log/kern.log"
+ FileOwner="root"
+ FileGroup="adm"
+)
+
+lpr.* action(
+ name="action_lpr"
+ type="omfile"
+ File="/var/log/lpr.log"
+ FileOwner="root"
+ FileGroup="adm"
+)
+
+mail.* action(
+ name="action_mail"
+ type="omfile"
+ File="/var/log/mail.log"
+ FileOwner="root"
+ FileGroup="adm"
+)
+
+news.* action(
+ name="action_news"
+ type="omfile"
+ File="/var/log/news.log"
+ FileOwner="root"
+ FileGroup="adm"
+)
+
+user.* action(
+ name="action_user"
+ type="omfile"
+ File="/var/log/user.log"
+ FileOwner="root"
+ FileGroup="adm"
+)
+
+*.=debug;auth,authpriv,news,mail.none action(
+ name="action_debug"
+ type="omfile"
+ File="/var/log/debug.log"
+ FileOwner="root"
+ FileGroup="adm"
+)
+
+*.info;auth,authpriv,cron,daemon,lpr,mail,news.none action(
+ name="action_messages"
+ 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(
+# name="action_syslog"
+# type="omfile"
+# File="/var/log/syslog"
+# FileOwner="root"
+# FileGroup="adm"
+#)
+
+*.emerg action(
+ name="action_emerge"
+ 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.27.0-fix-librdkafka-detection.patch b/app-admin/rsyslog/files/8-stable/rsyslog-8.27.0-fix-librdkafka-detection.patch
deleted file mode 100644
index 366c0af..0000000
--- a/app-admin/rsyslog/files/8-stable/rsyslog-8.27.0-fix-librdkafka-detection.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -1695,12 +1695,14 @@ AM_CONDITIONAL(ENABLE_KAFKA_TESTS, test x$enable_kafka_tests = xyes)
-
- # omkafka works with older library
- if test "x$enable_omkafka" = "xyes"; then
-- PKG_CHECK_MODULES([LIBRDKAFKA], [librdkafka],, [
-- AC_CHECK_LIB([rdkafka], [rd_kafka_produce], [
-- AC_MSG_WARN([librdkafka is missing but library present, using -lrdkafka])
-- LIBRDKAFKA_LIBS=-lrdkafka
-- ], [
-- AC_MSG_ERROR([could not find rdkafka library])
-+ PKG_CHECK_MODULES([LIBRDKAFKA], [rdkafka],, [
-+ PKG_CHECK_MODULES([LIBRDKAFKA], [librdkafka],, [
-+ AC_CHECK_LIB([rdkafka], [rd_kafka_produce], [
-+ AC_MSG_WARN([librdkafka is missing but library present, using -lrdkafka])
-+ LIBRDKAFKA_LIBS=-lrdkafka
-+ ], [
-+ AC_MSG_ERROR([could not find rdkafka library])
-+ ])
- ])
- ])
- AC_CHECK_HEADERS([librdkafka/rdkafka.h])
-@@ -1708,12 +1710,13 @@ fi
-
- # imkafka needs newer library
- if test "x$enable_imkafka" = "xyes"; then
-- PKG_CHECK_MODULES(LIBRDKAFKA, rdkafka >= 0.9.1)
-- AC_CHECK_LIB([rdkafka], [rd_kafka_produce], [
-- AC_MSG_WARN([librdkafka is missing but library present, using -lrdkafka])
-- LIBRDKAFKA_LIBS=-lrdkafka
-- ], [
-- AC_MSG_ERROR([could not find rdkafka library])
-+ PKG_CHECK_MODULES([LIBRDKAFKA], [rdkafka >= 0.9.1],, [
-+ AC_CHECK_LIB([rdkafka], [rd_kafka_produce], [
-+ AC_MSG_WARN([librdkafka is missing but library present, using -lrdkafka])
-+ LIBRDKAFKA_LIBS=-lrdkafka
-+ ], [
-+ AC_MSG_ERROR([could not find rdkafka library])
-+ ])
- ])
- AC_CHECK_HEADERS([librdkafka/rdkafka.h])
- fi
diff --git a/app-admin/rsyslog/rsyslog-8.24.0-r2.ebuild b/app-admin/rsyslog/rsyslog-8.24.0-r2.ebuild
index e1c37f8..d86c0ae 100644
--- a/app-admin/rsyslog/rsyslog-8.24.0-r2.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.24.0-r2.ebuild
@@ -11,15 +11,9 @@ HOMEPAGE="http://www.rsyslog.com/"
BRANCH="8-stable"
if [[ ${PV} == "9999" ]]; then
- EGIT_REPO_URI="
- git://github.com/rsyslog/${PN}.git
- https://github.com/rsyslog/${PN}.git
- "
+ EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
- DOC_REPO_URI="
- git://github.com/rsyslog/${PN}-doc.git
- https://github.com/rsyslog/${PN}-doc.git
- "
+ DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git"
inherit git-r3
else
diff --git a/app-admin/rsyslog/rsyslog-8.27.0.ebuild b/app-admin/rsyslog/rsyslog-8.26.0-r1.ebuild
similarity index 96%
copy from app-admin/rsyslog/rsyslog-8.27.0.ebuild
copy to app-admin/rsyslog/rsyslog-8.26.0-r1.ebuild
index 94cd757..342a51b 100644
--- a/app-admin/rsyslog/rsyslog-8.27.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.26.0-r1.ebuild
@@ -11,15 +11,9 @@ HOMEPAGE="http://www.rsyslog.com/"
BRANCH="8-stable"
if [[ ${PV} == "9999" ]]; then
- EGIT_REPO_URI="
- git://github.com/rsyslog/${PN}.git
- https://github.com/rsyslog/${PN}.git
- "
+ EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
- DOC_REPO_URI="
- git://github.com/rsyslog/${PN}-doc.git
- https://github.com/rsyslog/${PN}-doc.git
- "
+ DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git"
inherit git-r3
else
@@ -45,7 +39,7 @@ else
unset _tmp_last_index
unset _tmp_suffix
else
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 hppa x86"
fi
SRC_URI="
@@ -55,8 +49,7 @@ else
PATCHES=(
"${FILESDIR}"/8-stable/${PN}-8.26.0-fix-zmq3-format-security.patch
- "${FILESDIR}"/8-stable/${PN}-8.27.0-fix-librdkafka-detection.patch
- "${FILESDIR}"/8-stable/50-${PN}-8.18.0-musl-fix.patch
+ "${FILESDIR}/8-stable/50-${PN}-8.18.0-musl-fix.patch"
)
fi
@@ -222,7 +215,6 @@ src_configure() {
$(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)
diff --git a/app-admin/rsyslog/rsyslog-8.27.0.ebuild b/app-admin/rsyslog/rsyslog-8.28.0.ebuild
similarity index 96%
copy from app-admin/rsyslog/rsyslog-8.27.0.ebuild
copy to app-admin/rsyslog/rsyslog-8.28.0.ebuild
index 94cd757..fae3cb7 100644
--- a/app-admin/rsyslog/rsyslog-8.27.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.28.0.ebuild
@@ -11,15 +11,9 @@ HOMEPAGE="http://www.rsyslog.com/"
BRANCH="8-stable"
if [[ ${PV} == "9999" ]]; then
- EGIT_REPO_URI="
- git://github.com/rsyslog/${PN}.git
- https://github.com/rsyslog/${PN}.git
- "
+ EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
- DOC_REPO_URI="
- git://github.com/rsyslog/${PN}-doc.git
- https://github.com/rsyslog/${PN}-doc.git
- "
+ DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git"
inherit git-r3
else
@@ -45,19 +39,14 @@ else
unset _tmp_last_index
unset _tmp_suffix
else
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~hppa 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.26.0-fix-zmq3-format-security.patch
- "${FILESDIR}"/8-stable/${PN}-8.27.0-fix-librdkafka-detection.patch
- "${FILESDIR}"/8-stable/50-${PN}-8.18.0-musl-fix.patch
- )
+ PATCHES=( "${FILESDIR}"/8-stable/50-${PN}-8.18.0-musl-fix.patch )
fi
LICENSE="GPL-3 LGPL-3 Apache-2.0"
@@ -89,7 +78,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= )
diff --git a/app-admin/rsyslog/rsyslog-8.27.0.ebuild b/app-admin/rsyslog/rsyslog-8.29.0.ebuild
similarity index 96%
rename from app-admin/rsyslog/rsyslog-8.27.0.ebuild
rename to app-admin/rsyslog/rsyslog-8.29.0.ebuild
index 94cd757..e3771f8 100644
--- a/app-admin/rsyslog/rsyslog-8.27.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.29.0.ebuild
@@ -11,15 +11,9 @@ HOMEPAGE="http://www.rsyslog.com/"
BRANCH="8-stable"
if [[ ${PV} == "9999" ]]; then
- EGIT_REPO_URI="
- git://github.com/rsyslog/${PN}.git
- https://github.com/rsyslog/${PN}.git
- "
+ EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
- DOC_REPO_URI="
- git://github.com/rsyslog/${PN}-doc.git
- https://github.com/rsyslog/${PN}-doc.git
- "
+ DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git"
inherit git-r3
else
@@ -53,11 +47,7 @@ else
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.26.0-fix-zmq3-format-security.patch
- "${FILESDIR}"/8-stable/${PN}-8.27.0-fix-librdkafka-detection.patch
- "${FILESDIR}"/8-stable/50-${PN}-8.18.0-musl-fix.patch
- )
+ PATCHES=( "${FILESDIR}"/8-stable/50-${PN}-8.18.0-musl-fix.patch )
fi
LICENSE="GPL-3 LGPL-3 Apache-2.0"
@@ -89,7 +79,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= )
@@ -312,7 +302,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}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/musl:master commit in: app-admin/rsyslog/, app-admin/rsyslog/files/8-stable/
@ 2017-10-18 19:17 Aric Belsito
0 siblings, 0 replies; 5+ messages in thread
From: Aric Belsito @ 2017-10-18 19:17 UTC (permalink / raw
To: gentoo-commits
commit: 8795ea76b557be634843bebc6a44a9d7fc3263a6
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Wed Oct 18 19:17:00 2017 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Wed Oct 18 19:17:00 2017 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=8795ea76
app-admin/rsyslog: version bump to 8.30.0
app-admin/rsyslog/Manifest | 34 ++++++++++++----------
...usl-fix.patch => rsyslog-8.18.0-musl-fix.patch} | 0
.../rsyslog-8.27.0-fix-mmnormalize-tests.patch | 23 +++++++++++++++
.../8-stable/rsyslog-8.30.0-fix-kerberos.patch | 22 ++++++++++++++
app-admin/rsyslog/rsyslog-8.24.0-r2.ebuild | 4 +--
app-admin/rsyslog/rsyslog-8.26.0-r1.ebuild | 2 +-
app-admin/rsyslog/rsyslog-8.28.0.ebuild | 6 +++-
...rsyslog-8.29.0.ebuild => rsyslog-8.30.0.ebuild} | 9 ++++--
8 files changed, 77 insertions(+), 23 deletions(-)
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index c9d694c..0bf9946 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -1,23 +1,25 @@
-AUX 8-stable/50-default-r1.conf 1952 SHA256 2ff8a047f14e7fc259c2d09195ced208f27503ca21efba8663df8c2aa05fda1c SHA512 1bc4d8059d83de57ff44d34265b0c3881bab7889f51c044728ba462c9105c89425187f95b6b01d6d6d103abde22a9dff063e5d6b90027ed87e9f851f9b1ad5b3 WHIRLPOOL bb6f12f9874e43702f69d1abb5c656dcbe12c8d81e936eb3d121078ebbdbfa259a45aace60e35a90b0445c9b03682faea4e1a808d3e8c55e01ed62577abeca7c
-AUX 8-stable/50-default.conf 1701 SHA256 61c1dd1450f574a21a8d8375faaf3e42f9856df91011150ff13c0cfddc86ed41 SHA512 33e4e63239b9112fec1a37115ac80ab8dbd6e7189d9d29b1bc743c433e0124ea0d1a4cf6f7ada9e5b92e9b0025b6617a1a16f4c491e743bbf4327a5f376a1ea9 WHIRLPOOL d33b83bb690e78b5e5f7cfc090d21da03615c891a287b1f3a92a51514dcad1f5dfe8d2ceed867b3007768d47f48d207fac43a1ff33a85b24c21a5531cdf9d311
-AUX 8-stable/50-rsyslog-8.18.0-musl-fix.patch 168 SHA256 5806738195b8155bbb19e3fb0db84f59668f5cf0c303d0f3c1e15a4ac31f8997 SHA512 8ab680645e59392ce164e8b46b3c6b64def1fa08f83fca3feb1065d0f1a663f5cf34600aec86190edcd06d364399efaa04b372310f76f263d11cb179e3a840fa WHIRLPOOL e70fededf8f540d77628d26b9d28512ee7b1b6ca6bd0e13b644c6f7665c2a91c85a6602e7b22e5a404e758caf6a71393d0abfff3b2a6e98519ffa2399c1ec778
-AUX 8-stable/README.gentoo 1126 SHA256 29b4c68f521f2f1f138f44c4635da1a270fed9cbd4a780569754080987aa777c SHA512 46fdf3350e2005d3ef588d50dfc6d474a1b5d3010329b656879a43cbbd7be0cd91944b88d3838f45f69c830fc28c42e7fac2cd52e0a4b24bb6780562d59ae384 WHIRLPOOL a1a3ec8b887110a01e8c1c1320f25493dd8ff343e4b08780c30c9bc3bb842afa0ef79db08195db876697c1a69807f49a8b3793609d25f78559fa534507fc195e
-AUX 8-stable/rsyslog-8.24.0-fix-tcpflood-without-librelp-r1.patch 4660 SHA256 f50685f76004298a8a77ee6eb88868ff0f8fb8eb7ca5ce0f6809c4db9c42474d SHA512 231030532a126dade0fa2c98d9bd8ef610d3059210cabfc6b0a51adfb610b61eb57b7926a2a51f01f196d196a9134b4c1db7105aeedc4d35eb70abac97301378 WHIRLPOOL 88a9ebe6e3dbeca7b55e16192e6be6d862241a17402c2abf0bcdad4f16fed5fa11f7c140ac0de1655a52d43ad18eaa493b3e2426e1b3c80d1be119dffdc9cd15
-AUX 8-stable/rsyslog-8.26.0-fix-zmq3-format-security.patch 1982 SHA256 abf1b264e7de3a86c2f6cec86d59496bd865fcce5e691b71c7b2c977bdf7358d SHA512 b426c3eaa2adc2de14e129125ccd630e2fa2132c6ca774f3e18ee784f0622573a95339d901a1b9c2877e8b77d00f8be9f9d17f92769136c356aaab58358d2159 WHIRLPOOL e327d0d8f5e3aab078233324359f42fd21aba2cb65927097acdbbf9dbac296a84fcfad71de228a9b2868f229d7f2260742f4180b677ef2a961a47d81db65a2bb
-AUX 8-stable/rsyslog.conf 1562 SHA256 fc70a94213b5eb519febf9aa7d758ee9526433bcc5683bcb7451d16e65a2f5b0 SHA512 1720174fab020e2de590f3d6bbb03784aca1928fe05f7e75e02fb4597cb8b2ee755e6deb8e8f989060511044ae483f791f496f24e0eecaf27eb9e0b5e20a2c7a WHIRLPOOL 97cf3fdee62a9339b412ebe93b71b2d6804df60aad9cb7e71779fcaddb01d489e38bbb353557864ea38aba384e664e6da636812c3c078ed9e22e261ed7b78cba
-AUX 8-stable/rsyslog.confd-r1 1145 SHA256 0be3575df8010523de6b37e98c417192e8ec481292ca9fb47c8d2211795e03a6 SHA512 a7f8621bdd490596b09f9a7583dd0c992006c55335b2e6e687bef4141bb18cd4bb43e23f590a138e9c8d5a3cbac0cc46c3b01c7d3ff9f9dd3c53418b13b0dd4a WHIRLPOOL 05079ab1a55aca9b68c81c8b7da66ff029f72c7168bd15faebf7d7172dddc69f6ffb2864e1fcd8c1f2dbb51416bea89fab3667a34ed7295b3abafc6a93883d3e
-AUX 8-stable/rsyslog.initd-r1 1758 SHA256 93044cc5fc344cd90d17cbb5cebee3c60ebf674e53c8b9efc6e758d53912d343 SHA512 0ddd385e77759370344032f52f945b1e90d4961140db63e2562e4be78dfc2bae16ac9439d40fe078110593999b5c5efd7680b402fc0771b1261ff28b1725e265 WHIRLPOOL 14918404976219e379f80d67fe47a0f6e9d51938061c9f5d205bbcd7cedbda96825f75fd64f2fcc446d96292710a5ea375e117f621c33c9df7352e27286c91ae
-AUX 8-stable/rsyslog.logrotate 682 SHA256 89cc8f13c1f7a3ae446b40da7b31cdf471e2c9e2d3d5b8f48e524f7a82fbff89 SHA512 6c58abd2f02157177a61695f53eccbf201c514821b0c551a4812621e8d3dd2da9b5cd651d93860cb51ebdbdc7056d0ef0dde99c2a57ac3c43aa968a141805912 WHIRLPOOL 9d29c2c9351252887c3dad78962df942bb1cd7387eb44e3c98764319f82d90c42d255a5642c55bb37811fb903e1c5314ca536bc9d32ccfd0535f0579f4e25ff0
+AUX 50-default-r1.conf 1952 SHA256 2ff8a047f14e7fc259c2d09195ced208f27503ca21efba8663df8c2aa05fda1c SHA512 1bc4d8059d83de57ff44d34265b0c3881bab7889f51c044728ba462c9105c89425187f95b6b01d6d6d103abde22a9dff063e5d6b90027ed87e9f851f9b1ad5b3 WHIRLPOOL bb6f12f9874e43702f69d1abb5c656dcbe12c8d81e936eb3d121078ebbdbfa259a45aace60e35a90b0445c9b03682faea4e1a808d3e8c55e01ed62577abeca7c
+AUX 50-default.conf 1701 SHA256 61c1dd1450f574a21a8d8375faaf3e42f9856df91011150ff13c0cfddc86ed41 SHA512 33e4e63239b9112fec1a37115ac80ab8dbd6e7189d9d29b1bc743c433e0124ea0d1a4cf6f7ada9e5b92e9b0025b6617a1a16f4c491e743bbf4327a5f376a1ea9 WHIRLPOOL d33b83bb690e78b5e5f7cfc090d21da03615c891a287b1f3a92a51514dcad1f5dfe8d2ceed867b3007768d47f48d207fac43a1ff33a85b24c21a5531cdf9d311
+AUX README.gentoo 1126 SHA256 29b4c68f521f2f1f138f44c4635da1a270fed9cbd4a780569754080987aa777c SHA512 46fdf3350e2005d3ef588d50dfc6d474a1b5d3010329b656879a43cbbd7be0cd91944b88d3838f45f69c830fc28c42e7fac2cd52e0a4b24bb6780562d59ae384 WHIRLPOOL a1a3ec8b887110a01e8c1c1320f25493dd8ff343e4b08780c30c9bc3bb842afa0ef79db08195db876697c1a69807f49a8b3793609d25f78559fa534507fc195e
+AUX rsyslog-8.18.0-musl-fix.patch 168 SHA256 5806738195b8155bbb19e3fb0db84f59668f5cf0c303d0f3c1e15a4ac31f8997 SHA512 8ab680645e59392ce164e8b46b3c6b64def1fa08f83fca3feb1065d0f1a663f5cf34600aec86190edcd06d364399efaa04b372310f76f263d11cb179e3a840fa WHIRLPOOL e70fededf8f540d77628d26b9d28512ee7b1b6ca6bd0e13b644c6f7665c2a91c85a6602e7b22e5a404e758caf6a71393d0abfff3b2a6e98519ffa2399c1ec778
+AUX rsyslog-8.24.0-fix-tcpflood-without-librelp-r1.patch 4660 SHA256 f50685f76004298a8a77ee6eb88868ff0f8fb8eb7ca5ce0f6809c4db9c42474d SHA512 231030532a126dade0fa2c98d9bd8ef610d3059210cabfc6b0a51adfb610b61eb57b7926a2a51f01f196d196a9134b4c1db7105aeedc4d35eb70abac97301378 WHIRLPOOL 88a9ebe6e3dbeca7b55e16192e6be6d862241a17402c2abf0bcdad4f16fed5fa11f7c140ac0de1655a52d43ad18eaa493b3e2426e1b3c80d1be119dffdc9cd15
+AUX rsyslog-8.26.0-fix-zmq3-format-security.patch 1982 SHA256 abf1b264e7de3a86c2f6cec86d59496bd865fcce5e691b71c7b2c977bdf7358d SHA512 b426c3eaa2adc2de14e129125ccd630e2fa2132c6ca774f3e18ee784f0622573a95339d901a1b9c2877e8b77d00f8be9f9d17f92769136c356aaab58358d2159 WHIRLPOOL e327d0d8f5e3aab078233324359f42fd21aba2cb65927097acdbbf9dbac296a84fcfad71de228a9b2868f229d7f2260742f4180b677ef2a961a47d81db65a2bb
+AUX rsyslog-8.27.0-fix-mmnormalize-tests.patch 509 SHA256 e7816064d62366166b96850cdf34d9cde8f4a77495a7f9a6aad331bcf987996a SHA512 70bfe4f95b23e4e88e5b7535a1b86742a02438f2eadc6fd2e82c66ebdc9d59d983c1ded7d4902dd5d7ef9413847398c1318df82bace3b7e5b1ca8bd23ca9e8e4 WHIRLPOOL b6dd892f7525b05aff42982b3e697767c5053b36fd9080fe8fbddb6584145bfab5e96b5260145c65f438a2025cbfce0bfcf2e88a8b6272c24661371b26d37b90
+AUX rsyslog-8.30.0-fix-kerberos.patch 736 SHA256 ad8560a02e348070c1208bb67f0c4e7a77b4b62d7432ab74d07a7bd96e54c2ac SHA512 8d72cad0106afdf953ce0cf8a5dd0ecfb7daf63c3e274c26e3283ac486de1fc4ce10a450019f1a11f067d320d299dc2b350e4cd5eda283c3b514864e924465a9 WHIRLPOOL 4b5e010bb4f8cf890a57a4a7de044417f02f4342795a76aa7c153f0c8acc41037d412886816ae45b318793a989cbf3c3ef458753198ecfc4f6b3cccd8a924d2d
+AUX rsyslog.conf 1562 SHA256 fc70a94213b5eb519febf9aa7d758ee9526433bcc5683bcb7451d16e65a2f5b0 SHA512 1720174fab020e2de590f3d6bbb03784aca1928fe05f7e75e02fb4597cb8b2ee755e6deb8e8f989060511044ae483f791f496f24e0eecaf27eb9e0b5e20a2c7a WHIRLPOOL 97cf3fdee62a9339b412ebe93b71b2d6804df60aad9cb7e71779fcaddb01d489e38bbb353557864ea38aba384e664e6da636812c3c078ed9e22e261ed7b78cba
+AUX rsyslog.confd-r1 1145 SHA256 0be3575df8010523de6b37e98c417192e8ec481292ca9fb47c8d2211795e03a6 SHA512 a7f8621bdd490596b09f9a7583dd0c992006c55335b2e6e687bef4141bb18cd4bb43e23f590a138e9c8d5a3cbac0cc46c3b01c7d3ff9f9dd3c53418b13b0dd4a WHIRLPOOL 05079ab1a55aca9b68c81c8b7da66ff029f72c7168bd15faebf7d7172dddc69f6ffb2864e1fcd8c1f2dbb51416bea89fab3667a34ed7295b3abafc6a93883d3e
+AUX rsyslog.initd-r1 1758 SHA256 93044cc5fc344cd90d17cbb5cebee3c60ebf674e53c8b9efc6e758d53912d343 SHA512 0ddd385e77759370344032f52f945b1e90d4961140db63e2562e4be78dfc2bae16ac9439d40fe078110593999b5c5efd7680b402fc0771b1261ff28b1725e265 WHIRLPOOL 14918404976219e379f80d67fe47a0f6e9d51938061c9f5d205bbcd7cedbda96825f75fd64f2fcc446d96292710a5ea375e117f621c33c9df7352e27286c91ae
+AUX rsyslog.logrotate 682 SHA256 89cc8f13c1f7a3ae446b40da7b31cdf471e2c9e2d3d5b8f48e524f7a82fbff89 SHA512 6c58abd2f02157177a61695f53eccbf201c514821b0c551a4812621e8d3dd2da9b5cd651d93860cb51ebdbdc7056d0ef0dde99c2a57ac3c43aa968a141805912 WHIRLPOOL 9d29c2c9351252887c3dad78962df942bb1cd7387eb44e3c98764319f82d90c42d255a5642c55bb37811fb903e1c5314ca536bc9d32ccfd0535f0579f4e25ff0
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.29.0.tar.gz 2447907 SHA256 220ba30b5afb0f3ddb328613fea7aa3966b01e4d0c52d6de9ab27b0858f19738 SHA512 6e0a69f2ac36fcfd0714b2b7053bd263ca8875d2aba7ad6452223eb8677edfa1cf4978989661614dd65dd1822f0123599d565679c8faa3960f136c8d9472e952 WHIRLPOOL e82a07b18481b49a2b41ba2fc40b3d0715ebdfec7508592b09f154c10ce36cf079714683e1deb94f13ebbe20fbe242cd695d547e6dbb23ec6939ccdb67540173
+DIST rsyslog-8.30.0.tar.gz 2468224 SHA256 dfb9c3efe52ad03ad9f4479699139fb447177049553b6993315f53b668a2251f SHA512 90e172d08ba7548252fc9744f71259dadf5a40afef405516e7b1601620913ca4b2ffc4859b16f369b9c1974ea10f4e41bc2d987e3d6bf9aabeb979f7de6aefe0 WHIRLPOOL b965024cd94dbc2e81dedb2ac3fe3c12d82913b83f7d4f3b123ad8e101c14a5ca7eb17d087081a68545584e6d18e0069f779c63ddaad274c9f2e05d860887d0d
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.29.0.tar.gz 4473644 SHA256 ca3f6a11a165221b4e5e189d9b86ea146245d7ad892758ef9c543db73a914663 SHA512 791633b93693c1eacde965e07ced863b96d1bfa488fc5c4770424825ab702cae7babd5286e552da5e17d1d7779f228c61a1527b9726dffea31bbb3b4e80525dc WHIRLPOOL 74f4fccfa14e44a574590110bf3d0591555b6bb0685fd65a575b002e503d61996a593d51dbedbc9ff390d9bef1942d1b3fa55e7eb334a6bf5cabb3c2c9a2e5a1
-EBUILD rsyslog-8.24.0-r2.ebuild 12487 SHA256 b360a351b9dceb3bb73bfb3c77b7474922b7280422c98f41ddb9043e91e2d1e3 SHA512 c2677eb079e5a82209d32e6b1548a5a831a72daa4ae50b80017db223985581e2725c435e897243f907384763c63133263fee2473cf1a45dc4cdb47879a7537d1 WHIRLPOOL 48a2fc336ba0f77428066ac0205abf43b8297b0c62fc00bac242942943e73dc12f14cf35ae36ba5564c90c695ef81345a8dc64aa151190374cbacf7645bba772
-EBUILD rsyslog-8.26.0-r1.ebuild 12568 SHA256 19c3608ba64abd648bc4072505f24164fa9ad86baecce8919dd17603499ac5e7 SHA512 6e274ecf2955f83befe6a68e2ccbc25c79f12ad1942f798d0d2a115f63d3ae611e161d4994013408ba91140bfbddc73afa16d0588c4755256d5b0e9587e6dc02 WHIRLPOOL 996b3ddedde04defe88218e707f93b6a056c4cafb870fa747f3e7cdd08552062e43aa6d311318882c5664a277cac3a07177287b4f8fbe2ce083c095238a35e4b
-EBUILD rsyslog-8.28.0.ebuild 12526 SHA256 77c508b8b827a056dca4938827601f601ae1d7bb0d61fdce113e4712524b94ff SHA512 65e291593b43760e38376854c71e4d8f21a97963154f387772b2f13b7c1be490e85f535e50c05ddf9089c14a6bbb240dd74fc798320a95dd0f7a52afbd1f3ed3 WHIRLPOOL f9ad12e3b6ce44b77dc0205371ccfb51821f763da1d6b1117ee33f7889ae083553e6623f59a9dd2c43d9a509426cc70b8bf7456e1d761d2675bd15641c8bb9a6
-EBUILD rsyslog-8.29.0.ebuild 12549 SHA256 c1acf42a15744e8b099ee81ec6538ca822a67aefb3210143ee1ba88d6bf32eeb SHA512 7007a8ddb849d54a3790f62b9db601215668079ff2900f223b9eeca35de170910f459ea3664e2d144e60154c62c30547e729f58e501ef29bf49ff828d69c78c1 WHIRLPOOL 763ba286c44c40e9f3ff7930756b187f47f3a7f9963808e90b9e3a59197baee796ed8cab6884e9246e751fe5f3a27e253abfe23c7317383f1c6576fa61d5eda5
+DIST rsyslog-docs-8.30.0.tar.gz 4487378 SHA256 59c702e587e8f4566104b3266909deedba3c189849bed6965bbc56a1fbc08ca8 SHA512 8068bb9bb8408447bff49730e9aac105eab1bd610592dd524e7639b668b2d05a4836d3a9862622445a0bb8d8b140db67c861dad6ec207d11049ac368e363684d WHIRLPOOL a324fdf1c0796e88bc29c20c5afedc02924c712d4bff1c3601ea4dc85d1910c9c7272ae926f7c423b7568ebce832e9ec626b616ff669586fc2afe73bfe0a7cfd
+EBUILD rsyslog-8.24.0-r2.ebuild 12484 SHA256 ee2d29bdad2b520105e97ee65655f8c61de2b4c6c490228dd16604ab849fa678 SHA512 9a897553187e70d9c72211e84b25fb81ef40f25f01373bed2fc0bffda3a485458e431534b7da0d38f952a561d6eaca4b1fba6c52aac4bfa7cc07ac08506a936b WHIRLPOOL f474b289a68fbc058da3130aa651e617ef89b6689258c5f9ab933e37e994f76efacdf8b5f07c36e66453ae24712391a206e4bd66b17780f21af57d3154bd2cf3
+EBUILD rsyslog-8.26.0-r1.ebuild 12565 SHA256 324a2e2c6fc6661347d0306b0f409a3b9f5678d521f8f8d7032f0b136d5caf1c SHA512 ea4d76dba23ebd602b8e900d9acdd7c4aa690e06acfd81f3214a3a2346b8ce121746a86f9177ccdddd8aa511c223b7d8025a2d997ae25c6babd974c736b0021d WHIRLPOOL 6b2acc302d37ce82e3bc82f233413286d61f79511684708c6077a1411f62d39ce2627aabd00f773fa2c0deae923b30e0148bd1627b51c080247c84edca6593c2
+EBUILD rsyslog-8.28.0.ebuild 12593 SHA256 c11c383441144a1481bce7184f4085d321ac4fb827987292e9576a29990a8012 SHA512 c6a6ef895033ece147323ce620d9292464eb05366be87621bddd1805ed5ea75747b533c8cb0676c3e0776835dfc9289fbcf492e2efb488a6ddf2605821787657 WHIRLPOOL 6d991815152db97977775cbac4465b608af72b5553d0854d0f88897e7d006e632e24150daf67382418721c2b63f05f724d9fc41652349ba2e0e2fde6de9150cc
+EBUILD rsyslog-8.30.0.ebuild 12606 SHA256 1c3e2d5819f0b65a48d338c647d2bea5a62eadc258374890693e602a7b4505e6 SHA512 8cd17f431d63c2515f5f7756899b3e13459973893daca93767d9ae51704ec00de7cf278877612171a92ad3d9d3d19773f02ae1754c320d4bc1c5fc4195a53251 WHIRLPOOL f633654fad65b2a79200aad8520e356080c44e0206ebb2f753edf03be3f04d96273314a6b72e12c415be4dbb6c408c144a7b87dab44014b7b732eacd87343663
MISC metadata.xml 3335 SHA256 e4b519c8c8cf1d559aeb5151eca28d5057174d3bfcef2d74985c0ae20ea5adc7 SHA512 bfa3a8fbb502f6fdc110e8aa6b7394449329c29a63fc71c615317c97deb4e48f6e9f952bf492cc96be15fffb514f281a0d19de697bfddab4d4c7acf3c535c6a1 WHIRLPOOL 5ef1bccf69bbc7c5fd7dc88e8850e54fac881c24abfd07b05ca69e7213914d639a6254ae583a6436dfb4d784fe27b4fbfee6f1b9aeebccc7afb276ffb0cf4f93
diff --git a/app-admin/rsyslog/files/8-stable/50-rsyslog-8.18.0-musl-fix.patch b/app-admin/rsyslog/files/8-stable/rsyslog-8.18.0-musl-fix.patch
similarity index 100%
rename from app-admin/rsyslog/files/8-stable/50-rsyslog-8.18.0-musl-fix.patch
rename to app-admin/rsyslog/files/8-stable/rsyslog-8.18.0-musl-fix.patch
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
new file mode 100644
index 0000000..6ef7e64
--- /dev/null
+++ b/app-admin/rsyslog/files/8-stable/rsyslog-8.27.0-fix-mmnormalize-tests.patch
@@ -0,0 +1,23 @@
+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.30.0-fix-kerberos.patch b/app-admin/rsyslog/files/8-stable/rsyslog-8.30.0-fix-kerberos.patch
new file mode 100644
index 0000000..a202e63
--- /dev/null
+++ b/app-admin/rsyslog/files/8-stable/rsyslog-8.30.0-fix-kerberos.patch
@@ -0,0 +1,22 @@
+https://github.com/rsyslog/rsyslog/issues/1838
+
+--- a/plugins/imgssapi/imgssapi.c
++++ b/plugins/imgssapi/imgssapi.c
+@@ -291,7 +291,7 @@ finalize_it:
+
+
+ static rsRetVal
+-doRcvData(tcps_sess_t *pSess, char *buf, size_t lenBuf, ssize_t *piLenRcvd)
++doRcvData(tcps_sess_t *pSess, char *buf, size_t lenBuf, ssize_t *piLenRcvd, int *const oserr)
+ {
+ DEFiRet;
+ int allowedMethods;
+@@ -307,7 +307,7 @@ doRcvData(tcps_sess_t *pSess, char *buf, size_t lenBuf, ssize_t *piLenRcvd)
+ CHKiRet(TCPSessGSSRecv(pSess, buf, lenBuf, piLenRcvd));
+ } else {
+ *piLenRcvd = lenBuf;
+- CHKiRet(netstrm.Rcv(pSess->pStrm, (uchar*) buf, piLenRcvd) != RS_RET_OK);
++ CHKiRet(netstrm.Rcv(pSess->pStrm, (uchar*) buf, piLenRcvd, oserr));
+ }
+
+ finalize_it:
diff --git a/app-admin/rsyslog/rsyslog-8.24.0-r2.ebuild b/app-admin/rsyslog/rsyslog-8.24.0-r2.ebuild
index d86c0ae..dbe9961 100644
--- a/app-admin/rsyslog/rsyslog-8.24.0-r2.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.24.0-r2.ebuild
@@ -48,8 +48,8 @@ else
"
PATCHES=(
- "${FILESDIR}/8-stable/${PN}-8.24.0-fix-tcpflood-without-librelp-r1.patch"
- "${FILESDIR}/8-stable/50-${PN}-8.18.0-musl-fix.patch"
+ "${FILESDIR}"/8-stable/${PN}-8.24.0-fix-tcpflood-without-librelp-r1.patch
+ "${FILESDIR}"/8-stable/${PN}-8.18.0-musl-fix.patch
)
fi
diff --git a/app-admin/rsyslog/rsyslog-8.26.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.26.0-r1.ebuild
index 342a51b..4215964 100644
--- a/app-admin/rsyslog/rsyslog-8.26.0-r1.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.26.0-r1.ebuild
@@ -49,7 +49,7 @@ else
PATCHES=(
"${FILESDIR}"/8-stable/${PN}-8.26.0-fix-zmq3-format-security.patch
- "${FILESDIR}/8-stable/50-${PN}-8.18.0-musl-fix.patch"
+ "${FILESDIR}"/8-stable/${PN}-8.18.0-musl-fix.patch
)
fi
diff --git a/app-admin/rsyslog/rsyslog-8.28.0.ebuild b/app-admin/rsyslog/rsyslog-8.28.0.ebuild
index fae3cb7..c249c23 100644
--- a/app-admin/rsyslog/rsyslog-8.28.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.28.0.ebuild
@@ -46,7 +46,11 @@ else
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/50-${PN}-8.18.0-musl-fix.patch )
+
+ PATCHES=(
+ "${FILESDIR}"/8-stable/${PN}-8.27.0-fix-mmnormalize-tests.patch
+ "${FILESDIR}"/8-stable/${PN}-8.18.0-musl-fix.patch
+ )
fi
LICENSE="GPL-3 LGPL-3 Apache-2.0"
diff --git a/app-admin/rsyslog/rsyslog-8.29.0.ebuild b/app-admin/rsyslog/rsyslog-8.30.0.ebuild
similarity index 98%
rename from app-admin/rsyslog/rsyslog-8.29.0.ebuild
rename to app-admin/rsyslog/rsyslog-8.30.0.ebuild
index e3771f8..630a520 100644
--- a/app-admin/rsyslog/rsyslog-8.29.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.30.0.ebuild
@@ -47,7 +47,10 @@ else
doc? ( http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-doc-${MY_PV}.tar.gz -> ${MY_FILENAME_DOCS} )
"
- PATCHES=( "${FILESDIR}"/8-stable/50-${PN}-8.18.0-musl-fix.patch )
+ PATCHES=(
+ "${FILESDIR}"/8-stable/${PN}-8.30.0-fix-kerberos.patch
+ "${FILESDIR}"/8-stable/${PN}-8.18.0-musl-fix.patch
+ )
fi
LICENSE="GPL-3 LGPL-3 Apache-2.0"
@@ -56,7 +59,7 @@ IUSE="dbi debug doc elasticsearch +gcrypt grok jemalloc kafka kerberos libressl
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.7:=
>=dev-libs/libestr-0.1.9
>=dev-libs/liblogging-1.0.1:=[stdlog]
>=sys-libs/zlib-1.2.5
@@ -87,7 +90,7 @@ 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:=
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/musl:master commit in: app-admin/rsyslog/, app-admin/rsyslog/files/8-stable/
@ 2018-05-14 18:50 Anthony G. Basile
0 siblings, 0 replies; 5+ messages in thread
From: Anthony G. Basile @ 2018-05-14 18:50 UTC (permalink / raw
To: gentoo-commits
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>whissi@gentoo.org</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"
}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-05-14 18:50 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-09-05 19:05 [gentoo-commits] proj/musl:master commit in: app-admin/rsyslog/, app-admin/rsyslog/files/8-stable/ Aric Belsito
-- strict thread matches above, loose matches on Subject: below --
2018-05-14 18:50 Anthony G. Basile
2017-10-18 19:17 Aric Belsito
2017-05-18 2:04 Aric Belsito
2017-03-31 18:14 Aric Belsito
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox