Skip to content

Commit 6384372

Browse files
committed
merge the rest of the 9.8 changes from upstream
2 parents d5d6a52 + c21fc9d commit 6384372

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

93 files changed

+46957
-499
lines changed

.depend

Lines changed: 10 additions & 5 deletions
Large diffs are not rendered by default.

.github/ci-status.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ master :
66
[![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/openssh.svg)](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:openssh)
77
[![Coverity Status](https://scan.coverity.com/projects/21341/badge.svg)](https://scan.coverity.com/projects/openssh-portable)
88

9+
9.8 :
10+
[![C/C++ CI](https://github.com/openssh/openssh-portable/actions/workflows/c-cpp.yml/badge.svg?branch=V_9_8)](https://github.com/openssh/openssh-portable/actions/workflows/c-cpp.yml?query=branch:V_9_8)
11+
[![C/C++ CI self-hosted](https://github.com/openssh/openssh-portable-selfhosted/actions/workflows/selfhosted.yml/badge.svg?branch=V_9_8)](https://github.com/openssh/openssh-portable-selfhosted/actions/workflows/selfhosted.yml?query=branch:V_9_8)
12+
913
9.7 :
1014
[![C/C++ CI](https://github.com/openssh/openssh-portable/actions/workflows/c-cpp.yml/badge.svg?branch=V_9_7)](https://github.com/openssh/openssh-portable/actions/workflows/c-cpp.yml?query=branch:V_9_7)
1115
[![C/C++ CI self-hosted](https://github.com/openssh/openssh-portable-selfhosted/actions/workflows/selfhosted.yml/badge.svg?branch=V_9_7)](https://github.com/openssh/openssh-portable-selfhosted/actions/workflows/selfhosted.yml?query=branch:V_9_7)

.github/configs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,7 @@ case "$config" in
208208
# and hostbased (since valgrind won't let ssh exec keysign).
209209
# Slow ones are run separately to increase parallelism.
210210
SKIP_LTESTS="agent-timeout connection-timeout hostbased"
211+
SKIP_LTESTS="$SKIP_LTESTS penalty-expire"
211212
SKIP_LTESTS="$SKIP_LTESTS ${tests2} ${tests3} ${tests4} ${tests5}"
212213
;;
213214
valgrind-2)
@@ -289,7 +290,7 @@ case "${TARGET_HOST}" in
289290
hostkey-agent key-options keyscan knownhosts-command login-timeout
290291
reconfigure reexec rekey scp scp-uri scp3 sftp sftp-badcmds
291292
sftp-batch sftp-cmds sftp-glob sftp-perm sftp-uri stderr-data
292-
transfer"
293+
transfer penalty penalty-expire"
293294
SKIP_LTESTS="$(echo $T)"
294295
TEST_TARGET=t-exec
295296
SUDO=""

.github/workflows/c-cpp.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ jobs:
1717
target:
1818
- ubuntu-20.04
1919
- ubuntu-22.04
20-
- macos-11
2120
- macos-12
2221
- macos-13
2322
- macos-14
@@ -102,7 +101,6 @@ jobs:
102101
- { target: ubuntu-22.04, config: selinux }
103102
- { target: ubuntu-22.04, config: kitchensink }
104103
- { target: ubuntu-22.04, config: without-openssl }
105-
- { target: macos-11, config: pam }
106104
- { target: macos-12, config: pam }
107105
- { target: macos-13, config: pam }
108106
- { target: macos-14, config: pam }

.github/workflows/upstream.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Upstream self-hosted
33
on:
44
push:
55
branches: [ master ]
6-
paths: [ '**.c', '**.h', '.github/configs', '.github/workflows/upstream.yml' ]
6+
paths: [ '**.c', '**.h', '**.sh', '.github/configs', '.github/workflows/upstream.yml' ]
77

88
jobs:
99
selfhosted:
@@ -43,7 +43,7 @@ jobs:
4343
- name: make
4444
run: vmrun "cd /usr/src/usr.bin/ssh && case ${{ matrix.config }} in without-openssl) make OPENSSL=no;; ubsan) make DEBUG='-fsanitize-minimal-runtime -fsanitize=undefined';; *) make; esac"
4545
- name: make install
46-
run: vmrun "cd /usr/src/usr.bin/ssh && sudo make install"
46+
run: vmrun "cd /usr/src/usr.bin/ssh && sudo make install && sudo /etc/rc.d/sshd -f restart"
4747
- name: make tests`
4848
run: vmrun "cd /usr/src/regress/usr.bin/ssh && case ${{ matrix.config }} in without-openssl) make OPENSSL=no;; ubsan) make DEBUG='-fsanitize-minimal-runtime -fsanitize=undefined';; *) make; esac"
4949
env:

.gitignore

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,14 @@
22
Makefile
33
buildpkg.sh
44
config.h
5-
config.h.in
65
config.h.in~
76
config.log
87
config.status
9-
configure
10-
aclocal.m4
118
openbsd-compat/Makefile
129
openbsd-compat/regress/Makefile
1310
openssh.xml
1411
opensshd.init
1512
survey.sh
16-
**/*.0
1713
**/*.o
1814
**/*.lo
1915
**/*.so

.skipped-commit-ids

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,11 @@ e1dc11143f83082e3154d6094f9136d0dc2637ad more relinking makefile tweaks
3232
ef9341d5a50f0d33e3a6fbe995e92964bc7ef2d3 Makefile relinking changes
3333
2fe8d707ae35ba23c7916adcb818bb5b66837ba0 ssh-agent relink kit
3434
866cfcc1955aef8f3fc32da0b70c353a1b859f2e ssh-agent relink changes
35+
8b3820adb4da4e139c4b3cffbcc0bde9f08bf0c6 sshd-session relink kit
36+
6d2ded4cd91d4d727c2b26e099b91ea935bed504 relink kit
37+
fb39324748824cb0387e9d67c41d1bef945c54ea Makefile change
38+
5f378c38ad8976d507786dc4db9283a879ec8cd0 Makefile change
39+
112aacedd3b61cc5c34b1fa6d9fb759214179172 Makefile change
3540

3641
Old upstream tree:
3742

0 commit comments

Comments
 (0)