diff --git a/extra/openssh/build b/extra/openssh/build index eb189d18..b09c6261 100755 --- a/extra/openssh/build +++ b/extra/openssh/build @@ -1,5 +1,7 @@ #!/bin/sh -e +patch -p1 < musl-btmp.patch + export CFLAGS="$CFLAGS -Wno-error=incompatible-pointer-types" ./configure \ diff --git a/extra/openssh/checksums b/extra/openssh/checksums index 84c6b74b..b4216605 100644 --- a/extra/openssh/checksums +++ b/extra/openssh/checksums @@ -1,2 +1,3 @@ -3916a6fe028dce304e9e7c17e92f31085b183d235033cef3877d9018521aeea817 +4cb4d97b991b5593df23d723d455d89e86608df39454d6a734bbf0647813098478 41de8bef1bc5366ed5a08ad2bd674e3562c8020d29e73d0d7b7dcabba9506df77e +32d3653c6613f7f9eb6f1f3dd2405edecf4970c0be27a2d3ba75f8ede24d28e8bd diff --git a/extra/openssh/patches/musl-btmp.patch b/extra/openssh/patches/musl-btmp.patch new file mode 100644 index 00000000..38529811 --- /dev/null +++ b/extra/openssh/patches/musl-btmp.patch @@ -0,0 +1,11 @@ +--- a/loginrec.c ++++ b/loginrec.c +@@ -614,7 +614,7 @@ + ** into account. + **/ + +-#if defined(USE_UTMP) || defined (USE_WTMP) || defined (USE_LOGIN) ++#if defined(USE_BTMP) || defined(USE_UTMP) || defined (USE_WTMP) || defined (USE_LOGIN) + + /* build the utmp structure */ + void diff --git a/extra/openssh/sources b/extra/openssh/sources index 937ca06d..5b44acf4 100644 --- a/extra/openssh/sources +++ b/extra/openssh/sources @@ -1,2 +1,3 @@ -https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-9.8p1.tar.gz +https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-9.9p1.tar.gz files/sshd.run +patches/musl-btmp.patch diff --git a/extra/openssh/version b/extra/openssh/version index 4fe6e521..a24378e6 100644 --- a/extra/openssh/version +++ b/extra/openssh/version @@ -1 +1 @@ -9.8p1 1 +9.9p1 1