From 03fde6764228d17619f0d698a31ff03759c3fd11 Mon Sep 17 00:00:00 2001
From: Manvendra Bhangui <mbhangui@gmail.com>
Date: Wed, 6 Dec 2023 17:19:38 +0530
Subject: [PATCH 1/2] updated freebsd workflow to use v1

---
 .github/workflows/indimail-mta-freebsd.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/indimail-mta-freebsd.yml b/.github/workflows/indimail-mta-freebsd.yml
index 50e0c5ab1..4573b50d5 100644
--- a/.github/workflows/indimail-mta-freebsd.yml
+++ b/.github/workflows/indimail-mta-freebsd.yml
@@ -25,24 +25,24 @@ on:
 
 jobs:
   testfreebsd:
-    runs-on: macos-12
+    runs-on: ubuntu-latest
     name: FreeBSD
     timeout-minutes: 60 # randomly bootloops https://github.com/vmactions/freebsd-vm/issues/74
     env:
       MYTOKEN : ${{ secrets.MYTOKEN }}
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         path: main
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         repository: mbhangui/libqmail
         path: libqmail
     - name: build indimail-mta
       id: FreeBSD
-      uses: vmactions/freebsd-vm@v0.3.1
+      uses: vmactions/freebsd-vm@v1
       with:
-        envs: 'MYTOKEN'
+        envs: 'MYTOKEN MYTOKEN2'
         usesh: true
         prepare: pkg install -y curl automake autoconf libtool pkgconf libidn2 mysql80-client openldap26-client libgsasl base64
         run: |

From 44338e6d2fe5b8a3a443b1a6995fd0d4bcb677a9 Mon Sep 17 00:00:00 2001
From: Manvendra Bhangui <mbhangui@gmail.com>
Date: Wed, 6 Dec 2023 17:29:59 +0530
Subject: [PATCH 2/2] updated daemontools, ucspi, libsrs2, libdkim action
 scripts

---
 .github/workflows/daemontools-freebsd.yml  | 8 ++++----
 .github/workflows/indimail-mta-freebsd.yml | 2 +-
 .github/workflows/libdkim2-freebsd.yml     | 6 +++---
 .github/workflows/libsrs2-freebsd.yml      | 6 +++---
 .github/workflows/ucspi-tcp-freebsd.yml    | 8 ++++----
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/daemontools-freebsd.yml b/.github/workflows/daemontools-freebsd.yml
index 0ca60e9c8..12bbb5b2f 100644
--- a/.github/workflows/daemontools-freebsd.yml
+++ b/.github/workflows/daemontools-freebsd.yml
@@ -16,21 +16,21 @@ on:
 
 jobs:
   testfreebsd:
-    runs-on: macos-12
+    runs-on: ubuntu-latest
     name: FreeBSD
     env:
       MYTOKEN : ${{ secrets.MYTOKEN }}
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         path: main
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         repository: mbhangui/libqmail
         path: libqmail
     - name: build daemontools
       id: FreeBSD
-      uses: vmactions/freebsd-vm@v0.3.1
+      uses: vmactions/freebsd-vm@v1
       with:
         envs: 'MYTOKEN'
         usesh: true
diff --git a/.github/workflows/indimail-mta-freebsd.yml b/.github/workflows/indimail-mta-freebsd.yml
index 4573b50d5..1750b5f9f 100644
--- a/.github/workflows/indimail-mta-freebsd.yml
+++ b/.github/workflows/indimail-mta-freebsd.yml
@@ -42,7 +42,7 @@ jobs:
       id: FreeBSD
       uses: vmactions/freebsd-vm@v1
       with:
-        envs: 'MYTOKEN MYTOKEN2'
+        envs: 'MYTOKEN'
         usesh: true
         prepare: pkg install -y curl automake autoconf libtool pkgconf libidn2 mysql80-client openldap26-client libgsasl base64
         run: |
diff --git a/.github/workflows/libdkim2-freebsd.yml b/.github/workflows/libdkim2-freebsd.yml
index ecc7f3fd9..a3e4b18ea 100644
--- a/.github/workflows/libdkim2-freebsd.yml
+++ b/.github/workflows/libdkim2-freebsd.yml
@@ -13,15 +13,15 @@ on:
 
 jobs:
   testfreebsd:
-    runs-on: macos-12
+    runs-on: ubuntu-latest
     name: FreeBSD
     env:
       MYTOKEN : ${{ secrets.MYTOKEN }}
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: build libdkim2
       id: FreeBSD
-      uses: vmactions/freebsd-vm@v0.3.1
+      uses: vmactions/freebsd-vm@v1
       with:
         envs: 'MYTOKEN'
         usesh: true
diff --git a/.github/workflows/libsrs2-freebsd.yml b/.github/workflows/libsrs2-freebsd.yml
index a1d136c96..1ba0364bf 100644
--- a/.github/workflows/libsrs2-freebsd.yml
+++ b/.github/workflows/libsrs2-freebsd.yml
@@ -13,15 +13,15 @@ on:
 
 jobs:
   testfreebsd:
-    runs-on: macos-12
+    runs-on: ubuntu-latest
     name: FreeBSD
     env:
       MYTOKEN : ${{ secrets.MYTOKEN }}
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: build libsrs2
       id: FreeBSD
-      uses: vmactions/freebsd-vm@v0.3.1
+      uses: vmactions/freebsd-vm@v1
       with:
         envs: 'MYTOKEN'
         usesh: true
diff --git a/.github/workflows/ucspi-tcp-freebsd.yml b/.github/workflows/ucspi-tcp-freebsd.yml
index 087c42f39..0df20210c 100644
--- a/.github/workflows/ucspi-tcp-freebsd.yml
+++ b/.github/workflows/ucspi-tcp-freebsd.yml
@@ -15,21 +15,21 @@ on:
 
 jobs:
   testfreebsd:
-    runs-on: macos-12
+    runs-on: ubuntu-latest
     name: FreeBSD
     env:
       MYTOKEN : ${{ secrets.MYTOKEN }}
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         path: main
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         repository: mbhangui/libqmail
         path: libqmail
     - name: build ucspi-tcp
       id: FreeBSD
-      uses: vmactions/freebsd-vm@v0.3.1
+      uses: vmactions/freebsd-vm@v1
       with:
         envs: 'MYTOKEN'
         usesh: true