From 1f8f9ee922615cedd6bc5214eaa22536c6360b89 Mon Sep 17 00:00:00 2001
From: Matthew Seaman <matthew@FreeBSD.org>
Date: Wed, 13 Dec 2023 23:22:43 +0000
Subject: [PATCH] sysutils/rsyslog8: update to 8.2312.0

Delete `files/patch-tools_rsyslogd.c` -- this patch fixing an
inability to fork rsyslog is now incorporated upstream.

Changes:	https://github.com/rsyslog/rsyslog/blob/v8.2312.0/ChangeLog
Reported b:	replogy
---
 sysutils/rsyslog8/Makefile                    |  3 +-
 sysutils/rsyslog8/distinfo                    |  6 ++--
 .../rsyslog8/files/patch-tools_rsyslogd.c     | 36 -------------------
 3 files changed, 4 insertions(+), 41 deletions(-)
 delete mode 100644 sysutils/rsyslog8/files/patch-tools_rsyslogd.c

diff --git a/sysutils/rsyslog8/Makefile b/sysutils/rsyslog8/Makefile
index a81c1ce7fae33..5b93e3a24ff39 100644
--- a/sysutils/rsyslog8/Makefile
+++ b/sysutils/rsyslog8/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	rsyslog
-PORTVERSION=	8.2310.0
-PORTREVISION=	2
+PORTVERSION=	8.2312.0
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.rsyslog.com/files/download/rsyslog/
 
diff --git a/sysutils/rsyslog8/distinfo b/sysutils/rsyslog8/distinfo
index 558e468d75b0e..c391812bea47e 100644
--- a/sysutils/rsyslog8/distinfo
+++ b/sysutils/rsyslog8/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1697053686
-SHA256 (rsyslog-8.2310.0.tar.gz) = 20d9ce792bf0a7ed0703dbf0941490f8be655f48b55b4bebdc0827bbb0ddbf11
-SIZE (rsyslog-8.2310.0.tar.gz) = 3349174
+TIMESTAMP = 1702509396
+SHA256 (rsyslog-8.2312.0.tar.gz) = 774032006128a896437f5913e132aa27dbfb937cd8847e449522d5a12d63d03e
+SIZE (rsyslog-8.2312.0.tar.gz) = 3358109
diff --git a/sysutils/rsyslog8/files/patch-tools_rsyslogd.c b/sysutils/rsyslog8/files/patch-tools_rsyslogd.c
deleted file mode 100644
index a4fdaf7a965c1..0000000000000
--- a/sysutils/rsyslog8/files/patch-tools_rsyslogd.c
+++ /dev/null
@@ -1,36 +0,0 @@
---- tools/rsyslogd.c.orig	2023-10-09 07:12:48 UTC
-+++ tools/rsyslogd.c
-@@ -460,19 +460,24 @@ prepareBackground(const int parentPipeFD)
- 		/* try MacOS, FreeBSD */
- 		if(close_unneeded_open_files("/proc/fd", beginClose, parentPipeFD) != 0) {
- 			/* did not work out, so let's close everything... */
--			const int endClose = getdtablesize();
--#		if defined(HAVE_CLOSE_RANGE)
--			if(close_range(beginClose, endClose, 0) != 0) {
-+			int endClose = (parentPipeFD > dbgGetDbglogFd()) ? parentPipeFD : dbgGetDbglogFd();
-+			for(int i = beginClose ; i <= endClose ; ++i) {
-+				if((i != dbgGetDbglogFd()) && (i != parentPipeFD)) {
-+					aix_close_it(i); /* AIXPORT */
-+				}
-+			}
-+			beginClose = endClose + 1;
-+			endClose = getdtablesize();
-+#if defined(HAVE_CLOSE_RANGE)
-+			if(close_range(beginClose, endClose, 0) !=0) {
- 				dbgprintf("errno %d after close_range(), fallback to loop\n", errno);
--#		endif
-+#endif
- 				for(int i = beginClose ; i <= endClose ; ++i) {
--					if((i != dbgGetDbglogFd()) && (i != parentPipeFD)) {
--						  aix_close_it(i); /* AIXPORT */
--					}
-+					aix_close_it(i); /* AIXPORT */
- 				}
--#		if defined(HAVE_CLOSE_RANGE)
-+#if defined(HAVE_CLOSE_RANGE)
- 			}
--#		endif
-+#endif
- 		}
- 	}
- 	seedRandomNumberForChild();