X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=openssh.spec;h=28971bc55f78d2f452f325da355dcc15e1d0c006;hb=e0204747472e678f3e1ea0004d0fdf2eb52d1508;hp=7c556ad4848863ac1d39cc2d6f9b03fe9ef80140;hpb=530329bf8f877266bfd35f55bb553b2e07eadb96;p=packages%2Fopenssh.git

diff --git a/openssh.spec b/openssh.spec
index 7c556ad..28971bc 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -20,9 +20,8 @@
 %if "%{pld_release}" == "ac"
 %define		pam_ver	0.79.0
 %else
-%define		pam_ver	1:1.1.5-5
+%define		pam_ver	1:1.1.8-5
 %endif
-
 Summary:	OpenSSH free Secure Shell (SSH) implementation
 Summary(de.UTF-8):	OpenSSH - freie Implementation der Secure Shell (SSH)
 Summary(es.UTF-8):	Implementación libre de SSH
@@ -34,13 +33,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:	6.2p1
-Release:	2
+Version:	6.7p1
+Release:	6
 Epoch:		2
 License:	BSD
 Group:		Applications/Networking
 Source0:	ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/%{name}-%{version}.tar.gz
-# Source0-md5:	7b2d9dd75b5cf267ea1737ec75500316
+# Source0-md5:	3246aa79317b1d23cae783a3bf8275d6
 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,24 +53,21 @@ Source9:	sshd.service
 Source10:	sshd-keygen
 Source11:	sshd.socket
 Source12:	sshd@.service
-Patch100:	%{name}-heimdal.patch
 Patch0:		%{name}-no_libnsl.patch
 Patch2:		%{name}-pam_misc.patch
 Patch3:		%{name}-sigpipe.patch
 # http://pkgs.fedoraproject.org/gitweb/?p=openssh.git;a=tree
-Patch4:		%{name}-5.9p1-ldap.patch
-Patch5:		%{name}-5.9p1-ldap-fixes.patch
-Patch8:		ldap.conf.patch
-Patch6:		%{name}-config.patch
-
+Patch4:		%{name}-ldap.patch
+Patch5:		%{name}-ldap-fixes.patch
+Patch6:		ldap.conf.patch
+Patch7:		%{name}-config.patch
+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
-# http://people.debian.org/~cjwatson/%{name}-blacklist.diff
-Patch12:	%{name}-blacklist.diff
-Patch13:	%{name}-kuserok.patch
+
 Patch14:	%{name}-bind.patch
 Patch15:	%{name}-disable_ldap.patch
 URL:		http://www.openssh.com/portable.html
@@ -85,9 +81,8 @@ BuildRequires:	automake
 %{?with_kerberos5:BuildRequires:	heimdal-devel >= 0.7}
 %{?with_libedit:BuildRequires:	libedit-devel}
 %{?with_selinux:BuildRequires:	libselinux-devel}
-BuildRequires:	libwrap-devel
 %{?with_ldap:BuildRequires:	openldap-devel}
-BuildRequires:	openssl-devel >= 0.9.7d
+BuildRequires:	openssl-devel >= 0.9.8f
 BuildRequires:	pam-devel
 %{?with_gtk:BuildRequires:	pkgconfig}
 BuildRequires:	rpm >= 4.4.9-56
@@ -101,7 +96,6 @@ Requires:	pam >= 0.79.0
 %else
 Requires:	filesystem >= 3.0-11
 Requires:	pam >= %{pam_ver}
-Suggests:	openssh-blacklist
 Suggests:	xorg-app-xauth
 %endif
 Obsoletes:	ssh
@@ -258,6 +252,7 @@ Group:		Applications/Networking
 Requires:	%{name}
 Provides:	ssh-clients
 Obsoletes:	ssh-clients
+%requires_eq_to	openssl	openssl-devel
 
 %description clients
 Ssh (Secure Shell) a program for logging into a remote machine and for
@@ -348,16 +343,16 @@ Requires(pre):	/bin/id
 Requires(pre):	/usr/sbin/useradd
 Requires(post,preun,postun):	systemd-units >= 38
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-# remove in 6.0, kept for flawless upgrade
-%{?with_ldap:Requires:	%{name}-server-ldap = %{epoch}:%{version}-%{release}}
 Requires:	pam >= %{pam_ver}
 Requires:	rc-scripts >= 0.4.3.0
 Requires:	systemd-units >= 38
 Requires:	util-linux
+%{?with_ldap:Suggests:	%{name}-server-ldap}
 Suggests:	/bin/login
 Suggests:	xorg-app-xauth
 Provides:	ssh-server
 Provides:	user(sshd)
+%requires_eq_to	openssl	openssl-devel
 
 %description server
 Ssh (Secure Shell) a program for logging into a remote machine and for
@@ -426,6 +421,7 @@ Summary:	A LDAP support for open source SSH server daemon
 Summary(pl.UTF-8):	Wsparcie LDAP dla serwera OpenSSH
 Group:		Daemons
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	openldap-nss-config
 
 %description server-ldap
 OpenSSH LDAP backend is a way how to distribute the authorized tokens
@@ -515,6 +511,9 @@ 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.
@@ -525,26 +524,25 @@ openldap-a.
 
 %prep
 %setup -q
-%{?with_kerberos5:%patch100 -p1}
 %patch0 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch8 -p1
 %patch6 -p1
+%patch7 -p1
+%patch8 -p1
 
 %{?with_hpn:%patch9 -p1}
 %patch10 -p1
 %patch11 -p1
-%patch12 -p1
-%patch13 -p1
+
 %patch14 -p1
 %{!?with_ldap:%patch15 -p1}
 
 %if "%{pld_release}" == "ac"
 # fix for missing x11.pc
-%{__sed} -i -e '/pkg-config/s/ x11//' contrib/Makefile
+%{__sed} -i -e 's/\(`$(PKG_CONFIG) --libs gtk+-2.0\) x11`/\1` -lX11/' contrib/Makefile
 %endif
 
 # hack since arc4random from openbsd-compat needs symbols from libssh and vice versa
@@ -558,7 +556,7 @@ cp /usr/share/automake/config.sub .
 %{__aclocal}
 %{__autoconf}
 %{__autoheader}
-CPPFLAGS="-DCHROOT"
+CPPFLAGS="%{rpmcppflags} -DCHROOT -std=gnu99"
 %configure \
 	PERL=%{__perl} \
 	--disable-strip \
@@ -575,9 +573,10 @@ CPPFLAGS="-DCHROOT"
 	--with-pam \
 	--with-pid-dir=%{_localstatedir}/run \
 	--with-privsep-path=%{_privsepdir} \
+%if "%{pld_release}" != "ac"
 	--with-sandbox=seccomp_filter \
+%endif
 	%{?with_selinux:--with-selinux} \
-	--with-tcp-wrappers \
 %if "%{pld_release}" == "ac"
 	--with-xauth=/usr/X11R6/bin/xauth
 %else
@@ -763,9 +762,9 @@ fi
 %defattr(644,root,root,755)
 %doc TODO README OVERVIEW CREDITS Change*
 %attr(755,root,root) %{_bindir}/ssh-key*
-%attr(755,root,root) %{_bindir}/ssh-vulnkey*
+#%attr(755,root,root) %{_bindir}/ssh-vulnkey*
 %{_mandir}/man1/ssh-key*.1*
-%{_mandir}/man1/ssh-vulnkey*.1*
+#%{_mandir}/man1/ssh-vulnkey*.1*
 %dir %{_sysconfdir}
 %dir %{_libexecdir}