[src/netbsd-8]: src/crypto/external/bsd/openssh/dist Pull up following revisi...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2f2247d16d20
branches:  netbsd-8
changeset: 320657:2f2247d16d20
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Jul 15 10:59:49 2018 +0000

description:
Pull up following revision(s) (requested by sevan in ticket #922):

        crypto/external/bsd/openssh/dist/ssh-agent.1: revision 1.13
        crypto/external/bsd/openssh/dist/ssh-agent.c: revision 1.23

Amend whitelisted filesystem paths ssh-agent will look for PKCS11 related
libraries so that things work out of the box with pkgsrc without having to
explicitly whitelist things.

ok christos

diffstat:

 crypto/external/bsd/openssh/dist/ssh-agent.1 |  4 ++--
 crypto/external/bsd/openssh/dist/ssh-agent.c |  6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diffs (45 lines):

diff -r 1579919b92c5 -r 2f2247d16d20 crypto/external/bsd/openssh/dist/ssh-agent.1
--- a/crypto/external/bsd/openssh/dist/ssh-agent.1      Sun Jul 15 10:54:03 2018 +0000
+++ b/crypto/external/bsd/openssh/dist/ssh-agent.1      Sun Jul 15 10:59:49 2018 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: ssh-agent.1,v 1.12 2017/04/18 18:41:46 christos Exp $
+.\"    $NetBSD: ssh-agent.1,v 1.12.4.1 2018/07/15 10:59:49 martin Exp $
 .\" $OpenBSD: ssh-agent.1,v 1.64 2016/11/30 06:54:26 jmc Exp $
 .\"
 .\"
@@ -131,7 +131,7 @@
 option to
 .Xr ssh-add 1 .
 The default is to allow loading PKCS#11 libraries from
-.Dq /usr/lib/*,/usr/local/lib/* .
+.Dq /usr/lib/*,/usr/pkg/lib/* .
 PKCS#11 libraries that do not match the whitelist will be refused.
 See PATTERNS in
 .Xr ssh_config 5
diff -r 1579919b92c5 -r 2f2247d16d20 crypto/external/bsd/openssh/dist/ssh-agent.c
--- a/crypto/external/bsd/openssh/dist/ssh-agent.c      Sun Jul 15 10:54:03 2018 +0000
+++ b/crypto/external/bsd/openssh/dist/ssh-agent.c      Sun Jul 15 10:59:49 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ssh-agent.c,v 1.20.4.1 2017/12/04 10:55:18 snj Exp $   */
+/*     $NetBSD: ssh-agent.c,v 1.20.4.2 2018/07/15 10:59:49 martin Exp $        */
 /* $OpenBSD: ssh-agent.c,v 1.224 2017/07/24 04:34:28 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo%cs.hut.fi@localhost>
@@ -36,7 +36,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: ssh-agent.c,v 1.20.4.1 2017/12/04 10:55:18 snj Exp $");
+__RCSID("$NetBSD: ssh-agent.c,v 1.20.4.2 2018/07/15 10:59:49 martin Exp $");
 
 #include <sys/param.h> /* MIN MAX */
 #include <sys/types.h>
@@ -82,7 +82,7 @@
 #endif
 
 #ifndef DEFAULT_PKCS11_WHITELIST
-# define DEFAULT_PKCS11_WHITELIST "/usr/lib*/*,/usr/local/lib*/*"
+# define DEFAULT_PKCS11_WHITELIST "/usr/lib*/*,/usr/pkg/lib*/*"
 #endif
 
 /* Maximum accepted message length */