Date: Sun, 24 Jan 2016 15:44:58 +0000 (UTC) From: =?UTF-8?Q?Dag-Erling_Sm=c3=b8rgrav?= <des@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r294666 - stable/10/crypto/openssh Message-ID: <201601241544.u0OFiwko012314@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: des Date: Sun Jan 24 15:44:57 2016 New Revision: 294666 URL: https://svnweb.freebsd.org/changeset/base/294666 Log: MFH (r263234, r263691, r266465, r290671, r290672, r290673, r290674, r294320, r294322, r294324, r294330, r294469, r294494, r294466) Reduce diffs to head in preparation for removing HPN and None. Added: stable/10/crypto/openssh/freebsd-post-merge.sh (contents, props changed) - copied, changed from r263691, head/crypto/openssh/freebsd-post-merge.sh stable/10/crypto/openssh/freebsd-pre-merge.sh (contents, props changed) - copied, changed from r263691, head/crypto/openssh/freebsd-pre-merge.sh Deleted: stable/10/crypto/openssh/FREEBSD-tricks stable/10/crypto/openssh/config.h.in stable/10/crypto/openssh/configure stable/10/crypto/openssh/schnorr.c Modified: stable/10/crypto/openssh/FREEBSD-upgrade stable/10/crypto/openssh/auth-krb5.c (contents, props changed) stable/10/crypto/openssh/auth-pam.c (contents, props changed) stable/10/crypto/openssh/auth2-chall.c (contents, props changed) stable/10/crypto/openssh/bufaux.c (contents, props changed) stable/10/crypto/openssh/buffer.c stable/10/crypto/openssh/channels.c stable/10/crypto/openssh/cipher.c stable/10/crypto/openssh/clientloop.c stable/10/crypto/openssh/compat.c stable/10/crypto/openssh/config.h stable/10/crypto/openssh/digest-libc.c (contents, props changed) stable/10/crypto/openssh/freebsd-configure.sh stable/10/crypto/openssh/kex.c stable/10/crypto/openssh/misc.c stable/10/crypto/openssh/moduli.5 stable/10/crypto/openssh/monitor.c (contents, props changed) stable/10/crypto/openssh/monitor_wrap.c (contents, props changed) stable/10/crypto/openssh/mux.c (contents, props changed) stable/10/crypto/openssh/packet.c stable/10/crypto/openssh/pathnames.h (contents, props changed) stable/10/crypto/openssh/readconf.c stable/10/crypto/openssh/scp.1 stable/10/crypto/openssh/servconf.c stable/10/crypto/openssh/serverloop.c stable/10/crypto/openssh/session.c stable/10/crypto/openssh/sftp-common.c (contents, props changed) stable/10/crypto/openssh/sftp-server.8 (contents, props changed) stable/10/crypto/openssh/sftp.1 stable/10/crypto/openssh/sftp.c stable/10/crypto/openssh/ssh-add.1 stable/10/crypto/openssh/ssh-gss.h (contents, props changed) stable/10/crypto/openssh/ssh-keygen.1 (contents, props changed) stable/10/crypto/openssh/ssh-keyscan.1 (contents, props changed) stable/10/crypto/openssh/ssh-keysign.8 stable/10/crypto/openssh/ssh-pkcs11-helper.8 stable/10/crypto/openssh/ssh.1 stable/10/crypto/openssh/ssh.c stable/10/crypto/openssh/ssh_config (contents, props changed) stable/10/crypto/openssh/ssh_config.5 stable/10/crypto/openssh/ssh_namespace.h stable/10/crypto/openssh/sshconnect.c stable/10/crypto/openssh/sshconnect2.c stable/10/crypto/openssh/sshd.8 stable/10/crypto/openssh/sshd.c stable/10/crypto/openssh/sshd_config (contents, props changed) stable/10/crypto/openssh/sshd_config.5 Directory Properties: stable/10/ (props changed) stable/10/crypto/openssh/sandbox-capsicum.c (props changed) Modified: stable/10/crypto/openssh/FREEBSD-upgrade ============================================================================== --- stable/10/crypto/openssh/FREEBSD-upgrade Sun Jan 24 15:15:57 2016 (r294665) +++ stable/10/crypto/openssh/FREEBSD-upgrade Sun Jan 24 15:44:57 2016 (r294666) @@ -3,81 +3,97 @@ FreeBSD maintainer's guide to OpenSSH-portable ============================================== -XXX -XXX this needs a complete rewrite -XXX svn merge from vendor branch, resolve conflicts manually -XXX (see FREEBSD-tricks for tips on how to reduce conflicts) -XXX run freebsd-configure.sh to generate config.h and krb5_config.h -XXX svn diff Makefile.in to see if the Makefiles need adjusting -XXX +00) Make sure your mail spool has plenty of free space. It'll fill up + pretty fast once you're done with this checklist. -0) Make sure your mail spool has plenty of free space. It'll fill up - pretty fast once you're done with this checklist. +01) Download the latest OpenSSH-portable tarball and signature from + OpenBSD (ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/). -1) Grab the latest OpenSSH-portable tarball from the OpenBSD FTP - site (ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/) +02) Verify the signature: -2) Unpack the tarball in a suitable directory. + $ gpg --verify openssh-X.YpZ.tar.gz.asc - $ tar xf openssh-X.YpZ.tar.gz \ - -X /usr/src/crypto/openssh/FREEBSD-Xlist +03) Unpack the tarball in a suitable directory: -3) Remove trash: + $ tar xf openssh-X.YpZ.tar.gz - Make sure -X took care of everything, and if it didn't, make sure - to update FREEBSD-Xlist so you won't miss it the next time. A good - way to do this is to run a test import and see if any new files - show up: +04) Copy to the vendor directory: - $ cvs -n import src/crypto/openssh OPENSSH x | grep \^N + $ svn co svn+ssh://svn.freebsd.org/base/vendor-crypto/openssh/dist + $ rsync --archive --delete openssh-X.YpZ/ dist/ -4) Import the sources: +05) Take care of added / deleted files: - $ cvs import src/crypto/openssh OPENSSH OpenSSH_X_YpZ + $ svn rm $(svn stat dist | awk '$1 == "!" { print $2 }') + $ svn add --no-auto-props $(svn stat dist | awk '$1 == "?" { print $2 }') -5) Resolve conflicts. Remember to bump the version number and - addendum in version.h, and update the default value in - ssh{,d}_config and ssh{,d}_config.5. +06) Commit: -6) Generate configure and config.h.in: + $ svn commit -m "Vendor import of OpenSSH X.YpZ." dist - $ autoconf - $ autoheader +07) Tag: - Note: this requires a recent version of autoconf, not autoconf213. + $ svn copy -m "Tag OpenSSH X.YpZ." \ + svn+ssh://svn.freebsd.org/base/vendor-crypto/openssh/dist \ + svn+ssh://svn.freebsd.org/base/vendor-crypto/openssh/X.YpZ -7) Run configure with the appropriate arguments: +08) Check out head and run the pre-merge script: - $ ./configure --prefix=/usr --sysconfdir=/etc/ssh \ - --with-pam --with-tcp-wrappers --with-libedit \ - --with-ssl-engine + $ svn co svn+ssh://svn.freebsd.org/base/head + $ cd head/crypto/openssh + $ sh freebsd-pre-merge.sh - This will regenerate config.h, which must be committed along with - the rest. +09) Merge from the vendor branch: - Note that we don't want to configure OpenSSH for Kerberos using - configure since we have to be able to turn it on or off depending - on the value of MK_KERBEROS. Our Makefiles take care of this. + $ svn merge -cNNNNNN \^/vendor-crypto/openssh/dist . -8) If source files have been added or removed, update the appropriate - makefiles to reflect changes in the vendor's Makefile.in. +0A) Resolve conflicts. Remember to bump the version addendum in + version.h, and update the default value in ssh{,d}_config and + ssh{,d}_config.5. -9) Build libssh. Follow the instructions in ssh_namespace.h to get a - list of new symbols. Update ssh_namespace.h, build everything, - install and test. +0B) Diff against the vendor branch: -A) Build and test the pam_ssh PAM module. It gropes around libssh's - internals and will break if something significant changes or if - ssh_namespace.h is out of whack. + $ svn diff \^/vendor-crypto/openssh/dist . -B) Re-commit everything on repoman (you *did* use a test repo for - this, didn't you?) + Files that have modifications relative to the vendor code, and + only those files, must have the svn:keywords property set to + FreeBSD=%H and be listed in the 'keywords' file created by the + pre-merge script. + +0C) Run the post-merge script: + + $ sh freebsd-post-merge.sh + +0D) Run the configure script: + + $ sh freebsd-configure.sh + +0E) Check config.h very carefully. + +0F) If source files have been added or removed, update the appropriate + makefiles to reflect changes in the vendor's Makefile.in. + +10) Build libssh: + + $ cd ../../secure/lib/libssh && make obj && make depend && make + +11) Follow the instructions in ssh_namespace.h to get a list of new + symbols, and them to ssh_namespace.h. Keep it sorted! + +12) Build and install world, reboot, test. Pay particular attention + to pam_ssh(8), which gropes inside libssh and will break if + something significant changes or if ssh_namespace.h is out of + whack. + +13) Commit, and hunker down for the inevitable storm of complaints. An overview of FreeBSD changes to OpenSSH-portable ================================================== +XXX This section is out of date + 0) VersionAddendum The SSH protocol allows for a human-readable version string of up Modified: stable/10/crypto/openssh/auth-krb5.c ============================================================================== --- stable/10/crypto/openssh/auth-krb5.c Sun Jan 24 15:15:57 2016 (r294665) +++ stable/10/crypto/openssh/auth-krb5.c Sun Jan 24 15:44:57 2016 (r294666) @@ -2,7 +2,7 @@ /* * Kerberos v5 authentication and ticket-passing routines. * - * $FreeBSD: src/crypto/openssh/auth-krb5.c,v 1.6 2001/02/13 16:58:04 assar Exp $ + * $FreeBSD$ */ /* * Copyright (c) 2002 Daniel Kouril. All rights reserved. Modified: stable/10/crypto/openssh/auth-pam.c ============================================================================== --- stable/10/crypto/openssh/auth-pam.c Sun Jan 24 15:15:57 2016 (r294665) +++ stable/10/crypto/openssh/auth-pam.c Sun Jan 24 15:44:57 2016 (r294666) @@ -45,7 +45,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* Based on $FreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.11 2003/03/31 13:48:18 des Exp $ */ +/* Based on $FreeBSD$ */ #include "includes.h" #include <sys/types.h> Modified: stable/10/crypto/openssh/auth2-chall.c ============================================================================== --- stable/10/crypto/openssh/auth2-chall.c Sun Jan 24 15:15:57 2016 (r294665) +++ stable/10/crypto/openssh/auth2-chall.c Sun Jan 24 15:44:57 2016 (r294666) @@ -25,6 +25,7 @@ */ #include "includes.h" +__RCSID("$FreeBSD$"); #include <sys/types.h> Modified: stable/10/crypto/openssh/bufaux.c ============================================================================== --- stable/10/crypto/openssh/bufaux.c Sun Jan 24 15:15:57 2016 (r294665) +++ stable/10/crypto/openssh/bufaux.c Sun Jan 24 15:44:57 2016 (r294666) @@ -38,6 +38,7 @@ */ #include "includes.h" +__RCSID("$FreeBSD$"); #include <sys/types.h> Modified: stable/10/crypto/openssh/buffer.c ============================================================================== --- stable/10/crypto/openssh/buffer.c Sun Jan 24 15:15:57 2016 (r294665) +++ stable/10/crypto/openssh/buffer.c Sun Jan 24 15:44:57 2016 (r294666) @@ -1,5 +1,4 @@ /* $OpenBSD: buffer.c,v 1.35 2014/02/02 03:44:31 djm Exp $ */ -/* $FreeBSD$ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -14,6 +13,7 @@ */ #include "includes.h" +__RCSID("$FreeBSD$"); #include <sys/param.h> Modified: stable/10/crypto/openssh/channels.c ============================================================================== --- stable/10/crypto/openssh/channels.c Sun Jan 24 15:15:57 2016 (r294665) +++ stable/10/crypto/openssh/channels.c Sun Jan 24 15:44:57 2016 (r294666) @@ -1,5 +1,4 @@ /* $OpenBSD: channels.c,v 1.331 2014/02/26 20:29:29 djm Exp $ */ -/* $FreeBSD$ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -41,6 +40,7 @@ */ #include "includes.h" +__RCSID("$FreeBSD$"); #include <sys/types.h> #include <sys/ioctl.h> Modified: stable/10/crypto/openssh/cipher.c ============================================================================== --- stable/10/crypto/openssh/cipher.c Sun Jan 24 15:15:57 2016 (r294665) +++ stable/10/crypto/openssh/cipher.c Sun Jan 24 15:44:57 2016 (r294666) @@ -1,5 +1,4 @@ /* $OpenBSD: cipher.c,v 1.97 2014/02/07 06:55:54 djm Exp $ */ -/* $FreeBSD$ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -37,6 +36,7 @@ */ #include "includes.h" +__RCSID("$FreeBSD$"); #include <sys/types.h> Modified: stable/10/crypto/openssh/clientloop.c ============================================================================== --- stable/10/crypto/openssh/clientloop.c Sun Jan 24 15:15:57 2016 (r294665) +++ stable/10/crypto/openssh/clientloop.c Sun Jan 24 15:44:57 2016 (r294666) @@ -1,5 +1,4 @@ /* $OpenBSD: clientloop.c,v 1.258 2014/02/02 03:44:31 djm Exp $ */ -/* $FreeBSD$ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -61,6 +60,7 @@ */ #include "includes.h" +__RCSID("$FreeBSD$"); #include <sys/types.h> #include <sys/ioctl.h> Modified: stable/10/crypto/openssh/compat.c ============================================================================== --- stable/10/crypto/openssh/compat.c Sun Jan 24 15:15:57 2016 (r294665) +++ stable/10/crypto/openssh/compat.c Sun Jan 24 15:44:57 2016 (r294666) @@ -1,5 +1,4 @@ /* $OpenBSD: compat.c,v 1.82 2013/12/30 23:52:27 djm Exp $ */ -/* $FreeBSD$ */ /* * Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl. All rights reserved. * @@ -25,6 +24,7 @@ */ #include "includes.h" +__RCSID("$FreeBSD$"); #include <sys/types.h> Modified: stable/10/crypto/openssh/config.h ============================================================================== --- stable/10/crypto/openssh/config.h Sun Jan 24 15:15:57 2016 (r294665) +++ stable/10/crypto/openssh/config.h Sun Jan 24 15:44:57 2016 (r294666) @@ -1681,6 +1681,11 @@ /* Define if xauth is found in your path */ /* #undef XAUTH_PATH */ +/* Enable large inode numbers on Mac OS X 10.5. */ +#ifndef _DARWIN_USE_64_BIT_INODE +# define _DARWIN_USE_64_BIT_INODE 1 +#endif + /* Number of bits in a file offset, on hosts where this is settable. */ /* #undef _FILE_OFFSET_BITS */ Modified: stable/10/crypto/openssh/digest-libc.c ============================================================================== --- stable/10/crypto/openssh/digest-libc.c Sun Jan 24 15:15:57 2016 (r294665) +++ stable/10/crypto/openssh/digest-libc.c Sun Jan 24 15:44:57 2016 (r294666) @@ -17,6 +17,7 @@ */ #include "includes.h" +__RCSID("$FreeBSD$"); #include <sys/types.h> #include <limits.h> Modified: stable/10/crypto/openssh/freebsd-configure.sh ============================================================================== --- stable/10/crypto/openssh/freebsd-configure.sh Sun Jan 24 15:15:57 2016 (r294665) +++ stable/10/crypto/openssh/freebsd-configure.sh Sun Jan 24 15:44:57 2016 (r294666) @@ -7,6 +7,7 @@ configure_args=" --prefix=/usr --sysconfdir=/etc/ssh --with-pam + --with-ssl-dir=/usr --with-tcp-wrappers --with-libedit --with-ssl-engine @@ -15,6 +16,19 @@ configure_args=" set -e +# make sure configure uses the correct compiler +export CC=$(echo ".include <bsd.lib.mk>" | make -f /dev/stdin -VCC) +export CPP=$(echo ".include <bsd.lib.mk>" | make -f /dev/stdin -VCPP) +unset CFLAGS CPPFLAGS LDFLAGS LIBS + +# regenerate configure and config.h.in +autoheader +autoconf + +# reset PATH to avoid picking up the wrong libraries +export PATH=/bin:/sbin:/usr/bin:/usr/sbin +unset LD_LIBRARY_PATH + # generate config.h with krb5 and stash it sh configure $configure_args --with-kerberos5 mv config.log config.log.orig Copied and modified: stable/10/crypto/openssh/freebsd-post-merge.sh (from r263691, head/crypto/openssh/freebsd-post-merge.sh) ============================================================================== --- head/crypto/openssh/freebsd-post-merge.sh Mon Mar 24 19:15:13 2014 (r263691, copy source) +++ stable/10/crypto/openssh/freebsd-post-merge.sh Sun Jan 24 15:44:57 2016 (r294666) @@ -1,14 +1,14 @@ #!/bin/sh # -# $FreeBSD$ +# $FreeBSD: stable/10/crypto/openssh/freebsd-post-merge.sh 263691 2014-03-24 19:15:13Z des $ # xargs perl -n -i -e ' print; s/\$(Id|OpenBSD): [^\$]*/\$FreeBSD/ && print; - m/^\#include "includes.h"/ && print "__RCSID(\"\$FreeBSD\$\");\n"; ' <keywords -xargs perl -p -i -e ' - s/^\.Dd \$Mdocdate: (\w+) (\d+) (\d+) \$$/.Dd $1 $2, $3/ -' <mdocdates +xargs perl -n -i -e ' + print; + m/^\#include "includes.h"/ && print "__RCSID(\"\$FreeBSD\$\");\n"; +' <rcsid Copied and modified: stable/10/crypto/openssh/freebsd-pre-merge.sh (from r263691, head/crypto/openssh/freebsd-pre-merge.sh) ============================================================================== --- head/crypto/openssh/freebsd-pre-merge.sh Mon Mar 24 19:15:13 2014 (r263691, copy source) +++ stable/10/crypto/openssh/freebsd-pre-merge.sh Sun Jan 24 15:44:57 2016 (r294666) @@ -1,19 +1,17 @@ #!/bin/sh # -# $FreeBSD$ +# $FreeBSD: stable/10/crypto/openssh/freebsd-pre-merge.sh 263691 2014-03-24 19:15:13Z des $ # -find . -type f -name '*.[1-9ch]' | cut -c 3- | \ +:>keywords +:>rcsid +svn list -R | grep -v '/$' | \ while read f ; do - svn propget svn:keywords $f | grep -q . && echo $f -done >keywords -xargs perl -n -i -e ' + svn proplist -v $f | grep -q 'FreeBSD=%H' || continue + egrep -l '^(#|\.\\"|/\*)[[:space:]]+\$FreeBSD[:\$]' $f >>keywords + egrep -l '__RCSID\("\$FreeBSD[:\$]' $f >>rcsid +done +sort -u keywords rcsid | xargs perl -n -i -e ' $strip = $ARGV if /\$(Id|OpenBSD):.*\$/; - print unless ($strip eq $ARGV && /\$FreeBSD.*\$/); -' <keywords - -find . -type f -name '*.[1-9]' | cut -c 3- | \ - xargs grep -l '^\.Dd ' . >mdocdates -xargs perl -p -i -e ' - s/^\.Dd (\w+) (\d+), (\d+)$/.Dd \$Mdocdate: $1 $2 $3 \$/; -' <mdocdates + print unless (($strip eq $ARGV || /__RCSID/) && /\$FreeBSD[:\$]/); +' Modified: stable/10/crypto/openssh/kex.c ============================================================================== --- stable/10/crypto/openssh/kex.c Sun Jan 24 15:15:57 2016 (r294665) +++ stable/10/crypto/openssh/kex.c Sun Jan 24 15:44:57 2016 (r294666) @@ -1,5 +1,4 @@ /* $OpenBSD: kex.c,v 1.98 2014/02/02 03:44:31 djm Exp $ */ -/* $FreeBSD$ */ /* * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. * @@ -25,6 +24,7 @@ */ #include "includes.h" +__RCSID("$FreeBSD$"); #include <sys/param.h> Modified: stable/10/crypto/openssh/misc.c ============================================================================== --- stable/10/crypto/openssh/misc.c Sun Jan 24 15:15:57 2016 (r294665) +++ stable/10/crypto/openssh/misc.c Sun Jan 24 15:44:57 2016 (r294666) @@ -1,5 +1,4 @@ /* $OpenBSD: misc.c,v 1.92 2013/10/14 23:28:23 djm Exp $ */ -/* $FreeBSD$ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2005,2006 Damien Miller. All rights reserved. @@ -26,6 +25,7 @@ */ #include "includes.h" +__RCSID("$FreeBSD$"); #include <sys/types.h> #include <sys/ioctl.h> Modified: stable/10/crypto/openssh/moduli.5 ============================================================================== --- stable/10/crypto/openssh/moduli.5 Sun Jan 24 15:15:57 2016 (r294665) +++ stable/10/crypto/openssh/moduli.5 Sun Jan 24 15:44:57 2016 (r294666) @@ -13,7 +13,7 @@ .\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -.Dd September 26, 2012 +.Dd $Mdocdate: September 26 2012 $ .Dt MODULI 5 .Os .Sh NAME Modified: stable/10/crypto/openssh/monitor.c ============================================================================== --- stable/10/crypto/openssh/monitor.c Sun Jan 24 15:15:57 2016 (r294665) +++ stable/10/crypto/openssh/monitor.c Sun Jan 24 15:44:57 2016 (r294666) @@ -26,6 +26,7 @@ */ #include "includes.h" +__RCSID("$FreeBSD$"); #include <sys/types.h> #include <sys/param.h> Modified: stable/10/crypto/openssh/monitor_wrap.c ============================================================================== --- stable/10/crypto/openssh/monitor_wrap.c Sun Jan 24 15:15:57 2016 (r294665) +++ stable/10/crypto/openssh/monitor_wrap.c Sun Jan 24 15:44:57 2016 (r294666) @@ -26,6 +26,7 @@ */ #include "includes.h" +__RCSID("$FreeBSD$"); #include <sys/types.h> #include <sys/uio.h> Modified: stable/10/crypto/openssh/mux.c ============================================================================== --- stable/10/crypto/openssh/mux.c Sun Jan 24 15:15:57 2016 (r294665) +++ stable/10/crypto/openssh/mux.c Sun Jan 24 15:44:57 2016 (r294666) @@ -31,6 +31,7 @@ */ #include "includes.h" +__RCSID("$FreeBSD$"); #include <sys/types.h> #include <sys/param.h> Modified: stable/10/crypto/openssh/packet.c ============================================================================== --- stable/10/crypto/openssh/packet.c Sun Jan 24 15:15:57 2016 (r294665) +++ stable/10/crypto/openssh/packet.c Sun Jan 24 15:44:57 2016 (r294666) @@ -38,6 +38,7 @@ */ #include "includes.h" +__RCSID("$FreeBSD$"); #include <sys/types.h> #include "openbsd-compat/sys-queue.h" Modified: stable/10/crypto/openssh/pathnames.h ============================================================================== --- stable/10/crypto/openssh/pathnames.h Sun Jan 24 15:15:57 2016 (r294665) +++ stable/10/crypto/openssh/pathnames.h Sun Jan 24 15:44:57 2016 (r294666) @@ -1,4 +1,5 @@ /* $OpenBSD: pathnames.h,v 1.24 2013/12/06 13:39:49 markus Exp $ */ +/* $FreeBSD$ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> Modified: stable/10/crypto/openssh/readconf.c ============================================================================== --- stable/10/crypto/openssh/readconf.c Sun Jan 24 15:15:57 2016 (r294665) +++ stable/10/crypto/openssh/readconf.c Sun Jan 24 15:44:57 2016 (r294666) @@ -1,5 +1,4 @@ /* $OpenBSD: readconf.c,v 1.218 2014/02/23 20:11:36 djm Exp $ */ -/* $FreeBSD$ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland Modified: stable/10/crypto/openssh/scp.1 ============================================================================== --- stable/10/crypto/openssh/scp.1 Sun Jan 24 15:15:57 2016 (r294665) +++ stable/10/crypto/openssh/scp.1 Sun Jan 24 15:44:57 2016 (r294666) @@ -10,7 +10,7 @@ .\" .\" $OpenBSD: scp.1,v 1.61 2013/10/20 09:51:26 djm Exp $ .\" -.Dd October 20, 2013 +.Dd $Mdocdate: October 20 2013 $ .Dt SCP 1 .Os .Sh NAME Modified: stable/10/crypto/openssh/servconf.c ============================================================================== --- stable/10/crypto/openssh/servconf.c Sun Jan 24 15:15:57 2016 (r294665) +++ stable/10/crypto/openssh/servconf.c Sun Jan 24 15:44:57 2016 (r294666) @@ -1,6 +1,5 @@ /* $OpenBSD: servconf.c,v 1.249 2014/01/29 06:18:35 djm Exp $ */ -/* $FreeBSD$ */ /* * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * All rights reserved Modified: stable/10/crypto/openssh/serverloop.c ============================================================================== --- stable/10/crypto/openssh/serverloop.c Sun Jan 24 15:15:57 2016 (r294665) +++ stable/10/crypto/openssh/serverloop.c Sun Jan 24 15:44:57 2016 (r294666) @@ -1,5 +1,4 @@ /* $OpenBSD: serverloop.c,v 1.170 2014/02/02 03:44:31 djm Exp $ */ -/* $FreeBSD$ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -37,6 +36,7 @@ */ #include "includes.h" +__RCSID("$FreeBSD$"); #include <sys/types.h> #include <sys/param.h> Modified: stable/10/crypto/openssh/session.c ============================================================================== --- stable/10/crypto/openssh/session.c Sun Jan 24 15:15:57 2016 (r294665) +++ stable/10/crypto/openssh/session.c Sun Jan 24 15:44:57 2016 (r294666) @@ -1,5 +1,4 @@ /* $OpenBSD: session.c,v 1.270 2014/01/31 16:39:19 tedu Exp $ */ -/* $FreeBSD$ */ /* * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * All rights reserved Modified: stable/10/crypto/openssh/sftp-common.c ============================================================================== --- stable/10/crypto/openssh/sftp-common.c Sun Jan 24 15:15:57 2016 (r294665) +++ stable/10/crypto/openssh/sftp-common.c Sun Jan 24 15:44:57 2016 (r294666) @@ -25,6 +25,7 @@ */ #include "includes.h" +__RCSID("$FreeBSD$"); #include <sys/types.h> #include <sys/stat.h> Modified: stable/10/crypto/openssh/sftp-server.8 ============================================================================== --- stable/10/crypto/openssh/sftp-server.8 Sun Jan 24 15:15:57 2016 (r294665) +++ stable/10/crypto/openssh/sftp-server.8 Sun Jan 24 15:44:57 2016 (r294666) @@ -1,5 +1,4 @@ .\" $OpenBSD: sftp-server.8,v 1.25 2013/10/14 14:18:56 jmc Exp $ -.\" $FreeBSD$ .\" .\" Copyright (c) 2000 Markus Friedl. All rights reserved. .\" @@ -23,7 +22,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd October 14, 2013 +.Dd $Mdocdate: October 14 2013 $ .Dt SFTP-SERVER 8 .Os .Sh NAME Modified: stable/10/crypto/openssh/sftp.1 ============================================================================== --- stable/10/crypto/openssh/sftp.1 Sun Jan 24 15:15:57 2016 (r294665) +++ stable/10/crypto/openssh/sftp.1 Sun Jan 24 15:44:57 2016 (r294666) @@ -23,7 +23,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd October 20, 2013 +.Dd $Mdocdate: October 20 2013 $ .Dt SFTP 1 .Os .Sh NAME Modified: stable/10/crypto/openssh/sftp.c ============================================================================== --- stable/10/crypto/openssh/sftp.c Sun Jan 24 15:15:57 2016 (r294665) +++ stable/10/crypto/openssh/sftp.c Sun Jan 24 15:44:57 2016 (r294666) @@ -1,5 +1,4 @@ /* $OpenBSD: sftp.c,v 1.158 2013/11/20 20:54:10 deraadt Exp $ */ -/* $FreeBSD$ */ /* * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> * @@ -17,6 +16,7 @@ */ #include "includes.h" +__RCSID("$FreeBSD$"); #include <sys/types.h> #include <sys/ioctl.h> Modified: stable/10/crypto/openssh/ssh-add.1 ============================================================================== --- stable/10/crypto/openssh/ssh-add.1 Sun Jan 24 15:15:57 2016 (r294665) +++ stable/10/crypto/openssh/ssh-add.1 Sun Jan 24 15:44:57 2016 (r294666) @@ -35,7 +35,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd December 7, 2013 +.Dd $Mdocdate: December 7 2013 $ .Dt SSH-ADD 1 .Os .Sh NAME Modified: stable/10/crypto/openssh/ssh-gss.h ============================================================================== --- stable/10/crypto/openssh/ssh-gss.h Sun Jan 24 15:15:57 2016 (r294665) +++ stable/10/crypto/openssh/ssh-gss.h Sun Jan 24 15:44:57 2016 (r294666) @@ -1,4 +1,5 @@ /* $OpenBSD: ssh-gss.h,v 1.11 2014/02/26 20:28:44 djm Exp $ */ +/* $FreeBSD$ */ /* * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. * Modified: stable/10/crypto/openssh/ssh-keygen.1 ============================================================================== --- stable/10/crypto/openssh/ssh-keygen.1 Sun Jan 24 15:15:57 2016 (r294665) +++ stable/10/crypto/openssh/ssh-keygen.1 Sun Jan 24 15:44:57 2016 (r294666) @@ -1,5 +1,4 @@ .\" $OpenBSD: ssh-keygen.1,v 1.120 2014/02/05 20:13:25 naddy Exp $ -.\" $FreeBSD$ .\" .\" Author: Tatu Ylonen <ylo@cs.hut.fi> .\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -36,7 +35,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd February 5, 2014 +.Dd $Mdocdate: February 5 2014 $ .Dt SSH-KEYGEN 1 .Os .Sh NAME Modified: stable/10/crypto/openssh/ssh-keyscan.1 ============================================================================== --- stable/10/crypto/openssh/ssh-keyscan.1 Sun Jan 24 15:15:57 2016 (r294665) +++ stable/10/crypto/openssh/ssh-keyscan.1 Sun Jan 24 15:44:57 2016 (r294666) @@ -1,5 +1,4 @@ .\" $OpenBSD: ssh-keyscan.1,v 1.34 2014/01/28 14:13:39 jmc Exp $ -.\" $FreeBSD$ .\" .\" Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>. .\" @@ -7,7 +6,7 @@ .\" permitted provided that due credit is given to the author and the .\" OpenBSD project by leaving this copyright notice intact. .\" -.Dd January 28, 2014 +.Dd $Mdocdate: January 28 2014 $ .Dt SSH-KEYSCAN 1 .Os .Sh NAME Modified: stable/10/crypto/openssh/ssh-keysign.8 ============================================================================== --- stable/10/crypto/openssh/ssh-keysign.8 Sun Jan 24 15:15:57 2016 (r294665) +++ stable/10/crypto/openssh/ssh-keysign.8 Sun Jan 24 15:44:57 2016 (r294666) @@ -22,7 +22,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd December 7, 2013 +.Dd $Mdocdate: December 7 2013 $ .Dt SSH-KEYSIGN 8 .Os .Sh NAME Modified: stable/10/crypto/openssh/ssh-pkcs11-helper.8 ============================================================================== --- stable/10/crypto/openssh/ssh-pkcs11-helper.8 Sun Jan 24 15:15:57 2016 (r294665) +++ stable/10/crypto/openssh/ssh-pkcs11-helper.8 Sun Jan 24 15:44:57 2016 (r294666) @@ -14,7 +14,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd July 16, 2013 +.Dd $Mdocdate: July 16 2013 $ .Dt SSH-PKCS11-HELPER 8 .Os .Sh NAME Modified: stable/10/crypto/openssh/ssh.1 ============================================================================== --- stable/10/crypto/openssh/ssh.1 Sun Jan 24 15:15:57 2016 (r294665) +++ stable/10/crypto/openssh/ssh.1 Sun Jan 24 15:44:57 2016 (r294666) @@ -35,7 +35,7 @@ .\" .\" $OpenBSD: ssh.1,v 1.343 2013/12/07 11:58:46 naddy Exp $ .\" $FreeBSD$ -.Dd December 7, 2013 +.Dd $Mdocdate: December 7 2013 $ .Dt SSH 1 .Os .Sh NAME Modified: stable/10/crypto/openssh/ssh.c ============================================================================== --- stable/10/crypto/openssh/ssh.c Sun Jan 24 15:15:57 2016 (r294665) +++ stable/10/crypto/openssh/ssh.c Sun Jan 24 15:44:57 2016 (r294666) @@ -1,5 +1,4 @@ /* $OpenBSD: ssh.c,v 1.401 2014/02/26 20:18:37 djm Exp $ */ -/* $FreeBSD$ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland Modified: stable/10/crypto/openssh/ssh_config ============================================================================== --- stable/10/crypto/openssh/ssh_config Sun Jan 24 15:15:57 2016 (r294665) +++ stable/10/crypto/openssh/ssh_config Sun Jan 24 15:44:57 2016 (r294666) @@ -1,5 +1,4 @@ # $OpenBSD: ssh_config,v 1.28 2013/09/16 11:35:43 sthen Exp $ -# $FreeBSD$ # This is the ssh client system-wide configuration file. See # ssh_config(5) for more information. This file provides defaults for Modified: stable/10/crypto/openssh/ssh_config.5 ============================================================================== --- stable/10/crypto/openssh/ssh_config.5 Sun Jan 24 15:15:57 2016 (r294665) +++ stable/10/crypto/openssh/ssh_config.5 Sun Jan 24 15:44:57 2016 (r294666) @@ -35,7 +35,7 @@ .\" .\" $OpenBSD: ssh_config.5,v 1.185 2014/02/23 20:11:36 djm Exp $ .\" $FreeBSD$ -.Dd March 22, 2015 +.Dd $Mdocdate: February 23 2014 $ .Dt SSH_CONFIG 5 .Os .Sh NAME Modified: stable/10/crypto/openssh/ssh_namespace.h ============================================================================== --- stable/10/crypto/openssh/ssh_namespace.h Sun Jan 24 15:15:57 2016 (r294665) +++ stable/10/crypto/openssh/ssh_namespace.h Sun Jan 24 15:44:57 2016 (r294666) @@ -202,6 +202,7 @@ #define compat20 ssh_compat20 #define compat_cipher_proposal ssh_compat_cipher_proposal #define compat_datafellows ssh_compat_datafellows +#define compat_kex_proposal ssh_compat_kex_proposal #define compat_pkalg_proposal ssh_compat_pkalg_proposal #define convtime ssh_convtime #define crypto_hash_sha512 ssh_crypto_hash_sha512 Modified: stable/10/crypto/openssh/sshconnect.c ============================================================================== --- stable/10/crypto/openssh/sshconnect.c Sun Jan 24 15:15:57 2016 (r294665) +++ stable/10/crypto/openssh/sshconnect.c Sun Jan 24 15:44:57 2016 (r294666) @@ -1,5 +1,4 @@ /* $OpenBSD: sshconnect.c,v 1.246 2014/02/06 22:21:01 djm Exp $ */ -/* $FreeBSD$ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -15,6 +14,7 @@ */ #include "includes.h" +__RCSID("$FreeBSD$"); #include <sys/types.h> #include <sys/wait.h> Modified: stable/10/crypto/openssh/sshconnect2.c ============================================================================== --- stable/10/crypto/openssh/sshconnect2.c Sun Jan 24 15:15:57 2016 (r294665) +++ stable/10/crypto/openssh/sshconnect2.c Sun Jan 24 15:44:57 2016 (r294666) @@ -1,5 +1,4 @@ /* $OpenBSD: sshconnect2.c,v 1.204 2014/02/02 03:44:32 djm Exp $ */ -/* $FreeBSD$ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2008 Damien Miller. All rights reserved. @@ -26,6 +25,7 @@ */ #include "includes.h" +__RCSID("$FreeBSD$"); #include <sys/types.h> #include <sys/socket.h> Modified: stable/10/crypto/openssh/sshd.8 ============================================================================== --- stable/10/crypto/openssh/sshd.8 Sun Jan 24 15:15:57 2016 (r294665) +++ stable/10/crypto/openssh/sshd.8 Sun Jan 24 15:44:57 2016 (r294666) @@ -35,7 +35,7 @@ .\" .\" $OpenBSD: sshd.8,v 1.273 2013/12/07 11:58:46 naddy Exp $ .\" $FreeBSD$ -.Dd December 7, 2013 +.Dd $Mdocdate: December 7 2013 $ .Dt SSHD 8 .Os .Sh NAME Modified: stable/10/crypto/openssh/sshd.c ============================================================================== --- stable/10/crypto/openssh/sshd.c Sun Jan 24 15:15:57 2016 (r294665) +++ stable/10/crypto/openssh/sshd.c Sun Jan 24 15:44:57 2016 (r294666) @@ -1,5 +1,4 @@ /* $OpenBSD: sshd.c,v 1.420 2014/02/26 21:53:37 markus Exp $ */ -/* $FreeBSD$ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland Modified: stable/10/crypto/openssh/sshd_config ============================================================================== --- stable/10/crypto/openssh/sshd_config Sun Jan 24 15:15:57 2016 (r294665) +++ stable/10/crypto/openssh/sshd_config Sun Jan 24 15:44:57 2016 (r294666) @@ -1,5 +1,4 @@ # $OpenBSD: sshd_config,v 1.93 2014/01/10 05:59:19 djm Exp $ -# $FreeBSD$ # This is the sshd server system-wide configuration file. See # sshd_config(5) for more information. @@ -128,7 +127,7 @@ # override default of no subsystems Subsystem sftp /usr/libexec/sftp-server -# Disable HPN tuning improvements. +# Change to yes to disable HPN tuning improvements. #HPNDisabled no # Buffer size for HPN to non-HPN connections. Modified: stable/10/crypto/openssh/sshd_config.5 ============================================================================== --- stable/10/crypto/openssh/sshd_config.5 Sun Jan 24 15:15:57 2016 (r294665) +++ stable/10/crypto/openssh/sshd_config.5 Sun Jan 24 15:44:57 2016 (r294666) @@ -35,7 +35,7 @@ .\" .\" $OpenBSD: sshd_config.5,v 1.172 2014/02/27 22:47:07 djm Exp $ .\" $FreeBSD$ -.Dd March 22, 2015 +.Dd $Mdocdate: February 27 2014 $ .Dt SSHD_CONFIG 5 .Os .Sh NAME
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601241544.u0OFiwko012314>