SPECS (AC-branch): openssh.spec - HEAD merge: openssh public key blacklist ...

[glen]

Author: glen                         Date: Wed Jun 18 18:39:10 2008 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- HEAD merge: openssh public key blacklist support, including ssh-vulnkey tool, added (from Debian)
- rel 5

---- Files affected:
SPECS:
   openssh.spec (1.286.2.13 -> 1.286.2.14) 

---- Diffs:

================================================================
Index: SPECS/openssh.spec
diff -u SPECS/openssh.spec:1.286.2.13 SPECS/openssh.spec:1.286.2.14
--- SPECS/openssh.spec:1.286.2.13	Tue Jun 17 08:53:28 2008
+++ SPECS/openssh.spec	Wed Jun 18 20:39:04 2008
@@ -24,7 +24,7 @@
 Summary(uk.UTF-8):	OpenSSH - вільна реалізація протоколу Secure Shell (SSH)
 Name:		openssh
 Version:	5.0p1
-Release:	4
+Release:	5
 Epoch:		2
 License:	BSD
 Group:		Applications/Networking
@@ -37,6 +37,7 @@
 Source4:	%{name}.sysconfig
 Source5:	ssh-agent.sh
 Source6:	ssh-agent.conf
+Patch100:	%{name}-heimdal.patch
 Patch0:		%{name}-no_libnsl.patch
 Patch1:		%{name}-linux-ipv6.patch
 Patch2:		%{name}-pam_misc.patch
@@ -46,11 +47,12 @@
 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.9p1-hpn13v2.diff.gz
 Patch9:		%{name}-5.0p1-hpn13v4.diff
 Patch10:	%{name}-include.patch
 Patch11:	%{name}-chroot.patch
-Patch12:	%{name}-unbreakalive.patch
-Patch100:	%{name}-heimdal.patch
+Patch12:	http://people.debian.org/~cjwatson/%{name}-blacklist.diff
+Patch13:	%{name}-unbreakalive.patch
 URL:		http://www.openssh.com/
 BuildRequires:	%{__perl}
 BuildRequires:	autoconf
@@ -458,6 +460,7 @@
 
 %prep
 %setup -q
+%{?with_kerberos5:%patch100 -p1}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -468,9 +471,8 @@
 %{?with_hpn:%patch9 -p1}
 %patch10 -p1
 %patch11 -p1
-%patch12 -p0
-
-%{?with_kerberos5:%patch100 -p1}
+%patch12 -p1
+%patch13 -p0
 
 %build
 cp /usr/share/automake/config.sub .
@@ -598,7 +600,9 @@
 %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}
 
@@ -668,12 +672,16 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.286.2.14  2008/06/18 18:39:04  glen
+- HEAD merge: openssh public key blacklist support, including ssh-vulnkey tool, added (from Debian)
+- rel 5
+
 Revision 1.286.2.13  2008/06/17 06:53:28  arekm
 - rel 4; fix keepalive (from upstream)
 
 Revision 1.286.2.12  2008/05/30 16:39:35  marcus
 - changed default HPN bcond to off due to some uncompatibilities with eg. PuTTY
-software. Th and Ti did it earlier. Release 3.
+  software. Th and Ti did it earlier. Release 3.
 
 Revision 1.286.2.11  2008-05-19 07:42:43  glen
 - hpn 5.0p1-hpn13v4
================================================================

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