HBSD: sync up with hardened/11.2-releng/master branch

Commit: b8dead303184bcbd695cdb20407f5677f2424092
ass-a2s · Oct 7, 2018 · 12706d4 · 12706d4
1 parent 0dc4b34
commit 12706d4
Show file tree

Hide file tree

Showing 1,975 changed files with 567,677 additions and 25,925 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,5 @@
+.clang_complete
+.snap
 _.tinderbox.*
 _.amd64.*
 _.arm.*
@@ -14,5 +16,6 @@ GPATH
 GRTAGS
 GTAGS
 ID
+.tags
 cscope.out
 ?cscope.out
diff --git a/Makefile.inc1 b/Makefile.inc1
@@ -1202,9 +1202,9 @@ KERNCONF=${KERNFAST}
 .endif
 .endif
 .if ${TARGET_ARCH} == "powerpc64"
-KERNCONF?=	GENERIC64
+KERNCONF?=	HARDENEDBSD64
 .else
-KERNCONF?=	GENERIC
+KERNCONF?=	HARDENEDBSD
 .endif
 INSTKERNNAME?=	kernel
 

diff --git a/Makefile.libcompat b/Makefile.libcompat
@@ -107,6 +107,7 @@ LIBCOMPATWMAKEFLAGS+= CC="${XCC} ${LIBCOMPATCFLAGS}" \
 		-DNO_CPU_CFLAGS \
 		MK_CTF=no \
 		-DNO_LINT \
+		MK_SAFESTACK=no \
 		MK_TESTS=no
 LIBCOMPATWMAKE+=	${LIBCOMPATWMAKEENV} ${MAKE} ${LIBCOMPATWMAKEFLAGS} \
 			MK_MAN=no MK_HTML=no

diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
@@ -579,6 +579,9 @@ OLD_LIBS+=usr/lib/libbsnmptools.so.0
 OLD_LIBS+=usr/lib/libbsnmptools.so
 # 20170112: sysdecode_getfsstat_flags() renamed to sysdecode_getfsstat_mode()
 OLD_FILES+=usr/share/man/man3/sysdecode_getfsstat_flags.3.gz
+# 20170104: librt move to /lib
+OLD_LIBS+=usr/lib/librt.so.1
+OLD_LIBS+=usr/lib/librt_p.a
 # 20161229: Three files from gnop tests consolidated into one
 OLD_FILES+=usr/tests/sys/geom/class/nop/1_test
 OLD_FILES+=usr/tests/sys/geom/class/nop/2_test
@@ -1207,6 +1210,8 @@ OLD_DIRS+=usr/lib/clang/3.7.0/lib
 OLD_DIRS+=usr/lib/clang/3.7.0
 # 20151130: libelf moved from /usr/lib to /lib (libkvm dependency in r291406)
 OLD_LIBS+=usr/lib/libelf.so.2
+# 20151120: remove unused pkg repo public key
+OLD_FILES+=usr/share/keys/pkg/trusted/hardenedbsd.crt.2014-09-04
 # 20151115: Fox bad upgrade scheme
 OLD_FILES+=usr/share/locale/zh_CN.GB18030/zh_Hans_CN.GB18030
 OLD_FILES+=usr/share/locale/zh_CN.GB2312/zh_Hans_CN.GB2312
@@ -2445,6 +2450,10 @@ OLD_FILES+=usr/tests/usr.sbin/pw/pw_modify
 # 20141202: update to mandoc CVS 20141201
 OLD_FILES+=usr.bin/preconv
 OLD_FILES+=share/man/man1/preconv.1.gz
+# 20141204 ibcs support removal
+OLD_FILES+=etc/rc.d/archdep
+OLD_FILES+=shate/examples/ibcs2/README
+OLD_FILES+=shate/examples/ibcs2/hello.uu
 # 20141129: mrouted rc.d scripts removed from base
 OLD_FILES+=etc/rc.d/mrouted
 # 20141126: convert sbin/mdconfig/tests to ATF format tests