- pass LANGUAGE as well; how about other variables like GREP_OPTIONS, LESS,

[packages/openssh.git] / openssh.spec

diff --git a/openssh.spec b/openssh.spec
index 7d1f1c600d3fdc027c0806e92d7d99a4478a1a81..6be9e5bf45cb8f452e3caf5de92a0ff752528071 100644 (file)
--- a/openssh.spec
+++ b/openssh.spec
@@ -6,7 +6,7 @@
 %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 including Cipher NONE
+%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}
@@ -22,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:       5.0p1
-Release:       1
+Version:       5.1p1
+Release:       3
 Epoch:         2
 License:       BSD
 Group:         Applications/Networking
 Source0:       ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/%{name}-%{version}.tar.gz
-# Source0-md5: 1f1dfaa775f33dd3328169de9bdc292a
+# Source0-md5: 03f2d0c1b5ec60d4ac9997a146d2faec
 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
@@ -37,7 +37,6 @@ Source4:      %{name}.sysconfig
 Source5:       ssh-agent.sh
 Source6:       ssh-agent.conf
 Patch0:                %{name}-no_libnsl.patch
-Patch1:                %{name}-linux-ipv6.patch
 Patch2:                %{name}-pam_misc.patch
 Patch3:                %{name}-sigpipe.patch
 # http://www.opendarwin.org/projects/openssh-lpk/
@@ -45,9 +44,11 @@ Patch4:              %{name}-lpk-4.3p1-0.3.7.patch
 Patch5:                %{name}-config.patch
 Patch7:                %{name}-selinux.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
-Patch9:        %{name}-4.7p1-hpn13v1.diff
+# 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
@@ -66,6 +67,8 @@ BuildRequires:        rpmbuild(macros) >= 1.318
 BuildRequires: zlib-devel
 Requires:      filesystem >= 3.0-11
 Requires:      pam >= 0.99.7.1
+Suggests:      openssh-blacklist
+Suggests:      xorg-app-xauth
 Obsoletes:     ssh
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -326,7 +329,7 @@ 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)
@@ -456,7 +459,6 @@ GNOME.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %{?with_ldap:%patch4 -p1}
@@ -464,11 +466,14 @@ GNOME.
 %patch7 -p1
 %{?with_hpn:%patch9 -p1}
 %patch10 -p1
+%patch11 -p1
+%patch12 -p1
 
 %build
 cp /usr/share/automake/config.sub .
 %{__aclocal}
 %{__autoconf}
+CPPFLAGS="-DCHROOT"
 %configure \
        PERL=%{__perl} \
        --with-dns \
@@ -590,7 +595,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}
 
@@ -638,6 +645,7 @@ fi
 %{_mandir}/man8/sftp-server.8*
 %{_mandir}/man8/ssh-keysign.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(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/sshd
 %attr(640,root,root) %{_sysconfdir}/moduli