CTSRD-CHERI · bsdjhb · Nov 12, 2024 · May 19, 2024 · May 19, 2024 · May 19, 2024
diff --git a/Makefile.inc1 b/Makefile.inc1
@@ -1771,10 +1771,10 @@ restage reinstall reinstallsysroot: .MAKE .PHONY
 	@echo "Removing $$(find ${DESTDIR} -type d -empty -print | wc -l) empty directories from ${DESTDIR}"
 	find ${DESTDIR} -type d -empty -delete
 	@echo
+.endif
 	@echo "--------------------------------------------------------------"
-	@echo ">>> Done installing sysroot"
+	@echo ">>> Installing everything completed on `LC_ALL=C date`"
 	@echo "--------------------------------------------------------------"
-.endif
 
 redistribute: .MAKE .PHONY
 	@echo "--------------------------------------------------------------"

diff --git a/Makefile.libcompat b/Makefile.libcompat
@@ -1,4 +1,3 @@
-
 .if !targets(__<${_this:T}>__)
 __<${_this:T}>__:
 

diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
@@ -51,6 +51,10 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20240716: retire mergemaster
+OLD_FILES+=usr/sbin/mergemaster
+OLD_FILES+=usr/share/man/man8/mergemaster.8.gz
+
 # 20240527: csh: Remove hardlink /.cshrc
 OLD_FILES+=.cshrc
 

diff --git a/bin/Makefile b/bin/Makefile
@@ -1,4 +1,3 @@
-
 .include <src.opts.mk>
 
 SUBDIR= cat \

diff --git a/bin/Makefile.inc b/bin/Makefile.inc
@@ -1,4 +1,3 @@
-
 .include <src.opts.mk>
 
 BINDIR?=	/bin

diff --git a/bin/cat/Makefile b/bin/cat/Makefile
@@ -1,4 +1,3 @@
-
 .include <src.opts.mk>
 
 PACKAGE=runtime

diff --git a/bin/cat/tests/Makefile b/bin/cat/tests/Makefile
@@ -1,4 +1,3 @@
-
 PACKAGE=	tests
 
 NETBSD_ATF_TESTS_SH=		cat_test

diff --git a/bin/chflags/Makefile b/bin/chflags/Makefile
@@ -1,4 +1,3 @@
-
 .include <src.opts.mk>
 
 PACKAGE=runtime

diff --git a/bin/chflags/tests/Makefile b/bin/chflags/tests/Makefile
@@ -1,4 +1,3 @@
-
 ATF_TESTS_SH+=  chflags_test
 
 .include <bsd.test.mk>
diff --git a/bin/chio/Makefile b/bin/chio/Makefile
@@ -1,4 +1,3 @@
-
 PACKAGE=utilities
 PROG=	chio
 

diff --git a/bin/chmod/Makefile b/bin/chmod/Makefile
@@ -1,4 +1,3 @@
-
 .include <src.opts.mk>
 
 PACKAGE=runtime

diff --git a/bin/chmod/tests/Makefile b/bin/chmod/tests/Makefile
@@ -1,4 +1,3 @@
-
 ATF_TESTS_SH+=	chmod_test
 
 .include <bsd.test.mk>
diff --git a/bin/cp/Makefile b/bin/cp/Makefile
@@ -1,4 +1,3 @@
-
 .include <src.opts.mk>
 
 PACKAGE=runtime

diff --git a/bin/cp/tests/Makefile b/bin/cp/tests/Makefile
@@ -1,4 +1,3 @@
-
 PACKAGE=	tests
 
 ATF_TESTS_SH=	cp_test

diff --git a/bin/cpuset/Makefile b/bin/cpuset/Makefile
@@ -1,4 +1,3 @@
-
 PROG=   cpuset
 
 LIBADD=	jail

diff --git a/bin/date/Makefile b/bin/date/Makefile
@@ -1,4 +1,3 @@
-
 .include <src.opts.mk>
 
 PACKAGE=runtime

diff --git a/bin/date/tests/Makefile b/bin/date/tests/Makefile
@@ -1,4 +1,3 @@
-
 ATF_TESTS_SH=	format_string_test
 
 .include <bsd.test.mk>
diff --git a/bin/dd/Makefile b/bin/dd/Makefile
@@ -1,4 +1,3 @@
-
 .include <src.opts.mk>
 
 PACKAGE=runtime

diff --git a/bin/dd/tests/Makefile b/bin/dd/tests/Makefile
@@ -1,4 +1,3 @@
-
 ATF_TESTS_SH=	dd2_test
 NETBSD_ATF_TESTS_SH=	dd_test
 

diff --git a/bin/df/Makefile b/bin/df/Makefile
@@ -1,4 +1,3 @@
-
 PACKAGE=runtime
 
 PROG=	df

diff --git a/bin/domainname/Makefile b/bin/domainname/Makefile
@@ -1,4 +1,3 @@
-
 PACKAGE=yp
 PROG=	domainname
 

diff --git a/bin/echo/Makefile b/bin/echo/Makefile
@@ -1,4 +1,3 @@
-
 .include <src.opts.mk>
 
 PACKAGE=runtime

diff --git a/bin/echo/tests/Makefile b/bin/echo/tests/Makefile
@@ -1,4 +1,3 @@
-
 ATF_TESTS_SH+=  echo_test
 
 .include <bsd.test.mk>
diff --git a/bin/ed/Makefile b/bin/ed/Makefile
@@ -1,4 +1,3 @@
-
 .include <src.opts.mk>
 
 PACKAGE=runtime

diff --git a/bin/ed/test/Makefile b/bin/ed/test/Makefile
@@ -1,4 +1,3 @@
-
 SHELL=	/bin/sh
 ED=	${.OBJDIR}/ed
 

diff --git a/bin/expr/Makefile b/bin/expr/Makefile
@@ -1,4 +1,3 @@
-
 .include <src.opts.mk>
 
 PACKAGE=runtime

diff --git a/bin/expr/tests/Makefile b/bin/expr/tests/Makefile
@@ -1,4 +1,3 @@
-
 NETBSD_ATF_TESTS_SH=	expr_test
 
 ATF_TESTS_SH_SED_expr_test+=	-e 's/eval expr/eval expr --/g'

diff --git a/bin/freebsd-version/Makefile b/bin/freebsd-version/Makefile
@@ -1,4 +1,3 @@
-
 PACKAGE=runtime
 SCRIPTS = freebsd-version
 MAN = freebsd-version.1

diff --git a/bin/getfacl/Makefile b/bin/getfacl/Makefile
@@ -1,4 +1,3 @@
-
 PACKAGE=runtime
 PROG=	getfacl
 

diff --git a/bin/kenv/Makefile b/bin/kenv/Makefile
@@ -1,4 +1,3 @@
-
 PACKAGE=runtime
 PROG=	kenv
 

diff --git a/bin/kill/Makefile b/bin/kill/Makefile
@@ -1,4 +1,3 @@
-
 PACKAGE=runtime
 PROG=	kill
 

diff --git a/bin/ln/Makefile b/bin/ln/Makefile
@@ -1,4 +1,3 @@
-
 .include <src.opts.mk>
 
 PACKAGE=runtime

diff --git a/bin/ln/tests/Makefile b/bin/ln/tests/Makefile
@@ -1,4 +1,3 @@
-
 ATF_TESTS_SH+=  ln_test
 
 .include <bsd.test.mk>
diff --git a/bin/ls/Makefile b/bin/ls/Makefile
@@ -1,4 +1,3 @@
-
 .include <src.opts.mk>
 
 PACKAGE=runtime

diff --git a/bin/ls/tests/Makefile b/bin/ls/tests/Makefile
@@ -1,4 +1,3 @@
-
 ATF_TESTS_SH+=	ls_tests
 # This seems like overkill, but the idea in mind is that all of the testcases
 # should be runnable as !root

diff --git a/bin/mkdir/Makefile b/bin/mkdir/Makefile
@@ -1,4 +1,3 @@
-
 .include <src.opts.mk>
 
 PACKAGE=runtime

diff --git a/bin/mkdir/tests/Makefile b/bin/mkdir/tests/Makefile
@@ -1,4 +1,3 @@
-
 ATF_TESTS_SH+=  mkdir_test
 
 .include <bsd.test.mk>
diff --git a/bin/mv/Makefile b/bin/mv/Makefile
@@ -1,4 +1,3 @@
-
 .include <src.opts.mk>
 
 PACKAGE=runtime

diff --git a/bin/mv/tests/Makefile b/bin/mv/tests/Makefile
@@ -1,4 +1,3 @@
-
 .include <bsd.own.mk>
 
 TAP_TESTS_SH=	legacy_test

diff --git a/bin/pax/Makefile b/bin/pax/Makefile
@@ -1,4 +1,3 @@
-
 .include <src.opts.mk>
 
 PACKAGE=runtime

diff --git a/bin/pax/tests/Makefile b/bin/pax/tests/Makefile
@@ -1,4 +1,3 @@
-
 .include <bsd.own.mk>
 
 TAP_TESTS_PERL=	legacy_test

diff --git a/bin/pkill/tests/Makefile b/bin/pkill/tests/Makefile
@@ -1,4 +1,3 @@
-
 .include <bsd.own.mk>
 
 PACKAGE=	tests

diff --git a/bin/ps/Makefile b/bin/ps/Makefile
@@ -1,4 +1,3 @@
-
 PACKAGE=runtime
 PROG=	ps
 SRCS=	fmt.c keyword.c nlist.c print.c ps.c

diff --git a/bin/pwait/Makefile b/bin/pwait/Makefile
@@ -1,4 +1,3 @@
-
 .include <src.opts.mk>
 
 PACKAGE=runtime

diff --git a/bin/pwait/tests/Makefile b/bin/pwait/tests/Makefile
@@ -1,4 +1,3 @@
-
 ATF_TESTS_SH=	pwait_test
 
 .include <bsd.test.mk>
diff --git a/bin/pwd/Makefile b/bin/pwd/Makefile
@@ -1,4 +1,3 @@
-
 PACKAGE=runtime
 PROG=	pwd
 

diff --git a/bin/realpath/Makefile b/bin/realpath/Makefile
@@ -1,4 +1,3 @@
-
 PACKAGE=runtime
 PROG=	realpath
 

diff --git a/bin/rm/Makefile b/bin/rm/Makefile
@@ -1,4 +1,3 @@
-
 .include <src.opts.mk>
 
 PACKAGE=runtime

diff --git a/bin/rm/tests/Makefile b/bin/rm/tests/Makefile
@@ -1,4 +1,3 @@
-
 ATF_TESTS_SH+=  rm_test
 
 .include <bsd.test.mk>
diff --git a/bin/rmail/Makefile b/bin/rmail/Makefile
@@ -1,4 +1,3 @@
-
 PACKAGE=sendmail
 SENDMAIL_DIR=${SRCTOP}/contrib/sendmail
 .PATH:	${SENDMAIL_DIR}/rmail

diff --git a/bin/rmdir/Makefile b/bin/rmdir/Makefile
@@ -1,4 +1,3 @@
-
 .include <src.opts.mk>
 
 PACKAGE=runtime

diff --git a/bin/rmdir/tests/Makefile b/bin/rmdir/tests/Makefile
@@ -1,4 +1,3 @@
-
 ATF_TESTS_SH+=  rmdir_test
 
 .include <bsd.test.mk>
diff --git a/bin/setfacl/Makefile b/bin/setfacl/Makefile
@@ -1,4 +1,3 @@
-
 PACKAGE=runtime
 PROG=	setfacl
 SRCS=	file.c mask.c merge.c remove.c setfacl.c util.c

diff --git a/bin/sh/Makefile b/bin/sh/Makefile
@@ -1,4 +1,3 @@
-
 .include <src.opts.mk>
 
 CONFGROUPS=	ETC ROOT

diff --git a/bin/sh/tests/Makefile b/bin/sh/tests/Makefile
@@ -1,4 +1,3 @@
-
 .include <bsd.own.mk>
 
 TESTS_SUBDIRS+=	builtins

diff --git a/bin/sh/tests/builtins/Makefile b/bin/sh/tests/builtins/Makefile
@@ -1,4 +1,3 @@
-
 PACKAGE=	tests
 
 .include <src.opts.mk>

diff --git a/bin/sh/tests/errors/Makefile b/bin/sh/tests/errors/Makefile
@@ -1,4 +1,3 @@
-
 PACKAGE=	tests
 
 TESTSDIR=	${TESTSBASE}/bin/sh/${.CURDIR:T}

diff --git a/bin/sh/tests/execution/Makefile b/bin/sh/tests/execution/Makefile
@@ -1,4 +1,3 @@
-
 PACKAGE=	tests
 
 TESTSDIR=	${TESTSBASE}/bin/sh/${.CURDIR:T}

diff --git a/bin/sh/tests/expansion/Makefile b/bin/sh/tests/expansion/Makefile
@@ -1,4 +1,3 @@
-
 PACKAGE=	tests
 
 TESTSDIR=	${TESTSBASE}/bin/sh/${.CURDIR:T}

diff --git a/bin/sh/tests/invocation/Makefile b/bin/sh/tests/invocation/Makefile
@@ -1,4 +1,3 @@
-
 PACKAGE=	tests
 
 TESTSDIR=	${TESTSBASE}/bin/sh/${.CURDIR:T}

diff --git a/bin/sh/tests/parameters/Makefile b/bin/sh/tests/parameters/Makefile
@@ -1,4 +1,3 @@
-
 PACKAGE=	tests
 
 TESTSDIR=	${TESTSBASE}/bin/sh/${.CURDIR:T}

diff --git a/bin/sh/tests/parser/Makefile b/bin/sh/tests/parser/Makefile
@@ -1,4 +1,3 @@
-
 PACKAGE=	tests
 
 TESTSDIR=	${TESTSBASE}/bin/sh/${.CURDIR:T}

diff --git a/bin/sh/tests/set-e/Makefile b/bin/sh/tests/set-e/Makefile
@@ -1,4 +1,3 @@
-
 PACKAGE=	tests
 
 TESTSDIR=	${TESTSBASE}/bin/sh/${.CURDIR:T}

diff --git a/bin/sleep/Makefile b/bin/sleep/Makefile
@@ -1,4 +1,3 @@
-
 .include <src.opts.mk>
 
 PACKAGE=runtime

diff --git a/bin/sleep/tests/Makefile b/bin/sleep/tests/Makefile
@@ -1,4 +1,3 @@
-
 .include <bsd.own.mk>
 
 NETBSD_ATF_TESTS_SH=	sleep_test

diff --git a/bin/stty/Makefile b/bin/stty/Makefile
@@ -1,4 +1,3 @@
-
 PACKAGE=runtime
 PROG=	stty
 SRCS=	cchar.c gfmt.c key.c modes.c print.c stty.c util.c

diff --git a/bin/sync/Makefile b/bin/sync/Makefile
@@ -1,4 +1,3 @@
-
 PACKAGE=runtime
 PROG=	sync
 MAN=	sync.8

diff --git a/bin/test/Makefile b/bin/test/Makefile
@@ -1,4 +1,3 @@
-
 .include <src.opts.mk>
 
 PACKAGE=runtime

diff --git a/bin/test/tests/Makefile b/bin/test/tests/Makefile
@@ -1,4 +1,3 @@
-
 .include <bsd.own.mk>
 
 TAP_TESTS_SH=	legacy_test

diff --git a/bin/tests/Makefile b/bin/tests/Makefile
@@ -1,4 +1,3 @@
-
 .PATH:		${SRCTOP}/tests
 KYUAFILE=	yes
 

diff --git a/bin/timeout/Makefile b/bin/timeout/Makefile
@@ -1,4 +1,3 @@
-
 .include <src.opts.mk>
 
 PROG=	timeout

diff --git a/bin/timeout/tests/Makefile b/bin/timeout/tests/Makefile
@@ -1,4 +1,3 @@
-
 ATF_TESTS_SH=	timeout_test
 
 .include <bsd.test.mk>
diff --git a/bin/uuidgen/Makefile b/bin/uuidgen/Makefile
@@ -1,4 +1,3 @@
-
 PACKAGE=	runtime
 PROG=	uuidgen
 

diff --git a/cddl/Makefile b/cddl/Makefile
@@ -1,4 +1,3 @@
-
 .include <src.opts.mk>
 
 SUBDIR=	lib .WAIT \

diff --git a/cddl/Makefile.inc b/cddl/Makefile.inc
@@ -1,10 +1,10 @@
-
 OPENSOLARIS_USR_DISTDIR= ${.CURDIR}/../../../cddl/contrib/opensolaris
 OPENSOLARIS_SYS_DISTDIR= ${.CURDIR}/../../../sys/cddl/contrib/opensolaris
 
 IGNORE_PRAGMA=	YES
 
 CFLAGS+=	-DNEED_SOLARIS_BOOLEAN
+CFLAGS+=	-DHAVE_STRLCAT -DHAVE_STRLCPY
 
 # Do not lint the CDDL stuff. It is all externally maintained and
 # lint output is wasteful noise here.
Original file line number	Diff line number	Diff line change
		@@ -1,4 +1,3 @@

		.if !targets(__<${_this:T}>__)
		__<${_this:T}>__:

Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,4 +1,3 @@

		.include <src.opts.mk>

		SUBDIR= cat \
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,4 +1,3 @@

		.include <src.opts.mk>

		BINDIR?= /bin
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,4 +1,3 @@

		.include <src.opts.mk>

		PACKAGE=runtime
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,4 +1,3 @@

		PACKAGE= tests

		NETBSD_ATF_TESTS_SH= cat_test
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,4 +1,3 @@

		ATF_TESTS_SH+= chflags_test

		.include <bsd.test.mk>
Original file line number	Diff line number	Diff line change
		@@ -1,4 +1,3 @@

		ATF_TESTS_SH+= chmod_test

		.include <bsd.test.mk>
Original file line number	Diff line number	Diff line change
		@@ -1,4 +1,3 @@

		PACKAGE= tests

		ATF_TESTS_SH= cp_test
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,4 +1,3 @@

		ATF_TESTS_SH= format_string_test

		.include <bsd.test.mk>
Original file line number	Diff line number	Diff line change
		@@ -1,4 +1,3 @@

		ATF_TESTS_SH= dd2_test
		NETBSD_ATF_TESTS_SH= dd_test

Expand Down