[packages/openssh] upstream patch to allow pselect6_time64 in seccomp filter
atler
atler at pld-linux.org
Wed Feb 3 23:42:59 CET 2021
commit e17f5bba301191f2472d43b9d11edf194e18bcb7
Author: Jan Palus <atler at pld-linux.org>
Date: Wed Feb 3 23:31:05 2021 +0100
upstream patch to allow pselect6_time64 in seccomp filter
appears to be required by arm with glibc 2.33
allow_pselect6_time64.patch | 30 ++++++++++++++++++++++++++++++
openssh.spec | 2 ++
2 files changed, 32 insertions(+)
---
diff --git a/openssh.spec b/openssh.spec
index 3115ad1..2d17c50 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -74,6 +74,7 @@ Patch12: openssh-bug-2905.patch
Patch13: %{name}-skip-interop-tests.patch
Patch14: %{name}-bind.patch
Patch15: %{name}-disable_ldap.patch
+Patch16: allow_pselect6_time64.patch
URL: http://www.openssh.com/portable.html
BuildRequires: %{__perl}
%{?with_audit:BuildRequires: audit-libs-devel}
@@ -559,6 +560,7 @@ openldap-a.
%patch14 -p1
%{!?with_ldap:%patch15 -p1}
+%patch16 -p1
%if "%{pld_release}" == "ac"
# fix for missing x11.pc
diff --git a/allow_pselect6_time64.patch b/allow_pselect6_time64.patch
new file mode 100644
index 0000000..046e030
--- /dev/null
+++ b/allow_pselect6_time64.patch
@@ -0,0 +1,30 @@
+From 0f90440ca70abab947acbd77795e9f130967956c Mon Sep 17 00:00:00 2001
+From: Darren Tucker <dtucker at dtucker.net>
+Date: Fri, 20 Nov 2020 13:37:54 +1100
+Subject: Add new pselect6_time64 syscall on ARM.
+
+This is apparently needed on armhfp/armv7hl. bz#3232, patch from
+jjelen at redhat.com.
+---
+ sandbox-seccomp-filter.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+(limited to 'sandbox-seccomp-filter.c')
+
+diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c
+index e0768c06..5065ae7e 100644
+--- a/sandbox-seccomp-filter.c
++++ b/sandbox-seccomp-filter.c
+@@ -267,6 +267,9 @@ static const struct sock_filter preauth_insns[] = {
+ #ifdef __NR_pselect6
+ SC_ALLOW(__NR_pselect6),
+ #endif
++#ifdef __NR_pselect6_time64
++ SC_ALLOW(__NR_pselect6_time64),
++#endif
+ #ifdef __NR_read
+ SC_ALLOW(__NR_read),
+ #endif
+--
+cgit v1.2.3
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/openssh.git/commitdiff/99aa2bcd46d5092670f84e7a38d7395e63f6c3bc
More information about the pld-cvs-commit
mailing list