SPECS: openssh.spec - updated hpn patch to 13v1 (AC-branch merge)

[glen]

Author: glen                         Date: Tue Feb 26 14:34:39 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated hpn patch to 13v1 (AC-branch merge)

---- Files affected:
SPECS:
   openssh.spec (1.292 -> 1.293) 

---- Diffs:

================================================================
Index: SPECS/openssh.spec
diff -u SPECS/openssh.spec:1.292 SPECS/openssh.spec:1.293
--- SPECS/openssh.spec:1.292	Tue Dec 11 21:15:07 2007
+++ SPECS/openssh.spec	Tue Feb 26 15:34:34 2008
@@ -8,17 +8,11 @@
 %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		# with High Performance SSH/SCP - HPN-SSH including Cipher NONE
+
 # gtk2-based gnome-askpass means no gnome1-based
 %{?with_gtk:%undefine with_gnome}
 #
-%define		_rel	3
-#
 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
@@ -31,7 +25,7 @@
 Summary(uk.UTF-8):	OpenSSH - вільна реалізація протоколу Secure Shell (SSH)
 Name:		openssh
 Version:	4.7p1
-Release:	%{_rel}%{?with_hpn:hpn}%{?with_hpn_none:hpn_none}
+Release:	3%{?with_hpn:hpn}
 Epoch:		2
 License:	BSD
 Group:		Applications/Networking
@@ -54,13 +48,9 @@
 # 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
+Patch9:	%{name}-4.7p1-hpn13v1.diff
 Patch10:	%{name}-include.patch
 URL:		http://www.openssh.com/
 BuildRequires:	%{__perl}
@@ -246,8 +236,8 @@
 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
@@ -331,8 +321,6 @@
 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
@@ -344,6 +332,8 @@
 Requires:	pam >= 0.99.7.1
 Requires:	rc-scripts >= 0.4.0.18
 Requires:	util-linux
+Provides:	ssh-server
+Provides:	user(sshd)
 
 %description server
 Ssh (Secure Shell) a program for logging into a remote machine and for
@@ -477,8 +467,7 @@
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
-%{?with_hpn:%patch8 -p1}
-%{?with_hpn_none:%patch9 -p1}
+%{?with_hpn:%patch9 -p1}
 %patch10 -p1
 
 %build
@@ -677,6 +666,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.293  2008-02-26 14:34:34  glen
+- updated hpn patch to 13v1 (AC-branch merge)
+
 Revision 1.292  2007-12-11 20:15:07  glen
 - AC-branch merge: paths are already substituted by Makefile; rel 3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/openssh.spec?r1=1.292&r2=1.293&f=u