diff --git a/srcpkgs/openssh/patches/musl-btmp.patch b/srcpkgs/openssh/patches/musl-btmp.patch new file mode 100644 index 00000000000..ab3d2ef1341 --- /dev/null +++ b/srcpkgs/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/srcpkgs/openssh/patches/musl-connect.patch b/srcpkgs/openssh/patches/musl-connect.patch deleted file mode 100644 index cde7bc8cb1f..00000000000 --- a/srcpkgs/openssh/patches/musl-connect.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/openbsd-compat/port-linux.c -+++ b/openbsd-compat/port-linux.c -@@ -366,7 +366,7 @@ - error_f("socket \"%s\": %s", path, strerror(errno)); - goto out; - } -- if (connect(fd, &addr, sizeof(addr)) != 0) { -+ if (connect(fd, (const struct sockaddr *)&addr, sizeof(addr)) != 0) { - error_f("socket \"%s\" connect: %s", path, strerror(errno)); - goto out; - } diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template index 5bd67e87037..5b31b5f9142 100644 --- a/srcpkgs/openssh/template +++ b/srcpkgs/openssh/template @@ -1,6 +1,6 @@ # Template file for 'openssh' pkgname=openssh -version=9.8p1 +version=9.9p1 revision=1 build_style=gnu-configure configure_args="--datadir=/usr/share/openssh @@ -26,7 +26,7 @@ license="BSD-2-Clause, ISC" homepage="https://www.openssh.com" changelog="https://www.openssh.com/releasenotes.html" distfiles="https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${version}.tar.gz" -checksum=dd8bd002a379b5d499dfb050dd1fa9af8029e80461f4bb6c523c49973f5a39f3 +checksum=b343fbcdbff87f15b1986e6e15d6d4fc9a7d36066be6b7fb507087ba8f966c02 conf_files="/etc/ssh/moduli /etc/ssh/ssh_config /etc/ssh/sshd_config /etc/pam.d/sshd" make_dirs=" /var/chroot/ssh 0755 root root