Upgrade package, fix patches, fix ZeroMQ source URL, update/cleanup keys

and signatures.

14 files changed, 36 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c73f800b8f06..577a338f8c79 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = freeswitch
 	pkgdesc = An opensource and free (libre, price) telephony system, similar to Asterisk.
-	pkgver = 1.10.7
-	pkgrel = 2
+	pkgver = 1.10.8
+	pkgrel = 1
 	url = http://freeswitch.org/
 	install = freeswitch.install
 	arch = i686
@@ -44,7 +44,7 @@ pkgbase = freeswitch
 	conflicts = freeswitch-fixed
 	backup = etc/freeswitch/private/passwords.xml
 	backup = etc/freeswitch/vars.xml
-	source = https://github.com/signalwire/freeswitch/archive/v1.10.7.tar.gz
+	source = https://github.com/signalwire/freeswitch/archive/v1.10.8.tar.gz
 	source = freeswitch.conf.d
 	source = README.freeswitch
 	source = run.freeswitch
@@ -54,6 +54,7 @@ pkgbase = freeswitch
 	source = freeswitch-arch.patch
 	source = apr-nsig-fix.patch
 	source = python-3.10.patch
+	source = fix-zmq-url.patch
 	source = freeswitch.conf.d.sig
 	source = README.freeswitch.sig
 	source = run.freeswitch.sig
@@ -63,8 +64,8 @@ pkgbase = freeswitch
 	source = freeswitch-arch.patch.sig
 	source = apr-nsig-fix.patch.sig
 	source = python-3.10.patch.sig
-	validpgpkeys = 412D089B780A1E986489A79F3BE997D520108D8F
-	validpgpkeys = 748231EBCBD808A14F5E85D28C004C2F93481F6B
+	source = fix-zmq-url.patch.sig
+	validpgpkeys = 071C6FAFDA426F1F3984C488E56023217FBB112D
 	sha512sums = SKIP
 	sha512sums = a9c0f8397e9375b26f8c3950c07fff9ce2c60684bd99cfb371cd19cce2bfb2f042a5380a38751bcd212096611d38731a2613a93d037b53f0c1cf356180b98912
 	sha512sums = 55e913bae6d3bb04ae9253989e40b6e0c3bfcecf95c28c904f5022ed218227c68530aaa60f99d7486469c95f9c1719da041a8fef82bf4ee54b1f901c443d347d
@@ -73,8 +74,10 @@ pkgbase = freeswitch
 	sha512sums = a4fd539de109de3475abfeb2bd8a95670af3f5af83bd6f6b229df19e81da3f121c28a62cff282f9dc152908ebe0f24f76743e00c72fa04dc1fd465a00dc6f976
 	sha512sums = 0d71a056de156f5840effabf6fb37a20e64ae011ecd48bf049886d4c073fe251cd6adeb0380784622b570948e1ca30ce7c92a2cade230a7177c97ed697e6f1cb
 	sha512sums = 4d4f5237297b298010b8a0b264435cc2c04742ca313272e7558f164b19aef97afaace5cf005eeffcfa6be096daedace67931cc209bccdabd2f3d01a42b643036
-	sha512sums = d82ab534e9912d7440e66643c30d9e2691973f8915a00ed7c794fc8fc3649439fe6538d3b17e2eb2838a448ef394a613fb89429afa70055cdcaefd54339f6022
+	sha512sums = dd23352fe208b1c7f36ff6dec9ff8288795f99448273e5ec38fd44deb3eb37a8756ad55225bce31f464e3ae43afe4c38883d64f251bc3f0c529890009a3324e9
 	sha512sums = 4739be0c1c6783ace2bd10f7573b1ca86be013d21a7f973b5fd348c98fb9ed1a548baacee6bb65b7501251106c8dbd7266997f8699d2d7070a2bd7efe145b866
+	sha512sums = cf55641654538af737246f9c838b98c081cf4b00e5713b821b86e0fc02df7b6605ea26fed9b5e9d3740a7766ac33d6effec324d3cc9ed6a7d6faeb9ba744f35f
+	sha512sums = SKIP
 	sha512sums = SKIP
 	sha512sums = SKIP
 	sha512sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 6ba0f02f2c91..2067ba364713 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,7 @@
 # Contributor: Brent Saner <r00t (at) square-r00t (dot) net>
 # Bug reports can be filed at https://bugs.square-r00t.net/index.php?project=3
 # News updates for packages can be followed at https://devblog.square-r00t.net
-validpgpkeys=('412D089B780A1E986489A79F3BE997D520108D8F'
-              '748231EBCBD808A14F5E85D28C004C2F93481F6B')
+validpgpkeys=('071C6FAFDA426F1F3984C488E56023217FBB112D')
 
 # This builds the FreeSWITCH open source telephone engine
 # from the freeswitch git.  It enables the following modules
@@ -166,8 +165,8 @@ _disabled_modules=(languages/mod_spidermonkey
 # BUILD CONFIGURATION ENDS                     #
 
 pkgname=freeswitch
-pkgver=1.10.7
-pkgrel=2
+pkgver=1.10.8
+pkgrel=1
 pkgdesc="An opensource and free (libre, price) telephony system, similar to Asterisk."
 arch=('i686' 'x86_64')
 url="http://freeswitch.org/"
@@ -227,6 +226,7 @@ source=("https://github.com/signalwire/${pkgname}/archive/v${pkgver}.tar.gz"
 	 'freeswitch-arch.patch'  # required for 1.6.17
          'apr-nsig-fix.patch'
          'python-3.10.patch'
+         'fix-zmq-url.patch'
          'freeswitch.conf.d.sig'
          'README.freeswitch.sig'
          'run.freeswitch.sig'
@@ -235,7 +235,8 @@ source=("https://github.com/signalwire/${pkgname}/archive/v${pkgver}.tar.gz"
          'freeswitch.service.sig'
 	 'freeswitch-arch.patch.sig'
          'apr-nsig-fix.patch.sig'  # required for 1.6.17
-         'python-3.10.patch.sig' )
+         'python-3.10.patch.sig'
+         'fix-zmq-url.patch.sig' )
 _pkgname="freeswitch"
 sha512sums=('SKIP'
             'a9c0f8397e9375b26f8c3950c07fff9ce2c60684bd99cfb371cd19cce2bfb2f042a5380a38751bcd212096611d38731a2613a93d037b53f0c1cf356180b98912'
@@ -245,8 +246,10 @@ sha512sums=('SKIP'
             'a4fd539de109de3475abfeb2bd8a95670af3f5af83bd6f6b229df19e81da3f121c28a62cff282f9dc152908ebe0f24f76743e00c72fa04dc1fd465a00dc6f976'
             '0d71a056de156f5840effabf6fb37a20e64ae011ecd48bf049886d4c073fe251cd6adeb0380784622b570948e1ca30ce7c92a2cade230a7177c97ed697e6f1cb'
 	    '4d4f5237297b298010b8a0b264435cc2c04742ca313272e7558f164b19aef97afaace5cf005eeffcfa6be096daedace67931cc209bccdabd2f3d01a42b643036'
-            'd82ab534e9912d7440e66643c30d9e2691973f8915a00ed7c794fc8fc3649439fe6538d3b17e2eb2838a448ef394a613fb89429afa70055cdcaefd54339f6022'
+            'dd23352fe208b1c7f36ff6dec9ff8288795f99448273e5ec38fd44deb3eb37a8756ad55225bce31f464e3ae43afe4c38883d64f251bc3f0c529890009a3324e9'
             '4739be0c1c6783ace2bd10f7573b1ca86be013d21a7f973b5fd348c98fb9ed1a548baacee6bb65b7501251106c8dbd7266997f8699d2d7070a2bd7efe145b866'
+            'cf55641654538af737246f9c838b98c081cf4b00e5713b821b86e0fc02df7b6605ea26fed9b5e9d3740a7766ac33d6effec324d3cc9ed6a7d6faeb9ba744f35f'
+            'SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
@@ -275,6 +278,7 @@ prepare() {
 
   patch -Np1 -i ../apr-nsig-fix.patch
   patch -Np1 -i ../python-3.10.patch
+  patch -Np1 -i ../fix-zmq-url.patch
 
   # BUILD BEGINS
   msg "Bootstrapping..."
diff --git a/README.freeswitch.sig b/README.freeswitch.sig
index 6aae134814b4..9e856d8ebe03 100644
--- a/README.freeswitch.sig
+++ b/README.freeswitch.sig
diff --git a/apr-nsig-fix.patch b/apr-nsig-fix.patch
index a743383181ef..6248f0722f69 100644
--- a/apr-nsig-fix.patch
+++ b/apr-nsig-fix.patch
@@ -1,9 +1,9 @@
-diff -Naur freeswitch-1.10.7.pristine/libs/apr/include/apr_general.h freeswitch-1.10.7/libs/apr/include/apr_general.h
---- freeswitch-1.10.7.pristine/libs/apr/include/apr_general.h	2021-10-28 16:05:37.752029385 +0000
-+++ freeswitch-1.10.7/libs/apr/include/apr_general.h	2021-10-28 16:08:18.345230793 +0000
+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 "apr_pools.h"
- #include "apr_errno.h"
+ #include "fspr_pools.h"
+ #include "fspr_errno.h"
  
 -#if !defined(_ANSI_SOURCE) && defined(_DARWIN_C_SOURCE)
 -#define NSIG __DARWIN_NSIG
diff --git a/apr-nsig-fix.patch.sig b/apr-nsig-fix.patch.sig
index 35390e71c35c..384627da285f 100644
--- a/apr-nsig-fix.patch.sig
+++ b/apr-nsig-fix.patch.sig
diff --git a/conf_log.freeswitch.sig b/conf_log.freeswitch.sig
index 802bd64c698e..70da24310e4a 100644
--- a/conf_log.freeswitch.sig
+++ b/conf_log.freeswitch.sig
diff --git a/fix-zmq-url.patch b/fix-zmq-url.patch
new file mode 100644
index 000000000000..7948dbf8c3f2
--- /dev/null
+++ b/fix-zmq-url.patch
@@ -0,0 +1,12 @@
+diff -Naur freeswitch-1.10.8.pristine/src/mod/event_handlers/mod_event_zmq/Makefile.am freeswitch-1.10.8/src/mod/event_handlers/mod_event_zmq/Makefile.am
+--- freeswitch-1.10.8.pristine/src/mod/event_handlers/mod_event_zmq/Makefile.am	2022-12-28 19:08:53.136009309 +0000
++++ freeswitch-1.10.8/src/mod/event_handlers/mod_event_zmq/Makefile.am	2022-12-28 19:09:28.626542887 +0000
+@@ -2,7 +2,7 @@
+ MODNAME=mod_event_zmq
+ ZMQ=zeromq-2.1.9
+ 
+-ZMQ_BASEURL=http://download.zeromq.org
++ZMQ_BASEURL=https://github.com/zeromq/zeromq2-x/releases/download/v2.1.9
+ ZMQ_BASEURL_ALT=http://download.zeromq.org/historic
+ 
+ ZMQ_DIR=$(switch_srcdir)/libs/$(ZMQ)
diff --git a/fix-zmq-url.patch.sig b/fix-zmq-url.patch.sig
new file mode 100644
index 000000000000..3cef0de70c45
--- /dev/null
+++ b/fix-zmq-url.patch.sig
diff --git a/freeswitch-arch.patch.sig b/freeswitch-arch.patch.sig
index ad013921b5b0..cc9d1218d60d 100644
--- a/freeswitch-arch.patch.sig
+++ b/freeswitch-arch.patch.sig
diff --git a/freeswitch.conf.d.sig b/freeswitch.conf.d.sig
index 3c9354ed3e5e..a63e45c89cc0 100644
--- a/freeswitch.conf.d.sig
+++ b/freeswitch.conf.d.sig
diff --git a/freeswitch.service.sig b/freeswitch.service.sig
index 85078545ec45..c745491a6b90 100644
--- a/freeswitch.service.sig
+++ b/freeswitch.service.sig
diff --git a/python-3.10.patch.sig b/python-3.10.patch.sig
index 2f3f4b23f526..64867b9acc8b 100644
--- a/python-3.10.patch.sig
+++ b/python-3.10.patch.sig
diff --git a/run.freeswitch.sig b/run.freeswitch.sig
index 6089cd1d9d55..58e214785894 100644
--- a/run.freeswitch.sig
+++ b/run.freeswitch.sig
diff --git a/run_log.freeswitch.sig b/run_log.freeswitch.sig
index 0c5c14b5d719..36ee7aa79b5b 100644
--- a/run_log.freeswitch.sig
+++ b/run_log.freeswitch.sig