From nobody Fri Aug 02 15:19:34 2024 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 4Wb8dM1Y5Qz5Rtdj; Fri, 02 Aug 2024 15:19:35 +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 4Wb8dM0cDqz55rF; Fri, 2 Aug 2024 15:19:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722611975; 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=nZHP83tA3OybOK4EuwiuZntcLNhUq3FI2ncK4ysbMlM=; b=x3CDzw04EEoNt//+w/osqUWeRAVOW/2l0LYPn2pMfFKwm9z/nio3Xa5wn4112QQc7WTHhA uMs19HOaH73ee87gdDydIT507J2CwEXtTMRfs9hbQ7VfWOXEMDQTAl5TrhHrGz5SDQJAFS X9jtEONml9GTirPukeUC8wIg8ca+R/fqk5PVhwhWkQOKdK+uYasMNzWOtt6MPB7JYSqZUh ll0s8ssaMVBH+Ctv3YY/cSCTZNlyzMLCV+v+1OfkpZdNRoqw3HludNNtPv2SD655y+vp0H u2HuixJVvrZnAC1Wf65veddJ10o80HboJn1mC6s9SQXHY4hoqNR3SOuOA9mEyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722611975; a=rsa-sha256; cv=none; b=RI2SN6Q8t+eW0qNfmJsFUe96SSpvHxjxmcf5SBfYGnSGmq9kOymRCU5MyopqFq+ZjOmosU KXSiYl8ZFBd3Jyv33vwJHGyi41HitdJ76AEmwptSODA4jvimDf1MAbc1yPSQ6bcbY2snGM RLZmpw4KglsANZ5Y6c6IPW6WyVEWslD/lN3lUESN+NVq5NLqq5hvK33HrQhXGmAu5rzXLs 80kvBF6Pin7Lk15ekcgZkjaOYsqI6pAHo21Zk5AoPcuiDb9UueHj6+yrLPPy22jhMDQe/m 4xgKlvJPhwPWxw6avfCVu0VrN8qUSpM7wR0GPSl3Z15NmyNOTjrInDwpX2a0AQ== 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=1722611975; 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=nZHP83tA3OybOK4EuwiuZntcLNhUq3FI2ncK4ysbMlM=; b=O18OXvdnUe7uG6A4pQ8FsOwlLv0UtvAoEZOi4HTABGWydtBnfhkG5jPUA/ScoXBIyje56k vzBkxkbQjBCFiMgEGjRCyFKgSOsm0oaHpFpA0WSOnYeLuOkUW+xTL2kyBS8QgFNuZNqXcn FtA5Ahd48kJGXBmvDjMSl9Dn7dJcIj1iNkI6QMvmtKrDx4S2KppywVfSVZKLmTKOJHnw+N H5Nw81dJ3MxDErIZrCdaVelKk4pZGCO8Dd2296n3sqlnalv841eEQVr8O5jG5xqlphMWhL BDSe6FLAXnN7Ao9h9PzfsiMWheBF8kyxyAxCBD97w3yR3cUE03VWgwLsPST5wg== 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 4Wb8dM0CxMzYm4; Fri, 2 Aug 2024 15:19:35 +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 472FJYxR036680; Fri, 2 Aug 2024 15:19:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 472FJYPO036677; Fri, 2 Aug 2024 15:19:34 GMT (envelope-from git) Date: Fri, 2 Aug 2024 15:19:34 GMT Message-Id: <202408021519.472FJYPO036677@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Cy Schubert Subject: git: 2b625445f942 - main - sysutils/heirloom: Fix build on 15-CURRENT after e24a65528388 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@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/main X-Git-Reftype: branch X-Git-Commit: 2b625445f9426de4b38497e2778743dc7f5741b8 Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=2b625445f9426de4b38497e2778743dc7f5741b8 commit 2b625445f9426de4b38497e2778743dc7f5741b8 Author: Cy Schubert AuthorDate: 2024-08-02 15:12:26 +0000 Commit: Cy Schubert CommitDate: 2024-08-02 15:14:57 +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 --- 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