Add FreeBSD 13 support

.cirrus.yml

@@ -3,7 +3,7 @@ env:
   ARCH: amd64
 
 freebsd_instance:
-  image_family: freebsd-12-2
+  image_family: freebsd-13-0
 
 build_task:
   prepare_script:

.gitignore

@@ -12,5 +12,7 @@ tools/pkg-static
 tools/roothack/.depend
 tools/roothack/.depend.roothack.o
 tools/roothack/roothack
+tools/roothack/roothack.debug
+tools/roothack/roothack.full
 tools/roothack/roothack.o
 work

Makefile

@@ -10,7 +10,7 @@ BASE?=			/cdrom/usr/freebsd-dist
 KERNCONF?=		GENERIC
 MFSROOT_FREE_INODES?=	10%
 MFSROOT_FREE_BLOCKS?=	10%
-MFSROOT_MAXSIZE?=	100m
+MFSROOT_MAXSIZE?=	120m
 ROOTPW_HASH?=		$$6$$051DdQA7fTvLymkY$$Z5f6snVFQJKugWmGi8y0motBNaKn9em0y2K0ZsJMku3v9gkiYh8M.OTIIie3RvHpzT6udumtZUtc0kXwJcCMR1
 
 # If you want to build your own kernel and make you own world, you need to set

ci/ci.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e
 BASE=/tmp/freebsd-dist
-RELEASE=${RELEASE:-12.2-RELEASE}
+RELEASE=${RELEASE:-13.0-RELEASE}
 DOWNLOAD_URL=http://ftp.freebsd.org/pub/FreeBSD/releases/amd64/${RELEASE}
 while getopts b:r: opt
 do
@@ -13,25 +13,29 @@ done
 if [ "${ACTION}" = "prepare" ]
 then
 	mkdir -p ${BASE}
-	fetch -o ${BASE}/base.txz ${DOWNLOAD_URL}/base.txz
-	fetch -o ${BASE}/kernel.txz ${DOWNLOAD_URL}/kernel.txz
+	fetch -m -o ${BASE}/base.txz ${DOWNLOAD_URL}/base.txz
+	fetch -m -o ${BASE}/kernel.txz ${DOWNLOAD_URL}/kernel.txz
+	if [ -x tools/roothack/roothack ]
+	then
+		cd tools/roothack && make depend && make
+	fi
 elif [ "${ACTION}" = "build-std" ]
 then
 	make clean V=1
-	make iso V=1 RELEASE=${RELEASE} BASE=${BASE}
-	make V=1 RELEASE=${RELEASE} BASE=${BASE}
+	make iso V=1 RELEASE=${RELEASE} BASE=${BASE} ROOTHACK=1
+	make V=1 RELEASE=${RELEASE} BASE=${BASE} ROOTHACK=1
 elif [ "${ACTION}" = "build-se" ]
 then
 	make clean V=1
-	make iso V=1 RELEASE=${RELEASE} BASE=${BASE} SE=1
-	make V=1 RELEASE=${RELEASE} BASE=${BASE} SE=1
+	make iso V=1 RELEASE=${RELEASE} BASE=${BASE} ROOTHCK=1 SE=1
+	make V=1 RELEASE=${RELEASE} BASE=${BASE} ROOTHACK=1 SE=1
 elif [ "${ACTION}" = "build-mini" ]
 then
 	make clean V=1
-	make prepare-mini V=1 RELEASE=${RELEASE} BASE=${BASE}
+	make prepare-mini V=1 RELEASE=${RELEASE} ROOTHACK=1 BASE=${BASE}
 	cd mini
 	make clean V=1
-	make iso V=1 RELEASE=${RELEASE}
+	make iso V=1 RELEASE=${RELEASE} ROOTHACK=1 BASE=${BASE}
 	make clean V=1
 	cd ..
 	make clean V=1

mini/files/basefiles

@@ -10,6 +10,8 @@ sbin/sha1
 sbin/sha256
 sbin/sha512
 sbin/shutdown
+lib/casper/libcap_dns.so.*
+lib/casper/libcap_fileargs.so.*
 lib/libalias*
 lib/libbegemot.so.*
 lib/libbsdxml.so.*
@@ -25,14 +27,16 @@ lib/libedit.so.*
 lib/libelf.so.*
 lib/libgcc_s.so.*
 lib/libgeom.so.*
+lib/libibverbs.so.*
 lib/libipsec.so.*
 lib/libjail.so.*
 lib/libkiconv.so.*
 lib/libkvm.so.*
 lib/libm.so.*
 lib/libmd.so.*
-lib/libncurses.so.*
+lib/libmlx5.so.*
 lib/libncursesw.so.*
+lib/libnv.so.*
 lib/libpcap.so.*
 lib/libsbuf.so.*
 lib/libssp.so.*
@@ -75,13 +79,15 @@ usr/bin/xargs
 usr/lib/libarchive.so*
 usr/lib/libbsm.so*
 usr/lib/libbz2.so*
+usr/lib/libcap_dns.so*
+usr/lib/libcap_fileargs.so*
 usr/lib/libdialog.so*
 usr/lib/libfetch.so*
-usr/lib/libgnuregex*.so*
 usr/lib/liblzma.so*
 usr/lib/libmagic.so.*
 usr/lib/libopie.so*
 usr/lib/libpam.so*
+usr/lib/libregex.so.*
 usr/lib/librt.so*
 usr/lib/libssl.so*
 usr/lib/libusb.so*
@@ -113,6 +119,8 @@ usr/sbin/pwd_mkdb
 usr/sbin/sade
 usr/sbin/syslogd
 usr/sbin/tcpdump
+usr/sbin/traceroute
+usr/sbin/traceroute6
 usr/sbin/tzsetup
 usr/share/misc/iso3166
 usr/share/misc/termcap

mini/files/localfiles

@@ -10,7 +10,11 @@ bin/tmux
 lib/libevent-2.1.so*
 lib/libiconv.so.*
 lib/libintl.so.*
+lib/liblz4.so.*
 lib/libreadline.so.*
 lib/libutf8proc.so.*
+lib/libxxhash.so.*
+lib/libzstd.so.*
 sbin/dropbear
 sbin/dmidecode
+sbin/smartctl

tools/roothack/Makefile

@@ -1,7 +1,7 @@
 PROG=	roothack
 MAN=
 
-LDADD=	-larchive -lbz2 -lz -llzma -lcrypto -lbsdxml -lmd
+LDADD=	-larchive -lbz2 -lz -llzma -lcrypto -lbsdxml -lmd -lprivatezstd
 
 NO_SHARED=