From nobody Fri Aug 02 15:26:09 2024 X-Original-To: dev-commits-ports-branches@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 4Wb8my1Bffz5Rtr7; Fri, 02 Aug 2024 15:26:10 +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 4Wb8my0Zr6z56WM; Fri, 2 Aug 2024 15:26:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722612370; 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=UkWtPojnILSQMMJ+ug6BCuGcWi4xC6+AkFk6PNG5fGs=; b=v95IPvNmjw2UZS55nfhMcFNU4Z0SkQyaJ+5xCtPYzfdYCWa+kAmPLE1wdUFDVoXa/fivVp xfSDhrGXJ8Xa+WXHE72lSL+vsHBC++I/uy74JTwcuUUDqpIGpcSX8ji6c1vA7K6VYmp4TD jnJRjyVO9F9bbgX7+X2nWKsyJNCHKmnpSjN1RRx/Uhf8L1X+ms5g4mMD9uczmrkEmKJ/kQ C4I055ymUKhrZT/LrDz4m8v3wGXO6Z1zKr2axApy7GgyLr16NKAkz+KgTojUM9bVx4c4JK mzfvsCu/Q2TKI/wGSelPTxfMV1mJWRueaaeN3ATCeVPISKQaVz7PBp3Oa19Vhw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722612370; a=rsa-sha256; cv=none; b=gutukrR+DKmYQLBssnRurikM1LQeGmRDX3LDucP/KnzzgbtS1NIuhIRYj02WtvXzyuV7nG l8AgT9q0G1gAFXjT/1taJ5/hkk/SZsg1CeR5KcYSqCB1htT+B6ib9oXO8pCbJcmZV/ZN/q aPSIIjDCM80UN72IlwH5WwLeqkzR+btcsJYBrHp41/OyiJCBPwfyocrxzoVY8YqXXS295G OAY/o4ZpXUhvyC/ktGBUaxhXp8ogS9EHGs6hJcS5h4uSugIPKDUJePoHzLp4qaQFvHWA4+ ICSfGqaXmF8KFygKg6K6WnHVoagjvlGcTOATIIR22YSmlKCwXG3j796xdPiL2w== 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=1722612370; 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=UkWtPojnILSQMMJ+ug6BCuGcWi4xC6+AkFk6PNG5fGs=; b=p1WsmKPBC1bZ3Sodg4t1YxVve4R8G9ub2y9aFfcweg8Q46TpOD0AK7BYKAbap/7+nBStW2 MVcA1I7xMYEPc62sUzn980cbpBLgkmI4+P5ZsOyWkJpIUO5fA4feZDY9Ff3yo+60KPbSB6 /koxOsYoYtbTfbn2AQPll+OoiEwSRGFHx+4xYA49Flef3ITnOo55JAP8EqOwIDUXrSX4FM ZEMYo1dj+cJzJ1gc8sGNBzFEqC8nZ3oM+jpOmD6vwQV3U9e1wSOCg3kWkgVCcxJ6Zykq7q /1gHnx91tVXW4IKNN1qgyc688+ekcLirbgLUeODe1hjOGZUsVLAoRetZtv6WpQ== 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 4Wb8my09YszYlL; Fri, 2 Aug 2024 15:26:10 +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 472FQ9b4052949; Fri, 2 Aug 2024 15:26:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 472FQ9Q8052946; Fri, 2 Aug 2024 15:26:09 GMT (envelope-from git) Date: Fri, 2 Aug 2024 15:26:09 GMT Message-Id: <202408021526.472FQ9Q8052946@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Cy Schubert Subject: git: 18d1fdb4c439 - 2024Q3 - sysutils/heirloom: Fix build on 15-CURRENT after e24a65528388 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q3 X-Git-Reftype: branch X-Git-Commit: 18d1fdb4c4399dfa93f49308768ba54fae5a5fa6 Auto-Submitted: auto-generated The branch 2024Q3 has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=18d1fdb4c4399dfa93f49308768ba54fae5a5fa6 commit 18d1fdb4c4399dfa93f49308768ba54fae5a5fa6 Author: Cy Schubert AuthorDate: 2024-08-02 15:12:26 +0000 Commit: Cy Schubert CommitDate: 2024-08-02 15:22:23 +0000 sysutils/heirloom: Fix build on 15-CURRENT after e24a65528388 src/e24a65528388 was one of a series of commits to 15-CURRENT that removed kernel stack swapping support. e24a65528388 removed the P_SWAPPINGOUT flag resulting in this port failing to build on 15-CURRENT. Remove the test for the flag. MFH: 2024Q3 (cherry picked from commit 2b625445f9426de4b38497e2778743dc7f5741b8) --- sysutils/heirloom/files/patch-ps__ps.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/sysutils/heirloom/files/patch-ps__ps.c b/sysutils/heirloom/files/patch-ps__ps.c index adba8e5dcc85..822945949e45 100644 --- a/sysutils/heirloom/files/patch-ps__ps.c +++ b/sysutils/heirloom/files/patch-ps__ps.c @@ -1,6 +1,6 @@ ---- ps/ps.c.orig 2007-02-02 06:40:20.000000000 -0800 -+++ ps/ps.c 2009-03-06 14:51:53.455864840 -0800 -@@ -88,6 +88,9 @@ +--- ps/ps.c.orig 2024-08-02 07:55:02.072464000 -0700 ++++ ps/ps.c 2024-08-02 08:09:25.924815000 -0700 +@@ -87,6 +87,9 @@ #define proc process #undef p_pgid #undef p_pctcpu @@ -10,7 +10,7 @@ #if defined (__DragonFly__) #endif /* __DragonFly__ */ #elif defined (__hpux) -@@ -492,6 +495,7 @@ +@@ -491,6 +494,7 @@ static void postproc(struct proc *); static enum okay selectproc(struct proc *); @@ -18,7 +18,7 @@ /************************************************************************ * Utility functions * -@@ -2140,7 +2144,6 @@ +@@ -2139,7 +2143,6 @@ static enum okay getproc_kvm(struct proc *p) { @@ -26,7 +26,18 @@ struct kinfo_proc *kp; int c; -@@ -4875,6 +4878,7 @@ +@@ -2205,8 +2208,10 @@ + #else /* __FreeBSD__ >= 5 */ + if (kp->ki_sflag & PS_INMEM) + p->p_flag |= FL_LOAD; ++#if (__FreeBSD__) < 15 + if (kp->ki_sflag & PS_SWAPPINGOUT) + p->p_flag |= FL_SWAP; ++#endif /* __FreeBSD__ < 15 */ + p->p_oldpri = ((double)kp->ki_pri.pri_user - PRI_MIN) / + (PRI_MAX - PRI_MIN) * 60 + 60; + p->p_pri = 40 - ((double)kp->ki_pri.pri_user - PRI_MIN) / +@@ -4874,6 +4879,7 @@ #ifdef __GLIBC__ putenv("POSIXLY_CORRECT=1"); #endif