correct the previous patch into a arm target one [release 8.2p1-4mamba;Fri Apr 03 2020]

This commit is contained in:
Silvan Calarco 2024-01-06 08:15:56 +01:00
parent ab680811c7
commit 6401ac9e19
2 changed files with 24 additions and 6 deletions

View File

@ -0,0 +1,10 @@
--- openssh-8.2p1/sandbox-seccomp-filter.c.orig 2020-04-03 21:22:35.404943267 +0200
+++ openssh-8.2p1/sandbox-seccomp-filter.c 2020-04-03 21:22:48.674099772 +0200
@@ -251,6 +251,7 @@
#ifdef __NR_clock_nanosleep
SC_ALLOW(__NR_clock_nanosleep),
#endif
+#define __NR_clock_nanosleep_time64 407
#ifdef __NR_clock_nanosleep_time64
SC_ALLOW(__NR_clock_nanosleep_time64),
#endif

View File

@ -7,7 +7,7 @@
Name: openssh
Version: 8.2p1
Release: 2mamba
Release: 4mamba
Summary: OpenSSH free Secure Shell (SSH) implementation
Group: Network/Security
Vendor: openmamba
@ -22,6 +22,7 @@ Source4: openssh-sshd@.service
Source5: openssh-sshd.socket
Source6: openssh-sshd.conf
Patch0: openssh-7.6p1-ssh_config.patch
Patch1: openssh-8.2p1-arm-glibc-2.31.patch
License: BSD
## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel
@ -50,6 +51,7 @@ BuildRequires: coreutils
%endif
BuildRequires: libwrap-devel
BuildRequires: libopenssl >= 1.0.1c
BuildRequires: glibc-devel >= 2.31
BuildRoot: %{_tmppath}/%{name}-%{version}-root
# NOTE:
@ -121,7 +123,12 @@ A Gtk2 SSH passphrase requester.
%prep
%setup -q
#-D -T
#:<< _EOF
%patch0 -p1
%ifarch arm
%patch1 -p1
%endif
%build
# note: --with-rand-helper unneeded for Linux
@ -134,7 +141,6 @@ export CFLAGS="%{optflags} -DUSE_CHROOT"
--libexecdir=%{_libexecdir}/openssh \
--with-pid-dir=/run/sshd \
--with-md5-passwords \
--with-ipv4-default \
--with-mantype=man \
%if %with_opensc
--with-opensc \
@ -144,12 +150,8 @@ export CFLAGS="%{optflags} -DUSE_CHROOT"
%if %with_selinux
--with-selinux \
%endif
--with-tcp-wrappers \
--with-libedit \
--without-rsh \
--without-smartcard \
--without-zlib-version-check \
--disable-suid-ssh \
--disable-etc-default-login \
--with-default-path=/usr/local/bin:/bin:/usr/bin \
--with-superuser-path=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin \
@ -298,6 +300,12 @@ exit 0
%{_libexecdir}/openssh/ssh-askpass
%changelog
* Fri Apr 03 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 8.2p1-4mamba
- correct the previous patch into a arm target one
* Fri Apr 03 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 8.2p1-3mamba
- arm: added patch for glibc 2.31 (from Arch) to fix problem as seen on x86
* Fri Mar 06 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 8.2p1-2mamba
- rebuilt to fix server problem on x86 probably following glibc 2.31