Merge pull request #1380 from hadfl/upstream_merge/2023091701

Upstream merge/2023091701
omniosorg · Sep 17, 2023 · 1ad7f63 · 1ad7f63
2 parents b9f6ce3 + ee3bfe0
commit 1ad7f63
Show file tree

Hide file tree

Showing 22 changed files with 1,030 additions and 522 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4319,6 +4319,7 @@ usr/src/man/man3c/strtok.3c
 usr/src/man/man3c/strtok_r.3c
 usr/src/man/man3c/strtold.3c
 usr/src/man/man3c/strtoll.3c
+usr/src/man/man3c/strtonumx.3c
 usr/src/man/man3c/strtoull.3c
 usr/src/man/man3c/strtoumax.3c
 usr/src/man/man3c/strxfrm_l.3c
@@ -8632,6 +8633,9 @@ usr/src/test/bhyve-tests/tests/kdev/vlapic_msr_access
 usr/src/test/bhyve-tests/tests/kdev/vpmtmr_freq
 usr/src/test/bhyve-tests/tests/kdev/vrtc_ops
 usr/src/test/bhyve-tests/tests/kdev/wrmsr_tsc
+usr/src/test/bhyve-tests/tests/perf/entry_exit
+usr/src/test/bhyve-tests/tests/perf/payload_entry_exit
+usr/src/test/bhyve-tests/tests/perf/pobj_entry_exit.s
 usr/src/test/bhyve-tests/tests/viona/interface_version
 usr/src/test/bhyve-tests/tests/vmm/auto_destruct
 usr/src/test/bhyve-tests/tests/vmm/check_iommu
@@ -8821,6 +8825,8 @@ usr/src/test/libc-tests/tests/stdio/test_mbrtowc.64
 usr/src/test/libc-tests/tests/strcoll-strxfrm-6907.32
 usr/src/test/libc-tests/tests/strcoll-strxfrm-6907.64
 usr/src/test/libc-tests/tests/strerror/strerror
+usr/src/test/libc-tests/tests/strtonum.32
+usr/src/test/libc-tests/tests/strtonum.64
 usr/src/test/libc-tests/tests/symbols/setup
 usr/src/test/libc-tests/tests/symbols/symbols_test.amd64
 usr/src/test/libc-tests/tests/symbols/symbols_test.i386

diff --git a/README.OmniOS b/README.OmniOS
@@ -1,4 +1,4 @@
 This README is here to keep track of merges from illumos-joyent
 
-Last illumos-joyent commit: c15bc6ecc7e3e58e6be850bd55b5f0870a427633
+Last illumos-joyent commit: 408d36b50599742ddf5ce91a3702865072bfee64
 
diff --git a/usr/src/cmd/cmd-inet/usr.lib/ilbd/ilbd_rules.c b/usr/src/cmd/cmd-inet/usr.lib/ilbd/ilbd_rules.c
@@ -635,7 +635,7 @@ ilbd_audit_rule_event(const char *audit_rule_name,
 			}
 
 			/* copy ending proxy-src address */
-			if (&rlinfo->rl_nat_src_end == 0) {
+			if (IN6_IS_ADDR_UNSPECIFIED(&rlinfo->rl_nat_src_end)) {
 				/* proxy-src is a single address */
 				event->adt_ilb_create_rule.proxy_src_max_type =
 				    event->

diff --git a/usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/ikeadm.c b/usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/ikeadm.c
@@ -2035,9 +2035,9 @@ print_certcache(ike_certcache_t *c)
 
 	(void) printf(gettext("CERTIFICATE CACHE ID: %d\n"), c->cache_id);
 	(void) printf(gettext("\tSubject Name: <%s>\n"),
-	    (c->subject != NULL) ? c->subject : gettext("Name unavailable"));
+	    (*c->subject != '\0') ? c->subject : gettext("Name unavailable"));
 	(void) printf(gettext("\t Issuer Name: <%s>\n"),
-	    (c->issuer != NULL) ? c->issuer : gettext("Name unavailable"));
+	    (*c->issuer != '\0') ? c->issuer : gettext("Name unavailable"));
 	if ((int)c->certclass == -1)
 		(void) printf(gettext("\t\t[trusted certificate]\n"));
 	switch (c->linkage) {

diff --git a/usr/src/cmd/format/menu_command.c b/usr/src/cmd/format/menu_command.c
@@ -476,13 +476,10 @@ c_type(void)
 			    nparts++) {
 				if (cur_parts->etoc->efi_parts[nparts].p_tag ==
 				    V_RESERVED) {
-					if (cur_parts->etoc->efi_parts[nparts].
-					    p_name) {
-						(void) strcpy(volname,
-						    cur_parts->etoc->efi_parts
-						    [nparts].p_name);
-						volinit = 1;
-					}
+					(void) strcpy(volname,
+					    cur_parts->etoc->efi_parts
+					    [nparts].p_name);
+					volinit = 1;
 					break;
 				}
 			}
@@ -2084,12 +2081,8 @@ c_verify_efi(void)
 	}
 	tmp_pinfo.etoc = efi_info.e_parts;
 	fmt_print("\n");
-	if (cur_parts->etoc->efi_parts[8].p_name) {
-		fmt_print("Volume name = <%8s>\n",
-		    cur_parts->etoc->efi_parts[8].p_name);
-	} else {
-		fmt_print("Volume name = <        >\n");
-	}
+	fmt_print("Volume name = <%8s>\n",
+	    cur_parts->etoc->efi_parts[8].p_name);
 	fmt_print("ascii name  = ");
 	print_efi_string(efi_info.vendor, efi_info.product,
 	    efi_info.revision, efi_info.capacity);

diff --git a/usr/src/cmd/format/startup.c b/usr/src/cmd/format/startup.c
@@ -2033,14 +2033,8 @@ add_device_to_disklist(char *devname, char *devpath)
 		for (i = 0; i < search_parts->etoc->efi_nparts; i++) {
 			if (search_parts->etoc->efi_parts[i].p_tag ==
 			    V_RESERVED) {
-				if (search_parts->etoc->efi_parts[i].p_name) {
-					bcopy(search_parts->etoc->efi_parts[i]
-					    .p_name, search_disk->v_volume,
-					    LEN_DKL_VVOL);
-				} else {
-					bzero(search_disk->v_volume,
-					    LEN_DKL_VVOL);
-				}
+				bcopy(search_parts->etoc->efi_parts[i].p_name,
+				    search_disk->v_volume, LEN_DKL_VVOL);
 				break;
 			}
 		}

diff --git a/usr/src/cmd/perl/Makefile.perl b/usr/src/cmd/perl/Makefile.perl
@@ -49,10 +49,12 @@
 	-typemap $(PERLDIR)/lib/ExtUtils/typemap
 
 # CFLAGS for perl, specifically.
+# When building for Perl older than 5.38 we need to define PERL_USE_SAFE_PUTENV
+PERL_USE_SAFE_PUTENV:sh = if test ${PERL_VERSION/5.} -lt 38 ; then echo -DPERL_USE_SAFE_PUTENV ; fi
 PCFLAGS= -DPERL_EUPXS_ALWAYS_EXPORT -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 \
-	-DPERL_USE_SAFE_PUTENV -D_TS_ERRNO
+	$(PERL_USE_SAFE_PUTENV) -D_TS_ERRNO
 PCFLAGS64= -DPERL_EUPXS_ALWAYS_EXPORT -D_LARGEFILE_SOURCE64 \
-	 -DPERL_USE_SAFE_PUTENV -D_TS_ERRNO
+	$(PERL_USE_SAFE_PUTENV) -D_TS_ERRNO
 
 CSTD = $(CSTD_GNU99)
 ZGUIDANCE =

diff --git a/usr/src/cmd/sendmail/lib/smtp-sendmail b/usr/src/cmd/sendmail/lib/smtp-sendmail
@@ -31,7 +31,7 @@ SERVER_PID_FILE="/var/run/sendmail.pid"
 ALIASES_FILE="/etc/mail/aliases"
 SENDMAIL_CF="/etc/mail/sendmail.cf"
 
-case "$1" in 
+case "$1" in
 'refresh')
         [ -f $SERVER_PID_FILE ] && kill -1 `head -1 $SERVER_PID_FILE`
         ;;
@@ -44,7 +44,8 @@ case "$1" in
 	fi
 	if [ ! -f $ALIASES_FILE.db ] && [ ! -f $ALIASES_FILE.dir ] \
 	    && [ ! -f $ALIASES_FILE.pag ]; then
-		/usr/sbin/newaliases
+		# Create the aliases database
+		$SENDMAIL -bi
 	fi
 	MODE="-bd"
 	[ -f $DEFAULT_FILE ] && . $DEFAULT_FILE

diff --git a/usr/src/cmd/truss/Makefile.com b/usr/src/cmd/truss/Makefile.com
@@ -24,6 +24,7 @@
 # Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 # Copyright 2019 Joyent, Inc.
+# Copyright 2023 Oxide Computer Co.
 #
 
 PROG=	truss
@@ -34,6 +35,9 @@ OBJS=	main.o listopts.o ipc.o actions.o expound.o codes.o print.o \
 SRCS=	$(OBJS:%.o=../%.c)
 
 include ../../Makefile.cmd
+include ../../Makefile.ctf
+
+CTF_MODE	= link
 
 CFLAGS		+= $(CCVERBOSE)
 CFLAGS64	+= $(CCVERBOSE)
@@ -55,6 +59,7 @@ CPPFLAGS += -I$(SRC)/uts/common
 
 %.o:	../%.c
 	$(COMPILE.c) $<
+	$(POST_PROCESS_O)
 
 all: $(PROG)
 

diff --git a/usr/src/cmd/truss/main.c b/usr/src/cmd/truss/main.c
@@ -22,7 +22,7 @@
 /*
  * Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2015, Joyent, Inc.
- * Copyright 2020 Oxide Computer Company
+ * Copyright 2023 Oxide Computer Company
  */
 
 /*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
@@ -1217,7 +1217,7 @@ worker_thread(void *arg)
 					}
 				}
 			}
-			if (what == SYS_execve && pri->Errno == 0) {
+			if (what == SYS_execve && Lsp->pr_errno == 0) {
 				/*
 				 * Refresh the data model on exec() in case it
 				 * is different from the parent.  Lwait()