Merge conflicts between 9.5 and 9.6

Correct lost change in the merge (Anthony Mallet)

Merge conflicts between OpenSSH 8.7 and 8.8

Merge our changes from OpenSSH-8.6 to OpenSSH-8.7

Merge local changes between 8.5 and 8.6

merge local changes between openssh 8.4 and 8.5

Merge conflicts

Merge the [pgoyette-compat] branch

Don't treat mostly connection closed events as filtering events.
There a a failed to negotiate instance too, but I don't want to generate
more diff.

merge conflicts

branches: 1.17.2; 1.17.4;
merge conflicts.

branches: 1.16.4;
merge conflicts

branches: 1.15.2;
merge conflicts

merge conflicts.

branches: 1.13.2;
merge conflicts

Merge conflicts

merge openssh-6.7

merge conflicts.

remove error(1) output.

welcome to openssh-6.2

branches: 1.7.2; 1.7.6; 1.7.8; 1.7.14;
Separate strings correctly with ': ', not embedded NUL. Found by
mlelstv.

branches: 1.6.2;
Reapply formatting cleanup

merge openssh-5.9

Avoid using non-literal format strings and optimizing code a bit at the
same time.

- Merge conflicts
- WARNS=5

Merge in our changes:
- conditionalize login_cap
- conditionalize bsd_auth
- bring in pam from portable
- restore krb5, krb4, afs, skey
- bring in hpn patches, disable mt aes cipher, keep speedups and cipher none
- add ignore root rhosts option
- fix ctype macro arguments
- umac is broken, disable it
- better ~homedir handling
- netbsd style tunnels
- urandom, xhome, chrootdir, rescuedir NetBSD handling
- utmp/utmpx handling
- handle tty posix_vdisable properly
- handle setuid and unsetuid the posix way instead of setresuid()
- add all missing functions
- add new moduli
- add build glue

branches: 1.1.1;
Initial revision

Correct lost change in the merge (Anthony Mallet)

Merge conflicts between OpenSSH 8.7 and 8.8

Merge our changes from OpenSSH-8.6 to OpenSSH-8.7

Merge local changes between 8.5 and 8.6

merge local changes between openssh 8.4 and 8.5

Merge conflicts

Merge the [pgoyette-compat] branch

Don't treat mostly connection closed events as filtering events.
There a a failed to negotiate instance too, but I don't want to generate
more diff.

merge conflicts

branches: 1.17.2; 1.17.4;
merge conflicts.

branches: 1.16.4;
merge conflicts

branches: 1.15.2;
merge conflicts

merge conflicts.

branches: 1.13.2;
merge conflicts

Merge conflicts

merge openssh-6.7

merge conflicts.

remove error(1) output.

welcome to openssh-6.2

branches: 1.7.2; 1.7.6; 1.7.8; 1.7.14;
Separate strings correctly with ': ', not embedded NUL. Found by
mlelstv.

branches: 1.6.2;
Reapply formatting cleanup

merge openssh-5.9

Avoid using non-literal format strings and optimizing code a bit at the
same time.

- Merge conflicts
- WARNS=5

Merge in our changes:
- conditionalize login_cap
- conditionalize bsd_auth
- bring in pam from portable
- restore krb5, krb4, afs, skey
- bring in hpn patches, disable mt aes cipher, keep speedups and cipher none
- add ignore root rhosts option
- fix ctype macro arguments
- umac is broken, disable it
- better ~homedir handling
- netbsd style tunnels
- urandom, xhome, chrootdir, rescuedir NetBSD handling
- utmp/utmpx handling
- handle tty posix_vdisable properly
- handle setuid and unsetuid the posix way instead of setresuid()
- add all missing functions
- add new moduli
- add build glue

branches: 1.1.1;
Initial revision

Merge conflicts between OpenSSH 8.7 and 8.8

Merge our changes from OpenSSH-8.6 to OpenSSH-8.7

Merge local changes between 8.5 and 8.6

merge local changes between openssh 8.4 and 8.5

Merge conflicts

Merge the [pgoyette-compat] branch

Don't treat mostly connection closed events as filtering events.
There a a failed to negotiate instance too, but I don't want to generate
more diff.

merge conflicts

branches: 1.17.2; 1.17.4;
merge conflicts.

branches: 1.16.4;
merge conflicts

branches: 1.15.2;
merge conflicts

merge conflicts.

branches: 1.13.2;
merge conflicts

Merge conflicts

merge openssh-6.7

merge conflicts.

remove error(1) output.

welcome to openssh-6.2

branches: 1.7.2; 1.7.6; 1.7.8; 1.7.14;
Separate strings correctly with ': ', not embedded NUL. Found by
mlelstv.

branches: 1.6.2;
Reapply formatting cleanup

merge openssh-5.9

Avoid using non-literal format strings and optimizing code a bit at the
same time.

- Merge conflicts
- WARNS=5

Merge in our changes:
- conditionalize login_cap
- conditionalize bsd_auth
- bring in pam from portable
- restore krb5, krb4, afs, skey
- bring in hpn patches, disable mt aes cipher, keep speedups and cipher none
- add ignore root rhosts option
- fix ctype macro arguments
- umac is broken, disable it
- better ~homedir handling
- netbsd style tunnels
- urandom, xhome, chrootdir, rescuedir NetBSD handling
- utmp/utmpx handling
- handle tty posix_vdisable properly
- handle setuid and unsetuid the posix way instead of setresuid()
- add all missing functions
- add new moduli
- add build glue

branches: 1.1.1;
Initial revision

Merge our changes from OpenSSH-8.6 to OpenSSH-8.7

Merge local changes between 8.5 and 8.6

merge local changes between openssh 8.4 and 8.5

Merge conflicts

Merge the [pgoyette-compat] branch

Don't treat mostly connection closed events as filtering events.
There a a failed to negotiate instance too, but I don't want to generate
more diff.

merge conflicts

branches: 1.17.2; 1.17.4;
merge conflicts.

branches: 1.16.4;
merge conflicts

branches: 1.15.2;
merge conflicts

merge conflicts.

branches: 1.13.2;
merge conflicts

Merge conflicts

merge openssh-6.7

merge conflicts.

remove error(1) output.

welcome to openssh-6.2

branches: 1.7.2; 1.7.6; 1.7.8; 1.7.14;
Separate strings correctly with ': ', not embedded NUL. Found by
mlelstv.

branches: 1.6.2;
Reapply formatting cleanup

merge openssh-5.9

Avoid using non-literal format strings and optimizing code a bit at the
same time.

- Merge conflicts
- WARNS=5

Merge in our changes:
- conditionalize login_cap
- conditionalize bsd_auth
- bring in pam from portable
- restore krb5, krb4, afs, skey
- bring in hpn patches, disable mt aes cipher, keep speedups and cipher none
- add ignore root rhosts option
- fix ctype macro arguments
- umac is broken, disable it
- better ~homedir handling
- netbsd style tunnels
- urandom, xhome, chrootdir, rescuedir NetBSD handling
- utmp/utmpx handling
- handle tty posix_vdisable properly
- handle setuid and unsetuid the posix way instead of setresuid()
- add all missing functions
- add new moduli
- add build glue

branches: 1.1.1;
Initial revision

Merge local changes between 8.5 and 8.6

merge local changes between openssh 8.4 and 8.5

Merge conflicts

Merge the [pgoyette-compat] branch

Don't treat mostly connection closed events as filtering events.
There a a failed to negotiate instance too, but I don't want to generate
more diff.

merge conflicts

branches: 1.17.2; 1.17.4;
merge conflicts.

branches: 1.16.4;
merge conflicts

branches: 1.15.2;
merge conflicts

merge conflicts.

branches: 1.13.2;
merge conflicts

Merge conflicts

merge openssh-6.7

merge conflicts.

remove error(1) output.

welcome to openssh-6.2

branches: 1.7.2; 1.7.6; 1.7.8; 1.7.14;
Separate strings correctly with ': ', not embedded NUL. Found by
mlelstv.

branches: 1.6.2;
Reapply formatting cleanup

merge openssh-5.9

Avoid using non-literal format strings and optimizing code a bit at the
same time.

- Merge conflicts
- WARNS=5

Merge in our changes:
- conditionalize login_cap
- conditionalize bsd_auth
- bring in pam from portable
- restore krb5, krb4, afs, skey
- bring in hpn patches, disable mt aes cipher, keep speedups and cipher none
- add ignore root rhosts option
- fix ctype macro arguments
- umac is broken, disable it
- better ~homedir handling
- netbsd style tunnels
- urandom, xhome, chrootdir, rescuedir NetBSD handling
- utmp/utmpx handling
- handle tty posix_vdisable properly
- handle setuid and unsetuid the posix way instead of setresuid()
- add all missing functions
- add new moduli
- add build glue

branches: 1.1.1;
Initial revision

merge local changes between openssh 8.4 and 8.5

Merge conflicts

Merge the [pgoyette-compat] branch

Don't treat mostly connection closed events as filtering events.
There a a failed to negotiate instance too, but I don't want to generate
more diff.

merge conflicts

branches: 1.17.2; 1.17.4;
merge conflicts.

branches: 1.16.4;
merge conflicts

branches: 1.15.2;
merge conflicts

merge conflicts.

branches: 1.13.2;
merge conflicts

Merge conflicts

merge openssh-6.7

merge conflicts.

remove error(1) output.

welcome to openssh-6.2

branches: 1.7.2; 1.7.6; 1.7.8; 1.7.14;
Separate strings correctly with ': ', not embedded NUL. Found by
mlelstv.

branches: 1.6.2;
Reapply formatting cleanup

merge openssh-5.9

Avoid using non-literal format strings and optimizing code a bit at the
same time.

- Merge conflicts
- WARNS=5

Merge in our changes:
- conditionalize login_cap
- conditionalize bsd_auth
- bring in pam from portable
- restore krb5, krb4, afs, skey
- bring in hpn patches, disable mt aes cipher, keep speedups and cipher none
- add ignore root rhosts option
- fix ctype macro arguments
- umac is broken, disable it
- better ~homedir handling
- netbsd style tunnels
- urandom, xhome, chrootdir, rescuedir NetBSD handling
- utmp/utmpx handling
- handle tty posix_vdisable properly
- handle setuid and unsetuid the posix way instead of setresuid()
- add all missing functions
- add new moduli
- add build glue

branches: 1.1.1;
Initial revision

Merge conflicts

Merge the [pgoyette-compat] branch

Don't treat mostly connection closed events as filtering events.
There a a failed to negotiate instance too, but I don't want to generate
more diff.

merge conflicts

branches: 1.17.2; 1.17.4;
merge conflicts.

branches: 1.16.4;
merge conflicts

branches: 1.15.2;
merge conflicts

merge conflicts.

branches: 1.13.2;
merge conflicts

Merge conflicts

merge openssh-6.7

merge conflicts.

remove error(1) output.

welcome to openssh-6.2

branches: 1.7.2; 1.7.6; 1.7.8; 1.7.14;
Separate strings correctly with ': ', not embedded NUL. Found by
mlelstv.

branches: 1.6.2;
Reapply formatting cleanup

merge openssh-5.9

Avoid using non-literal format strings and optimizing code a bit at the
same time.

- Merge conflicts
- WARNS=5

Merge in our changes:
- conditionalize login_cap
- conditionalize bsd_auth
- bring in pam from portable
- restore krb5, krb4, afs, skey
- bring in hpn patches, disable mt aes cipher, keep speedups and cipher none
- add ignore root rhosts option
- fix ctype macro arguments
- umac is broken, disable it
- better ~homedir handling
- netbsd style tunnels
- urandom, xhome, chrootdir, rescuedir NetBSD handling
- utmp/utmpx handling
- handle tty posix_vdisable properly
- handle setuid and unsetuid the posix way instead of setresuid()
- add all missing functions
- add new moduli
- add build glue

branches: 1.1.1;
Initial revision

Merge the [pgoyette-compat] branch

Don't treat mostly connection closed events as filtering events.
There a a failed to negotiate instance too, but I don't want to generate
more diff.

merge conflicts

branches: 1.17.2;
merge conflicts.

branches: 1.16.4;
merge conflicts

branches: 1.15.2;
merge conflicts

merge conflicts.

branches: 1.13.2;
merge conflicts

Merge conflicts

merge openssh-6.7

merge conflicts.

remove error(1) output.

welcome to openssh-6.2

branches: 1.7.2; 1.7.6; 1.7.8; 1.7.14;
Separate strings correctly with ': ', not embedded NUL. Found by
mlelstv.

branches: 1.6.2;
Reapply formatting cleanup

merge openssh-5.9

Avoid using non-literal format strings and optimizing code a bit at the
same time.

- Merge conflicts
- WARNS=5

Merge in our changes:
- conditionalize login_cap
- conditionalize bsd_auth
- bring in pam from portable
- restore krb5, krb4, afs, skey
- bring in hpn patches, disable mt aes cipher, keep speedups and cipher none
- add ignore root rhosts option
- fix ctype macro arguments
- umac is broken, disable it
- better ~homedir handling
- netbsd style tunnels
- urandom, xhome, chrootdir, rescuedir NetBSD handling
- utmp/utmpx handling
- handle tty posix_vdisable properly
- handle setuid and unsetuid the posix way instead of setresuid()
- add all missing functions
- add new moduli
- add build glue

branches: 1.1.1;
Initial revision

merge conflicts.

merge conflicts

branches: 1.15.2;
merge conflicts

merge conflicts.

branches: 1.13.2;
merge conflicts

Merge conflicts

merge openssh-6.7

merge conflicts.

remove error(1) output.

welcome to openssh-6.2

branches: 1.7.2; 1.7.6; 1.7.8; 1.7.14;
Separate strings correctly with ': ', not embedded NUL. Found by
mlelstv.

branches: 1.6.2;
Reapply formatting cleanup

merge openssh-5.9

Avoid using non-literal format strings and optimizing code a bit at the
same time.

- Merge conflicts
- WARNS=5

Merge in our changes:
- conditionalize login_cap
- conditionalize bsd_auth
- bring in pam from portable
- restore krb5, krb4, afs, skey
- bring in hpn patches, disable mt aes cipher, keep speedups and cipher none
- add ignore root rhosts option
- fix ctype macro arguments
- umac is broken, disable it
- better ~homedir handling
- netbsd style tunnels
- urandom, xhome, chrootdir, rescuedir NetBSD handling
- utmp/utmpx handling
- handle tty posix_vdisable properly
- handle setuid and unsetuid the posix way instead of setresuid()
- add all missing functions
- add new moduli
- add build glue

branches: 1.1.1;
Initial revision

merge conflicts

branches: 1.15.2;
merge conflicts

merge conflicts.

branches: 1.13.2;
merge conflicts

Merge conflicts

merge openssh-6.7

merge conflicts.

remove error(1) output.

welcome to openssh-6.2

branches: 1.7.6;
Separate strings correctly with ': ', not embedded NUL. Found by
mlelstv.

branches: 1.6.2;
Reapply formatting cleanup

merge openssh-5.9

Avoid using non-literal format strings and optimizing code a bit at the
same time.

- Merge conflicts
- WARNS=5

Merge in our changes:
- conditionalize login_cap
- conditionalize bsd_auth
- bring in pam from portable
- restore krb5, krb4, afs, skey
- bring in hpn patches, disable mt aes cipher, keep speedups and cipher none
- add ignore root rhosts option
- fix ctype macro arguments
- umac is broken, disable it
- better ~homedir handling
- netbsd style tunnels
- urandom, xhome, chrootdir, rescuedir NetBSD handling
- utmp/utmpx handling
- handle tty posix_vdisable properly
- handle setuid and unsetuid the posix way instead of setresuid()
- add all missing functions
- add new moduli
- add build glue

branches: 1.1.1;
Initial revision

merge conflicts

merge conflicts.

branches: 1.13.2;
merge conflicts

Merge conflicts

merge openssh-6.7

merge conflicts.

remove error(1) output.

welcome to openssh-6.2

branches: 1.7.6;
Separate strings correctly with ': ', not embedded NUL. Found by
mlelstv.

branches: 1.6.2;
Reapply formatting cleanup

merge openssh-5.9

Avoid using non-literal format strings and optimizing code a bit at the
same time.

- Merge conflicts
- WARNS=5

Merge in our changes:
- conditionalize login_cap
- conditionalize bsd_auth
- bring in pam from portable
- restore krb5, krb4, afs, skey
- bring in hpn patches, disable mt aes cipher, keep speedups and cipher none
- add ignore root rhosts option
- fix ctype macro arguments
- umac is broken, disable it
- better ~homedir handling
- netbsd style tunnels
- urandom, xhome, chrootdir, rescuedir NetBSD handling
- utmp/utmpx handling
- handle tty posix_vdisable properly
- handle setuid and unsetuid the posix way instead of setresuid()
- add all missing functions
- add new moduli
- add build glue

branches: 1.1.1;
Initial revision

merge conflicts.

branches: 1.13.2;
merge conflicts

Merge conflicts

merge openssh-6.7

merge conflicts.

remove error(1) output.

welcome to openssh-6.2

branches: 1.7.6;
Separate strings correctly with ': ', not embedded NUL. Found by
mlelstv.

branches: 1.6.2;
Reapply formatting cleanup

merge openssh-5.9

Avoid using non-literal format strings and optimizing code a bit at the
same time.

- Merge conflicts
- WARNS=5

Merge in our changes:
- conditionalize login_cap
- conditionalize bsd_auth
- bring in pam from portable
- restore krb5, krb4, afs, skey
- bring in hpn patches, disable mt aes cipher, keep speedups and cipher none
- add ignore root rhosts option
- fix ctype macro arguments
- umac is broken, disable it
- better ~homedir handling
- netbsd style tunnels
- urandom, xhome, chrootdir, rescuedir NetBSD handling
- utmp/utmpx handling
- handle tty posix_vdisable properly
- handle setuid and unsetuid the posix way instead of setresuid()
- add all missing functions
- add new moduli
- add build glue

branches: 1.1.1;
Initial revision

merge conflicts

Merge conflicts

merge openssh-6.7

merge conflicts.

remove error(1) output.

welcome to openssh-6.2

branches: 1.7.6;
Separate strings correctly with ': ', not embedded NUL. Found by
mlelstv.

branches: 1.6.2;
Reapply formatting cleanup

merge openssh-5.9

Avoid using non-literal format strings and optimizing code a bit at the
same time.

- Merge conflicts
- WARNS=5

Merge in our changes:
- conditionalize login_cap
- conditionalize bsd_auth
- bring in pam from portable
- restore krb5, krb4, afs, skey
- bring in hpn patches, disable mt aes cipher, keep speedups and cipher none
- add ignore root rhosts option
- fix ctype macro arguments
- umac is broken, disable it
- better ~homedir handling
- netbsd style tunnels
- urandom, xhome, chrootdir, rescuedir NetBSD handling
- utmp/utmpx handling
- handle tty posix_vdisable properly
- handle setuid and unsetuid the posix way instead of setresuid()
- add all missing functions
- add new moduli
- add build glue

branches: 1.1.1;
Initial revision

import openssh-7.0

Changes since OpenSSH 6.9

Import new openssh to address

Changes since OpenSSH 6.3

from openbsd

new openssh:
See http://www.openssh.com/txt/release-5.9

from ftp.openbsd.org

import 5.2 from ftp.openbsd.org

sync with head.

for a reference, the tree before this commit was tagged
as yamt-pagecache-tag8.

this commit was splitted into small chunks to avoid
a limitation of cvs. ("Protocol error: too many arguments")

sync with head

Rebase to HEAD as of a few days ago.

resync from head