X-Git-Url: http://git.pld-linux.org/?p=packages%2Fopenssh.git;a=blobdiff_plain;f=openssh.spec;h=543aa6d5611045a7ae863ea4991d13d81128439d;hp=1fcfb0d505cca6053876974d567dce4a853d2bfb;hb=f149ec4d6a7dfd4eca5be5bd7dfd1069d519e3dc;hpb=f685d17fb4b2eab8c769c88b3a910e3292647816

diff --git a/openssh.spec b/openssh.spec
index 1fcfb0d..543aa6d 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -5,30 +5,20 @@
 #
 # Conditional build:
 %bcond_without	audit		# sshd audit support
-%bcond_with	gnome		# with gnome-askpass (GNOME 1.x) utility
-%bcond_without	gtk		# without GTK+ (2.x)
-%bcond_without	ldap		# with ldap support
-%bcond_without	libedit		# without libedit (editline/history support in sftp client)
-%bcond_without	kerberos5	# without kerberos5 support
-%bcond_without	selinux		# build without SELinux support
+%bcond_with	gnome		# gnome-askpass (GNOME 1.x) utility
+%bcond_without	gtk		# gnome-askpass (GTK+ 2.x) utility
+%bcond_without	ldap		# LDAP support
+%bcond_with	ldns		# DNSSEC support via libldns
+%bcond_without	libedit		# libedit (editline/history support in sftp client)
+%bcond_without	kerberos5	# Kerberos5 support
+%bcond_without	selinux		# SELinux support
 %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
+%bcond_without	tests		# test suite
 
 # gtk2-based gnome-askpass means no gnome1-based
 %{?with_gtk:%undefine with_gnome}
 
-%ifnarch x32
-# libseccomp requires 3.5 kernel, avoid such requirement where possible (non-x32 arches)
-%undefine	with_libseccomp
-%endif
-
-%define	sandbox %{?with_libseccomp:lib}seccomp_filter
-
-%ifarch x32
-%{!?with_libseccomp:%error openssh seccomp implementation is broken! do not disable libseccomp on x32}
-%endif
-
 %if "%{pld_release}" == "ac"
 %define		pam_ver	0.79.0
 %else
@@ -45,13 +35,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:	7.2p1
-Release:	1
+Version:	8.0p1
+Release:	2
 Epoch:		2
 License:	BSD
 Group:		Applications/Networking
-Source0:	ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/%{name}-%{version}.tar.gz
-# Source0-md5:	b984775f0cfff1f7ff18b8797fce8a28
+Source0:	http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/%{name}-%{version}.tar.gz
+# Source0-md5:	bf050f002fe510e1daecd39044e1122d
 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
@@ -78,9 +68,10 @@ Patch8:		ldap-helper-sigpipe.patch
 Patch9:		%{name}-5.2p1-hpn13v6.diff
 Patch10:	%{name}-include.patch
 Patch11:	%{name}-chroot.patch
+Patch12:	openssh-bug-2905.patch
+
 Patch14:	%{name}-bind.patch
 Patch15:	%{name}-disable_ldap.patch
-Patch16:	libseccomp-sandbox.patch
 URL:		http://www.openssh.com/portable.html
 BuildRequires:	%{__perl}
 %{?with_audit:BuildRequires:	audit-libs-devel}
@@ -89,11 +80,12 @@ BuildRequires:	automake
 %{?with_gnome:BuildRequires:	gnome-libs-devel}
 %{?with_gtk:BuildRequires:	gtk+2-devel}
 %{?with_kerberos5:BuildRequires:	heimdal-devel >= 0.7}
+%{?with_ldns:BuildRequires:	ldns-devel}
 %{?with_libedit:BuildRequires:	libedit-devel}
 BuildRequires:	libseccomp-devel
 %{?with_selinux:BuildRequires:	libselinux-devel}
 %{?with_ldap:BuildRequires:	openldap-devel}
-BuildRequires:	openssl-devel >= 0.9.8f
+BuildRequires:	openssl-devel >= 1.1.0g
 BuildRequires:	pam-devel
 %{?with_gtk:BuildRequires:	pkgconfig}
 BuildRequires:	rpm >= 4.4.9-56
@@ -541,10 +533,10 @@ openldap-a.
 %{?with_hpn:%patch9 -p1}
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
 
 %patch14 -p1
 %{!?with_ldap:%patch15 -p1}
-%{?with_libseccomp:%patch16 -p1}
 
 %if "%{pld_release}" == "ac"
 # fix for missing x11.pc
@@ -558,7 +550,7 @@ grep -rl /usr/libexec/openssh/ssh-ldap-helper . | xargs \
 %{__sed} -i -e 's,/usr/libexec/openssh/ssh-ldap-helper,%{_libexecdir}/ssh-ldap-helper,'
 
 # prevent being ovewritten by aclocal calls
-mv aclocal.m4 acinclude.m4
+%{__mv} aclocal.m4 acinclude.m4
 
 %build
 cp /usr/share/automake/config.sub .
@@ -576,6 +568,7 @@ CPPFLAGS="%{rpmcppflags} -DCHROOT -std=gnu99"
 	--with-ipaddr-display \
 	%{?with_kerberos5:--with-kerberos5=/usr} \
 	--with-ldap%{!?with_ldap:=no} \
+	%{?with_ldns:--with-ldns} \
 	%{?with_libedit:--with-libedit} \
 	--with-mantype=man \
 	--with-md5-passwords \
@@ -587,7 +580,7 @@ CPPFLAGS="%{rpmcppflags} -DCHROOT -std=gnu99"
 %if "%{pld_release}" == "ac"
 	--with-xauth=/usr/X11R6/bin/xauth
 %else
-	--with-sandbox=%{sandbox} \
+	--with-sandbox=seccomp_filter \
 	--with-xauth=%{_bindir}/xauth
 %endif
 
@@ -595,7 +588,11 @@ echo '#define LOGIN_PROGRAM		   "/bin/login"' >>config.h
 
 %{__make}
 
-%{?with_tests:%{__make} -j1 tests}
+%if %{with tests}
+%{__make} -j1 tests \
+	TEST_SSH_PORT=$((4242 + ${RANDOM:-$$} % 1000)) \
+	TEST_SSH_TRACE="yes"
+%endif
 
 cd contrib
 %if %{with gnome}
@@ -825,7 +822,7 @@ fi
 %{_mandir}/man5/moduli.5*
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sshd_config
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/sshd
-%attr(640,root,root) %{_sysconfdir}/moduli
+%{_sysconfdir}/moduli
 %attr(754,root,root) /etc/rc.d/init.d/sshd
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/sshd
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/security/blacklist.sshd