From 2137aa9d9fd3f2a3ebc1aa12c6e56ece99fa067c Mon Sep 17 00:00:00 2001
From: Ed Maste <emaste@FreeBSD.org>
Date: Tue, 10 Mar 2026 14:36:03 -0400
Subject: OpenSSH: Additional changes from git V_10_2 tag

There are a few additional patches included in the V_10_2 tag in
openssh-portable's git repo.  Excluding GitHub workflows and autoconf
goop they are:

876a7d2a1264 check PAM user against previous user, not pw_name
3d3ee425b61c fix duplicate PAM msgs, missing loginmsg reset
f4c6cb9433a5 If we have nfds_t, check if it's int or long.
cb41e63c65a2 seccomp sandbox: allow uname(3)
607f337637f2 upstream: downgrade a useless error() -> debug()

It is unclear why these are included in the Git tag but not in the
OpenSSH release tarball, but they look like good changes.
---
 .github/workflows/c-cpp.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to '.github/workflows/c-cpp.yml')

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index f64803b55ef6..a132ed87f65f 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -29,9 +29,9 @@ jobs:
           - ubuntu-latest
           - ubuntu-22.04-arm
           - ubuntu-24.04-arm
-          - macos-13
           - macos-14
           - macos-15
+          - macos-15-intel
           - windows-2022
           - windows-2025
         config: [default]
@@ -79,8 +79,9 @@ jobs:
           - { target: ubuntu-latest, config: libressl-3.7.3 }
           - { target: ubuntu-latest, config: libressl-3.8.4 }
           - { target: ubuntu-latest, config: libressl-3.9.2 }
-          - { target: ubuntu-latest, config: libressl-4.0.0 }
-          - { target: ubuntu-latest, config: libressl-4.1.0 }
+          - { target: ubuntu-latest, config: libressl-4.0.1 }
+          - { target: ubuntu-latest, config: libressl-4.1.1 }
+          - { target: ubuntu-latest, config: libressl-4.2.0 }
           - { target: ubuntu-latest, config: openssl-master }
           - { target: ubuntu-latest, config: openssl-noec }
           - { target: ubuntu-latest, config: openssl-1.1.1 }
@@ -111,7 +112,6 @@ jobs:
           - { target: ubuntu-latest, config: musl }
           - { target: ubuntu-22.04-arm, config: kitchensink }
           - { target: ubuntu-24.04-arm, config: kitchensink }
-          - { target: macos-13, config: pam }
           - { target: macos-14, config: pam }
           - { target: macos-15, config: pam }
     runs-on: ${{ matrix.target }}
-- 
cgit v1.3