From 8c1166092a3035df6db50b10d209a3a42890e961 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 8 Apr 2022 15:36:44 +0200 Subject: [PATCH 1/2] openssh: update to 9.0p1. --- srcpkgs/openssh/patches/ppoll_time64.patch | 26 ---------------------- srcpkgs/openssh/template | 6 ++--- 2 files changed, 3 insertions(+), 29 deletions(-) delete mode 100644 srcpkgs/openssh/patches/ppoll_time64.patch diff --git a/srcpkgs/openssh/patches/ppoll_time64.patch b/srcpkgs/openssh/patches/ppoll_time64.patch deleted file mode 100644 index 199361c69024..000000000000 --- a/srcpkgs/openssh/patches/ppoll_time64.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 284b6e5394652d519e31782e3b3cdfd7b21d1a81 Mon Sep 17 00:00:00 2001 -From: Darren Tucker -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(+) - -diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c -index 2e065ba3ed..4ce80cb2a7 100644 ---- a/sandbox-seccomp-filter.c -+++ b/sandbox-seccomp-filter.c -@@ -276,6 +276,9 @@ static const struct sock_filter preauth_insns[] = { - #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/srcpkgs/openssh/template b/srcpkgs/openssh/template index fe446fc131d4..02a2dec35f42 100644 --- a/srcpkgs/openssh/template +++ b/srcpkgs/openssh/template @@ -1,7 +1,7 @@ # Template file for 'openssh' pkgname=openssh -version=8.9p1 -revision=2 +version=9.0p1 +revision=1 build_style=gnu-configure configure_args="--datadir=/usr/share/openssh --sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody @@ -23,7 +23,7 @@ maintainer="Leah Neukirchen " license="BSD-2-Clause, ISC" homepage="https://www.openssh.com" distfiles="https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${version}.tar.gz" -checksum=fd497654b7ab1686dac672fb83dfb4ba4096e8b5ffcdaccd262380ae58bec5e7 +checksum=03974302161e9ecce32153cfa10012f1e65c8f3750f573a73ab1befd5972a28a 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" From 9e0498e28322d38676fc0cc9217aa79f93718cc2 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 8 Apr 2022 15:36:36 +0200 Subject: [PATCH 2/2] gnome-ssh-askpass: update to 9.0p1. --- srcpkgs/gnome-ssh-askpass/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gnome-ssh-askpass/template b/srcpkgs/gnome-ssh-askpass/template index 558193ab2a19..692556f6836b 100644 --- a/srcpkgs/gnome-ssh-askpass/template +++ b/srcpkgs/gnome-ssh-askpass/template @@ -1,7 +1,7 @@ # Template file for 'gnome-ssh-askpass' pkgname=gnome-ssh-askpass -version=8.9p1 -revision=2 +version=9.0p1 +revision=1 wrksrc="openssh-${version}" build_wrksrc="contrib" build_style=gnu-makefile @@ -13,7 +13,7 @@ maintainer="Leah Neukirchen " license="BSD-3-Clause, BSD-2-Clause" homepage="http://www.openssh.org" distfiles="https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${version}.tar.gz" -checksum=fd497654b7ab1686dac672fb83dfb4ba4096e8b5ffcdaccd262380ae58bec5e7 +checksum=03974302161e9ecce32153cfa10012f1e65c8f3750f573a73ab1befd5972a28a alternatives=" ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/gnome-ssh-askpass