git: e2aa1c868cf0 - main - sysutils/procs: Unbreak on CURRENT
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 16 Jan 2025 13:49:37 UTC
The branch main has been updated by olce:
URL: https://cgit.FreeBSD.org/ports/commit/?id=e2aa1c868cf04855469be0153669abfd448e1b12
commit e2aa1c868cf04855469be0153669abfd448e1b12
Author: Olivier Certner <olce@FreeBSD.org>
AuthorDate: 2025-01-15 14:29:31 +0000
Commit: Olivier Certner <olce@FreeBSD.org>
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 {