Merge branch 'opnsense:master' into master

maurice-w · Nov 5, 2024 · 0229cd5 · 0229cd5
2 parents 92e2f0f + d4474e4
commit 0229cd5
Show file tree

Hide file tree

Showing 9 changed files with 107 additions and 17 deletions.
diff --git a/Makefile b/Makefile
@@ -24,8 +24,8 @@
 # SUCH DAMAGE.
 
 STEPS=		audit arm base boot chroot clean clone compress confirm \
-		connect core distfiles download dvd fingerprint info \
-		kernel list make.conf nano options packages plugins ports \
+		connect core distfiles download dvd fingerprint info kernel \
+		kyua list make.conf nano options packages plugins ports \
 		prefetch print rebase release rename serial sign skim \
 		sync test update upload verify vga vm xtools
 SCRIPTS=	custom distribution factory hotfix nightly watch

diff --git a/build/clean.sh b/build/clean.sh
@@ -79,6 +79,10 @@ for ARG in ${@}; do
 		echo ">>> Removing kernel set"
 		rm -f ${SETSDIR}/kernel-*-${PRODUCT_ARCH}${PRODUCT_DEVICE+"-${PRODUCT_DEVICE}"}.*
 		;;
+	kyua)
+		echo ">>> Removing kyua set"
+		rm -f ${SETSDIR}/kyua-*-${PRODUCT_ARCH}.*
+		;;
 	logs)
 		setup_stage ${LOGSDIR}
 		;;

diff --git a/build/common.sh b/build/common.sh
@@ -771,8 +771,8 @@ find_set()
 	aux|packages|release)
 		echo $(find ${SETSDIR} -name "${1}-*-${PRODUCT_ARCH}.tar")
 		;;
-	xtools)
-		echo $(find ${SETSDIR} -name "xtools-*-${PRODUCT_ARCH}.txz")
+	kyua|xtools)
+		echo $(find ${SETSDIR} -name "${1}-*-${PRODUCT_ARCH}.txz")
 		;;
 	*)
 		echo "Cannot find unknown set: ${1}" >&2

diff --git a/build/kyua.sh b/build/kyua.sh
@@ -0,0 +1,87 @@
+#!/bin/sh
+
+# Copyright (c) 2024 Franco Fichtner <[email protected]>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+
+set -e
+
+SELF=kyua
+
+. ./common.sh
+
+KYUASET=$(find_set kyua)
+
+if [ -f "${KYUASET}" -a -z "${1}" ]; then
+	echo ">>> Reusing kyua set: ${KYUASET}"
+	exit 0
+fi
+
+git_branch ${SRCDIR} ${SRCBRANCH} SRCBRANCH
+git_version ${SRCDIR}
+
+KYUASET=${SETSDIR}/kyua-${PRODUCT_VERSION}-${PRODUCT_ARCH}.txz
+
+COMPONENTS="
+lib/atf
+libexec/atf
+lib/liblutok
+lib/liblua
+usr.bin/kyua
+lib/libnetbsd
+tests
+"
+
+for COMPONENT in ${COMPONENTS}; do
+	make -sC ${SRCDIR}/${COMPONENT} clean
+done
+
+for COMPONENT in ${COMPONENTS}; do
+	echo -n ">>> Building ${COMPONENT}... "
+	make -sC ${SRCDIR}/${COMPONENT} all
+	echo "done."
+done
+
+setup_stage ${STAGEDIR} work/usr/tests work/usr/include
+
+mtree -deiU -f ${SRCDIR}/etc/mtree/BSD.usr.dist -p ${STAGEDIR}/work/usr
+mtree -deiU -f ${SRCDIR}/etc/mtree/BSD.tests.dist -p ${STAGEDIR}/work/usr/tests
+mtree -deiU -f ${SRCDIR}/etc/mtree/BSD.include.dist -p ${STAGEDIR}/work/usr/include
+
+for COMPONENT in ${COMPONENTS}; do
+	if [ -n "${COMPONENT##lib/*}" -o "${COMPONENT}" = "lib/atf" ]; then
+		make -sC ${SRCDIR}/${COMPONENT} \
+		    DESTDIR=${STAGEDIR}/work install
+	fi
+done
+
+# remove a couple of debug additions
+rm -rf ${STAGEDIR}/work/usr/lib/debug
+find ${STAGEDIR}/work -type f -name "*.debug" -delete
+find ${STAGEDIR}/work -type d -empty -delete
+
+sh ./clean.sh ${SELF}
+
+setup_version ${STAGEDIR} ${STAGEDIR}/work ${SELF}
+generate_set ${STAGEDIR}/work ${KYUASET}
diff --git a/build/list.sh b/build/list.sh
@@ -32,15 +32,12 @@ SELF=list
 . ./common.sh
 
 for ARG in ${*}; do
-	case ${ARG} in
-	aux|base|distfiles|kernel|packages|release|xtools)
+	if [ -d "${TARGETDIR}/${ARG}" ]; then
+		ls -lah ${TARGETDIR}/"${ARG}"
+	else
 		SET=$(find_set "${ARG}")
 		if [ -n "${SET}" ]; then
 			tar -tf ${SET}
 		fi
-		;;
-	*)
-		ls -lah ${TARGETDIR}/"${ARG}"
-		;;
-	esac
+	fi
 done
diff --git a/build/upload.sh b/build/upload.sh
@@ -42,7 +42,7 @@ for ARG in ${@}; do
 	arm|dvd|nano|serial|vga|vm)
 		upload ${ARG} ${IMAGESDIR} "*-${ARG}-*${PRODUCT_DEVICE+"-${PRODUCT_DEVICE}"}*"
 		;;
-	aux|distfiles|packages|release)
+	aux|distfiles|kyua|packages|release)
 		upload ${ARG} ${SETSDIR} "${ARG}-*"
 		;;
 	base|kernel)

diff --git a/config/24.7/aux.conf b/config/24.7/aux.conf
@@ -2,4 +2,6 @@
 devel/binutils
 devel/cmake-core
 lang/go121					arm
+lang/go122					arm
+lang/go123					arm
 lang/rust					arm
diff --git a/config/24.7/make.conf b/config/24.7/make.conf
@@ -97,8 +97,8 @@ www_webgrind_SET=		CALLGRAPH
 
 # for www/caddy-custom
 CADDY_CUSTOM_PLUGINS=		github.com/caddyserver/ntlm-transport@e0c1e46a30093fa243d06a83964da5573ee6a51f \
-				github.com/mholt/caddy-dynamicdns@d8dab1bbf3fc592032f71dacc14510475b4e3e9a \
-				github.com/mholt/caddy-l4@bdee6a6620c02aca4817e6c3091fed26aa10940c \
+				github.com/mholt/caddy-dynamicdns@7c818ab3fc3485a72a346f85c77810725f19f9cf \
+				github.com/mholt/caddy-l4@ec8fae2093229e1ac29d7ef7b5dd5b209c0b08b8 \
 				github.com/mholt/caddy-ratelimit@12435ecef5dbb1b137eb68002b85d775a9d5cdb2 \
 				github.com/caddy-dns/cloudflare@89f16b99c18ef49c8bb470a82f895bce01cbaece \
 				github.com/caddy-dns/route53@d92230e22b716e9b0c8bc1086477415f8b90e77f \
@@ -107,7 +107,7 @@ CADDY_CUSTOM_PLUGINS=		github.com/caddyserver/ntlm-transport@e0c1e46a30093fa243d
 				github.com/caddy-dns/googleclouddns@22c91a4de6d3c3a17d395e510e1b77eab82cdc3c \
 				github.com/caddy-dns/gandi@d814cce86812e1e78544496e8f79e725058d8f1a \
 				github.com/caddy-dns/azure@f2351591d9f258201499abc37d054b7e6366fefb \
-				github.com/caddy-dns/porkbun@70de9b4c18f94dd2203927ab00ba104d62cb99a8 \
+				github.com/caddy-dns/porkbun@6b466fe4a00ba161d78669f048602ac70e706076 \
 				github.com/caddy-dns/ovh@62cc061d0f87156769feb16b6a81e97462ef6cee \
 				github.com/caddy-dns/namecheap@7095083a353829fc83632c34e8988fd8eb72f43d \
 				github.com/caddy-dns/netlify@eaa9514e3b9fda329b317b937e2c6c0f23d11356 \
@@ -124,7 +124,7 @@ CADDY_CUSTOM_PLUGINS=		github.com/caddyserver/ntlm-transport@e0c1e46a30093fa243d
 				github.com/caddy-dns/mailinabox@39d0e3ce8e259f6d1b98b6c417fc79a0a1708e91 \
 				github.com/caddy-dns/netcup@a811da94403509715bd149669b07544706fd6d46 \
 				github.com/caddy-dns/rfc2136@b8df5e8730c9dcd6fce4b483530b96dcd46c0690 \
-				github.com/caddy-dns/dnsmadeeasy@91d629f293a577f1be3bb57529589ce39f4935b5 \
+				github.com/caddy-dns/dnsmadeeasy@429f104d55d714143ebdcbf3e3effdc9039572e0 \
 				github.com/caddy-dns/bunny@71ced26b4224a713a918171a72c30c9908b59793 \
 				github.com/caddy-dns/civo@e2766c887ff53e6d24eb2646bbae85af77f41a78 \
 				github.com/caddy-dns/scaleway@561fd7f77b1b2022b4fd59d386179bfa65adebef \

diff --git a/config/24.7/plugins.conf b/config/24.7/plugins.conf
@@ -84,7 +84,7 @@ sysutils/smart					arm
 sysutils/virtualbox				arm,aarch64
 sysutils/vmware					arm
 sysutils/xen					arm,aarch64
-vendor/sunnyvalley				arm
+vendor/sunnyvalley				arm,aarch64
 www/OPNProxy					arm
 www/c-icap					arm
 www/cache