From nobody Mon Jun 12 10:10:16 2023 X-Original-To: dev-commits-ports-main@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 4QfnVx1b9tz4cVGw; Mon, 12 Jun 2023 10:10:17 +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 4QfnVx0vRdz3G1H; Mon, 12 Jun 2023 10:10:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686564617; 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=pF0RFBXmKTmVl7ww6Ql7DOigYvaWXi+sK1yiQo1G71s=; b=TuT3SbrosiT8NGQVFqLKkAdDaQWrN/J3MK3c8Q6PovGdFqV0IUfJH1nlZpfu+KyTgIIF+e b7zk1Tb9Mjw4c59dbTHslWMcZeBUi59hNNwfIiuRq/V02EKk0KhQYOiAiFpZ/qbR+4JcWF hlZmHVGAxk5HUEbpkXHRuBaoey6uwyh0m02xIPm8j+MEfA628mbmvHVYLzqV2xci82PZ4R M+T0F9FHE1cw98tdJOpwNy6skD9xse071egNXDFVI4KkwSpRmv0Op4nBYI59LBucZsLCZs v7+dbjPSGo8o7FEBq18u7EUZwmhpq0/h+5nSTy/r9y+dCYNV6aHnbl80yhqdsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686564617; 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=pF0RFBXmKTmVl7ww6Ql7DOigYvaWXi+sK1yiQo1G71s=; b=fYorKL+2DD4MYFY2GtpL+bAr+ie3j2hf4WdYOGn38pQds1CvD4N60GcMx7VTUVCDAPI1po BvoYbiiFDQ+SoaQtY2qK8IoxHyUzMgoRXlN+dVc+VR5AaEyMQFHCCnLvs9s9e+kLBPb5OU KEUQoJqH/8HN7ZCYy6FJS4zbvnIRSYiPQEsm+SEIPR8vNQ/Ck8hcYwLnFEYVu7mVpGIPs2 iyLd5FSZFJx/SqySPOaM3+oSdBzPxwoXPJxZRwFcZS1aL+ppbMa/XtgpjlsCMD8DJgPuXX E6PR68ogTG71bqjRy433bZndH35Aod9N2MmkYR4HKAlreGC0uFvj+s0ATClTmQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686564617; a=rsa-sha256; cv=none; b=ydbt6/S+9IdO+HLDXDO9XeM+fEqE2bHvMQLMzk5JIjGN8uqfjhKZlL2u1NCZcLUfZ7yr8g a7sh0EB1GY/OOaANd+BeVLCQwY73V6k4ntvRpPvY5lAEqm2DjeCbc3Uijj+s/0w8NO/Yco LJGLxVgd+n8GsgmNZnjyp2E0/Tm8UjKqlP9SZ0JIKCpeZwdt0xMYjmt8t9NURNv+4H/f4G SC9GWDAupAg8MtKbSkqQmLAiu45GwQh1iOri6KYG4fuReDa2i1XhIMK7cyavcdwJ4b++tq RxQBClpk7ydbdGpTUs+2lTPGYvvFgr+M1iqaDZNqXcksrM8q1/pEq1VmDa0ftQ== 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 4QfnVw748lzbnb; Mon, 12 Jun 2023 10:10:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35CAAGKa026646; Mon, 12 Jun 2023 10:10:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35CAAGRd026640; Mon, 12 Jun 2023 10:10:16 GMT (envelope-from git) Date: Mon, 12 Jun 2023 10:10:16 GMT Message-Id: <202306121010.35CAAGRd026640@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Doug Rabson Subject: git: c85ba9733b0d - main - sysutils/conmon: Fix podman's restart-policy handling List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dfr X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c85ba9733b0dd5ec45bc9816b3ff065ab1f3218f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dfr: URL: https://cgit.FreeBSD.org/ports/commit/?id=c85ba9733b0dd5ec45bc9816b3ff065ab1f3218f commit c85ba9733b0dd5ec45bc9816b3ff065ab1f3218f Author: Doug Rabson AuthorDate: 2023-06-06 07:42:07 +0000 Commit: Doug Rabson CommitDate: 2023-06-12 10:08:56 +0000 sysutils/conmon: Fix podman's restart-policy handling Approved-by: dch Differential Revision: https://reviews.freebsd.org/D40437 --- sysutils/conmon/Makefile | 2 +- sysutils/conmon/files/patch-src_close__fds.c | 33 ++++++++++++++++++++++++++++ sysutils/conmon/pkg-message | 17 ++++++++++++++ 3 files changed, 51 insertions(+), 1 deletion(-) diff --git a/sysutils/conmon/Makefile b/sysutils/conmon/Makefile index 251c26caa78b..5114574ede56 100644 --- a/sysutils/conmon/Makefile +++ b/sysutils/conmon/Makefile @@ -1,7 +1,7 @@ PORTNAME= conmon DISTVERSIONPREFIX= v DISTVERSION= 2.1.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MAINTAINER= dfr@FreeBSD.org diff --git a/sysutils/conmon/files/patch-src_close__fds.c b/sysutils/conmon/files/patch-src_close__fds.c new file mode 100644 index 000000000000..70c296705df3 --- /dev/null +++ b/sysutils/conmon/files/patch-src_close__fds.c @@ -0,0 +1,33 @@ +--- src/close_fds.c.orig 2023-02-28 02:39:11 UTC ++++ src/close_fds.c +@@ -22,6 +22,12 @@ + + #include + ++#ifdef __FreeBSD__ ++#define OPEN_FILES_DIR "/dev/fd" ++#else ++#define OPEN_FILES_DIR "/proc/self/fd" ++#endif ++ + static int open_files_max_fd; + static fd_set *open_files_set; + +@@ -31,7 +37,7 @@ static void __attribute__((constructor)) init() + ssize_t size = 0; + DIR *d; + +- d = opendir("/proc/self/fd"); ++ d = opendir(OPEN_FILES_DIR); + if (!d) + return; + +@@ -85,7 +91,7 @@ void close_all_fds_ge_than(int firstfd) + struct dirent *ent; + DIR *d; + +- d = opendir("/proc/self/fd"); ++ d = opendir(OPEN_FILES_DIR); + if (!d) + return; + diff --git a/sysutils/conmon/pkg-message b/sysutils/conmon/pkg-message new file mode 100644 index 000000000000..f3784b3d66c6 --- /dev/null +++ b/sysutils/conmon/pkg-message @@ -0,0 +1,17 @@ +[ +{ type: install + message: <