From 9d7406f5e6858b94fd35e017c7849c0ac43f1965396bf5cd73ea83d2a5303e0b Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Tue, 29 May 2012 07:11:57 +0000
Subject: [PATCH] Accepting request 122649 from home:elvigia:branches:network

- Update to version 6.0, large list of changes, seen
  http://www.openssh.org/txt/release-6.0 for detail.

OBS-URL: https://build.opensuse.org/request/show/122649
OBS-URL: https://build.opensuse.org/package/show/network/openssh?expand=0&rev=27
---
 openssh-5.9p1.tar.bz2         |  3 ---
 openssh-6.0p1.tar.xz          |  3 +++
 openssh-askpass-gnome.spec    |  5 +++--
 openssh-nocrazyabicheck.patch | 14 ++++++++------
 openssh.changes               |  6 ++++++
 openssh.spec                  |  5 +++--
 6 files changed, 23 insertions(+), 13 deletions(-)
 delete mode 100644 openssh-5.9p1.tar.bz2
 create mode 100644 openssh-6.0p1.tar.xz

diff --git a/openssh-5.9p1.tar.bz2 b/openssh-5.9p1.tar.bz2
deleted file mode 100644
index e4b12ed..0000000
--- a/openssh-5.9p1.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:478962a2757c61d73de051b8cf8ace9f8f5c4cff5910ca7ba5a7735c5a2ab980
-size 894158
diff --git a/openssh-6.0p1.tar.xz b/openssh-6.0p1.tar.xz
new file mode 100644
index 0000000..f10fb94
--- /dev/null
+++ b/openssh-6.0p1.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3f53036a3253b2e0a6c2163011c8af4613b65afcba3bb282645624995352a49d
+size 774272
diff --git a/openssh-askpass-gnome.spec b/openssh-askpass-gnome.spec
index 10b784a..ab2b295 100644
--- a/openssh-askpass-gnome.spec
+++ b/openssh-askpass-gnome.spec
@@ -26,7 +26,8 @@ BuildRequires:  openssl-devel
 BuildRequires:  pam-devel
 BuildRequires:  tcpd-devel
 BuildRequires:  update-desktop-files
-Version:        5.9p1
+BuildRequires:  xz
+Version:        6.0p1
 Release:        0
 Requires:       openssh = %{version}
 Requires:       openssh-askpass = %{version}
@@ -35,7 +36,7 @@ License:        BSD-3-Clause
 Group:          Productivity/Networking/SSH
 Url:            http://www.openssh.com/
 %define _name openssh
-Source:         %{_name}-%{version}.tar.bz2
+Source:         %{_name}-%{version}.tar.xz
 Patch:          %{_name}-5.9p1-sshd_config.diff
 Patch1:         %{_name}-5.9p1-pam-fix2.diff
 Patch2:         %{_name}-5.9p1-saveargv-fix.diff
diff --git a/openssh-nocrazyabicheck.patch b/openssh-nocrazyabicheck.patch
index c9b07c4..bd1afa4 100644
--- a/openssh-nocrazyabicheck.patch
+++ b/openssh-nocrazyabicheck.patch
@@ -1,15 +1,17 @@
 --- entropy.c.orig
 +++ entropy.c
-@@ -213,10 +213,11 @@ seed_rng(void)
- 	 * OpenSSL version numbers: MNNFFPPS: major minor fix patch status
- 	 * We match major, minor, fix and status (not patch)
+@@ -216,12 +216,13 @@ seed_rng(void)
+ 	 * allow 1.0.1 to work with 1.0.0). Going backwards is only allowed
+ 	 * within a patch series.
  	 */
-+    /*
- 	if ((SSLeay() ^ OPENSSL_VERSION_NUMBER) & ~0xff0L)
++#if 0
+ 	u_long version_mask = SSLeay() >= 0x1000000f ?  ~0xffff0L : ~0xff0L;
+ 	if (((SSLeay() ^ OPENSSL_VERSION_NUMBER) & version_mask) ||
+ 	    (SSLeay() >> 12) < (OPENSSL_VERSION_NUMBER >> 12))
  		fatal("OpenSSL version mismatch. Built against %lx, you "
  		    "have %lx", (u_long)OPENSSL_VERSION_NUMBER, SSLeay());
 -
-+*/
++#endif
  #ifndef OPENSSL_PRNG_ONLY
  	if (RAND_status() == 1) {
  		debug3("RNG is ready, skipping seeding");
diff --git a/openssh.changes b/openssh.changes
index 21a1939..61bcc8d 100644
--- a/openssh.changes
+++ b/openssh.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue May 29 06:52:13 UTC 2012 - crrodriguez@opensuse.org
+
+- Update to version 6.0, large list of changes, seen
+  http://www.openssh.org/txt/release-6.0 for detail.
+
 -------------------------------------------------------------------
 Thu May 10 20:50:33 UTC 2012 - crrodriguez@opensuse.org
 
diff --git a/openssh.spec b/openssh.spec
index 890e560..19be30b 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -30,17 +30,18 @@ BuildRequires:  openssl-devel
 BuildRequires:  pam-devel
 BuildRequires:  tcpd-devel
 BuildRequires:  xorg-x11-devel
+BuildRequires:  xz
 Requires:       /bin/netstat
 PreReq:         pwdutils %{insserv_prereq} %{fillup_prereq} coreutils
 Conflicts:      nonfreessh
-Version:        5.9p1
+Version:        6.0p1
 Release:        0
 %define xversion 1.2.4.1
 Summary:        Secure Shell Client and Server (Remote Login Program)
 License:        BSD-3-Clause ; MIT
 Group:          Productivity/Networking/SSH
 Url:            http://www.openssh.com/
-Source:         %{name}-%{version}.tar.bz2
+Source:         %{name}-%{version}.tar.xz
 Source1:        sshd.init
 Source2:        sshd.pamd
 Source3:        x11-ssh-askpass-%{xversion}.tar.bz2