[illumos-gate merge]release-20210114

commit f73e1ebf60792a8bdb2d559097c3131b68c09318
    13352 disable mdns date and time in version string
commit 20a2a10f2c0bcd395700659efe34b54ab4404444
    10447 ACPI binaries should be reproducible
commit abe1d126b4a1229ee2861d65508e7a52bd8c2721
    13440 ppin disablement path missing state transition
commit ae9405842e25ee75c6a9fd1996e04b41fbd2eda3
    13420 libld: symbol 'dynsort_compare_syms' is multiply-defined
commit 338c2f033035af5b17f61d9df825917015c95a35
    13415 psvcpolicy: variable 'curr_state' set but not used
commit 71f73b0075fdda332f0e079884f3aa28497b0806
    13414 libcurses: symbol '_win' is multiply-defined
commit 2cbc828d66d6088914f685ae0e77169ecc9fc7f9
    13443 gate build missing some NATIVE_LIBS
commit bac90afdc3c952be2a041bb1b669ac56cef7d145
    13444 libbe_py should provide nextboot information
commit 3561e562ae78c234d96711f36e19360789b0ffe3
    13410 ddi_ufm(9E) typos and such
commit aa35d5f200c519c3e5425cb26762e2d01ce2e66f
    13416 libprtdiag_psr: variable 'ap_args' set but not used
commit 16d53a891df2f19b4dc37110081555be4e474d8c
    13413 svc.startd: 'contract_list_pool' is multiply-defined

Conflicts:
    usr/src/cmd/bhyve/Makefile

10 files changed, 13 insertions, 10 deletions

diff --git a/usr/src/cmd/acpi/acpidump/Makefile b/usr/src/cmd/acpi/acpidump/Makefile
index 29efef7992..c6102b2275 100644
--- a/usr/src/cmd/acpi/acpidump/Makefile
+++ b/usr/src/cmd/acpi/acpidump/Makefile
@@ -30,6 +30,7 @@ CERRWARN += -_gcc=-Wno-unused-function
 SMOFF = all_func_returns
 
 CPPFLAGS += -I$(SRC)/uts/intel/sys/acpi -DACPI_DUMP_APP
+CPPFLAGS += -DACPI_DATE=\"$(VERSION)\"
 
 LDLIBS += -ldevinfo
 
diff --git a/usr/src/cmd/acpi/acpixtract/Makefile b/usr/src/cmd/acpi/acpixtract/Makefile
index e2446ec33d..875c54420d 100644
--- a/usr/src/cmd/acpi/acpixtract/Makefile
+++ b/usr/src/cmd/acpi/acpixtract/Makefile
@@ -31,6 +31,7 @@ VPATH = ../common:$(SRC)/common/acpica/utilities
 SMOFF = all_func_returns,macros
 
 CPPFLAGS += -I$(SRC)/uts/intel/sys/acpi -DACPI_XTRACT_APP
+CPPFLAGS += -DACPI_DATE=\"$(VERSION)\"
 
 .KEEP_STATE:
 
diff --git a/usr/src/cmd/acpi/iasl/Makefile b/usr/src/cmd/acpi/iasl/Makefile
index 80885ceb40..a762f324de 100644
--- a/usr/src/cmd/acpi/iasl/Makefile
+++ b/usr/src/cmd/acpi/iasl/Makefile
@@ -105,6 +105,7 @@ INTERMEDIATES = \
 SMATCH=off
 
 CPPFLAGS += -I$(SRC)/uts/intel/sys/acpi -DACPI_ASL_COMPILER -I.
+CPPFLAGS += -DACPI_DATE=\"$(VERSION)\"
 
 LEX_C_FILES = aslcompilerlex.c dtparserlex.c prparserlex.c
 YACC_C_FILES = aslcompilerparse.c dtparserparse.c prparserparse.c
diff --git a/usr/src/cmd/acpi/iasl/aslutils.c b/usr/src/cmd/acpi/iasl/aslutils.c
index 16ef1f478f..e1bc50a26a 100644
--- a/usr/src/cmd/acpi/iasl/aslutils.c
+++ b/usr/src/cmd/acpi/iasl/aslutils.c
@@ -542,7 +542,7 @@ UtDisplaySummary (
         /* Compiler name and version number */
 
         FlPrintFile (FileId, "%s version %X [%s]\n\n",
-            ASL_COMPILER_NAME, (UINT32) ACPI_CA_VERSION, __DATE__);
+            ASL_COMPILER_NAME, (UINT32) ACPI_CA_VERSION, ACPI_DATE);
     }
 
     /* Summary of main input and output files */
diff --git a/usr/src/cmd/bhyve/Makefile b/usr/src/cmd/bhyve/Makefile
index 4dc737c768..d9991287f0 100644
--- a/usr/src/cmd/bhyve/Makefile
+++ b/usr/src/cmd/bhyve/Makefile
@@ -140,6 +140,7 @@ C99MODE=	-xc99=%all
 
 $(PROG) := LDLIBS += -lsocket -lnsl -ldlpi -ldladm -lmd -lsunw_crypto -luuid \
 	-lvmmapi -lz
+NATIVE_LIBS += libz.so
 $(ZHYVE_PROG) := LDLIBS += -lnvpair
 $(MEVENT_TEST_PROG) := LDLIBS += -lsocket
 
diff --git a/usr/src/cmd/cmd-inet/usr.bin/dns-sd/Makefile b/usr/src/cmd/cmd-inet/usr.bin/dns-sd/Makefile
index 9bc700ab29..8afabd17fe 100644
--- a/usr/src/cmd/cmd-inet/usr.bin/dns-sd/Makefile
+++ b/usr/src/cmd/cmd-inet/usr.bin/dns-sd/Makefile
@@ -26,6 +26,7 @@ SRCDIR=		$(SRC)/contrib/mDNSResponder
 CFLAGS += $(CSTD_GNU99)
 CPPFLAGS += -I$(SRCDIR)/mDNSShared
 CPPFLAGS += -DmDNSResponderVersion=878.1.1
+CPPFLAGS += -DMDNS_VERSIONSTR_NODTS
 LDLIBS += -lsocket -ldns_sd
 
 # not linted
diff --git a/usr/src/cmd/picl/plugins/sun4u/daktari/psvcpolicy/psvcpolicy.c b/usr/src/cmd/picl/plugins/sun4u/daktari/psvcpolicy/psvcpolicy.c
index 3dcd6972d3..c8806c9fe3 100644
--- a/usr/src/cmd/picl/plugins/sun4u/daktari/psvcpolicy/psvcpolicy.c
+++ b/usr/src/cmd/picl/plugins/sun4u/daktari/psvcpolicy/psvcpolicy.c
@@ -23,8 +23,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * Daktari platform platform specific environment monitoring policies
  */
@@ -98,7 +96,7 @@ static int dak_policy_debug = 0;
 #define	GET_SENSOR_FAILED_MSG		\
 	gettext("Failed to get sensor value, id = %s, errno = %d\n")
 #define	ADD_PS_MSG			\
-gettext("WARNING: Only 1 Power Supply in system. ADD a 2nd Power Supply.\n")
+    gettext("WARNING: Only 1 Power Supply in system. ADD a 2nd Power Supply.\n")
 #define	REMOVE_LOAD_MSG			\
 	gettext("WARNING: Power Supply at 95%% current. Remove some load.\n")
 #define	PS_OVER_CURRENT_MSG		\
@@ -201,7 +199,7 @@ static i2c_noise_param_t i2cparams[] = {
 
 static void
 i2cparams_debug(i2c_noise_param_t *pi2cparams, char *platform,
-	int usingDefaults)
+    int usingDefaults)
 {
 	char s[128];
 	i2c_noise_param_t *p;
@@ -1849,7 +1847,7 @@ psvc_check_disk_fault_policy_0(psvc_opaque_t hdlp, char *id)
 {
 	int32_t		status = PSVC_SUCCESS;
 	int32_t		i;
-	char		curr_state[32], prev_state[32], led_state[32];
+	char		prev_state[32], led_state[32];
 	char		disk_fault[32], disk_state[32];
 	static char	*disk_id[DAK_MAX_DISKS] = {NULL};
 	static char	*led_id[DAK_MAX_DISKS] = {NULL};
@@ -1884,7 +1882,6 @@ psvc_check_disk_fault_policy_0(psvc_opaque_t hdlp, char *id)
 	}
 
 	for (i = 0; i < DAK_MAX_DISKS; i++) {
-		curr_state[0] = 0;
 		prev_state[0] = 0;
 
 		status = psvc_get_attr(hdlp, disk_id[i], PSVC_PRESENCE_ATTR,
diff --git a/usr/src/cmd/sgs/libld/common/update.c b/usr/src/cmd/sgs/libld/common/update.c
index 7626520cd7..d61d4cfcd5 100644
--- a/usr/src/cmd/sgs/libld/common/update.c
+++ b/usr/src/cmd/sgs/libld/common/update.c
@@ -58,7 +58,7 @@ sym_hash_compare(Sym_s_list * s1, Sym_s_list * s2)
  * we need to examine the symbols the indices reference. It is safe, because
  * the linker is single threaded.
  */
-Sym *dynsort_compare_syms;
+static Sym *dynsort_compare_syms;
 
 static int
 dynsort_compare(const void *idx1, const void *idx2)
diff --git a/usr/src/cmd/svc/startd/restarter.c b/usr/src/cmd/svc/startd/restarter.c
index 516004c894..70f84a06d6 100644
--- a/usr/src/cmd/svc/startd/restarter.c
+++ b/usr/src/cmd/svc/startd/restarter.c
@@ -135,6 +135,7 @@
 #include "startd.h"
 #include "protocol.h"
 
+uu_list_pool_t *contract_list_pool;
 static uu_list_pool_t *restarter_instance_pool;
 static restarter_instance_list_t instance_list;
 
diff --git a/usr/src/cmd/svc/startd/startd.h b/usr/src/cmd/svc/startd/startd.h
index df3e98a27b..cf6e7e5cc5 100644
--- a/usr/src/cmd/svc/startd/startd.h
+++ b/usr/src/cmd/svc/startd/startd.h
@@ -325,7 +325,7 @@ typedef struct graph_vertex {
 	 *
 	 * Currently, only relevant for GVT_SVC and GVT_INST type vertices.
 	 */
-	int 				gv_refs;
+	int				gv_refs;
 
 	int32_t				gv_stn_tset;
 	int32_t				gv_reason;
@@ -566,7 +566,7 @@ typedef struct contract_entry {
 
 extern volatile uint16_t	storing_contract;
 
-uu_list_pool_t *contract_list_pool;
+extern uu_list_pool_t *contract_list_pool;
 
 /* contract.c */
 ctid_t contract_init(void);