9 files changed, 94 insertions, 12 deletions
diff --git a/usr/src/pkg/manifests/system-data-zoneinfo.mf b/usr/src/pkg/manifests/system-data-zoneinfo.mf
index 620600e7a4..94e0512a28 100644
--- a/usr/src/pkg/manifests/system-data-zoneinfo.mf
+++ b/usr/src/pkg/manifests/system-data-zoneinfo.mf
@@ -13,11 +13,11 @@
 # Copyright 2018 Nexenta Systems, Inc.
 # Copyright (c) 2014 Joyent, Inc. All rights reserved.
 # Copyright 2017 OmniTI Computer Consulting, Inc. All rights reserved.
-# Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
+# Copyright 2020 OmniOS Community Edition (OmniOSce) Association.
 #
 
 set name=pkg.fmri \
-    value=pkg:/system/data/zoneinfo@2019.3,$(PKGVERS_BUILTON)-$(PKGVERS_BRANCH)
+    value=pkg:/system/data/zoneinfo@2020.1,$(PKGVERS_BUILTON)-$(PKGVERS_BRANCH)
 set name=pkg.description value="timezone information"
 set name=pkg.summary value="Timezone Information"
 set name=info.classification value=org.opensolaris.category.2008:System/Core
@@ -122,7 +122,6 @@ file path=usr/share/lib/zoneinfo/America/El_Salvador
 file path=usr/share/lib/zoneinfo/America/Fort_Nelson
 file path=usr/share/lib/zoneinfo/America/Fortaleza
 file path=usr/share/lib/zoneinfo/America/Glace_Bay
-file path=usr/share/lib/zoneinfo/America/Godthab
 file path=usr/share/lib/zoneinfo/America/Goose_Bay
 file path=usr/share/lib/zoneinfo/America/Grand_Turk
 file path=usr/share/lib/zoneinfo/America/Grenada
@@ -173,6 +172,7 @@ file path=usr/share/lib/zoneinfo/America/Noronha
 file path=usr/share/lib/zoneinfo/America/North_Dakota/Beulah
 file path=usr/share/lib/zoneinfo/America/North_Dakota/Center
 file path=usr/share/lib/zoneinfo/America/North_Dakota/New_Salem
+file path=usr/share/lib/zoneinfo/America/Nuuk
 file path=usr/share/lib/zoneinfo/America/Ojinaga
 file path=usr/share/lib/zoneinfo/America/Panama
 file path=usr/share/lib/zoneinfo/America/Pangnirtung
@@ -525,6 +525,7 @@ hardlink path=usr/share/lib/zoneinfo/America/Ensenada \
     target=../America/Tijuana
 hardlink path=usr/share/lib/zoneinfo/America/Fort_Wayne \
     target=../America/Indiana/Indianapolis
+hardlink path=usr/share/lib/zoneinfo/America/Godthab target=Nuuk
 hardlink path=usr/share/lib/zoneinfo/America/Indianapolis \
     target=../America/Indiana/Indianapolis
 hardlink path=usr/share/lib/zoneinfo/America/Jujuy \
diff --git a/usr/src/pkg/manifests/system-header.mf b/usr/src/pkg/manifests/system-header.mf
index 5b1da26c58..c95634b16c 100644
--- a/usr/src/pkg/manifests/system-header.mf
+++ b/usr/src/pkg/manifests/system-header.mf
@@ -1027,6 +1027,7 @@ file path=usr/include/sys/fs/pc_label.h
 file path=usr/include/sys/fs/pc_node.h
 file path=usr/include/sys/fs/pxfs_ki.h
 file path=usr/include/sys/fs/sdev_impl.h
+file path=usr/include/sys/fs/sdev_plugin.h
 file path=usr/include/sys/fs/snode.h
 file path=usr/include/sys/fs/swapnode.h
 file path=usr/include/sys/fs/tmp.h
diff --git a/usr/src/pkg/manifests/system-library-libutempter.mf b/usr/src/pkg/manifests/system-library-libutempter.mf
new file mode 100644
index 0000000000..e883545383
--- /dev/null
+++ b/usr/src/pkg/manifests/system-library-libutempter.mf
@@ -0,0 +1,44 @@
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source.  A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+
+set name=pkg.fmri value=pkg:/system/library/libutempter@$(PKGVERS)
+set name=pkg.description \
+    value="Interface to record user sessions in utmpx database"
+set name=pkg.summary \
+    value="Interface to record user sessions in utmpx database"
+set name=info.classification \
+    value=org.opensolaris.category.2008:System/Library
+set name=variant.arch value=$(ARCH)
+dir path=usr group=sys
+dir path=usr/include
+dir path=usr/lib
+dir path=usr/lib/$(ARCH64)
+dir path=usr/share
+dir path=usr/share/man
+dir path=usr/share/man/man3utempter
+file path=usr/include/utempter.h
+file path=usr/lib/$(ARCH64)/libutempter.so.1
+file path=usr/lib/libutempter.so.1
+file path=usr/share/man/man3utempter/utempter_add_record.3utempter
+license usr/src/lib/libutempter/THIRDPARTYLICENSE \
+    license=usr/src/lib/libutempter/THIRDPARTYLICENSE
+link path=usr/lib/$(ARCH64)/libutempter.so target=libutempter.so.1
+link path=usr/lib/libutempter.so target=libutempter.so.1
+link path=usr/share/man/man3utempter/addToUtmp.3utempter \
+    target=utempter_add_record.3utempter
+link path=usr/share/man/man3utempter/removeFromUtmp.3utempter \
+    target=utempter_add_record.3utempter
+link path=usr/share/man/man3utempter/removeLineFromUtmp.3utempter \
+    target=utempter_add_record.3utempter
+link path=usr/share/man/man3utempter/utempter_remove_added_record.3utempter \
+    target=utempter_add_record.3utempter
+link path=usr/share/man/man3utempter/utempter_remove_record.3utempter \
+    target=utempter_add_record.3utempter
diff --git a/usr/src/pkg/manifests/system-microcode-intel.mf b/usr/src/pkg/manifests/system-microcode-intel.mf
index cafafa2448..bac6419d24 100644
--- a/usr/src/pkg/manifests/system-microcode-intel.mf
+++ b/usr/src/pkg/manifests/system-microcode-intel.mf
@@ -25,7 +25,7 @@
 # Copyright 2014 Gary Mills
 # Copyright 2019 Peter Tribble.
 # Copyright 2019 Joyent, Inc.
-# Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
+# Copyright 2020 OmniOS Community Edition (OmniOSce) Association.
 #
 
 #
@@ -35,7 +35,7 @@
 #
 <include global_zone_only_component>
 set name=pkg.fmri \
-    value=pkg:/system/microcode/intel@20191115,$(PKGVERS_BUILTON)-$(PKGVERS_BRANCH)
+    value=pkg:/system/microcode/intel@20200508,$(PKGVERS_BUILTON)-$(PKGVERS_BRANCH)
 set name=pkg.description value="Microcode for Intel CPUs"
 set name=org.opensolaris.incorp-facet value=true
 set name=variant.arch value=i386
diff --git a/usr/src/pkg/manifests/system-test-cryptotest.mf b/usr/src/pkg/manifests/system-test-cryptotest.mf
index 2ef1c75749..3a6b0c06bb 100644
--- a/usr/src/pkg/manifests/system-test-cryptotest.mf
+++ b/usr/src/pkg/manifests/system-test-cryptotest.mf
@@ -14,6 +14,7 @@
 # Copyright 2014, OmniTI Computer Consulting, Inc. All rights reserved.
 # Copyright 2015 Nexenta Systems, Inc.  All rights reserved.
 # Copyright 2019 Joyent, Inc.
+# Copyright 2020 Oxide Computer Company
 #
 
 set name=pkg.fmri value=pkg:/system/test/cryptotest@$(PKGVERS)
@@ -25,6 +26,7 @@ set name=variant.arch value=$(ARCH)
 dir path=opt/crypto-tests
 dir path=opt/crypto-tests/bin
 dir path=opt/crypto-tests/runfiles
+dir path=opt/crypto-tests/share
 dir path=opt/crypto-tests/tests
 dir path=opt/crypto-tests/tests/aes group=root mode=0755 owner=root
 dir path=opt/crypto-tests/tests/aes/kcf group=root mode=0755 owner=root
@@ -38,6 +40,22 @@ dir path=opt/crypto-tests/tests/hmac/pkcs
 file path=opt/crypto-tests/README mode=0444
 file path=opt/crypto-tests/bin/cryptotest mode=0555
 file path=opt/crypto-tests/runfiles/default.run mode=0444
+file path=opt/crypto-tests/share/MD5Msg.rsp mode=0444
+file path=opt/crypto-tests/share/README mode=0444
+file path=opt/crypto-tests/share/SHA1LongMsg.rsp mode=0444
+file path=opt/crypto-tests/share/SHA1ShortMsg.rsp mode=0444
+file path=opt/crypto-tests/share/SHA224LongMsg.rsp mode=0444
+file path=opt/crypto-tests/share/SHA224ShortMsg.rsp mode=0444
+file path=opt/crypto-tests/share/SHA256LongMsg.rsp mode=0444
+file path=opt/crypto-tests/share/SHA256ShortMsg.rsp mode=0444
+file path=opt/crypto-tests/share/SHA384LongMsg.rsp mode=0444
+file path=opt/crypto-tests/share/SHA384ShortMsg.rsp mode=0444
+file path=opt/crypto-tests/share/SHA512LongMsg.rsp mode=0444
+file path=opt/crypto-tests/share/SHA512ShortMsg.rsp mode=0444
+file path=opt/crypto-tests/share/SHA512_224LongMsg.rsp mode=0444
+file path=opt/crypto-tests/share/SHA512_224ShortMsg.rsp mode=0444
+file path=opt/crypto-tests/share/SHA512_256LongMsg.rsp mode=0444
+file path=opt/crypto-tests/share/SHA512_256ShortMsg.rsp mode=0444
 file opt/crypto-tests/tests/aes/kcf/aes_cbc_32 \
     path=opt/crypto-tests/tests/aes/kcf/aes_cbc_32 group=root mode=0555 \
     owner=root
diff --git a/usr/src/pkg/manifests/system-test-libctest.mf b/usr/src/pkg/manifests/system-test-libctest.mf
index 69252d7c82..472e4f3432 100644
--- a/usr/src/pkg/manifests/system-test-libctest.mf
+++ b/usr/src/pkg/manifests/system-test-libctest.mf
@@ -164,6 +164,8 @@ file path=opt/libc-tests/tests/stdio/fmemopentest.32 mode=0555
 file path=opt/libc-tests/tests/stdio/fmemopentest.64 mode=0555
 file path=opt/libc-tests/tests/stdio/ftell_ungetc.32 mode=0555
 file path=opt/libc-tests/tests/stdio/ftell_ungetc.64 mode=0555
+file path=opt/libc-tests/tests/stdio/ftello_12768.64 mode=0555
+file path=opt/libc-tests/tests/stdio/ftello_12768.lfs mode=0555
 file path=opt/libc-tests/tests/stdio/memstream.32 mode=0555
 file path=opt/libc-tests/tests/stdio/memstream.64 mode=0555
 file path=opt/libc-tests/tests/stdio/memstream_reopen.32 mode=0555
diff --git a/usr/src/pkg/manifests/system-test-nettest.mf b/usr/src/pkg/manifests/system-test-nettest.mf
index acc4cab0c6..0d938e4fd3 100644
--- a/usr/src/pkg/manifests/system-test-nettest.mf
+++ b/usr/src/pkg/manifests/system-test-nettest.mf
@@ -11,11 +11,12 @@
 
 #
 # Copyright 2019 Joyent, Inc.
+# Copyright 2020 Oxide Computer Company
 #
 
 set name=pkg.fmri value=pkg:/system/test/nettest@$(PKGVERS)
-set name=pkg.description value="net-tests"
-set name=pkg.summary value="net-tests execution"
+set name=pkg.description value="Miscellaneous Network Unit Tests"
+set name=pkg.summary value="Network Unit Test Suite"
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/System
 set name=variant.arch value=$(ARCH)
@@ -26,8 +27,10 @@ dir path=opt/net-tests/runfiles
 dir path=opt/net-tests/tests
 dir path=opt/net-tests/tests/forwarding
 file path=opt/net-tests/bin/nettest mode=0555
-file path=opt/net-tests/config/ip_forwarding.config
-file path=opt/net-tests/runfiles/default.run
+file path=opt/net-tests/config/ip_forwarding.config mode=0644 \
+    preserve=renamenew
+file path=opt/net-tests/runfiles/default.run mode=0444
+file path=opt/net-tests/tests/forwarding/README mode=0444
 file path=opt/net-tests/tests/forwarding/ip_forwarding mode=0555
 file path=opt/net-tests/tests/forwarding/ip_fwd_001 mode=0555
 file path=opt/net-tests/tests/forwarding/ip_fwd_002 mode=0555
@@ -50,5 +53,6 @@ file path=opt/net-tests/tests/forwarding/ip_fwd_018 mode=0555
 file path=opt/net-tests/tests/forwarding/ip_fwd_019 mode=0555
 file path=opt/net-tests/tests/forwarding/ip_fwd_020 mode=0555
 file path=opt/net-tests/tests/forwarding/ip_fwd_suite mode=0555
-file path=opt/net-tests/tests/forwarding/README
-file path=opt/net-tests/tests/net_common
+file path=opt/net-tests/tests/net_common mode=0555
+license lic_CDDL license=lic_CDDL
+depend fmri=system/test/testrunner type=require
diff --git a/usr/src/pkg/manifests/system-test-smartostest.mf b/usr/src/pkg/manifests/system-test-smartostest.mf
index 21bc4cbd1a..47a6e8edfc 100644
--- a/usr/src/pkg/manifests/system-test-smartostest.mf
+++ b/usr/src/pkg/manifests/system-test-smartostest.mf
@@ -44,7 +44,7 @@ file path=usr/bin/ctfmerge mode=0555
 # The libc-tests attempt to forge a hardlink to isaexec
 # so we need to redeliver isaexec in order to create the
 # proto area correctly.
-file path=usr/lib/isaexec
+file path=usr/lib/isaexec mode=0555
 
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
diff --git a/usr/src/pkg/manifests/system-test-zfstest.mf b/usr/src/pkg/manifests/system-test-zfstest.mf
index fd373bc8ca..3b4bcc373e 100644
--- a/usr/src/pkg/manifests/system-test-zfstest.mf
+++ b/usr/src/pkg/manifests/system-test-zfstest.mf
@@ -150,6 +150,7 @@ dir path=opt/zfs-tests/tests/functional/removal
 dir path=opt/zfs-tests/tests/functional/rename_dirs
 dir path=opt/zfs-tests/tests/functional/replacement
 dir path=opt/zfs-tests/tests/functional/reservation
+dir path=opt/zfs-tests/tests/functional/resilver
 dir path=opt/zfs-tests/tests/functional/rootpool
 dir path=opt/zfs-tests/tests/functional/rsend
 dir path=opt/zfs-tests/tests/functional/scrub_mirror
@@ -1633,6 +1634,9 @@ file \
     path=opt/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_features_004_neg \
     mode=0555
 file \
+    path=opt/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_features_005_pos \
+    mode=0555
+file \
     path=opt/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_tempname \
     mode=0555
 file \
@@ -2927,6 +2931,14 @@ file path=opt/zfs-tests/tests/functional/reservation/reservation_021_neg \
 file path=opt/zfs-tests/tests/functional/reservation/reservation_022_pos \
     mode=0555
 file path=opt/zfs-tests/tests/functional/reservation/setup mode=0555
+file path=opt/zfs-tests/tests/functional/resilver/cleanup mode=0555
+file path=opt/zfs-tests/tests/functional/resilver/resilver.cfg mode=0444
+file path=opt/zfs-tests/tests/functional/resilver/resilver_restart_001 \
+    mode=0555
+file path=opt/zfs-tests/tests/functional/resilver/resilver_restart_002 \
+    mode=0555
+file path=opt/zfs-tests/tests/functional/resilver/setup mode=0555
+file path=opt/zfs-tests/tests/functional/resilver/sysevent mode=0555
 file path=opt/zfs-tests/tests/functional/rootpool/cleanup mode=0555
 file path=opt/zfs-tests/tests/functional/rootpool/rootpool_002_neg mode=0555
 file path=opt/zfs-tests/tests/functional/rootpool/rootpool_003_neg mode=0555