Split ci/freebsd.ini into per-release machine files

FreeBSD 15 replaced base Heimdal with MIT Kerberos 5, so pointing
krb5-config at the MIT port is no longer necessary there; FreeBSD 14
still ships Heimdal and needs the override.  A single shared machine
file cannot express that difference, so give each release its own.

Assisted-by: Claude:claude-opus-5[1m]

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index aaf5d5551ddccb769ff1d94e2125a1a8ddaa2066..f4e039afcfa5ee6412e50803b7484b1a1493ab7b 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1732,7 +1732,7 @@ unit:clang:trixie:amd64:
 clang:freebsd14:amd64:
   variables:
     GIT_CLONE_PATH: "${GIT_CLONE_PATH_INSTANCE_EXECUTOR}"
-    EXTRA_SETUP_FILES: "--native-file ci/freebsd.ini"
+    EXTRA_SETUP_FILES: "--native-file ci/freebsd14.ini"
   <<: *build_job
   <<: *freebsd_autoscaler_14_amd64_tags
 
@@ -1760,7 +1760,7 @@ unit:clang:freebsd14:amd64:
 clang:freebsd15:amd64:
   variables:
     GIT_CLONE_PATH: "${GIT_CLONE_PATH_INSTANCE_EXECUTOR}"
-    EXTRA_SETUP_FILES: "--native-file ci/freebsd.ini"
+    EXTRA_SETUP_FILES: "--native-file ci/freebsd15.ini"
   <<: *build_job
   <<: *freebsd_autoscaler_15_amd64_tags
 

diff --git a/ci/freebsd.ini b/ci/freebsd.ini
deleted file mode 100644 (file)
index 2228399..0000000
--- a/ci/freebsd.ini
+++ /dev/null
@@ -1,11 +0,0 @@
-[binaries]
-c = 'clang'
-# Use MIT Kerberos5 for BIND 9 GSS-API support because of FreeBSD Heimdal
-# incompatibility; see https://bugs.freebsd.org/275241.
-krb5-config = '/usr/local/bin/krb5-config'
-
-[built-in options]
-optimization = 'g'
-
-[project options]
-line = 'enabled'

diff --git a/ci/freebsd14.ini b/ci/freebsd14.ini
new file mode 100644 (file)
index 0000000..048cc78
--- /dev/null
+++ b/ci/freebsd14.ini
@@ -0,0 +1,12 @@
+[binaries]
+c = 'clang'
+# FreeBSD 14 ships Heimdal in the base system, which BIND 9 GSS-API support is
+# incompatible with (see https://bugs.freebsd.org/275241), so use the MIT
+# Kerberos 5 port instead.
+krb5-config = '/usr/local/bin/krb5-config'
+
+[built-in options]
+optimization = 'g'
+
+[project options]
+line = 'enabled'

diff --git a/ci/freebsd15.ini b/ci/freebsd15.ini
new file mode 100644 (file)
index 0000000..c90e455
--- /dev/null
+++ b/ci/freebsd15.ini
@@ -0,0 +1,10 @@
+[binaries]
+c = 'clang'
+# FreeBSD 15 replaced base Heimdal with MIT Kerberos 5, so no krb5-config
+# override is needed here, unlike on FreeBSD 14.
+
+[built-in options]
+optimization = 'g'
+
+[project options]
+line = 'enabled'