Automatic import for version 6.0p1

.abf.yml

@@ -1,3 +1,3 @@
 sources:
   "openssh-4.4p1-watchdog.patch.tgz": e4a13018c494faf7ed06fd74dad720a8a8ac9089
-  "openssh-5.9p1.tar.gz": be8878869bb80ce12ca79282768ffa73cc3f05fc
+  "openssh-6.0p1.tar.gz": f691e53ef83417031a2854b8b1b661c9c08e4422

openssh-3.1p1-check-only-ssl-version.patch

@@ -1,11 +0,0 @@
---- openssh-5.7p1/entropy.c.mdv	2011-01-13 08:05:29.000000000 -0200
-+++ openssh-5.7p1/entropy.c	2011-01-29 15:41:52.000000000 -0200
-@@ -155,7 +155,7 @@ init_rng(void)
- 	 * OpenSSL version numbers: MNNFFPPS: major minor fix patch status
- 	 * We match major, minor, fix and status (not patch)
- 	 */
--	if ((SSLeay() ^ OPENSSL_VERSION_NUMBER) & ~0xff0L)
-+	if ((SSLeay() >> 12) != (OPENSSL_VERSION_NUMBER >> 12))
- 		fatal("OpenSSL version mismatch. Built against %lx, you "
- 		    "have %lx", (u_long)OPENSSL_VERSION_NUMBER, SSLeay());
- 

openssh-5.9p1.tar.gz.asc

@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.11 (OpenBSD)
-
-iD8DBQBOZGDHzo7LA4b/nEgRAkayAKDRlyAGT0g15XdOiI+CAhyxysr9bwCgtDkJ
-PnTod/3zVmNUwO+PfT17em0=
-=z1ZY
------END PGP SIGNATURE-----

openssh-6.0p1.tar.gz.asc

@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.11 (OpenBSD)
+
+iD8DBQBPkO5Bzo7LA4b/nEgRAnhxAJ9aXEXTkMXAgjItklBucCUpcMCf6QCfRyIi
+K8AJ/uBzcJ+EtOuwmj7InxM=
+=Dkwp
+-----END PGP SIGNATURE-----

openssh.spec

@@ -43,8 +43,8 @@
 
 Summary:	OpenSSH free Secure Shell (SSH) implementation
 Name:		openssh
-Version:	5.9p1
-Release:	2
+Version:	6.0p1
+Release:	1
 License:	BSD
 Group:		Networking/Remote access
 URL:		http://www.openssh.com/
@@ -65,8 +65,6 @@ Source19:	README.3.8p1.upgrade.urpmi
 Source20:	README.3.9p1-3.upgrade.urpmi
 Source21:	README.hpn
 Patch1:		openssh-mdv_conf.diff
-# authorized by Damien Miller <djm@openbsd.com>
-Patch3:		openssh-3.1p1-check-only-ssl-version.patch
 # rediffed from openssh-4.4p1-watchdog.patch.tgz
 Patch4:		openssh-4.4p1-watchdog.diff
 # optional ldap support
@@ -95,7 +93,7 @@ Provides:	ssh
 Requires(post): makedev
 Requires:	tcp_wrappers
 BuildRequires:	groff-for-man
-BuildRequires:	openssl-devel >= 0.9.7
+BuildRequires:	openssl-devel
 BuildRequires:	pam-devel
 BuildRequires:	tcp_wrappers-devel
 BuildRequires:	zlib-devel
@@ -243,7 +241,6 @@ This package contains the GNOME passphrase dialog.
 %setup -q -a10
 
 %patch1 -p1 -b .mdkconf
-%patch3 -p1 -b .ssl_ver
 %if %{build_watchdog}
 #patch -p0 -s -z .wdog < %{name}-%{wversion}-watchdog.patch
 %patch4 -p1 -b .watchdog
@@ -510,6 +507,14 @@ update-alternatives --remove bssh-askpass %{_libdir}/ssh/gnome-ssh-askpass
 
 
 %changelog
+* Sun Apr 22 2012 Bernhard Rosenkraenzer <bero@bero.eu> 6.0p1-1
++ Revision: 792720
+- Update to 6.0
+
+* Fri Mar 16 2012 Oden Eriksson <oeriksson@mandriva.com> 5.9p1-3
++ Revision: 785272
+- rebuilt against new openssl
+
 * Sat Dec 03 2011 Oden Eriksson <oeriksson@mandriva.com> 5.9p1-2
 + Revision: 737413
 - gnome-ssh-askpass2.c does not build with gtk+-3.0, disable it for now