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
This commit is contained in:
Marcus Meissner 2012-05-29 07:11:57 +00:00 committed by Git OBS Bridge
parent 0c4ab9d007
commit 9d7406f5e6
6 changed files with 23 additions and 13 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:478962a2757c61d73de051b8cf8ace9f8f5c4cff5910ca7ba5a7735c5a2ab980
size 894158

3
openssh-6.0p1.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3f53036a3253b2e0a6c2163011c8af4613b65afcba3bb282645624995352a49d
size 774272

View File

@ -26,7 +26,8 @@ BuildRequires: openssl-devel
BuildRequires: pam-devel BuildRequires: pam-devel
BuildRequires: tcpd-devel BuildRequires: tcpd-devel
BuildRequires: update-desktop-files BuildRequires: update-desktop-files
Version: 5.9p1 BuildRequires: xz
Version: 6.0p1
Release: 0 Release: 0
Requires: openssh = %{version} Requires: openssh = %{version}
Requires: openssh-askpass = %{version} Requires: openssh-askpass = %{version}
@ -35,7 +36,7 @@ License: BSD-3-Clause
Group: Productivity/Networking/SSH Group: Productivity/Networking/SSH
Url: http://www.openssh.com/ Url: http://www.openssh.com/
%define _name openssh %define _name openssh
Source: %{_name}-%{version}.tar.bz2 Source: %{_name}-%{version}.tar.xz
Patch: %{_name}-5.9p1-sshd_config.diff Patch: %{_name}-5.9p1-sshd_config.diff
Patch1: %{_name}-5.9p1-pam-fix2.diff Patch1: %{_name}-5.9p1-pam-fix2.diff
Patch2: %{_name}-5.9p1-saveargv-fix.diff Patch2: %{_name}-5.9p1-saveargv-fix.diff

View File

@ -1,15 +1,17 @@
--- entropy.c.orig --- entropy.c.orig
+++ entropy.c +++ entropy.c
@@ -213,10 +213,11 @@ seed_rng(void) @@ -216,12 +216,13 @@ seed_rng(void)
* OpenSSL version numbers: MNNFFPPS: major minor fix patch status * allow 1.0.1 to work with 1.0.0). Going backwards is only allowed
* We match major, minor, fix and status (not patch) * within a patch series.
*/ */
+ /* +#if 0
if ((SSLeay() ^ OPENSSL_VERSION_NUMBER) & ~0xff0L) 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 " fatal("OpenSSL version mismatch. Built against %lx, you "
"have %lx", (u_long)OPENSSL_VERSION_NUMBER, SSLeay()); "have %lx", (u_long)OPENSSL_VERSION_NUMBER, SSLeay());
- -
+*/ +#endif
#ifndef OPENSSL_PRNG_ONLY #ifndef OPENSSL_PRNG_ONLY
if (RAND_status() == 1) { if (RAND_status() == 1) {
debug3("RNG is ready, skipping seeding"); debug3("RNG is ready, skipping seeding");

View File

@ -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 Thu May 10 20:50:33 UTC 2012 - crrodriguez@opensuse.org

View File

@ -30,17 +30,18 @@ BuildRequires: openssl-devel
BuildRequires: pam-devel BuildRequires: pam-devel
BuildRequires: tcpd-devel BuildRequires: tcpd-devel
BuildRequires: xorg-x11-devel BuildRequires: xorg-x11-devel
BuildRequires: xz
Requires: /bin/netstat Requires: /bin/netstat
PreReq: pwdutils %{insserv_prereq} %{fillup_prereq} coreutils PreReq: pwdutils %{insserv_prereq} %{fillup_prereq} coreutils
Conflicts: nonfreessh Conflicts: nonfreessh
Version: 5.9p1 Version: 6.0p1
Release: 0 Release: 0
%define xversion 1.2.4.1 %define xversion 1.2.4.1
Summary: Secure Shell Client and Server (Remote Login Program) Summary: Secure Shell Client and Server (Remote Login Program)
License: BSD-3-Clause ; MIT License: BSD-3-Clause ; MIT
Group: Productivity/Networking/SSH Group: Productivity/Networking/SSH
Url: http://www.openssh.com/ Url: http://www.openssh.com/
Source: %{name}-%{version}.tar.bz2 Source: %{name}-%{version}.tar.xz
Source1: sshd.init Source1: sshd.init
Source2: sshd.pamd Source2: sshd.pamd
Source3: x11-ssh-askpass-%{xversion}.tar.bz2 Source3: x11-ssh-askpass-%{xversion}.tar.bz2