[openssh-commits] [openssh] branch master updated (2de5c6b5 -> f2ad63c0)

Tue Oct 31 10:04:30 AEDT 2017

This is an automated email from the git hooks/post-receive script.

djm pushed a change to branch master
in repository openssh.

      from  2de5c6b5  fix rdomain compilation errors
       new  eb9c582b  Switch upstream git repository.
       new  7530e77b  upstream commit
       new  0b2e2896  upstream commit
       new  68d3bbb2  upstream commit
       new  b77c29a0  upstream commit
       new  d2135474  upstream commit
       new  dbe0662e  upstream commit
       new  116b1b43  upstream commit
       new  e4d4ddbb  upstream commit
       new  c6415b1f  upstream commit
       new  f2ad63c0  upstream commit

The 11 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.

Detailed log of new commits:

commit f2ad63c0718b93ac1d1e85f53fee33b06eef86b5
Author: djm at openbsd.org@openbsd.org <djm at openbsd.org@openbsd.org>
Date:   Mon Oct 30 22:01:52 2017 +0000

    upstream commit

    whitespace at EOL

    OpenBSD-Regress-ID: f4b5df99b28c6f63478deb916c6ed0e794685f07

commit c6415b1f8f1d0c2735564371647fd6a177fb9a3e
Author: djm at openbsd.org@openbsd.org <djm at openbsd.org@openbsd.org>
Date:   Mon Oct 30 21:59:43 2017 +0000

    upstream commit

    whitespace at EOL

    OpenBSD-Regress-ID: 19b1394393deee4c8a2114a3b7d18189f27a15cd

commit e4d4ddbbba0e585ca3ec3a455430750b4622a6d3
Author: millert at openbsd.org@openbsd.org <millert at openbsd.org@openbsd.org>
Date:   Wed Oct 25 20:08:36 2017 +0000

    upstream commit

    Use printenv to test whether an SSH_USER_AUTH is set
    instead of using $SSH_USER_AUTH.  The latter won't work with csh which treats
    unknown variables as an error when expanding them.  OK markus@

    OpenBSD-Regress-ID: f601e878dd8b71aa40381573dde3a8f567e6f2d1

commit 116b1b439413a724ebb3320633a64dd0f3ee1fe7
Author: millert at openbsd.org@openbsd.org <millert at openbsd.org@openbsd.org>
Date:   Tue Oct 24 19:33:32 2017 +0000

    upstream commit

    Add tests for URI parsing.  OK markus@

    OpenBSD-Regress-ID: 5d1df19874f3b916d1a2256a905526e17a98bd3b

commit dbe0662e9cd482593a4a8bf58c6481bfe8a747a4
Author: djm at openbsd.org@openbsd.org <djm at openbsd.org@openbsd.org>
Date:   Fri Oct 27 01:57:06 2017 +0000

    upstream commit

    whitespace at EOL

    OpenBSD-Commit-ID: c95549cf5a07d56ea11aaff818415118720214f6

commit d2135474344335a7c6ee643b6ade6db400fa76ee
Author: djm at openbsd.org@openbsd.org <djm at openbsd.org@openbsd.org>
Date:   Fri Oct 27 01:01:17 2017 +0000

    upstream commit

    whitespace at EOL (lots)

    OpenBSD-Commit-ID: 757257dd44116794ee1b5a45c6724973de181747

commit b77c29a07f5a02c7c1998701c73d92bde7ae1608
Author: djm at openbsd.org@openbsd.org <djm at openbsd.org@openbsd.org>
Date:   Fri Oct 27 00:18:41 2017 +0000

    upstream commit

    improve printing of rdomain on accept() a little

    OpenBSD-Commit-ID: 5da58db2243606899cedaa646c70201b2d12247a

commit 68d3bbb2e6dfbf117c46e942142795b2cdd0274b
Author: jmc at openbsd.org@openbsd.org <jmc at openbsd.org@openbsd.org>
Date:   Thu Oct 26 06:44:01 2017 +0000

    upstream commit

    mark up the rdomain keyword;

    OpenBSD-Commit-ID: 1b597d0ad0ad20e94dbd61ca066057e6f6313b8a

commit 0b2e2896b9d0d6cfb59e9ec8271085296bd4e99b
Author: jmc at openbsd.org@openbsd.org <jmc at openbsd.org@openbsd.org>
Date:   Wed Oct 25 06:19:46 2017 +0000

    upstream commit

    tweak the uri text, specifically removing some markup to
    make it a bit more readable;

    issue reported by - and diff ok - millert

    OpenBSD-Commit-ID: 8b56a20208040b2d0633536fd926e992de37ef3f

commit 7530e77bdc9415386d2a8ea3d086e8b611b2ba40
Author: jmc at openbsd.org@openbsd.org <jmc at openbsd.org@openbsd.org>
Date:   Wed Oct 25 06:18:06 2017 +0000

    upstream commit

    simplify macros in previous, and some minor tweaks;

    OpenBSD-Commit-ID: 6efeca3d8b095b76e21b484607d9cc67ac9a11ca

commit eb9c582b710dc48976b48eb2204218f6863bae9a
Author: Damien Miller <djm at mindrot.org>
Date:   Tue Oct 31 00:46:29 2017 +1100

    Switch upstream git repository.

    Previously portable OpenSSH has synced against a conversion of OpenBSD's
    CVS repository made using the git cvsimport tool, but this has become
    increasingly unreliable.

    As of this commit, portable OpenSSH now tracks a conversion of the
    OpenBSD CVS upstream made using the excellent cvs2gitdump tool from
    YASUOKA Masahiko: https://github.com/yasuoka/cvs2gitdump

    cvs2gitdump is considerably more reliable than gitcvsimport and the old
    version of cvsps that it uses under the hood, and is the same tool used
    to export the entire OpenBSD repository to git (so we know it can cope
    with future growth).

    These new conversions are mirrored at github, so interested parties can
    match portable OpenSSH commits to their upstream counterparts.

    https://github.com/djmdjm/openbsd-openssh-src
    https://github.com/djmdjm/openbsd-openssh-regress

    An unfortunate side effect of switching upstreams is that we must have
    a flag day, across which the upstream commit IDs will be inconsistent.
    The old commit IDs are recorded with the tags "Upstream-ID" for main
    directory commits and "Upstream-Regress-ID" for regress commits.

    To make it clear that the commit IDs do not refer to the same
    things, the new repository will instead use "OpenBSD-ID" and
    "OpenBSD-Regress-ID" tags instead.

    Apart from being a longwinded explanation of what is going on, this
    commit message also serves to synchronise our tools with the state of
    the tree, which happens to be:

    OpenBSD-ID: 9c43a9968c7929613284ea18e9fb92e4e2a8e4c1
    OpenBSD-Regress-ID: b33b385719420bf3bc57d664feda6f699c147fef

Summary of changes:
 .skipped-commit-ids    |   4 ++
 regress/Makefile       |   5 ++-
 regress/authinfo.sh    |   4 +-
 regress/connect-uri.sh |  29 ++++++++++++++
 regress/keytype.sh     |  12 +++---
 regress/scp-uri.sh     |  66 ++++++++++++++++++++++++++++++
 regress/sftp-uri.sh    |  63 +++++++++++++++++++++++++++++
 regress/sftp.sh        |   6 +--
 scp.1                  |  23 ++++++-----
 sftp.1                 |  16 ++++----
 ssh.1                  |  25 +++++-------
 ssh.c                  |  12 +++---
 sshd.c                 |   9 +++--
 sshd_config.5          |  29 +++++++-------
 umac.c                 | 106 ++++++++++++++++++++++++-------------------------
 15 files changed, 286 insertions(+), 123 deletions(-)
 create mode 100644 regress/connect-uri.sh
 create mode 100644 regress/scp-uri.sh
 create mode 100644 regress/sftp-uri.sh

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.