summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog13
-rw-r--r--contrib/caldera/openssh.spec6
-rw-r--r--contrib/redhat/openssh.spec2
-rw-r--r--contrib/suse/openssh.spec2
4 files changed, 17 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index f50cfa38..3f1334a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,17 @@
- djm@cvs.openbsd.org 2008/04/03 09:50:14
[version.h]
openssh-5.0
+ - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
+ [contrib/suse/openssh.spec] Crank version numbers in RPM spec files
+
+20080315
+ - (djm) [regress/test-exec.sh] Quote putty-related variables in case they are
+ empty; report and patch from Peter Stuge
+ - (djm) [regress/test-exec.sh] Silence noise from detection of putty
+ commands; report from Peter Stuge
+ - (djm) [session.c] Relocate incorrectly-placed closefrom() that was causing
+ crashes when used with ChrootDirectory
+
20080327
- (dtucker) Cache selinux status earlier so we know if it's enabled after a
@@ -3838,4 +3849,4 @@
OpenServer 6 and add osr5bigcrypt support so when someone migrates
passwords between UnixWare and OpenServer they will still work. OK dtucker@
-$Id: ChangeLog,v 1.4900 2008/04/03 09:53:08 djm Exp $
+$Id: ChangeLog,v 1.4901 2008/04/03 09:55:44 djm Exp $
diff --git a/contrib/caldera/openssh.spec b/contrib/caldera/openssh.spec
index 294757d6..34c3b8be 100644
--- a/contrib/caldera/openssh.spec
+++ b/contrib/caldera/openssh.spec
@@ -17,11 +17,11 @@
#old cvs stuff. please update before use. may be deprecated.
%define use_stable 1
%if %{use_stable}
- %define version 4.9p1
+ %define version 5.0p1
%define cvs %{nil}
%define release 1
%else
- %define version 4.9p1
+ %define version 5.0p1
%define cvs cvs20050315
%define release 0r1
%endif
@@ -357,4 +357,4 @@ fi
* Mon Jan 01 1998 ...
Template Version: 1.31
-$Id: openssh.spec,v 1.62 2008/03/27 06:43:46 djm Exp $
+$Id: openssh.spec,v 1.63 2008/04/03 09:55:46 djm Exp $
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec
index d6bd31b9..28f3fdad 100644
--- a/contrib/redhat/openssh.spec
+++ b/contrib/redhat/openssh.spec
@@ -1,4 +1,4 @@
-%define ver 4.9p1
+%define ver 5.0p1
%define rel 1
# OpenSSH privilege separation requires a user & group ID
diff --git a/contrib/suse/openssh.spec b/contrib/suse/openssh.spec
index 7819af4e..4e8c1e33 100644
--- a/contrib/suse/openssh.spec
+++ b/contrib/suse/openssh.spec
@@ -13,7 +13,7 @@
Summary: OpenSSH, a free Secure Shell (SSH) protocol implementation
Name: openssh
-Version: 4.9p1
+Version: 5.0p1
URL: http://www.openssh.com/
Release: 1
Source0: openssh-%{version}.tar.gz