From d8b82a7a4535b5716fa5f43d6f348142929112e0 Mon Sep 17 00:00:00 2001
From: Vsevolod Stakhov <vsevolod@rspamd.com>
Date: Tue, 4 Nov 2025 13:02:12 +0000
Subject: [PATCH] [Feature] Fix BSD workflow package installation and update OS
 versions

- FreeBSD: Add IGNORE_OSVERSION=yes to handle package version mismatches, update to 14.3/13.5
- OpenBSD: Set PKG_PATH for package repository, fix perl package name, update to 7.8/7.7/7.6
- Use latest stable versions of both operating systems
---
 .github/workflows/freebsd_build.yml | 10 ++++++----
 .github/workflows/openbsd_build.yml | 11 +++++++----
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/freebsd_build.yml b/.github/workflows/freebsd_build.yml
index e53b1d5418..ce1c08c2b3 100644
--- a/.github/workflows/freebsd_build.yml
+++ b/.github/workflows/freebsd_build.yml
@@ -8,12 +8,11 @@ on:
       freebsd_version:
         description: 'FreeBSD version to use'
         required: false
-        default: '14.2'
+        default: '14.3'
         type: choice
         options:
-          - '14.2'
-          - '13.4'
-          - '13.3'
+          - '14.3'
+          - '13.5'
       lua_version:
         description: 'Lua version to use'
         required: false
@@ -40,6 +39,9 @@ jobs:
           release: ${{ inputs.freebsd_version }}
           usesh: true
           prepare: |
+            # Ignore OS version mismatch between pkg repository and running system
+            export IGNORE_OSVERSION=yes
+
             # Update package repository
             pkg update -f
 
diff --git a/.github/workflows/openbsd_build.yml b/.github/workflows/openbsd_build.yml
index 94b468e8ae..01dd5c895b 100644
--- a/.github/workflows/openbsd_build.yml
+++ b/.github/workflows/openbsd_build.yml
@@ -8,12 +8,12 @@ on:
       openbsd_version:
         description: 'OpenBSD version to use'
         required: false
-        default: '7.6'
+        default: '7.8'
         type: choice
         options:
+          - '7.8'
+          - '7.7'
           - '7.6'
-          - '7.5'
-          - '7.4'
       lua_version:
         description: 'Lua version to use'
         required: false
@@ -39,11 +39,14 @@ jobs:
           release: ${{ inputs.openbsd_version }}
           usesh: true
           prepare: |
+            # Set package repository path
+            export PKG_PATH=https://cdn.openbsd.org/pub/OpenBSD/$(uname -r)/packages/$(uname -m)/
+
             # Install base build dependencies
             pkg_add cmake ninja pkgconf \
               pcre2 sqlite3 openssl ragel icu4c \
               libsodium glib2 libunwind \
-              perl-5 libarchive zstd xxhash \
+              perl libarchive zstd xxhash \
               hyperscan file gettext-tools
 
             # Install Lua version based on user selection
-- 
2.47.3