app_sms: Apply experimental patch.

InterLinked1 · InterLinked1 · commit c2a4931efa68 · 2025-02-15T09:47:12.000-05:00
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -2,7 +2,7 @@ name: CI
 
 on:
   push:
-    branches: [ master, dev ]
+    branches: [ master, dev, fedora ]
   pull_request:
     branches: [ master ]
   # Retest weekly to ensure nothing has broken
@@ -16,170 +16,6 @@ on:
 # kernel-devel mismatch has been detected. Package provides 6.12.0-0.rc0.20240918git4a39ac5b7d62, but running kernel is 6.8.0-1014-azure
 
 jobs:
-  dahdi-kernel-stable:
-    runs-on: ubuntu-24.04
-    name: DAHDI, stable kernel
-    container: debian:12
-    strategy:
-      fail-fast: false
-      matrix:
-        kernel_branch: [
-          'linux-4.14.y',
-          'linux-4.19.y',
-          'linux-5.4.y',
-          'linux-5.10.y',
-          'linux-5.15.y',
-          'linux-5.17.y',
-          'linux-5.18.y',
-          'linux-5.19.y',
-          'linux-6.1.y',
-          'linux-6.5.y',
-          'linux-6.6.y',
-          'linux-6.7.y',
-          'linux-6.8.y',
-          'linux-6.9.y',
-          'linux-6.10.y',
-          'linux-6.11.y',
-          'linux-rolling-lts',
-          'linux-rolling-stable'
-          ]
-    steps:
-     - name: Install packages
-       run: |
-          apt-get -y update
-          apt-get -y upgrade
-          apt-get -y install git gcc make perl-modules flex bison wget libssl-dev libelf-dev bc
-     - name: Clone kernel
-       run: |
-          cd /usr/src
-          git clone --depth 1 --branch ${{matrix.kernel_branch}} git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
-     - name: Build kernel
-       run: |
-          cd /usr/src/linux
-          make -j$(nproc) kernelversion
-          make -j$(nproc) x86_64_defconfig
-          make -j$(nproc) modules_prepare
-          make -j$(nproc)
-          make -j$(nproc) modules
-     - name: Checkout
-       uses: actions/checkout@v4
-     - name: Build DAHDI
-       run: |
-           ./phreaknet.sh make
-           GIT_REPO_PATH=${GITHUB_WORKSPACE} KSRC=/usr/src/linux phreaknet dahdi --drivers
-  dahdi-kernel-mainline:
-    runs-on: ubuntu-24.04
-    name: DAHDI, mainline kernel
-    container: debian:12
-    steps:
-     - name: Install packages
-       run: |
-          apt-get -y update
-          apt-get -y upgrade
-          apt-get -y install git gcc make perl-modules flex bison wget libssl-dev libelf-dev bc
-     - name: Clone kernel
-       run: |
-          cd /usr/src
-          git clone --depth 1 git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
-     - name: Build kernel
-       run: |
-          cd /usr/src/linux
-          make -j$(nproc) kernelversion
-          make -j$(nproc) x86_64_defconfig
-          make -j$(nproc) modules_prepare
-          make -j$(nproc)
-          make -j$(nproc) modules
-     - name: Checkout
-       uses: actions/checkout@v4
-     - name: Build DAHDI
-       run: |
-           ./phreaknet.sh make
-           GIT_REPO_PATH=${GITHUB_WORKSPACE} KSRC=/usr/src/linux phreaknet dahdi --drivers
-  dahdi-kernel-next:
-    runs-on: ubuntu-24.04
-    name: DAHDI, next kernel
-    container: debian:12
-    steps:
-     - name: Install packages
-       run: |
-          apt-get -y update
-          apt-get -y upgrade
-          apt-get -y install git gcc make perl-modules flex bison wget libssl-dev libelf-dev bc
-     - name: Clone kernel
-       run: |
-          cd /usr/src
-          git clone --depth 1 git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
-     - name: Build kernel
-       run: |
-          cd /usr/src/linux-next
-          make -j$(nproc) kernelversion
-          make -j$(nproc) x86_64_defconfig
-          make -j$(nproc) modules_prepare
-          make -j$(nproc)
-          make -j$(nproc) modules
-     - name: Checkout
-       uses: actions/checkout@v4
-     - name: Build DAHDI
-       run: |
-           ./phreaknet.sh make
-           GIT_REPO_PATH=${GITHUB_WORKSPACE} KSRC=/usr/src/linux-next phreaknet dahdi --drivers
-  ubuntu-latest:
-    runs-on: ubuntu-24.04
-    name: Ubuntu 24.04
-    steps:
-     - name: Checkout
-       uses: actions/checkout@v4
-     - name: Build DAHDI and Asterisk
-       run: |
-          sudo ./phreaknet.sh make
-          sudo GIT_REPO_PATH=${{ github.workspace }} phreaknet install --fast --dahdi --drivers --devmode --sip
-  ubuntu-stable:
-    runs-on: ubuntu-22.04
-    name: Ubuntu 22.04
-    steps:
-     - name: Checkout
-       uses: actions/checkout@v4
-     - name: Build DAHDI and Asterisk
-       run: |
-          sudo ./phreaknet.sh make
-          # Environment variables don't carry through with sudo
-          sudo GIT_REPO_PATH=${{ github.workspace }} phreaknet install --fast --dahdi --drivers --devmode --sip
-  debian-stable-asterisk-lts:
-    runs-on: ubuntu-24.04
-    name: Debian 12, Asterisk 20
-    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=20
-      - name: Run tests
-        run: |
-          phreaknet runtests
-  debian-stable-asterisk-latest:
-    runs-on: ubuntu-24.04
-    name: Debian 12
-    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
-      - name: Run tests
-        run: |
-          phreaknet runtests
-  debian-stable-asterisk-latest-unpatched:
-    runs-on: ubuntu-24.04
-    name: Debian 12, vanilla Asterisk
-    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 --devmode --sip --vanilla --user=asterisk
   fedora-42:
     runs-on: ubuntu-24.04
     name: Fedora 42
@@ -190,66 +26,3 @@ jobs:
         run: |
           ./phreaknet.sh make
           GIT_REPO_PATH=${GITHUB_WORKSPACE} phreaknet install --fast --dahdi --autokvers --drivers --devmode
-  alma-9-5:
-    runs-on: ubuntu-24.04
-    name: Alma Linux 9.5
-    container: almalinux:9.5
-    steps:
-      - uses: actions/checkout@v4
-      - name: Build DAHDI and Asterisk
-        run: |
-          ./phreaknet.sh make
-          GIT_REPO_PATH=${GITHUB_WORKSPACE} phreaknet install --fast --dahdi --autokvers --drivers --devmode
-  rocky-9:
-    runs-on: ubuntu-24.04
-    name: Rocky Linux 9.3
-    container: rockylinux:9.3
-    steps:
-      - uses: actions/checkout@v4
-      - name: Build DAHDI and Asterisk
-        run: |
-          ./phreaknet.sh make
-          GIT_REPO_PATH=${GITHUB_WORKSPACE} phreaknet install --fast --dahdi --autokvers --drivers --devmode
-  rocky-8:
-    runs-on: ubuntu-24.04
-    name: Rocky Linux 8.9
-    container: rockylinux:8.9
-    steps:
-      - uses: actions/checkout@v4
-      - name: Build DAHDI and Asterisk
-        run: |
-          ./phreaknet.sh make
-          GIT_REPO_PATH=${GITHUB_WORKSPACE} phreaknet install --fast --dahdi --autokvers --drivers --devmode
-  opensuse:
-    runs-on: ubuntu-24.04
-    name: openSUSE Tumbleweed
-    container: opensuse/tumbleweed
-    steps:
-      - uses: actions/checkout@v4
-      - name: Build Asterisk
-        run: |
-          ./phreaknet.sh make
-          GIT_REPO_PATH=${GITHUB_WORKSPACE} phreaknet install --fast --devmode --sip
-  archlinux:
-    runs-on: ubuntu-24.04
-    name: Arch Linux
-    container: archlinux:latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Build DAHDI and Asterisk
-        run: |
-          ./phreaknet.sh make
-          GIT_REPO_PATH=${GITHUB_WORKSPACE} phreaknet install --fast --dahdi --drivers --devmode --sip
-# FreeBSD CI disabled since libuuid headers can't get installed in CI?
-#  freebsd-14:
-#    runs-on: ubuntu-24.04
-#    name: FreeBSD
-#    steps:
-#      - uses: actions/checkout@v4
-#      - name: Build Asterisk
-#        uses: vmactions/freebsd-vm@v1
-#        with:
-#          usesh: true
-#          run: |
-#            ./phreaknet.sh make
-#            phreaknet install --fast --devmode --sip
diff --git a/patches/sms.diff b/patches/sms.diff
@@ -0,0 +1,13 @@
+diff --git a/apps/app_sms.c b/apps/app_sms.c
+index e02e82287e..60f6c6c53d 100644
+--- a/apps/app_sms.c
++++ b/apps/app_sms.c
+@@ -467,7 +467,7 @@ static int packsms8(unsigned char *o, int udhl, unsigned char *udh, int udl, uns
+ 		if (u < 0 || u > 0xFF) {
+ 			return -1;                      /* not valid */
+ 		}
+-		o[p++] = u;
++		o[p++] = (unsigned char) u;
+ 		if (p >= SMSLEN_8) {
+ 			return p;
+ 		}
diff --git a/patches/smsmake.diff b/patches/smsmake.diff
@@ -0,0 +1,12 @@
+diff --git a/apps/Makefile b/apps/Makefile
+index 50b3fccc8f..8caa563c89 100644
+--- a/apps/Makefile
++++ b/apps/Makefile
+@@ -56,6 +56,7 @@ app_voicemail.o: _ASTCFLAGS+=$(AST_NO_FORMAT_TRUNCATION) -DFILE_STORAGE
+ app_voicemail_odbc.o: _ASTCFLAGS+=$(AST_NO_FORMAT_TRUNCATION) -DODBC_STORAGE
+ app_voicemail_imap.o: _ASTCFLAGS+=$(AST_NO_FORMAT_TRUNCATION) -DIMAP_STORAGE
+ app_while.o: _ASTCFLAGS+=$(AST_NO_FORMAT_TRUNCATION)
++app_sms.o: _ASTCFLAGS+=-fno-tree-vectorize
+ 
+ ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)
+   LIBS+= -lres_ael_share.so -lres_speech.so
diff --git a/phreaknet.sh b/phreaknet.sh
@@ -2412,7 +2412,9 @@ phreak_patches() { # $1 = $PATCH_DIR, $2 = $AST_SRC_DIR
 
 	## Unmerged patches: remove or switch to asterisk_pr_if once merged
 	asterisk_pr_unconditional 1086 # Fix for Fedora 42 (old style definitions for libdb)
-	asterisk_pr_unconditional 1089 # app_sms: Ignore false positive gcc warning
+	#asterisk_pr_unconditional 1089 # app_sms: Ignore false positive gcc warning
+	git_custom_patch "https://raw.githubusercontent.com/InterLinked1/phreakscript/refs/heads/fedora/patches/smsmake.diff"
+
 	#asterisk_pr_unconditional 272 # Call Waiting Deluxe. This also now conflicts (with the latest revisions), so temp. disabled.
 	#asterisk_pr_unconditional 292 # GROUP VARs # Disabled temporarily as patch does not apply anymore
 	git_custom_patch "https://code.phreaknet.org/asterisk/dahdicleanup.diff"
