diff options
| author | Colin Watson <cjwatson@debian.org> | 2014-02-10 00:27:24 +0000 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2014-02-10 02:40:28 +0000 |
| commit | a2b8818c5d21cfcba443625251f691a2ea3a29c7 (patch) | |
| tree | 8fe1fe448cde57eecf71a7bcd57186661b90313f /contrib/caldera | |
| parent | d399ecd8eb7d4aed3b7ba0d2727e619607fb901b (diff) | |
| parent | ee8d8b97cc2c6081df3af453a228992b87309ec4 (diff) | |
Merge 6.5p1.
* New upstream release (http://www.openssh.com/txt/release-6.5,
LP: #1275068):
- ssh(1): Add support for client-side hostname canonicalisation using a
set of DNS suffixes and rules in ssh_config(5). This allows
unqualified names to be canonicalised to fully-qualified domain names
to eliminate ambiguity when looking up keys in known_hosts or checking
host certificate names (closes: #115286).
Diffstat (limited to 'contrib/caldera')
| -rw-r--r-- | contrib/caldera/openssh.spec | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/caldera/openssh.spec b/contrib/caldera/openssh.spec index d026b72d8..3c417bb8f 100644 --- a/contrib/caldera/openssh.spec +++ b/contrib/caldera/openssh.spec | |||
| @@ -16,7 +16,7 @@ | |||
| 16 | 16 | ||
| 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 | %define version 6.4p1 | 19 | %define version 6.5p1 |
| 20 | %if %{use_stable} | 20 | %if %{use_stable} |
| 21 | %define cvs %{nil} | 21 | %define cvs %{nil} |
| 22 | %define release 1 | 22 | %define release 1 |
| @@ -363,4 +363,4 @@ fi | |||
| 363 | * Mon Jan 01 1998 ... | 363 | * Mon Jan 01 1998 ... |
| 364 | Template Version: 1.31 | 364 | Template Version: 1.31 |
| 365 | 365 | ||
| 366 | $Id: openssh.spec,v 1.80.4.1 2013/11/08 01:36:19 djm Exp $ | 366 | $Id: openssh.spec,v 1.82 2014/01/16 07:51:10 djm Exp $ |