- openssh public key blacklist support, including ssh-vulnkey tool, added (from Debian)

[packages/openssh.git] / openssh.spec

diff --git a/openssh.spec b/openssh.spec
index ded75aabdcef51a34ef8384a47d3a1d0acb16118..d9e94228caf234f7652d73502ff15d89ceca0655 100644 (file)
--- a/openssh.spec
+++ b/openssh.spec
@@ -1,23 +1,16 @@
 #
 # Conditional build:
-%bcond_without chroot          # without chrooted user environment support
 %bcond_with    gnome           # with gnome-askpass (GNOME 1.x) utility
 %bcond_without gtk             # without GTK+ (2.x)
 %bcond_with    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    hpn             # with High Performance SSH/SCP - HPN-SSH (see patch comment)
-%bcond_with    hpn_none        # with hpn (above) and '-z' none cipher option
-#
-%if %{with hpn_none}
-%undefine      with_hpn
-%endif
+%bcond_with    hpn             # High Performance SSH/SCP - HPN-SSH including Cipher NONE (broken too often)
+
 # gtk2-based gnome-askpass means no gnome1-based
 %{?with_gtk:%undefine with_gnome}
 #
-%define                _rel    1
-#
 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
@@ -29,13 +22,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:       4.7p1
-Release:       %{_rel}%{?with_hpn:hpn}%{?with_hpn_none:hpn_none}
+Version:       5.0p1
+Release:       5
 Epoch:         2
 License:       BSD
 Group:         Applications/Networking
 Source0:       ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/%{name}-%{version}.tar.gz
-# Source0-md5: 50a800fd2c6def9e9a53068837e87b91
+# Source0-md5: 1f1dfaa775f33dd3328169de9bdc292a
 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
@@ -50,17 +43,13 @@ Patch3:             %{name}-sigpipe.patch
 # http://www.opendarwin.org/projects/openssh-lpk/
 Patch4:                %{name}-lpk-4.3p1-0.3.7.patch
 Patch5:                %{name}-config.patch
-# http://chrootssh.sourceforge.net/download/osshChroot-3.7.1p2.diff
-Patch6:                %{name}-chroot.patch
 Patch7:                %{name}-selinux.patch
-# HPN patches rediffed due 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-4.2p1-hpn11.diff
-Patch8:                %{name}-4.3p1-hpn11.patch
-# Adds HPN (see p11) and an undocumented -z none cipher flag
-# http://www.psc.edu/networking/projects/hpn-ssh/openssh-4.2p1-hpn11-none.diff
-Patch9:                %{name}-4.3p1-hpn11-none.patch
+# http://www.psc.edu/networking/projects/hpn-ssh/openssh-4.9p1-hpn13v2.diff.gz
+Patch9:                %{name}-5.0p1-hpn13v4.diff
 Patch10:       %{name}-include.patch
+Patch11:       %{name}-chroot.patch
+Patch12:       http://people.debian.org/~cjwatson/%{name}-blacklist.diff
 URL:           http://www.openssh.com/
 BuildRequires: %{__perl}
 BuildRequires: autoconf
@@ -79,6 +68,7 @@ BuildRequires:        rpmbuild(macros) >= 1.318
 BuildRequires: zlib-devel
 Requires:      filesystem >= 3.0-11
 Requires:      pam >= 0.99.7.1
+Suggests:      openssh-blacklist
 Obsoletes:     ssh
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -245,8 +235,8 @@ 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
-Provides:      ssh-clients
 Requires:      %{name} = %{epoch}:%{version}-%{release}
+Provides:      ssh-clients
 Obsoletes:     ssh-clients
 
 %description clients
@@ -330,8 +320,6 @@ Summary(pt_BR.UTF-8):       Servidor OpenSSH para comunicações encriptadas
 Summary(ru.UTF-8):     OpenSSH - сервер протокола Secure Shell (sshd)
 Summary(uk.UTF-8):     OpenSSH - сервер протоколу Secure Shell (sshd)
 Group:         Networking/Daemons
-Provides:      ssh-server
-Provides:      user(sshd)
 Requires(post):        chkconfig >= 0.9
 Requires(post):        grep
 Requires(post,preun):  /sbin/chkconfig
@@ -341,8 +329,10 @@ Requires(pre):     /usr/sbin/useradd
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 Requires:      /bin/login
 Requires:      pam >= 0.99.7.1
-Requires:      rc-scripts >= 0.4.0.18
+Requires:      rc-scripts >= 0.4.1.23
 Requires:      util-linux
+Provides:      ssh-server
+Provides:      user(sshd)
 
 %description server
 Ssh (Secure Shell) a program for logging into a remote machine and for
@@ -474,17 +464,17 @@ GNOME.
 %patch3 -p1
 %{?with_ldap:%patch4 -p1}
 %patch5 -p1
-%patch6 -p1
 %patch7 -p1
-%{?with_hpn:%patch8 -p1}
-%{?with_hpn_none:%patch9 -p1}
+%{?with_hpn:%patch9 -p1}
 %patch10 -p1
+%patch11 -p1
+%patch12 -p1
 
 %build
 cp /usr/share/automake/config.sub .
 %{__aclocal}
 %{__autoconf}
-%{?with_chroot:CPPFLAGS="-DCHROOT"}
+CPPFLAGS="-DCHROOT"
 %configure \
        PERL=%{__perl} \
        --with-dns \
@@ -544,10 +534,10 @@ install contrib/gnome-ssh-askpass1 $RPM_BUILD_ROOT%{_libexecdir}/ssh/ssh-askpass
 install contrib/gnome-ssh-askpass2 $RPM_BUILD_ROOT%{_libexecdir}/ssh/ssh-askpass
 %endif
 %if %{with gnome} || %{with gtk}
-cat << EOF >$RPM_BUILD_ROOT/etc/env.d/GNOME_SSH_ASKPASS_GRAB_SERVER
+cat << 'EOF' >$RPM_BUILD_ROOT/etc/env.d/GNOME_SSH_ASKPASS_GRAB_SERVER
 #GNOME_SSH_ASKPASS_GRAB_SERVER="true"
 EOF
-cat << EOF >$RPM_BUILD_ROOT/etc/env.d/GNOME_SSH_ASKPASS_GRAB_POINTER
+cat << 'EOF' >$RPM_BUILD_ROOT/etc/env.d/GNOME_SSH_ASKPASS_GRAB_POINTER
 #GNOME_SSH_ASKPASS_GRAB_POINTER="true"
 EOF
 ln -s %{_libexecdir}/ssh/ssh-askpass $RPM_BUILD_ROOT%{_libexecdir}/ssh-askpass
@@ -558,10 +548,6 @@ echo ".so ssh.1" > $RPM_BUILD_ROOT%{_mandir}/man1/slogin.1
 
 touch $RPM_BUILD_ROOT/etc/security/blacklist.sshd
 
-%if "%{_lib}" != "lib"
-find $RPM_BUILD_ROOT%{_sysconfdir} -type f -print0 | xargs -0 sed -i -e 's#%{_prefix}/lib#%{_libdir}#'
-%endif
-
 cat << 'EOF' > $RPM_BUILD_ROOT/etc/env.d/SSH_ASKPASS
 #SSH_ASKPASS="%{_libexecdir}/ssh-askpass"
 EOF
@@ -610,7 +596,9 @@ fi
 %defattr(644,root,root,755)
 %doc *.RNG TODO README OVERVIEW CREDITS Change*
 %attr(755,root,root) %{_bindir}/ssh-key*
+%attr(755,root,root) %{_bindir}/ssh-vulnkey*
 %{_mandir}/man1/ssh-key*.1*
+%{_mandir}/man1/ssh-vulnkey*.1*
 %dir %{_sysconfdir}
 %dir %{_libexecdir}