X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=openssh.spec;h=37b9ffc1c262e58cc9b2b518a2666b1a061763af;hb=HEAD;hp=543aa6d5611045a7ae863ea4991d13d81128439d;hpb=f149ec4d6a7dfd4eca5be5bd7dfd1069d519e3dc;p=packages%2Fopenssh.git

diff --git a/openssh.spec b/openssh.spec
index 543aa6d..2de60ac 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -15,6 +15,7 @@
 %bcond_without	libseccomp	# use libseccomp for seccomp privsep (requires 3.5 kernel)
 %bcond_with	hpn		# High Performance SSH/SCP - HPN-SSH including Cipher NONE (broken too often)
 %bcond_without	tests		# test suite
+%bcond_with	tests_conch	# run conch interoperability tests
 
 # gtk2-based gnome-askpass means no gnome1-based
 %{?with_gtk:%undefine with_gnome}
@@ -35,13 +36,13 @@ Summary(pt_BR.UTF-8):	Implementação livre do SSH
 Summary(ru.UTF-8):	OpenSSH - свободная реализация протокола Secure Shell (SSH)
 Summary(uk.UTF-8):	OpenSSH - вільна реалізація протоколу Secure Shell (SSH)
 Name:		openssh
-Version:	8.0p1
-Release:	2
+Version:	9.7p1
+Release:	3
 Epoch:		2
 License:	BSD
 Group:		Applications/Networking
-Source0:	http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/%{name}-%{version}.tar.gz
-# Source0-md5:	bf050f002fe510e1daecd39044e1122d
+Source0:	https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/%{name}-%{version}.tar.gz
+# Source0-md5:	1100f170ca1bc669038ca3743e074094
 Source1:	http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5:	66943d481cc422512b537bcc2c7400d1
 Source2:	%{name}d.init
@@ -54,6 +55,11 @@ Source9:	sshd.service
 Source10:	sshd-keygen
 Source11:	sshd.socket
 Source12:	sshd@.service
+Source13:	pld-ssh_config
+Source14:	pld-sshd_config
+Patch100:	%{name}-git.patch
+# Patch100-md5:	eb723cc4f21efc32752161d539c9c5e9
+Patch0:		%{name}-no-pty-tests.patch
 Patch1:		%{name}-tests-reuseport.patch
 Patch2:		%{name}-pam_misc.patch
 Patch3:		%{name}-sigpipe.patch
@@ -66,10 +72,10 @@ Patch8:		ldap-helper-sigpipe.patch
 # High Performance SSH/SCP - HPN-SSH - http://www.psc.edu/networking/projects/hpn-ssh/
 # http://www.psc.edu/networking/projects/hpn-ssh/openssh-5.2p1-hpn13v6.diff.gz
 Patch9:		%{name}-5.2p1-hpn13v6.diff
-Patch10:	%{name}-include.patch
+
 Patch11:	%{name}-chroot.patch
-Patch12:	openssh-bug-2905.patch
 
+Patch13:	%{name}-skip-interop-tests.patch
 Patch14:	%{name}-bind.patch
 Patch15:	%{name}-disable_ldap.patch
 URL:		http://www.openssh.com/portable.html
@@ -82,14 +88,19 @@ BuildRequires:	automake
 %{?with_kerberos5:BuildRequires:	heimdal-devel >= 0.7}
 %{?with_ldns:BuildRequires:	ldns-devel}
 %{?with_libedit:BuildRequires:	libedit-devel}
-BuildRequires:	libseccomp-devel
+BuildRequires:	libfido2-devel >= 1.5.0
+%{?with_libseccomp:BuildRequires:	libseccomp-devel}
 %{?with_selinux:BuildRequires:	libselinux-devel}
 %{?with_ldap:BuildRequires:	openldap-devel}
-BuildRequires:	openssl-devel >= 1.1.0g
+BuildRequires:	openssl-devel >= 1.1.1
 BuildRequires:	pam-devel
 %{?with_gtk:BuildRequires:	pkgconfig}
+%if %{with tests} && %{with tests_conch}
+BuildRequires:	python-TwistedConch
+%endif
 BuildRequires:	rpm >= 4.4.9-56
-BuildRequires:	rpmbuild(macros) >= 1.627
+BuildRequires:	rpm-build >= 4.6
+BuildRequires:	rpmbuild(macros) >= 1.752
 BuildRequires:	sed >= 4.0
 BuildRequires:	zlib-devel >= 1.2.3
 %if %{with tests} && 0%(id -u sshd >/dev/null 2>&1; echo $?)
@@ -100,14 +111,6 @@ BuildRequires:	%{name}-server
 BuildRequires:	uname(release) >= 3.5
 %endif
 Requires:	zlib >= 1.2.3
-%if "%{pld_release}" == "ac"
-Requires:	filesystem >= 2.0-1
-Requires:	pam >= 0.79.0
-%else
-Requires:	filesystem >= 3.0-11
-Requires:	pam >= %{pam_ver}
-Suggests:	xorg-app-xauth
-%endif
 Obsoletes:	ssh
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -259,10 +262,11 @@ Summary(pt_BR.UTF-8):	Clientes do OpenSSH
 Summary(ru.UTF-8):	OpenSSH - клиенты протокола Secure Shell
 Summary(uk.UTF-8):	OpenSSH - клієнти протоколу Secure Shell
 Group:		Applications/Networking
-Requires:	%{name}
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+Suggests:	%{name}-clients-helper-fido = %{epoch}:%{version}-%{release}
 Provides:	ssh-clients
 Obsoletes:	ssh-clients
-%requires_eq_to	openssl	openssl-devel
+%requires_eq_to	openssl%{?_isa}	openssl-devel
 
 %description clients
 Ssh (Secure Shell) a program for logging into a remote machine and for
@@ -333,6 +337,19 @@ xinitrc scripts for starting SSH agent.
 %description clients-agent-xinitrc -l pl.UTF-8
 Skrypty xinitrc do uruchamiania agenta SSH.
 
+%package clients-helper-fido
+Summary:	OpenSSH helper for FIDO authenticator
+Summary(pl.UTF-8):	OpenSSH helper obsługujący klucz autoryzujący FIDO
+Group:		Applications/Networking
+Requires:	%{name}-clients = %{epoch}:%{version}-%{release}
+Requires:	libfido2 >= 1.5.0
+
+%description clients-helper-fido
+OpenSSH helper for FIDO authenticator.
+
+%description clients-helper-fido -l pl.UTF-8
+OpenSSH helper obsługujący klucz autoryzujący FIDO.
+
 %package server
 Summary:	OpenSSH Secure Shell protocol server (sshd)
 Summary(de.UTF-8):	OpenSSH Secure Shell Protocol-Server (sshd)
@@ -353,7 +370,14 @@ Requires(pre):	/bin/id
 Requires(pre):	/usr/sbin/useradd
 Requires(post,preun,postun):	systemd-units >= 38
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+%if "%{pld_release}" == "ac"
+Requires:	filesystem >= 2.0-1
+Requires:	pam >= 0.79.0
+%else
+Requires:	filesystem >= 3.0-11
 Requires:	pam >= %{pam_ver}
+Suggests:	xorg-app-xauth
+%endif
 Requires:	rc-scripts >= 0.4.3.0
 Requires:	systemd-units >= 38
 %{?with_libseccomp:Requires:	uname(release) >= 3.5}
@@ -363,7 +387,7 @@ Suggests:	/bin/login
 Suggests:	xorg-app-xauth
 Provides:	ssh-server
 Provides:	user(sshd)
-%requires_eq_to	openssl	openssl-devel
+%requires_eq_to	openssl%{?_isa}	openssl-devel
 
 %description server
 Ssh (Secure Shell) a program for logging into a remote machine and for
@@ -508,9 +532,7 @@ Summary(pl.UTF-8):	Schemat klucza publicznego LDAP dla OpenSSH
 Group:		Networking/Daemons
 Requires(post,postun):	sed >= 4.0
 Requires:	openldap-servers
-%if "%{_rpmversion}" >= "5"
 BuildArch:	noarch
-%endif
 
 %description -n openldap-schema-openssh-lpk
 This package contains OpenSSH LDAP Public Key schema for openldap.
@@ -521,6 +543,9 @@ openldap-a.
 
 %prep
 %setup -q
+#%%patch100 -p1
+
+%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
@@ -531,9 +556,10 @@ openldap-a.
 %patch8 -p1
 
 %{?with_hpn:%patch9 -p1}
-%patch10 -p1
+
 %patch11 -p1
-%patch12 -p1
+
+%patch13 -p1
 
 %patch14 -p1
 %{!?with_ldap:%patch15 -p1}
@@ -553,7 +579,6 @@ grep -rl /usr/libexec/openssh/ssh-ldap-helper . | xargs \
 %{__mv} aclocal.m4 acinclude.m4
 
 %build
-cp /usr/share/automake/config.sub .
 %{__aclocal}
 %{__autoconf}
 %{__autoheader}
@@ -570,17 +595,22 @@ CPPFLAGS="%{rpmcppflags} -DCHROOT -std=gnu99"
 	--with-ldap%{!?with_ldap:=no} \
 	%{?with_ldns:--with-ldns} \
 	%{?with_libedit:--with-libedit} \
-	--with-mantype=man \
+	--with-mantype=doc \
 	--with-md5-passwords \
 	--with-pam \
 	--with-pid-dir=%{_localstatedir}/run \
 	--with-privsep-path=%{_privsepdir} \
 	--with-privsep-user=sshd \
+	--with-security-key-builtin \
 	%{?with_selinux:--with-selinux} \
 %if "%{pld_release}" == "ac"
 	--with-xauth=/usr/X11R6/bin/xauth
 %else
+%if %{with libseccomp}
 	--with-sandbox=seccomp_filter \
+%else
+	--with-sandbox=rlimit \
+%endif
 	--with-xauth=%{_bindir}/xauth
 %endif
 
@@ -591,7 +621,10 @@ echo '#define LOGIN_PROGRAM		   "/bin/login"' >>config.h
 %if %{with tests}
 %{__make} -j1 tests \
 	TEST_SSH_PORT=$((4242 + ${RANDOM:-$$} % 1000)) \
-	TEST_SSH_TRACE="yes"
+	TEST_SSH_TRACE="yes" \
+%if %{without tests_conch}
+	SKIP_LTESTS="conch-ciphers"
+%endif
 %endif
 
 cd contrib
@@ -608,6 +641,7 @@ cd contrib
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir},/etc/{pam.d,rc.d/init.d,sysconfig,security,env.d}} \
 	$RPM_BUILD_ROOT{%{_libexecdir}/ssh,%{schemadir},%{systemdunitdir}}
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/ssh{,d}_config.d
 install -d $RPM_BUILD_ROOT/etc/{profile.d,X11/xinit/xinitrc.d}
 
 %{__make} install \
@@ -621,6 +655,8 @@ cp -p %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/sshd
 cp -p %{SOURCE5} $RPM_BUILD_ROOT/etc/profile.d
 ln -sf /etc/profile.d/ssh-agent.sh $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d/ssh-agent.sh
 cp -p %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}
+cp -p %{SOURCE13} $RPM_BUILD_ROOT%{_sysconfdir}/ssh_config.d/50-pld.conf
+cp -p %{SOURCE14} $RPM_BUILD_ROOT%{_sysconfdir}/sshd_config.d/50-pld.conf
 cp -p %{SOURCE7} $RPM_BUILD_ROOT%{schemadir}
 
 cp -p %{SOURCE9} %{SOURCE11} %{SOURCE12} $RPM_BUILD_ROOT%{systemdunitdir}
@@ -629,6 +665,7 @@ install -p %{SOURCE10} $RPM_BUILD_ROOT%{_libexecdir}/sshd-keygen
 %{__sed} -i -e 's|@@LIBEXECDIR@@|%{_libexecdir}|g' \
 	$RPM_BUILD_ROOT/etc/rc.d/init.d/sshd \
 	$RPM_BUILD_ROOT%{systemdunitdir}/sshd.service \
+	$RPM_BUILD_ROOT%{systemdunitdir}/sshd@.service \
 	$RPM_BUILD_ROOT%{_libexecdir}/sshd-keygen
 
 %if %{with gnome}
@@ -780,7 +817,10 @@ fi
 %attr(755,root,root) %{_bindir}/ssh-add
 %attr(755,root,root) %{_bindir}/ssh-copy-id
 %attr(755,root,root) %{_bindir}/scp
+%attr(755,root,root) %{_libexecdir}/ssh-pkcs11-helper
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ssh_config
+%dir %{_sysconfdir}/ssh_config.d
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ssh_config.d/50-pld.conf
 %config(noreplace,missingok) %verify(not md5 mtime size) /etc/env.d/SSH_ASKPASS
 %{_mandir}/man1/scp.1*
 %{_mandir}/man1/ssh.1*
@@ -789,6 +829,7 @@ fi
 %{_mandir}/man1/ssh-add.1*
 %{_mandir}/man1/ssh-copy-id.1*
 %{_mandir}/man5/ssh_config.5*
+%{_mandir}/man8/ssh-pkcs11-helper.8*
 %lang(it) %{_mandir}/it/man1/ssh.1*
 %lang(it) %{_mandir}/it/man5/ssh_config.5*
 %lang(pl) %{_mandir}/pl/man1/scp.1*
@@ -807,20 +848,25 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) /etc/X11/xinit/xinitrc.d/ssh-agent.sh
 
+%files clients-helper-fido
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libexecdir}/ssh-sk-helper
+%{_mandir}/man8/ssh-sk-helper.8*
+
 %files server
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_sbindir}/sshd
 %attr(755,root,root) %{_libexecdir}/sftp-server
 %attr(755,root,root) %{_libexecdir}/ssh-keysign
-%attr(755,root,root) %{_libexecdir}/ssh-pkcs11-helper
 %attr(755,root,root) %{_libexecdir}/sshd-keygen
 %{_mandir}/man8/sshd.8*
 %{_mandir}/man8/sftp-server.8*
 %{_mandir}/man8/ssh-keysign.8*
-%{_mandir}/man8/ssh-pkcs11-helper.8*
 %{_mandir}/man5/sshd_config.5*
 %{_mandir}/man5/moduli.5*
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sshd_config
+%attr(750,root,root) %dir %{_sysconfdir}/sshd_config.d
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sshd_config.d/50-pld.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/sshd
 %{_sysconfdir}/moduli
 %attr(754,root,root) /etc/rc.d/init.d/sshd