From nobody Wed Dec 13 23:25:44 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SrBRs17RHz54TgH; Wed, 13 Dec 2023 23:25:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SrBRs0Z8pz3gPk; Wed, 13 Dec 2023 23:25:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702509945; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yvUHJQqocGbQ5Ge8Bctppdo/b24GctCxbxvNfhxL6wQ=; b=hc0poDusBlIDIe3UKs5P4SRTqB8EyobMls/7YcCFoLy1MvOcp/yuRSODYZWLXqJPOx1zzn L2Q3yMX4jghNUdS8F9voir+LV3aBfx1IbvgAfix35AtXGd22RM17o25DY3x1v6yoAOXAit hT6HUJDBAcvWGWvAk2UwahSaNptygzTh4KnZDxE/Y03i3S3o5hXVw5FcOCQ3R15lF7OKEj rGBTZrxlkgtzg9O0XffSQ9/GVYtKfxe9jDnPia7qR76kWxU537kekpHvdF3WJjq6JwL/9T 8lyzqc1ydSkbMY8ZCRffyWG7FMRJ5FKnenC7ghSwKF5eaBnoPR2T7qxNTGY8aA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702509945; a=rsa-sha256; cv=none; b=fqkqEcNi4M7wvyjFFIZOhC2O25MYZ56k57NdGZ7TuqVwclsMWmopwj8+xPXuZWz3QssuaX RpWrPgje4nlOEadohc8KNJqeCWZ+h7HkLds7ubuaA/Fux+nhAHSl1ITQcriEauqyMUbBYB fwJyGWljMo+cnucErIFV66pvbZf9iMkwiQahnApIX+CHjRpJbH8H7LpLaUxaUY3Ltx/x6J ggR7tGxOA8Hqe9roeWfv1/lX+HU1EpSXgi6b49cBwauIr5aYuZQ/eSyZZpy7h2LulVeiYd sxCCaSscD/EBYWPVJP06Ly/8GbxQLOb//q1LVMidNWn7S3yWT2pqVtzdV+ppAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702509945; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yvUHJQqocGbQ5Ge8Bctppdo/b24GctCxbxvNfhxL6wQ=; b=ccWGw97nAJdNZjmxlgvOntC/Co0Ib0rZKps1PAVo13TQsXOcPkAXXZQfjUWoJAZwQYi8/x wn7vQI73VU5tkkvG1IODYN3fQsrPTD4Hx2YJ3LS8nnd3l3C0UUFB5biVYYZzX0qwQqPyk/ k0spSrldE0HgIDTGRlcBxPaqZHDlzU+LcQQRPZhlF+QqJ/x0BEXJ6ESjg6DJ0Mq+lxo0Ec 0guCnqPdvIBvFlQxowkNklRmqXIJdqVjJrHh2jhPrC353buBuG7FsBa9x0JVyP/RYpvxSQ UbN/1x4vCFfPC7FvQBAiyOJBHSuqZs4y4ewGv+p9iFLFsHdruIosWUM4wTfEDg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SrBRr6lX4z1HZt; Wed, 13 Dec 2023 23:25:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BDNPiiv025540; Wed, 13 Dec 2023 23:25:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BDNPio7025537; Wed, 13 Dec 2023 23:25:44 GMT (envelope-from git) Date: Wed, 13 Dec 2023 23:25:44 GMT Message-Id: <202312132325.3BDNPio7025537@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthew Seaman Subject: git: 1f8f9ee92261 - main - sysutils/rsyslog8: update to 8.2312.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: matthew X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1f8f9ee922615cedd6bc5214eaa22536c6360b89 Auto-Submitted: auto-generated The branch main has been updated by matthew: URL: https://cgit.FreeBSD.org/ports/commit/?id=1f8f9ee922615cedd6bc5214eaa22536c6360b89 commit 1f8f9ee922615cedd6bc5214eaa22536c6360b89 Author: Matthew Seaman AuthorDate: 2023-12-13 23:22:43 +0000 Commit: Matthew Seaman CommitDate: 2023-12-13 23:22:43 +0000 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 ++--- sysutils/rsyslog8/files/patch-tools_rsyslogd.c | 36 -------------------------- 3 files changed, 4 insertions(+), 41 deletions(-) diff --git a/sysutils/rsyslog8/Makefile b/sysutils/rsyslog8/Makefile index a81c1ce7fae3..5b93e3a24ff3 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 558e468d75b0..c391812bea47 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 a4fdaf7a965c..000000000000 --- 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();