From nobody Thu Jan 16 13:49:37 2025 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 4YYkkT4sFKz5kT0y; Thu, 16 Jan 2025 13:49:37 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YYkkT2FfKz47JG; Thu, 16 Jan 2025 13:49:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737035377; 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=H0Yj5a7GY8wudyNRGmdaHlBfX5Nwcr35YoJZPf0y43s=; b=oUlUWJiFd5CtHBBzOI3P+Dkm1Ay2+qvjT14Yd3aqFMxBTSdUMAuFgoq8Et3BCkSjnaCD5r XCIxqIn9FddW8E5l4QVm0FHKLgq7RKoH6s71EOaQpHT+/VS7LZDpm4Xpn//JjAd0OSPSoY ReXRA/2xJtoJoYyfJ5Ej18qhn0oeuc/gA8DhjKSBUhiIbBhk4JlTqNkoUxvAxd1XSXm1p7 DT6OuDpdnkz2SVVp2o28OY7P0T3g5JYZpAaYLb7Vg8P9kvPMo7FddBgVqXwy0Q8UWIZTwB +KCMaCFZBihZzGWXb8wiiaxrLDNrprcDGegsNxEEGdkfm30DkVAJ1JBPrzfzUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737035377; 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=H0Yj5a7GY8wudyNRGmdaHlBfX5Nwcr35YoJZPf0y43s=; b=bVODYsL2jk1asWE9bFebXJaUoWf9tGGkEjQSHdoARgkTJNu7Mfj6EkZrXVy7S91fR6f+p5 PHwmPalsSxMwnzSoZdgS+GC778GdHckZlKLWOTgcuFdIJkslH9WvAmPfw/QGaAwJU5MSMv A+fUA8GLZEVdvLOOxolTWKdQQi3Vr3j+piGPCcOSfj8jqFnW2IN2ZH5i1p7I7TKX7bY/Na 6qOlcYPr3062t51j5g95mhpEmOfAyN08Rjkeb8q2bsk1q3DEzgCme9vTyzMKlv2rFkfi5g 0HjrkyqHwaY7h6X1EygmyLGEKQnIDWtxk7f0hJ8p2oQdcB4cu53+6rDdj/CZvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737035377; a=rsa-sha256; cv=none; b=Z0XDBObg7kf/tvSuuzV+3Lntab8jhipVWdnV9FMLR3qh13SyaRu+C2Fr6eqfwKFOJjQVj8 sphPl18yeFLFByC5wIXmsZvkKE1dxC87Dt2gTNhgPcSfagmFerk4djCiy0tWbZQL5ACu1a wr8yXRAyDhvEexN+MQjA7X6xBGZEw9IBdHAaBXq2DcZX+Qd18pQ6A46E6rJZfUoqHK8kNj 508qkhpHeaCtSwQWqDSMqjw32Wf4C1g4YcBne9miRnjfHdRghAaYSNkYsLwhO+cWjq4XEK 1yqRFpjEXMV+mokI0qyK0VQn01J6ewDtQ3VKbOdkd9MwPTm0BtecA3MBDHiF7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YYkkT1r7RzblF; Thu, 16 Jan 2025 13:49:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50GDnbY9001595; Thu, 16 Jan 2025 13:49:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50GDnbdC001592; Thu, 16 Jan 2025 13:49:37 GMT (envelope-from git) Date: Thu, 16 Jan 2025 13:49:37 GMT Message-Id: <202501161349.50GDnbdC001592@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Olivier Certner Subject: git: e2aa1c868cf0 - main - sysutils/procs: Unbreak on CURRENT 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e2aa1c868cf04855469be0153669abfd448e1b12 Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/ports/commit/?id=e2aa1c868cf04855469be0153669abfd448e1b12 commit e2aa1c868cf04855469be0153669abfd448e1b12 Author: Olivier Certner AuthorDate: 2025-01-15 14:29:31 +0000 Commit: Olivier Certner CommitDate: 2025-01-16 13:48:03 +0000 sysutils/procs: Unbreak on CURRENT This is upstream's fix, so will automatically appear in next versions. It allows compilation on all supported FreeBSD versions. PR: 283410 Reviewed by: emaste Approved by: portmgr (blanket) Sponsored by: The FreeBSD Foundation --- sysutils/procs/Makefile | 2 -- sysutils/procs/files/patch-src_columns_state.rs | 13 +++++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/sysutils/procs/Makefile b/sysutils/procs/Makefile index 7b03aeab9bb4..2d854bb0e960 100644 --- a/sysutils/procs/Makefile +++ b/sysutils/procs/Makefile @@ -11,8 +11,6 @@ WWW= https://github.com/dalance/procs LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN_FreeBSD_15= compilation fails: cannot find value `CRED_FLAG_CAPMODE` in crate `bsd_kvm_sys`, see https://github.com/dalance/bsd-kvm/issues/4, https://github.com/dalance/bsd-kvm-sys/issues/1, https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=283410 - USES= cargo llvm:lib USE_GITHUB= yes diff --git a/sysutils/procs/files/patch-src_columns_state.rs b/sysutils/procs/files/patch-src_columns_state.rs new file mode 100644 index 000000000000..ce5c7bdbbeb3 --- /dev/null +++ b/sysutils/procs/files/patch-src_columns_state.rs @@ -0,0 +1,13 @@ +This is upstream's fix. To be removed at the next update. + +--- src/columns/state.rs.orig 2024-10-23 10:22:18 UTC ++++ src/columns/state.rs +@@ -129,7 +129,7 @@ impl Column for State { + if (flag & libc::P_SYSTEM as i64) != 0 || info.lock > 0 { + state.push_str("L"); + } +- if (cr_flags & bsd_kvm_sys::CRED_FLAG_CAPMODE) != 0 { ++ if (cr_flags & libc::KI_CRF_CAPABILITY_MODE as u32) != 0 { + state.push_str("C"); + } + if (kiflag & libc::KI_SLEADER as i64) != 0 {