patches: Fix patches for master branch.

* PR 1086 shouldn't be applied when installing from Git (master branch).
* Add a CI build specifically against the master branch.

.github/workflows/main.yml

@@ -180,6 +180,16 @@ jobs:
         run: |
           ./phreaknet.sh make
           GIT_REPO_PATH=${GITHUB_WORKSPACE} phreaknet install --fast --dahdi --devmode --sip --vanilla --user=asterisk
+  debian-stable-asterisk-master:
+    runs-on: ubuntu-24.04
+    name: Debian 12, Asterisk master branch
+    container: debian:12
+    steps:
+      - uses: actions/checkout@v4
+      - name: Build DAHDI and Asterisk
+        run: |
+          ./phreaknet.sh make
+          GIT_REPO_PATH=${GITHUB_WORKSPACE} phreaknet install --fast --dahdi --drivers --sip --testsuite --version=master
   debian-dahdi-minimal:
     runs-on: ubuntu-24.04
     name: Debian 12, without libpri and libss7

phreaknet.sh

@@ -2462,8 +2462,11 @@ phreak_patches() { # $1 = $PATCH_DIR, $2 = $AST_SRC_DIR
 		asterisk_pr_unconditional 245 # config.c: fix template inheritance/overrides.
 	fi
 
-	## Merged into master, not yet in a release version (use asterisk_pr_if, e.g. asterisk_pr_if 1234 220300 210800 201300)
-	asterisk_pr_unconditional 1086 220300 210800 201300 # Fix for Fedora 42 (old style definitions for libdb)
+	## Merged, not yet in a release version (use asterisk_pr_if, e.g. asterisk_pr_if 1234 220300 210800 201300)
+	if [ $AST_MAJOR_VER -lt 23 ]; then
+		# Underlying problem code was removed entirely in master, so patch only needed for release versions
+		asterisk_pr_unconditional 1086 220300 210800 201300 # Fix for Fedora 42 (old style definitions for libdb)
+	fi
 
 	## Unmerged patches: remove or switch to asterisk_pr_if once merged
 	asterisk_pr_unconditional 1089 # app_sms: Ignore false positive gcc warning