Author: des
Date: Fri May 17 09:12:33 2013
New Revision: 250739
URL: http://svnweb.freebsd.org/changeset/base/250739
Log:
Upgrade to OpenSSH 6.2p2. Mostly a no-op since I had already patched
the issues that affected us.
Modified:
head/crypto/openssh/ChangeLog
head/crypto/openssh/README
head/crypto/openssh/krl.c
head/crypto/openssh/openbsd-compat/bsd-cygwin_util.c
head/crypto/openssh/openbsd-compat/bsd-cygwin_util.h
head/crypto/openssh/packet.c
head/crypto/openssh/ssh_config
head/crypto/openssh/ssh_config.5
head/crypto/openssh/sshconnect.c
head/crypto/openssh/sshd_config
head/crypto/openssh/sshd_config.5
head/crypto/openssh/version.h
Directory Properties:
head/crypto/openssh/ (props changed)
Modified: head/crypto/openssh/ChangeLog
==============================================================================
--- head/crypto/openssh/ChangeLog Fri May 17 08:57:09 2013
(r250738)
+++ head/crypto/openssh/ChangeLog Fri May 17 09:12:33 2013
(r250739)
@@ -1,3 +1,39 @@
+20130510
+ - (djm) OpenBSD CVS Cherrypick
+ - d...@cvs.openbsd.org 2013/04/11 02:27:50
+ [packet.c]
+ quiet disconnect notifications on the server from error() back to logit()
+ if it is a normal client closure; bz#2057 ok+feedback dtucker@
+ - (djm) [version.h contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
+ [contrib/suse/openssh.spec] Crank version numbers for release.
+
+20130404
+ - (dtucker) OpenBSD CVS Sync
+ - dtuc...@cvs.openbsd.org 2013/02/17 23:16:57
+ [readconf.c ssh.c readconf.h sshconnect2.c]
+ Keep track of which IndentityFile options were manually supplied and which
+ were default options, and don't warn if the latter are missing.
+ ok markus@
+ - dtuc...@cvs.openbsd.org 2013/02/19 02:12:47
+ [krl.c]
+ Remove bogus include. ok djm
+ - dtuc...@cvs.openbsd.org 2013/02/22 04:45:09
+ [ssh.c readconf.c readconf.h]
+ Don't complain if IdentityFiles specified in system-wide configs are
+ missing. ok djm, deraadt.
+ - mar...@cvs.openbsd.org 2013/02/22 19:13:56
+ [sshconnect.c]
+ support ProxyCommand=- (stdin/out already point to the proxy); ok djm@
+ - d...@cvs.openbsd.org 2013/02/22 22:09:01
+ [ssh.c]
+ Allow IdenityFile=none; ok markus deraadt (and dtucker for an earlier
+ version)
+
+20130401
+ - (dtucker) [openbsd-compat/bsd-cygwin_util.{c,h}] Don't include windows.h
+ to avoid conflicting definitions of __int64, adding the required bits.
+ Patch from Corinna Vinschen.
+
20120322
- (djm) [contrib/ssh-copy-id contrib/ssh-copy-id.1] Updated to Phil
Hands' greatly revised version.
Modified: head/crypto/openssh/README
==============================================================================
--- head/crypto/openssh/README Fri May 17 08:57:09 2013 (r250738)
+++ head/crypto/openssh/README Fri May 17 09:12:33 2013 (r250739)
@@ -1,4 +1,4 @@
-See http://www.openssh.com/txt/release-6.2 for the release notes.
+See http://www.openssh.com/txt/release-6.2p2 for the release notes.
- A Japanese translation of this document and of the OpenSSH FAQ is
- available at http://www.unixuser.org/~haruyama/security/openssh/index.html
@@ -62,4 +62,4 @@ References -
[6] http://www.openbsd.org/cgi-bin/man.cgi?query=style&sektion=9
[7] http://www.openssh.com/faq.html
-$Id: README,v 1.82 2013/02/26 23:48:19 djm Exp $
+$Id: README,v 1.82.2.1 2013/05/10 06:12:54 djm Exp $
Modified: head/crypto/openssh/krl.c
==============================================================================
--- head/crypto/openssh/krl.c Fri May 17 08:57:09 2013 (r250738)
+++ head/crypto/openssh/krl.c Fri May 17 09:12:33 2013 (r250739)
@@ -14,7 +14,7 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $OpenBSD: krl.c,v 1.9 2013/01/27 10:06:12 djm Exp $ */
+/* $OpenBSD: krl.c,v 1.10 2013/02/19 02:12:47 dtucker Exp $ */
#include "includes.h"
Modified: head/crypto/openssh/openbsd-compat/bsd-cygwin_util.c
==============================================================================
--- head/crypto/openssh/openbsd-compat/bsd-cygwin_util.c Fri May 17
08:57:09 2013 (r250738)
+++ head/crypto/openssh/openbsd-compat/bsd-cygwin_util.c Fri May 17
09:12:33 2013 (r250739)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2001, 2011 Corinna Vinschen <vinsc...@redhat.com>
+ * Copyright (c) 2000, 2001, 2011, 2013 Corinna Vinschen <vinsc...@redhat.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -27,20 +27,15 @@
* binary mode on Windows systems.
*/
+#define NO_BINARY_OPEN /* Avoid redefining open to binary_open for this file */
#include "includes.h"
#ifdef HAVE_CYGWIN
-#if defined(open) && open == binary_open
-# undef open
-#endif
-
#include <sys/types.h>
-
#include <fcntl.h>
-#include <stdlib.h>
+#include <string.h>
#include <unistd.h>
-#include <windows.h>
#include "xmalloc.h"
Modified: head/crypto/openssh/openbsd-compat/bsd-cygwin_util.h
==============================================================================
--- head/crypto/openssh/openbsd-compat/bsd-cygwin_util.h Fri May 17
08:57:09 2013 (r250738)
+++ head/crypto/openssh/openbsd-compat/bsd-cygwin_util.h Fri May 17
09:12:33 2013 (r250739)
@@ -1,7 +1,7 @@
-/* $Id: bsd-cygwin_util.h,v 1.15 2012/08/28 09:57:19 dtucker Exp $ */
+/* $Id: bsd-cygwin_util.h,v 1.15.4.1 2013/04/04 23:53:31 dtucker Exp $ */
/*
- * Copyright (c) 2000, 2001, 2011 Corinna Vinschen <vinsc...@redhat.com>
+ * Copyright (c) 2000, 2001, 2011, 2013 Corinna Vinschen <vinsc...@redhat.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -36,24 +36,21 @@
#undef ERROR
-#define WIN32_LEAN_AND_MEAN
+/* Avoid including windows headers. */
+typedef void *HANDLE;
+#define INVALID_HANDLE_VALUE ((HANDLE) -1)
-#include <windows.h>
#include <sys/cygwin.h>
#include <io.h>
-/* Make sure _WIN32 isn't defined later in the code, otherwise headers from
- other packages might get the wrong idea about the target system. */
-#ifdef _WIN32
-#undef _WIN32
-#endif
-
int binary_open(const char *, int , ...);
int check_ntsec(const char *);
char **fetch_windows_environment(void);
void free_windows_environment(char **);
+#ifndef NO_BINARY_OPEN
#define open binary_open
+#endif
#endif /* HAVE_CYGWIN */
Modified: head/crypto/openssh/packet.c
==============================================================================
--- head/crypto/openssh/packet.c Fri May 17 08:57:09 2013
(r250738)
+++ head/crypto/openssh/packet.c Fri May 17 09:12:33 2013
(r250739)
@@ -1,5 +1,5 @@
/* $OpenBSD: packet.c,v 1.181 2013/02/10 23:35:24 djm Exp $ */
-/* $FreeBSD$ */
+/* $OpenBSD: packet.c,v 1.182 2013/04/11 02:27:50 djm Exp $ */
/*
* Author: Tatu Ylonen <y...@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <y...@cs.hut.fi>, Espoo, Finland
@@ -1468,7 +1468,7 @@ packet_read_poll_seqnr(u_int32_t *seqnr_
/* Ignore normal client exit notifications */
do_log2(active_state->server_side &&
reason == SSH2_DISCONNECT_BY_APPLICATION ?
- SYSLOG_LEVEL_DEBUG1 : SYSLOG_LEVEL_ERROR,
+ SYSLOG_LEVEL_INFO : SYSLOG_LEVEL_ERROR,
"Received disconnect from %s: %u: %.400s",
get_remote_ipaddr(), reason, msg);
xfree(msg);
Modified: head/crypto/openssh/ssh_config
==============================================================================
--- head/crypto/openssh/ssh_config Fri May 17 08:57:09 2013
(r250738)
+++ head/crypto/openssh/ssh_config Fri May 17 09:12:33 2013
(r250739)
@@ -46,4 +46,4 @@
# PermitLocalCommand no
# VisualHostKey no
# ProxyCommand ssh -q -W %h:%p gateway.example.com
-# VersionAddendum FreeBSD-20130322
+# VersionAddendum FreeBSD-20130515
Modified: head/crypto/openssh/ssh_config.5
==============================================================================
--- head/crypto/openssh/ssh_config.5 Fri May 17 08:57:09 2013
(r250738)
+++ head/crypto/openssh/ssh_config.5 Fri May 17 09:12:33 2013
(r250739)
@@ -1230,7 +1230,7 @@ in
Specifies a string to append to the regular version string to identify
OS- or site-specific modifications.
The default is
-.Dq FreeBSD-20130322 .
+.Dq FreeBSD-20130515 .
.It Cm VisualHostKey
If this flag is set to
.Dq yes ,
Modified: head/crypto/openssh/sshconnect.c
==============================================================================
--- head/crypto/openssh/sshconnect.c Fri May 17 08:57:09 2013
(r250738)
+++ head/crypto/openssh/sshconnect.c Fri May 17 09:12:33 2013
(r250739)
@@ -1,5 +1,5 @@
/* $OpenBSD: sshconnect.c,v 1.236 2012/09/14 16:51:34 markus Exp $ */
-/* $FreeBSD$ */
+/* $OpenBSD: sshconnect.c,v 1.237 2013/02/22 19:13:56 markus Exp $ */
/*
* Author: Tatu Ylonen <y...@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <y...@cs.hut.fi>, Espoo, Finland
@@ -90,6 +90,13 @@ ssh_proxy_connect(const char *host, u_sh
pid_t pid;
char *shell, strport[NI_MAXSERV];
+ if (!strcmp(proxy_command, "-")) {
+ packet_set_connection(STDIN_FILENO, STDOUT_FILENO);
+ packet_set_timeout(options.server_alive_interval,
+ options.server_alive_count_max);
+ return 0;
+ }
+
if ((shell = getenv("SHELL")) == NULL || *shell == '\0')
shell = _PATH_BSHELL;
Modified: head/crypto/openssh/sshd_config
==============================================================================
--- head/crypto/openssh/sshd_config Fri May 17 08:57:09 2013
(r250738)
+++ head/crypto/openssh/sshd_config Fri May 17 09:12:33 2013
(r250739)
@@ -115,7 +115,7 @@
#MaxStartups 10:30:100
#PermitTunnel no
#ChrootDirectory none
-#VersionAddendum FreeBSD-20130322
+#VersionAddendum FreeBSD-20130515
# no default banner path
#Banner none
Modified: head/crypto/openssh/sshd_config.5
==============================================================================
--- head/crypto/openssh/sshd_config.5 Fri May 17 08:57:09 2013
(r250738)
+++ head/crypto/openssh/sshd_config.5 Fri May 17 09:12:33 2013
(r250739)
@@ -1180,7 +1180,7 @@ restrictions.
Optionally specifies additional text to append to the SSH protocol banner
sent by the server upon connection.
The default is
-.Dq FreeBSD-20130322 .
+.Dq FreeBSD-20130515 .
.It Cm X11DisplayOffset
Specifies the first display number available for
.Xr sshd 8 Ns 's
Modified: head/crypto/openssh/version.h
==============================================================================
--- head/crypto/openssh/version.h Fri May 17 08:57:09 2013
(r250738)
+++ head/crypto/openssh/version.h Fri May 17 09:12:33 2013
(r250739)
@@ -3,8 +3,8 @@
#define SSH_VERSION "OpenSSH_6.2"
-#define SSH_PORTABLE "p1"
+#define SSH_PORTABLE "p2"
#define SSH_RELEASE SSH_VERSION SSH_PORTABLE
-#define SSH_VERSION_FREEBSD "FreeBSD-20130322"
+#define SSH_VERSION_FREEBSD "FreeBSD-20130515"
#define SSH_VERSION_HPN "_hpn13v11"
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
