app-admin/rsyslog: version bump to 8.25.0-r2

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>

3 files changed, 37 insertions, 29 deletions

diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index 91e94439..e8088c6f 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -2,12 +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-8.24.0-fix-tcpflood-without-librelp-r1.patch 4660 SHA256 f50685f76004298a8a77ee6eb88868ff0f8fb8eb7ca5ce0f6809c4db9c42474d SHA512 231030532a126dade0fa2c98d9bd8ef610d3059210cabfc6b0a51adfb610b61eb57b7926a2a51f01f196d196a9134b4c1db7105aeedc4d35eb70abac97301378 WHIRLPOOL 88a9ebe6e3dbeca7b55e16192e6be6d862241a17402c2abf0bcdad4f16fed5fa11f7c140ac0de1655a52d43ad18eaa493b3e2426e1b3c80d1be119dffdc9cd15
 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-r1.ebuild 12696 SHA256 1f320048f4015489ced52a06975657aa3fe2fe78ffa81bce6462842fc56d9c8a SHA512 5609c411a8148bf2acdb6ce572e178b1e40834269a36d4a406eaa9776df5c134d66a9d5bacaa84874b0da2879046b7ea42713d8faff1f7e40267dc1c0bbdc187 WHIRLPOOL caf8faee011a243ee31a688d240c3fa039b71cc51b2997837bc18eced808802f8af950ffca24191dbc4e335339b97d0ce662aeb9086ce572745c21fb159b0fa3
+EBUILD rsyslog-8.25.0-r2.ebuild 12699 SHA256 fda57ebf418514858933efbee7fd118fc94d300ce0aa4a96c5011fd34c09ace5 SHA512 4c8d2e377d9627b665308c7dd5d9e361d3f15859913dfda436528e32f009ad405b8d75797e651007b0bbd488b6b7776c3081877c4d9ae7f1ebee13cd472725e6 WHIRLPOOL f249eddf6183791e6dd6597e57d759c67fc21b65ab7f0ab0fcfa0008606ba949d378c73c9415724b73e84826409405b02b6a318a2e90a5af9a79effb14f6b091
 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-r1.patch
index c3287068..a03a6562 100644
--- 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-r1.patch
@@ -1,19 +1,27 @@
-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
+Patch to allow building of tcpflood without librelp
 
-closes https://github.com/rsyslog/rsyslog/issues/1426
----
- tests/tcpflood.c | 24 +++++++++++++++++++++---
- 1 file changed, 21 insertions(+), 3 deletions(-)
+Cherry pick of
+https://github.com/rsyslog/rsyslog/commit/73e3b7ab2f8a3974d31844b492ad02d61ed5727f
+https://github.com/rsyslog/rsyslog/pull/1493
 
-diff --git a/tests/tcpflood.c b/tests/tcpflood.c
-index c500a51..aa79794 100644
---- a/tests/tcpflood.c
+
+Gentoo-Bug: https://bugs.gentoo.org/613264
+Gentoo-Bug: https://bugs.gentoo.org/614424
+
+diff -u b/tests/tcpflood.c b/tests/tcpflood.c
+--- b/tests/tcpflood.c
 +++ b/tests/tcpflood.c
-@@ -149,7 +149,9 @@ static int numMsgsToSend = 1; /* number of messages to send */
+@@ -96,7 +96,9 @@
+ #include <string.h>
+ #include <netinet/in.h>
+ #include <pthread.h>
++#ifdef ENABLE_RELP
+ #include <librelp.h>
++#endif
+ #include <sys/resource.h>
+ #include <sys/time.h>
+ #include <errno.h>
+@@ -149,7 +151,9 @@
  static int numConnections = 1; /* number of connections to create */
  static int softLimitConnections  = 0; /* soft connection limit, see -c option description */
  static int *sockArray;  /* array of sockets to use */
@@ -23,7 +31,7 @@ index c500a51..aa79794 100644
  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);
+@@ -216,6 +220,7 @@
  static int sendTLS(int i, char *buf, int lenBuf);
  static void closeTLSSess(int __attribute__((unused)) i);
  
@@ -31,7 +39,7 @@ index c500a51..aa79794 100644
  /* RELP subsystem */
  #pragma GCC diagnostic push
  #pragma GCC diagnostic ignored "-Wformat-security"
-@@ -235,6 +238,7 @@ initRELP_PLAIN(void)
+@@ -235,6 +240,7 @@
  	CHKRELP(relpEngineSetEnableCmd(pRelpEngine, (unsigned char*)"syslog",
  		eRelpCmdState_Required));
  }
@@ -39,7 +47,7 @@ index c500a51..aa79794 100644
  
  /* prepare send subsystem for UDP send */
  static int
-@@ -273,6 +277,7 @@ int openConn(int *fd, const int connIdx)
+@@ -273,6 +279,7 @@
  		port = targetPort;
  	}
  	if(transport == TP_RELP_PLAIN) {
@@ -47,7 +55,7 @@ index c500a51..aa79794 100644
  		relpRetVal relp_r;
  		relpClt_t *relpClt;
  		char relpPort[16];
-@@ -286,6 +291,7 @@ int openConn(int *fd, const int connIdx)
+@@ -286,6 +293,7 @@
  			return(1);
  		}
  		*fd = 1; /* mimic "all ok" state */
@@ -55,7 +63,7 @@ index c500a51..aa79794 100644
  	} else { /* TCP, with or without TLS */
  		if((sock=socket(AF_INET, SOCK_STREAM, 0))==-1) {
  			perror("\nsocket()");
-@@ -336,8 +342,10 @@ int openConnections(void)
+@@ -336,8 +344,10 @@
  	sessArray = calloc(numConnections, sizeof(gnutls_session_t));
  #	endif
  	sockArray = calloc(numConnections, sizeof(int));
@@ -66,7 +74,7 @@ index c500a51..aa79794 100644
  	for(i = 0 ; i < numConnections ; ++i) {
  		if(i % 10 == 0) {
  			if(bShowProgress)
-@@ -356,8 +364,10 @@ int openConnections(void)
+@@ -356,8 +366,10 @@
  					 * at least something.
  					 */
  					if(transport == TP_RELP_PLAIN) {
@@ -77,7 +85,7 @@ index c500a51..aa79794 100644
  					} else { /* TCP and TLS modes */
  						if(transport == TP_TLS)
  							closeTLSSess(i);
-@@ -403,14 +413,13 @@ void closeConnections(void)
+@@ -403,14 +415,13 @@
  
  	if(bShowProgress)
  		if(write(1, "      close connections", sizeof("      close connections")-1)){}
@@ -93,7 +101,7 @@ index c500a51..aa79794 100644
  			relpRetVal relpr;
  			if(sockArray[i] != -1) {
  				relpr = relpEngineCltDestruct(pRelpEngine, relpCltArray+i);
-@@ -419,6 +428,7 @@ void closeConnections(void)
+@@ -419,6 +430,7 @@
  				}
  				sockArray[i] = -1;
  			}
@@ -101,7 +109,7 @@ index c500a51..aa79794 100644
  		} 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)
+@@ -610,6 +622,7 @@
  				offsSendBuf = lenBuf;
  			}
  		} else if(transport == TP_RELP_PLAIN) {
@@ -109,7 +117,7 @@ index c500a51..aa79794 100644
  			relpRetVal relp_ret;
  			if(sockArray[socknum] == -1) {
  				/* connection was dropped, need to re-establish */
-@@ -627,6 +638,7 @@ int sendMessages(struct instdata *inst)
+@@ -627,6 +640,7 @@
  				printf("\nrelpCltSendSyslog() failed with relp error code %d\n",
  					   relp_ret);
  			}
@@ -117,7 +125,7 @@ index c500a51..aa79794 100644
  		}
  		if(lenSend != lenBuf) {
  			printf("\r%5.5d\n", i);
-@@ -1106,7 +1118,9 @@ int main(int argc, char *argv[])
+@@ -1106,7 +1120,9 @@
  						transport = TP_RELP_PLAIN;
  #					else
  						fprintf(stderr, "compiled without RELP support: "
@@ -128,7 +136,7 @@ index c500a51..aa79794 100644
  						exit(1);
  #					endif
  				} else {
-@@ -1168,7 +1182,9 @@ int main(int argc, char *argv[])
+@@ -1168,7 +1184,9 @@
  	if(transport == TP_TLS) {
  		initTLS();
  	} else if(transport == TP_RELP_PLAIN) {
@@ -138,7 +146,7 @@ index c500a51..aa79794 100644
  	}
  
  	if(openConnections() != 0) {
-@@ -1183,9 +1199,11 @@ int main(int argc, char *argv[])
+@@ -1183,9 +1201,11 @@
  
  	closeConnections(); /* this is important so that we do not finish too early! */
  
diff --git a/app-admin/rsyslog/rsyslog-8.25.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.25.0-r2.ebuild
index 0b079aea..1a86c823 100644
--- a/app-admin/rsyslog/rsyslog-8.25.0-r1.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.25.0-r2.ebuild
@@ -54,7 +54,7 @@ else
 	"
 
 	PATCHES=(
-		"${FILESDIR}/8-stable/${PN}-8.24.0-fix-tcpflood-without-librelp.patch"
+		"${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/50-${PN}-8.18.0-musl-imptcp-queue.patch"
 	)