summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2006-02-12 16:48:56 +1100
committerDarren Tucker <dtucker@zip.com.au>2006-02-12 16:48:56 +1100
commit6163350eb97774e7f780d5cc9df6164a6803aa0c (patch)
treeb9c1d343dae3e74255941b68d5a49786df5cdc2b
parent2f993465d4584c1eb188e02fde1f0da9dbb4fc88 (diff)
- (dtucker) [README version.h contrib/caldera/openssh.spec
contrib/redhat/openssh.spec contrib/suse/openssh.spec] Bump version strings to match 4.3p2 release.
-rw-r--r--ChangeLog5
-rw-r--r--README4
-rw-r--r--contrib/caldera/openssh.spec4
-rw-r--r--contrib/redhat/openssh.spec2
-rw-r--r--contrib/suse/openssh.spec2
-rw-r--r--version.h2
6 files changed, 11 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index b60041f59..2251c7295 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@
2 - (dtucker) [openbsd-compat/bsd-cygwin_util.c] Make loop counter unsigned 2 - (dtucker) [openbsd-compat/bsd-cygwin_util.c] Make loop counter unsigned
3 to silence compiler warning, from vinschen at redhat.com. 3 to silence compiler warning, from vinschen at redhat.com.
4 - (tim) [configure.ac] Bug #1149. Disable /etc/default/login check for QNX. 4 - (tim) [configure.ac] Bug #1149. Disable /etc/default/login check for QNX.
5 - (dtucker) [README version.h contrib/caldera/openssh.spec
6 contrib/redhat/openssh.spec contrib/suse/openssh.spec] Bump version
7 strings to match 4.3p2 release.
5 8
620060208 920060208
7 - (tim) [session.c] Logout records were not updated on systems with 10 - (tim) [session.c] Logout records were not updated on systems with
@@ -3852,4 +3855,4 @@
3852 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 3855 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
3853 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 3856 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
3854 3857
3855$Id: ChangeLog,v 1.4127 2006/02/12 02:37:48 tim Exp $ 3858$Id: ChangeLog,v 1.4128 2006/02/12 05:48:56 dtucker Exp $
diff --git a/README b/README
index 924293b66..9b05205b8 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
1See http://www.openssh.com/txt/release-4.3 for the release notes. 1See http://www.openssh.com/txt/release-4.3p2 for the release notes.
2 2
3- A Japanese translation of this document and of the OpenSSH FAQ is 3- A Japanese translation of this document and of the OpenSSH FAQ is
4- available at http://www.unixuser.org/~haruyama/security/openssh/index.html 4- available at http://www.unixuser.org/~haruyama/security/openssh/index.html
@@ -62,4 +62,4 @@ References -
62[6] http://www.openbsd.org/cgi-bin/man.cgi?query=style&sektion=9 62[6] http://www.openbsd.org/cgi-bin/man.cgi?query=style&sektion=9
63[7] http://www.openssh.com/faq.html 63[7] http://www.openssh.com/faq.html
64 64
65$Id: README,v 1.61 2005/12/01 11:21:04 dtucker Exp $ 65$Id: README,v 1.62 2006/02/12 05:48:56 dtucker Exp $
diff --git a/contrib/caldera/openssh.spec b/contrib/caldera/openssh.spec
index 077b86b3a..77fc51897 100644
--- a/contrib/caldera/openssh.spec
+++ b/contrib/caldera/openssh.spec
@@ -17,7 +17,7 @@
17#old cvs stuff. please update before use. may be deprecated. 17#old cvs stuff. please update before use. may be deprecated.
18%define use_stable 1 18%define use_stable 1
19%if %{use_stable} 19%if %{use_stable}
20 %define version 4.3p1 20 %define version 4.3p2
21 %define cvs %{nil} 21 %define cvs %{nil}
22 %define release 1 22 %define release 1
23%else 23%else
@@ -357,4 +357,4 @@ fi
357* Mon Jan 01 1998 ... 357* Mon Jan 01 1998 ...
358Template Version: 1.31 358Template Version: 1.31
359 359
360$Id: openssh.spec,v 1.56 2006/02/01 11:10:48 djm Exp $ 360$Id: openssh.spec,v 1.57 2006/02/12 05:48:56 dtucker Exp $
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec
index 545e27b64..cbdf7bbc7 100644
--- a/contrib/redhat/openssh.spec
+++ b/contrib/redhat/openssh.spec
@@ -1,4 +1,4 @@
1%define ver 4.3p1 1%define ver 4.3p2
2%define rel 1 2%define rel 1
3 3
4# OpenSSH privilege separation requires a user & group ID 4# OpenSSH privilege separation requires a user & group ID
diff --git a/contrib/suse/openssh.spec b/contrib/suse/openssh.spec
index e7739bd91..b49e78c65 100644
--- a/contrib/suse/openssh.spec
+++ b/contrib/suse/openssh.spec
@@ -13,7 +13,7 @@
13 13
14Summary: OpenSSH, a free Secure Shell (SSH) protocol implementation 14Summary: OpenSSH, a free Secure Shell (SSH) protocol implementation
15Name: openssh 15Name: openssh
16Version: 4.3p1 16Version: 4.3p2
17URL: http://www.openssh.com/ 17URL: http://www.openssh.com/
18Release: 1 18Release: 1
19Source0: openssh-%{version}.tar.gz 19Source0: openssh-%{version}.tar.gz
diff --git a/version.h b/version.h
index 2b729524e..d5fd0c6ce 100644
--- a/version.h
+++ b/version.h
@@ -2,5 +2,5 @@
2 2
3#define SSH_VERSION "OpenSSH_4.3" 3#define SSH_VERSION "OpenSSH_4.3"
4 4
5#define SSH_PORTABLE "p1" 5#define SSH_PORTABLE "p2"
6#define SSH_RELEASE SSH_VERSION SSH_PORTABLE 6#define SSH_RELEASE SSH_VERSION SSH_PORTABLE