~ubuntu-branches/ubuntu/lucid/openssh/lucid

« back to all changes in this revision

Viewing changes to version.h

  • Committer: Bazaar Package Importer
  • Author(s): Colin Watson
  • Date: 2008-09-30 23:09:58 UTC
  • mfrom: (1.13.3 upstream) (29 hardy)
  • mto: This revision was merged to the branch mainline in revision 43.
  • Revision ID: james.westby@ubuntu.com-20080930230958-o6vsgn8c4mm959s0
Tags: 1:5.1p1-3
* Remove unnecessary ssh-vulnkey output in non-verbose mode when no
  compromised or unknown keys were found (closes: #496495).
* Configure with --disable-strip; dh_strip will deal with stripping
  binaries and will honour DEB_BUILD_OPTIONS (thanks, Bernhard R. Link;
  closes: #498681).
* Fix handling of zero-length server banners (thanks, Tomas Mraz; closes:
  #497026).

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
/* $OpenBSD: version.h,v 1.49 2007/03/06 10:13:14 djm Exp $ */
 
1
/* $OpenBSD: version.h,v 1.54 2008/07/21 08:19:07 djm Exp $ */
2
2
 
3
 
#define SSH_VERSION     "OpenSSH_4.6"
 
3
#define SSH_VERSION     "OpenSSH_5.1"
4
4
 
5
5
#define SSH_PORTABLE    "p1"
6
 
#ifndef SSH_EXTRAVERSION
7
 
#define SSH_EXTRAVERSION
 
6
#ifdef SSH_EXTRAVERSION
 
7
#define SSH_RELEASE     SSH_VERSION SSH_PORTABLE " " SSH_EXTRAVERSION
 
8
#else
 
9
#define SSH_RELEASE     SSH_VERSION SSH_PORTABLE
8
10
#endif
9
 
#define SSH_RELEASE     SSH_VERSION SSH_PORTABLE SSH_EXTRAVERSION