summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2013-05-16 13:50:50 +0100
committerColin Watson <cjwatson@debian.org>2013-05-16 13:50:50 +0100
commit328b60656f29db6306994d7498dede386ec2d1c3 (patch)
tree7d3a4fd1eb06c355e7122b89b408b51b0b9b6c9b /ChangeLog
parent91c1846f2f94bc944f5e8f53b9903cb59ca42adc (diff)
parent79524838f0d5eb1cdf9fc268ec4c0bce46ccb67f (diff)
merge 6.2p2
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog42
1 files changed, 42 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index dbd8b0aa9..f5e2df0d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,45 @@
120130516
2 - (djm) [contrib/ssh-copy-id] Fix bug that could cause "rm *" to be
3 executed if mktemp failed; bz#2105 ok dtucker@
4 - (djm) Release 6.2p2
5
620130510
7 - (djm) OpenBSD CVS Cherrypick
8 - djm@cvs.openbsd.org 2013/04/11 02:27:50
9 [packet.c]
10 quiet disconnect notifications on the server from error() back to logit()
11 if it is a normal client closure; bz#2057 ok+feedback dtucker@
12 - (djm) [version.h contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
13 [contrib/suse/openssh.spec] Crank version numbers for release.
14 - (djm) [README] Update release notes URL
15
1620130404
17 - (dtucker) OpenBSD CVS Sync
18 - dtucker@cvs.openbsd.org 2013/02/17 23:16:57
19 [readconf.c ssh.c readconf.h sshconnect2.c]
20 Keep track of which IndentityFile options were manually supplied and which
21 were default options, and don't warn if the latter are missing.
22 ok markus@
23 - dtucker@cvs.openbsd.org 2013/02/19 02:12:47
24 [krl.c]
25 Remove bogus include. ok djm
26 - dtucker@cvs.openbsd.org 2013/02/22 04:45:09
27 [ssh.c readconf.c readconf.h]
28 Don't complain if IdentityFiles specified in system-wide configs are
29 missing. ok djm, deraadt.
30 - markus@cvs.openbsd.org 2013/02/22 19:13:56
31 [sshconnect.c]
32 support ProxyCommand=- (stdin/out already point to the proxy); ok djm@
33 - djm@cvs.openbsd.org 2013/02/22 22:09:01
34 [ssh.c]
35 Allow IdenityFile=none; ok markus deraadt (and dtucker for an earlier
36 version)
37
3820130401
39 - (dtucker) [openbsd-compat/bsd-cygwin_util.{c,h}] Don't include windows.h
40 to avoid conflicting definitions of __int64, adding the required bits.
41 Patch from Corinna Vinschen.
42
120120322 4320120322
2 - (djm) [contrib/ssh-copy-id contrib/ssh-copy-id.1] Updated to Phil 44 - (djm) [contrib/ssh-copy-id contrib/ssh-copy-id.1] Updated to Phil
3 Hands' greatly revised version. 45 Hands' greatly revised version.