openssh: update to 9.0p1

Remove upstreamed patches.

Signed-off-by: Sibren Vasse <redacted>

diff --git a/net/openssh/Makefile b/net/openssh/Makefile
index e574e91767d93239422d1037ed0046d86c4ce846..15fef1bc85bf50b3fa98a9b6823ee77c20c16081 100644 (file)
--- a/net/openssh/Makefile
+++ b/net/openssh/Makefile
@@ -8,19 +8,18 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=openssh
-PKG_VERSION:=8.9p1
+PKG_VERSION:=9.0p1
 PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \
                https://ftp.spline.de/pub/OpenBSD/OpenSSH/portable/
-PKG_HASH:=fd497654b7ab1686dac672fb83dfb4ba4096e8b5ffcdaccd262380ae58bec5e7
+PKG_HASH:=03974302161e9ecce32153cfa10012f1e65c8f3750f573a73ab1befd5972a28a
 
 PKG_LICENSE:=BSD ISC
 PKG_LICENSE_FILES:=LICENCE
 PKG_CPE_ID:=cpe:/a:openssh:openssh
 
-PKG_FIXUP:=autoreconf
 PKG_REMOVE_FILES:=
 PKG_CONFIG_DEPENDS := \
        CONFIG_OPENSSH_LIBFIDO2

diff --git a/net/openssh/patches/010-32bit-seccomp.patch b/net/openssh/patches/010-32bit-seccomp.patch
deleted file mode 100644 (file)
index f8f9576..0000000
--- a/net/openssh/patches/010-32bit-seccomp.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 995cf19fbef0b10dbcf1dd8d6382cec9194e08c5 Mon Sep 17 00:00:00 2001
-From: Darren Tucker <dtucker@dtucker.net>
-Date: Sat, 26 Feb 2022 14:06:14 +1100
-Subject: [PATCH] Allow ppoll_time64 in seccomp sandbox.
-
-Should fix sandbox violations on (some? at least i386 and armhf) 32bit
-Linux platforms.  Patch from chutzpahu at gentoo.org and cjwatson at
-debian.org via bz#3396.
----
- sandbox-seccomp-filter.c | 3 +++
- 1 file changed, 3 insertions(+)
-
---- a/sandbox-seccomp-filter.c
-+++ b/sandbox-seccomp-filter.c
-@@ -276,6 +276,9 @@ static const struct sock_filter preauth_
- #ifdef __NR_ppoll
-       SC_ALLOW(__NR_ppoll),
- #endif
-+#ifdef __NR_ppoll_time64
-+      SC_ALLOW(__NR_ppoll_time64),
-+#endif
- #ifdef __NR_poll
-       SC_ALLOW(__NR_poll),
- #endif

diff --git a/net/openssh/patches/020-improve-detection-of-fzero-call-used-regs.patch b/net/openssh/patches/020-improve-detection-of-fzero-call-used-regs.patch
deleted file mode 100644 (file)
index 345bfa3..0000000
--- a/net/openssh/patches/020-improve-detection-of-fzero-call-used-regs.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 6c4a67ece33d9551429490898bb3c793a689e913 Mon Sep 17 00:00:00 2001
-From: Colin Watson <cjwatson@debian.org>
-Date: Thu, 24 Feb 2022 16:04:18 +0000
-Subject: [PATCH] Improve detection of -fzero-call-used-regs=all support
-
-GCC doesn't tell us whether this option is supported unless it runs into
-the situation where it would need to emit corresponding code.
----
- m4/openssh.m4 | 3 +++
- 1 file changed, 3 insertions(+)
-
---- a/m4/openssh.m4
-+++ b/m4/openssh.m4
-@@ -14,6 +14,8 @@ AC_DEFUN([OSSH_CHECK_CFLAG_COMPILE], [{
-       AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
- #include <stdlib.h>
- #include <stdio.h>
-+/* Trivial function to help test for -fzero-call-used-regs */
-+void f(int n) {}
- int main(int argc, char **argv) {
-       (void)argv;
-       /* Some math to catch -ftrapv problems in the toolchain */
-@@ -21,6 +23,7 @@ int main(int argc, char **argv) {
-       float l = i * 2.1;
-       double m = l / 0.5;
-       long long int n = argc * 12345LL, o = 12345LL * (long long int)argc;
-+      f(0);
-       printf("%d %d %d %f %f %lld %lld\n", i, j, k, l, m, n, o);
-       /*
-        * Test fallthrough behaviour.  clang 10's -Wimplicit-fallthrough does