Author: glen Date: Tue Feb 26 14:00:59 2008 GMT
Module: SPECS Tag: AC-branch
---- Log message:
- updated hpn patch to 13v1
---- Files affected:
SPECS:
openssh.spec (1.286.2.3 -> 1.286.2.4)
---- Diffs:
================================================================
Index: SPECS/openssh.spec
diff -u SPECS/openssh.spec:1.286.2.3 SPECS/openssh.spec:1.286.2.4
--- SPECS/openssh.spec:1.286.2.3 Tue Dec 11 21:13:19 2007
+++ SPECS/openssh.spec Tue Feb 26 15:00:53 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 2
-#
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: 2%{?with_hpn:hpn}
Epoch: 2
License: BSD
Group: Applications/Networking
@@ -59,11 +53,8 @@
# 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
-Patch10: %{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
-Patch11: %{name}-4.3p1-hpn11-none.patch
-Patch12: %{name}-include.patch
+Patch10: %{name}-4.7p1-hpn13v1.diff
+Patch11: %{name}-include.patch
URL: http://www.openssh.com/
BuildRequires: %{__perl}
BuildRequires: autoconf
@@ -248,8 +239,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
@@ -333,8 +324,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
@@ -346,6 +335,8 @@
Requires: pam >= 0.77.3
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
@@ -482,8 +473,7 @@
%patch8 -p1
%patch9 -p1
%{?with_hpn:%patch10 -p1}
-%{?with_hpn_none:%patch11 -p1}
-%patch12 -p1
+%patch11 -p1
%build
cp /usr/share/automake/config.sub .
@@ -681,6 +671,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.286.2.4 2008-02-26 14:00:53 glen
+- updated hpn patch to 13v1
+
Revision 1.286.2.3 2007-12-11 20:13:19 glen
- paths are already substituted by Makefile; rel 2
- gotar you suck
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/openssh.spec?r1=1.286.2.3&r2=1.286.2.4&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
