sync

12 files changed, 1 insertions, 11 deletions

diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index c002117510b..fbb488f68fc 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -1192,7 +1192,6 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/netinet6/ip6protosw.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/netinet6/mld6_var.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/netinet6/nd6.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/netinet6/osdep.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/netinet6/pim6.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/netinet6/pim6_var.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/netinet6/tcpipv6.ph
diff --git a/distrib/sets/lists/base/md.amiga b/distrib/sets/lists/base/md.amiga
index b08e55ea775..7585f01d719 100644
--- a/distrib/sets/lists/base/md.amiga
+++ b/distrib/sets/lists/base/md.amiga
@@ -1262,7 +1262,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/ip6protosw.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/mld6_var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/nd6.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/osdep.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/pim6.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/pim6_var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/tcpipv6.ph
diff --git a/distrib/sets/lists/base/md.hp300 b/distrib/sets/lists/base/md.hp300
index 34c5c31d3a3..58fbdf2693b 100644
--- a/distrib/sets/lists/base/md.hp300
+++ b/distrib/sets/lists/base/md.hp300
@@ -1256,7 +1256,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/ip6protosw.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/mld6_var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/nd6.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/osdep.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/pim6.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/pim6_var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/tcpipv6.ph
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index 455016b400b..080bd5ae561 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -1268,7 +1268,6 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/netinet6/ip6protosw.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/netinet6/mld6_var.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/netinet6/nd6.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/netinet6/osdep.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/netinet6/pim6.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/netinet6/pim6_var.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/netinet6/tcpipv6.ph
diff --git a/distrib/sets/lists/base/md.mac68k b/distrib/sets/lists/base/md.mac68k
index 5410cf3988f..635f4ece506 100644
--- a/distrib/sets/lists/base/md.mac68k
+++ b/distrib/sets/lists/base/md.mac68k
@@ -1253,7 +1253,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/ip6protosw.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/mld6_var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/nd6.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/osdep.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/pim6.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/pim6_var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/tcpipv6.ph
diff --git a/distrib/sets/lists/base/md.mvme68k b/distrib/sets/lists/base/md.mvme68k
index 4aa2cbfcd88..b39cd4265b5 100644
--- a/distrib/sets/lists/base/md.mvme68k
+++ b/distrib/sets/lists/base/md.mvme68k
@@ -1258,7 +1258,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/ip6protosw.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/mld6_var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/nd6.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/osdep.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/pim6.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/pim6_var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/tcpipv6.ph
diff --git a/distrib/sets/lists/base/md.pmax b/distrib/sets/lists/base/md.pmax
index 7359e5224cf..bbd06c47b80 100644
--- a/distrib/sets/lists/base/md.pmax
+++ b/distrib/sets/lists/base/md.pmax
@@ -1213,7 +1213,6 @@
 ./usr/libdata/perl5/site_perl/mips-openbsd/netinet6/ip6protosw.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/netinet6/mld6_var.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/netinet6/nd6.ph
-./usr/libdata/perl5/site_perl/mips-openbsd/netinet6/osdep.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/netinet6/pim6.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/netinet6/pim6_var.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/netinet6/tcpipv6.ph
diff --git a/distrib/sets/lists/base/md.powerpc b/distrib/sets/lists/base/md.powerpc
index 79406d9565c..a81e271ae45 100644
--- a/distrib/sets/lists/base/md.powerpc
+++ b/distrib/sets/lists/base/md.powerpc
@@ -1194,7 +1194,6 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netinet6/ip6protosw.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netinet6/mld6_var.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netinet6/nd6.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/netinet6/osdep.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netinet6/pim6.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netinet6/pim6_var.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netinet6/tcpipv6.ph
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index fa5fb45a507..e27b8d6d518 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -856,7 +856,6 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/netinet6/ip6protosw.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/netinet6/mld6_var.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/netinet6/nd6.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/netinet6/osdep.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/netinet6/pim6.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/netinet6/pim6_var.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/netinet6/tcpipv6.ph
diff --git a/distrib/sets/lists/base/md.sun3 b/distrib/sets/lists/base/md.sun3
index 5fae66004a2..61fde102f32 100644
--- a/distrib/sets/lists/base/md.sun3
+++ b/distrib/sets/lists/base/md.sun3
@@ -1221,7 +1221,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/ip6protosw.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/mld6_var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/nd6.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/osdep.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/pim6.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/pim6_var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/tcpipv6.ph
diff --git a/distrib/sets/lists/base/md.vax b/distrib/sets/lists/base/md.vax
index 87824853a75..79ac15ed1de 100644
--- a/distrib/sets/lists/base/md.vax
+++ b/distrib/sets/lists/base/md.vax
@@ -798,7 +798,6 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/netinet6/ip6protosw.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/netinet6/mld6_var.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/netinet6/nd6.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/netinet6/osdep.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/netinet6/pim6.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/netinet6/pim6_var.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/netinet6/tcpipv6.ph
diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi
index 228be5dc595..44a33efcf2e 100644
--- a/distrib/sets/lists/base/mi
+++ b/distrib/sets/lists/base/mi
@@ -414,6 +414,7 @@
 ./usr/bin/ssh-add
 ./usr/bin/ssh-agent
 ./usr/bin/ssh-keygen
+./usr/bin/ssh-keyscan
 ./usr/bin/strings
 ./usr/bin/su
 ./usr/bin/sudo