upgpkg: v1.10.9

10 files changed, 106 insertions, 59 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 577a338f8c79..840f37fcfe8e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = freeswitch
 	pkgdesc = An opensource and free (libre, price) telephony system, similar to Asterisk.
-	pkgver = 1.10.8
+	pkgver = 1.10.9
 	pkgrel = 1
 	url = http://freeswitch.org/
 	install = freeswitch.install
@@ -36,15 +36,16 @@ pkgbase = freeswitch
 	depends = ffmpeg4.4
 	depends = openssl
 	depends = opus
+	depends = pcre
 	depends = freetype2
 	depends = spandsp-fs
-	depends = sofia-sip-fs
+	depends = sofia-sip
 	provides = freeswitch
 	conflicts = freeswitch-git
 	conflicts = freeswitch-fixed
 	backup = etc/freeswitch/private/passwords.xml
 	backup = etc/freeswitch/vars.xml
-	source = https://github.com/signalwire/freeswitch/archive/v1.10.8.tar.gz
+	source = https://github.com/signalwire/freeswitch/archive/v1.10.9.tar.gz
 	source = freeswitch.conf.d
 	source = README.freeswitch
 	source = run.freeswitch
@@ -52,9 +53,9 @@ pkgbase = freeswitch
 	source = conf_log.freeswitch
 	source = freeswitch.service
 	source = freeswitch-arch.patch
-	source = apr-nsig-fix.patch
-	source = python-3.10.patch
+	source = python-3.11.patch
 	source = fix-zmq-url.patch
+	source = spandsp-fix.patch
 	source = freeswitch.conf.d.sig
 	source = README.freeswitch.sig
 	source = run.freeswitch.sig
@@ -62,9 +63,9 @@ pkgbase = freeswitch
 	source = conf_log.freeswitch.sig
 	source = freeswitch.service.sig
 	source = freeswitch-arch.patch.sig
-	source = apr-nsig-fix.patch.sig
-	source = python-3.10.patch.sig
+	source = python-3.11.patch.sig
 	source = fix-zmq-url.patch.sig
+	source = spandsp-fix.patch.sig
 	validpgpkeys = 071C6FAFDA426F1F3984C488E56023217FBB112D
 	sha512sums = SKIP
 	sha512sums = a9c0f8397e9375b26f8c3950c07fff9ce2c60684bd99cfb371cd19cce2bfb2f042a5380a38751bcd212096611d38731a2613a93d037b53f0c1cf356180b98912
@@ -74,9 +75,9 @@ pkgbase = freeswitch
 	sha512sums = a4fd539de109de3475abfeb2bd8a95670af3f5af83bd6f6b229df19e81da3f121c28a62cff282f9dc152908ebe0f24f76743e00c72fa04dc1fd465a00dc6f976
 	sha512sums = 0d71a056de156f5840effabf6fb37a20e64ae011ecd48bf049886d4c073fe251cd6adeb0380784622b570948e1ca30ce7c92a2cade230a7177c97ed697e6f1cb
 	sha512sums = 4d4f5237297b298010b8a0b264435cc2c04742ca313272e7558f164b19aef97afaace5cf005eeffcfa6be096daedace67931cc209bccdabd2f3d01a42b643036
-	sha512sums = dd23352fe208b1c7f36ff6dec9ff8288795f99448273e5ec38fd44deb3eb37a8756ad55225bce31f464e3ae43afe4c38883d64f251bc3f0c529890009a3324e9
-	sha512sums = 4739be0c1c6783ace2bd10f7573b1ca86be013d21a7f973b5fd348c98fb9ed1a548baacee6bb65b7501251106c8dbd7266997f8699d2d7070a2bd7efe145b866
+	sha512sums = 07560ded0f537e256748ed243e06c2072e93679d3e601423a77fbf3b885caeae0f354455b532903f399c7c949841775a49c648fa5189cb19566dc6f7e83e5629
 	sha512sums = cf55641654538af737246f9c838b98c081cf4b00e5713b821b86e0fc02df7b6605ea26fed9b5e9d3740a7766ac33d6effec324d3cc9ed6a7d6faeb9ba744f35f
+	sha512sums = 7d249589dfaa081f29e8127f3e66beaeb696c15e35ab6d1aecf5ccc497d3b9993336455b612875ae62b04fd1a7ab12ad2d3b65460e5920dfd3adc71ff8b012c0
 	sha512sums = SKIP
 	sha512sums = SKIP
 	sha512sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 2067ba364713..56880df141e3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -165,7 +165,7 @@ _disabled_modules=(languages/mod_spidermonkey
 # BUILD CONFIGURATION ENDS                     #
 
 pkgname=freeswitch
-pkgver=1.10.8
+pkgver=1.10.9
 pkgrel=1
 pkgdesc="An opensource and free (libre, price) telephony system, similar to Asterisk."
 arch=('i686' 'x86_64')
@@ -186,9 +186,10 @@ depends=('curl'
          'ffmpeg4.4'
          'openssl'
          'opus'
+         'pcre'
          'freetype2'
          'spandsp-fs'
-         'sofia-sip-fs')
+         'sofia-sip')
 # per https://wiki.freeswitch.org/wiki/FreeSwitch_Dependencies, dependencies are downloaded and built *from upstream*, so thankfully the deps are pretty minimal.
 makedepends=('git'
              'libjpeg'
@@ -224,9 +225,9 @@ source=("https://github.com/signalwire/${pkgname}/archive/v${pkgver}.tar.gz"
          'conf_log.freeswitch'
          'freeswitch.service'
 	 'freeswitch-arch.patch'  # required for 1.6.17
-         'apr-nsig-fix.patch'
-         'python-3.10.patch'
+         'python-3.11.patch'
          'fix-zmq-url.patch'
+         'spandsp-fix.patch'
          'freeswitch.conf.d.sig'
          'README.freeswitch.sig'
          'run.freeswitch.sig'
@@ -234,9 +235,9 @@ source=("https://github.com/signalwire/${pkgname}/archive/v${pkgver}.tar.gz"
          'conf_log.freeswitch.sig'
          'freeswitch.service.sig'
 	 'freeswitch-arch.patch.sig'
-         'apr-nsig-fix.patch.sig'  # required for 1.6.17
-         'python-3.10.patch.sig'
-         'fix-zmq-url.patch.sig' )
+         'python-3.11.patch.sig'
+         'fix-zmq-url.patch.sig'
+         'spandsp-fix.patch.sig')
 _pkgname="freeswitch"
 sha512sums=('SKIP'
             'a9c0f8397e9375b26f8c3950c07fff9ce2c60684bd99cfb371cd19cce2bfb2f042a5380a38751bcd212096611d38731a2613a93d037b53f0c1cf356180b98912'
@@ -246,9 +247,9 @@ sha512sums=('SKIP'
             'a4fd539de109de3475abfeb2bd8a95670af3f5af83bd6f6b229df19e81da3f121c28a62cff282f9dc152908ebe0f24f76743e00c72fa04dc1fd465a00dc6f976'
             '0d71a056de156f5840effabf6fb37a20e64ae011ecd48bf049886d4c073fe251cd6adeb0380784622b570948e1ca30ce7c92a2cade230a7177c97ed697e6f1cb'
 	    '4d4f5237297b298010b8a0b264435cc2c04742ca313272e7558f164b19aef97afaace5cf005eeffcfa6be096daedace67931cc209bccdabd2f3d01a42b643036'
-            'dd23352fe208b1c7f36ff6dec9ff8288795f99448273e5ec38fd44deb3eb37a8756ad55225bce31f464e3ae43afe4c38883d64f251bc3f0c529890009a3324e9'
-            '4739be0c1c6783ace2bd10f7573b1ca86be013d21a7f973b5fd348c98fb9ed1a548baacee6bb65b7501251106c8dbd7266997f8699d2d7070a2bd7efe145b866'
+            '07560ded0f537e256748ed243e06c2072e93679d3e601423a77fbf3b885caeae0f354455b532903f399c7c949841775a49c648fa5189cb19566dc6f7e83e5629'
             'cf55641654538af737246f9c838b98c081cf4b00e5713b821b86e0fc02df7b6605ea26fed9b5e9d3740a7766ac33d6effec324d3cc9ed6a7d6faeb9ba744f35f'
+            '7d249589dfaa081f29e8127f3e66beaeb696c15e35ab6d1aecf5ccc497d3b9993336455b612875ae62b04fd1a7ab12ad2d3b65460e5920dfd3adc71ff8b012c0'
             'SKIP'
             'SKIP'
             'SKIP'
@@ -276,8 +277,8 @@ disable_module() {
 prepare() {
   cd ${srcdir}/${_pkgname}-${pkgver}
 
-  patch -Np1 -i ../apr-nsig-fix.patch
-  patch -Np1 -i ../python-3.10.patch
+  patch -Np1 -i ../python-3.11.patch
+  patch -Np1 -i ../spandsp-fix.patch
   patch -Np1 -i ../fix-zmq-url.patch
 
   # BUILD BEGINS
@@ -302,7 +303,7 @@ prepare() {
   # CONFIGURE
   # We need to override some things for the ./configure for 1.6.17
   #./configure \
-  export CFLAGS="${CFLAGS} -Wno-error -D__alloca=alloca -I/usr/include/python3.10" # -I/usr/include/ffmpeg4.4"
+  export CFLAGS="${CFLAGS} -Wno-error -D__alloca=alloca -I/usr/include/python3.11" # -I/usr/include/ffmpeg4.4"
   export CXXFLAGS="${CFLAGS}"
   PKG_CONFIG_PATH="/usr/lib/ffmpeg4.4/pkgconfig" \
   ./configure \
diff --git a/apr-nsig-fix.patch b/apr-nsig-fix.patch
deleted file mode 100644
index 6248f0722f69..000000000000
--- a/apr-nsig-fix.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Naur freeswitch-1.10.8.pristine/libs/apr/include/fspr_general.h freeswitch-1.10.8/libs/apr/include/fspr_general.h
---- freeswitch-1.10.8.pristine/libs/apr/include/fspr_general.h	2022-12-28 12:25:07.076204573 +0000
-+++ freeswitch-1.10.8/libs/apr/include/fspr_general.h	2022-12-28 12:26:34.536771598 +0000
-@@ -29,9 +29,9 @@
- #include "fspr_pools.h"
- #include "fspr_errno.h"
- 
--#if !defined(_ANSI_SOURCE) && defined(_DARWIN_C_SOURCE)
--#define NSIG __DARWIN_NSIG
--#endif
-+//#if !defined(_ANSI_SOURCE) && defined(_DARWIN_C_SOURCE)
-+//#define NSIG __DARWIN_NSIG
-+//#endif
- 
- #if APR_HAVE_SIGNAL_H
- #include <signal.h>
diff --git a/apr-nsig-fix.patch.sig b/apr-nsig-fix.patch.sig
deleted file mode 100644
index 384627da285f..000000000000
--- a/apr-nsig-fix.patch.sig
+++ /dev/null
diff --git a/python-3.10.patch b/python-3.10.patch
deleted file mode 100644
index 2d1d01fd5f93..000000000000
--- a/python-3.10.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 990a59db2a..57a187aa11 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1765,7 +1765,7 @@ then
- 
- 		AC_MSG_CHECKING([for python distutils])
- 		python_result="`$PYTHON -c 'import distutils;' 2>&1`"
--		if test -z "$python_result" ; then
-+		if test $? -eq 0; then
- 			python_has_distutils="yes"
- 		else
- 			python_has_distutils="no"
-@@ -1886,7 +1886,7 @@ then
- 
- 		AC_MSG_CHECKING([for python3 distutils])
- 		python3_result="`$PYTHON3 -c 'import distutils;' 2>&1`"
--		if test -z "$python3_result" ; then
-+		if test $? -eq 0 ; then
- 			python3_has_distutils="yes"
- 		else
- 			python3_has_distutils="no"
diff --git a/python-3.10.patch.sig b/python-3.10.patch.sig
deleted file mode 100644
index 64867b9acc8b..000000000000
--- a/python-3.10.patch.sig
+++ /dev/null
diff --git a/python-3.11.patch b/python-3.11.patch
new file mode 100644
index 000000000000..09206d031513
--- /dev/null
+++ b/python-3.11.patch
@@ -0,0 +1,36 @@
+diff -Naur freeswitch-1.10.9.pristine/configure.ac freeswitch-1.10.9/configure.ac
+--- freeswitch-1.10.9.pristine/configure.ac	2023-08-10 04:13:34.913098181 +0000
++++ freeswitch-1.10.9/configure.ac	2023-08-10 04:16:26.596385752 +0000
+@@ -1754,7 +1754,7 @@
+ 
+ 		AC_MSG_CHECKING([for python distutils])
+ 		python_result="`$PYTHON -c 'import distutils;' 2>&1`"
+-		if test -z "$python_result" ; then
++		if test $? -eq 0; then
+ 			python_has_distutils="yes"
+ 		else
+ 			python_has_distutils="no"
+@@ -1875,7 +1875,7 @@
+ 
+ 		AC_MSG_CHECKING([for python3 distutils])
+ 		python3_result="`$PYTHON3 -c 'import distutils;' 2>&1`"
+-		if test -z "$python3_result" ; then
++		if test $? -eq 0 ; then
+ 			python3_has_distutils="yes"
+ 		else
+ 			python3_has_distutils="no"
+diff -Naur freeswitch-1.10.9.pristine/src/mod/languages/mod_python3/mod_python3.c freeswitch-1.10.9/src/mod/languages/mod_python3/mod_python3.c
+--- freeswitch-1.10.9.pristine/src/mod/languages/mod_python3/mod_python3.c	2023-08-10 04:15:17.376400153 +0000
++++ freeswitch-1.10.9/src/mod/languages/mod_python3/mod_python3.c	2023-08-10 04:19:16.898350608 +0000
+@@ -154,9 +154,9 @@
+ 		/* Traceback */
+ 		do {
+ 			sprintf((char*)sTemp, "\n\tFile: \"%s\", line %i, in %s",
+-					PyString_AsString(pyTB->tb_frame->f_code->co_filename),
++					PyString_AsString(PyFrame_GetCode(pyTB->tb_frame)->co_filename),
+ 					pyTB->tb_lineno,
+-					PyString_AsString(pyTB->tb_frame->f_code->co_name) );
++					PyString_AsString(PyFrame_GetCode(pyTB->tb_frame)->co_name) );
+ 			strcat(buffer, (char*)sTemp);
+ 
+ 			pyTB=pyTB->tb_next;
diff --git a/python-3.11.patch.sig b/python-3.11.patch.sig
new file mode 100644
index 000000000000..f1e0b10638c1
--- /dev/null
+++ b/python-3.11.patch.sig
diff --git a/spandsp-fix.patch b/spandsp-fix.patch
new file mode 100644
index 000000000000..ef27923791e9
--- /dev/null
+++ b/spandsp-fix.patch
@@ -0,0 +1,47 @@
+--- freeswitch.pristine/src/mod/applications/mod_spandsp/mod_spandsp_dsp.c   2023-02-03 20:07:30.000000000 +0000
++++ freeswitch/src/mod/applications/mod_spandsp/mod_spandsp_dsp.c     2023-07-13 08:47:35.332074299 +0000
+@@ -156,13 +156,13 @@
+ {
+ 	switch_channel_t *channel = switch_core_session_get_channel(session);
+ 	const char *var;
+-	int r = V18_MODE_5BIT_4545;
++	int r = V18_MODE_WEITBRECHT_5BIT_4545;
+
+ 	if ((var = switch_channel_get_variable(channel, "v18_mode"))) {
+ 		if (!strcasecmp(var, "5BIT_45") || !strcasecmp(var, "baudot")) {
+-			r = V18_MODE_5BIT_4545;
++			r = V18_MODE_WEITBRECHT_5BIT_4545;
+ 		} else if (!strcasecmp(var, "5BIT_50")) {
+-			r = V18_MODE_5BIT_50;
++			r = V18_MODE_WEITBRECHT_5BIT_4545;
+ 		} else if (!strcasecmp(var, "DTMF")) {
+ 			r = V18_MODE_DTMF;
+ 		} else if (!strcasecmp(var, "EDT")) {
+@@ -213,7 +213,7 @@
+ 		return SWITCH_STATUS_FALSE;
+ 	}
+
+-	tdd_state = v18_init(NULL, TRUE, get_v18_mode(session), V18_AUTOMODING_GLOBAL, put_text_msg, NULL);
++	tdd_state = v18_init(NULL, TRUE, get_v18_mode(session), V18_AUTOMODING_GLOBAL, put_text_msg, NULL, NULL, NULL);
+
+
+ 	v18_put(tdd_state, text, -1);
+@@ -260,7 +260,7 @@
+ 	}
+
+ 	pvt->session = session;
+-	pvt->tdd_state = v18_init(NULL, TRUE, get_v18_mode(session), V18_AUTOMODING_GLOBAL, put_text_msg, NULL);
++	pvt->tdd_state = v18_init(NULL, TRUE, get_v18_mode(session), V18_AUTOMODING_GLOBAL, put_text_msg, NULL, NULL, NULL);
+ 	pvt->head_lead = TDD_LEAD;
+
+ 	v18_put(pvt->tdd_state, text, -1);
+@@ -338,7 +338,7 @@
+ 	}
+
+	pvt->session = session;
+-	pvt->tdd_state = v18_init(NULL, FALSE, get_v18_mode(session), V18_AUTOMODING_GLOBAL, put_text_msg, pvt);
++	pvt->tdd_state = v18_init(NULL, FALSE, get_v18_mode(session), V18_AUTOMODING_GLOBAL, put_text_msg, pvt, NULL, NULL);
+
+ 	if ((status = switch_core_media_bug_add(session, "spandsp_tdd_decode", NULL,
+ 						tdd_decode_callback, pvt, 0, SMBF_READ_REPLACE | SMBF_NO_PAUSE, &bug)) != SWITCH_STATUS_SUCCESS) {
+
diff --git a/spandsp-fix.patch.sig b/spandsp-fix.patch.sig
new file mode 100644
index 000000000000..99d95ab66939
--- /dev/null
+++ b/spandsp-fix.patch.sig