From 2789009ecc0965d223b8320168784f676addd2e9 Mon Sep 17 00:00:00 2001 From: Michal Josef Špaček Date: Jun 15 2022 10:21:19 +0000 Subject: [PATCH 1/9] BZ#1977579 Fix build Changes: * Ignore ASTMM. * Add -fPIC for res_snmp (https://issues.asterisk.org/jira/browse/ASTERISK-29634) --- diff --git a/asterisk-18.4.0-astmm_ignore_for_console_board.patch b/asterisk-18.4.0-astmm_ignore_for_console_board.patch new file mode 100644 index 0000000..402e159 --- /dev/null +++ b/asterisk-18.4.0-astmm_ignore_for_console_board.patch @@ -0,0 +1,10 @@ +--- a/channels/console_board.c 2022-04-07 16:00:48.018413156 +0200 ++++ b/channels/console_board.c 2022-04-07 16:00:38.836359567 +0200 +@@ -41,6 +41,7 @@ + extended + ***/ + ++#define ASTMM_LIBC ASTMM_IGNORE + #include "asterisk.h" /* ast_strdupa */ + #include "asterisk/utils.h" /* ast_strdupa */ + #include "console_video.h" /* ast_strdupa */ diff --git a/asterisk-18.4.0-res_snmp_fpic.patch b/asterisk-18.4.0-res_snmp_fpic.patch new file mode 100644 index 0000000..4669bf9 --- /dev/null +++ b/asterisk-18.4.0-res_snmp_fpic.patch @@ -0,0 +1,11 @@ +--- a/res/Makefile 2022-04-07 16:31:40.365791898 +0200 ++++ b/res/Makefile 2022-04-07 16:31:31.592727512 +0200 +@@ -74,6 +74,8 @@ + $(call MOD_ADD_C,res_stir_shaken,$(wildcard res_stir_shaken/*.c)) + + res_parking.o: _ASTCFLAGS+=$(AST_NO_FORMAT_TRUNCATION) ++snmp/agent.o: _ASTCFLAGS+=-fPIC ++res_snmp.o: _ASTCFLAGS+=-fPIC + + # Dependencies for res_ari_*.so are generated, so they're in this file + include ari.make diff --git a/asterisk.spec b/asterisk.spec index 7791a25..c7e1921 100644 --- a/asterisk.spec +++ b/asterisk.spec @@ -51,7 +51,7 @@ Summary: The Open Source PBX Name: asterisk Version: 18.4.0 -Release: %{?_rc||?_beta:0.}1%{?_rc:.rc%{_rc}}%{?_beta:.beta%{_beta}}%{?dist}.5 +Release: %{?_rc||?_beta:0.}1%{?_rc:.rc%{_rc}}%{?_beta:.beta%{_beta}}%{?dist}.6 License: GPLv2 URL: http://www.asterisk.org/ @@ -90,6 +90,9 @@ Patch0: asterisk-mariadb.patch Patch1: asterisk-16.1.0-explicit-python3.patch %endif +Patch2: asterisk-18.4.0-astmm_ignore_for_console_board.patch +Patch3: asterisk-18.4.0-res_snmp_fpic.patch + # Asterisk now builds against a bundled copy of pjproject, as they apply some patches # directly to pjproject before the build against it Provides: bundled(pjproject) = %{pjsip_version} @@ -650,6 +653,9 @@ echo '*************************************************************************' %patch1 -p1 %endif +%patch2 -p1 +%patch3 -p1 + cp %{S:3} menuselect.makedeps cp %{S:4} menuselect.makeopts @@ -1663,6 +1669,9 @@ fi %endif %changelog +* Wed Jun 15 2022 Michal Josef Špaček - 18.4.0-1.6 +- Fix build (#1977579) + * Wed Jun 01 2022 Jitka Plesnikova - 18.4.0-1.5 - Perl 5.36 rebuild From a523b2ca607b813dd3b8b615551f1b6ff9ae3f04 Mon Sep 17 00:00:00 2001 From: Michal Josef Špaček Date: Jun 15 2022 10:22:59 +0000 Subject: [PATCH 2/9] Update to upstream 18.5.1 release --- diff --git a/asterisk.spec b/asterisk.spec index c7e1921..4d1f540 100644 --- a/asterisk.spec +++ b/asterisk.spec @@ -50,8 +50,8 @@ Summary: The Open Source PBX Name: asterisk -Version: 18.4.0 -Release: %{?_rc||?_beta:0.}1%{?_rc:.rc%{_rc}}%{?_beta:.beta%{_beta}}%{?dist}.6 +Version: 18.5.1 +Release: %{?_rc||?_beta:0.}1%{?_rc:.rc%{_rc}}%{?_beta:.beta%{_beta}}%{?dist} License: GPLv2 URL: http://www.asterisk.org/ @@ -1669,6 +1669,9 @@ fi %endif %changelog +* Wed Jun 15 2022 Michal Josef Špaček - 18.5.1-1 +- Update to upstream 18.5.1 release. + * Wed Jun 15 2022 Michal Josef Špaček - 18.4.0-1.6 - Fix build (#1977579) diff --git a/sources b/sources index 18bc20d..6ebc9c8 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (asterisk-18.4.0.tar.gz) = 024d0a5c75d55fe614ba6219aece62778e9522a0f8365d57192aa5aa22be94d45a3bed69ac14659738e97dd98967533c13096a855366083e6df2b7800e684602 -SHA512 (asterisk-18.4.0.tar.gz.asc) = c7022aa76e93b98ee0e156dbd7429272977b423a99c92c49587831eaf14e4b91f33391ff4204cc98e38cd7ea00dcf3859e90287bd351d4856de7568ad80d8ccf +SHA512 (asterisk-18.5.1.tar.gz) = 95f30c14602587827c7d7bc4652639163f4fe6338fade35d533525aa8825d7a5082c9d6fa4671a5f4f89bd90a0d657ce7e51fd4216558bd367abcb10b25aeb23 +SHA512 (asterisk-18.5.1.tar.gz.asc) = 0a116783f3bdaf5c5bc51547f8edd699054af56c28fd619ea69ffa98fa3f020437a923c919daaac61ace82c78d102323a321b944fa573f2b3728d1debcf6d7f6 SHA512 (jansson-2.12.tar.bz2) = 6ed665a441c789cdf7eb22b6e69d02575746c81b00e0a81ced90d30aaf2badc93fac32e5841fd4e07751a27726a327a63fe28bb0689c6bef5b6164b435bbc30d SHA512 (pjproject-2.10.tar.bz2) = fe29edccc63a8e72323e1b6f955a8c3475e26aba9cb8f5125546da4409fecc19a09a7950eee6b8e4a3c908943bc043d95130f878ad52958c5eccc617e3bcfb4e From 65ef920739b3ca8275c13d7e55bafea98424df0b Mon Sep 17 00:00:00 2001 From: Michal Josef Špaček Date: Jun 15 2022 11:14:26 +0000 Subject: [PATCH 3/9] Update to upstream 18.6.0 release --- diff --git a/asterisk.spec b/asterisk.spec index 4d1f540..02967c7 100644 --- a/asterisk.spec +++ b/asterisk.spec @@ -50,7 +50,7 @@ Summary: The Open Source PBX Name: asterisk -Version: 18.5.1 +Version: 18.6.0 Release: %{?_rc||?_beta:0.}1%{?_rc:.rc%{_rc}}%{?_beta:.beta%{_beta}}%{?dist} License: GPLv2 URL: http://www.asterisk.org/ @@ -1010,6 +1010,7 @@ fi %{_libdir}/asterisk/modules/app_dictate.so %{_libdir}/asterisk/modules/app_directed_pickup.so %{_libdir}/asterisk/modules/app_disa.so +%{_libdir}/asterisk/modules/app_dtmfstore.so %{_libdir}/asterisk/modules/app_dumpchan.so %{_libdir}/asterisk/modules/app_echo.so %{_libdir}/asterisk/modules/app_exec.so @@ -1034,6 +1035,7 @@ fi #%%{_libdir}/asterisk/modules/app_readfile.so %{_libdir}/asterisk/modules/app_read.so %{_libdir}/asterisk/modules/app_record.so +%{_libdir}/asterisk/modules/app_reload.so %{_libdir}/asterisk/modules/app_saycounted.so #%%{_libdir}/asterisk/modules/app_saycountpl.so %{_libdir}/asterisk/modules/app_sayunixtime.so @@ -1054,6 +1056,7 @@ fi %{_libdir}/asterisk/modules/app_url.so %{_libdir}/asterisk/modules/app_userevent.so %{_libdir}/asterisk/modules/app_verbose.so +%{_libdir}/asterisk/modules/app_waitforcond.so %{_libdir}/asterisk/modules/app_waitforring.so %{_libdir}/asterisk/modules/app_waitforsilence.so %{_libdir}/asterisk/modules/app_waituntil.so @@ -1669,6 +1672,9 @@ fi %endif %changelog +* Wed Jun 15 2022 Michal Josef Špaček - 18.6.0-1 +- Update to upstream 18.6.0 release. + * Wed Jun 15 2022 Michal Josef Špaček - 18.5.1-1 - Update to upstream 18.5.1 release. diff --git a/sources b/sources index 6ebc9c8..f1b4e12 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (asterisk-18.5.1.tar.gz) = 95f30c14602587827c7d7bc4652639163f4fe6338fade35d533525aa8825d7a5082c9d6fa4671a5f4f89bd90a0d657ce7e51fd4216558bd367abcb10b25aeb23 -SHA512 (asterisk-18.5.1.tar.gz.asc) = 0a116783f3bdaf5c5bc51547f8edd699054af56c28fd619ea69ffa98fa3f020437a923c919daaac61ace82c78d102323a321b944fa573f2b3728d1debcf6d7f6 +SHA512 (asterisk-18.6.0.tar.gz) = 17ad7e4dc86f75d4e70f779b6fe6958ee544233b20a36847a6624a7f07b135ddb415f5dca245843ea359e9a6a7c75bfc40ce36fca1df5a7a12549ae522fa2590 +SHA512 (asterisk-18.6.0.tar.gz.asc) = 6f12d18bb8fc7739ba2c0123c7ef1ac92ba1202748c48a21aa41550a5f3f1cfc5618344a468476c6703ed3cd9df782aea39ae7209515e6b730de578cbe15c0af SHA512 (jansson-2.12.tar.bz2) = 6ed665a441c789cdf7eb22b6e69d02575746c81b00e0a81ced90d30aaf2badc93fac32e5841fd4e07751a27726a327a63fe28bb0689c6bef5b6164b435bbc30d SHA512 (pjproject-2.10.tar.bz2) = fe29edccc63a8e72323e1b6f955a8c3475e26aba9cb8f5125546da4409fecc19a09a7950eee6b8e4a3c908943bc043d95130f878ad52958c5eccc617e3bcfb4e From 9e7de6e8933387a17ea627c4ddb7d0ed5c2e2514 Mon Sep 17 00:00:00 2001 From: Michal Josef Špaček Date: Jun 15 2022 11:15:23 +0000 Subject: [PATCH 4/9] Update to upstream 18.7.1 release. --- diff --git a/asterisk-18.4.0-res_snmp_fpic.patch b/asterisk-18.4.0-res_snmp_fpic.patch deleted file mode 100644 index 4669bf9..0000000 --- a/asterisk-18.4.0-res_snmp_fpic.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/res/Makefile 2022-04-07 16:31:40.365791898 +0200 -+++ b/res/Makefile 2022-04-07 16:31:31.592727512 +0200 -@@ -74,6 +74,8 @@ - $(call MOD_ADD_C,res_stir_shaken,$(wildcard res_stir_shaken/*.c)) - - res_parking.o: _ASTCFLAGS+=$(AST_NO_FORMAT_TRUNCATION) -+snmp/agent.o: _ASTCFLAGS+=-fPIC -+res_snmp.o: _ASTCFLAGS+=-fPIC - - # Dependencies for res_ari_*.so are generated, so they're in this file - include ari.make diff --git a/asterisk.spec b/asterisk.spec index 02967c7..938ffe0 100644 --- a/asterisk.spec +++ b/asterisk.spec @@ -50,7 +50,7 @@ Summary: The Open Source PBX Name: asterisk -Version: 18.6.0 +Version: 18.7.1 Release: %{?_rc||?_beta:0.}1%{?_rc:.rc%{_rc}}%{?_beta:.beta%{_beta}}%{?dist} License: GPLv2 URL: http://www.asterisk.org/ @@ -91,7 +91,6 @@ Patch1: asterisk-16.1.0-explicit-python3.patch %endif Patch2: asterisk-18.4.0-astmm_ignore_for_console_board.patch -Patch3: asterisk-18.4.0-res_snmp_fpic.patch # Asterisk now builds against a bundled copy of pjproject, as they apply some patches # directly to pjproject before the build against it @@ -654,7 +653,6 @@ echo '*************************************************************************' %endif %patch2 -p1 -%patch3 -p1 cp %{S:3} menuselect.makedeps cp %{S:4} menuselect.makeopts @@ -1020,6 +1018,7 @@ fi %{_libdir}/asterisk/modules/app_getcpeid.so %{_libdir}/asterisk/modules/app_image.so %{_libdir}/asterisk/modules/app_macro.so +%{_libdir}/asterisk/modules/app_mf.so %{_libdir}/asterisk/modules/app_milliwatt.so %{_libdir}/asterisk/modules/app_mixmonitor.so %{_libdir}/asterisk/modules/app_morsecode.so @@ -1124,6 +1123,7 @@ fi %{_libdir}/asterisk/modules/func_enum.so %{_libdir}/asterisk/modules/func_env.so %{_libdir}/asterisk/modules/func_extstate.so +%{_libdir}/asterisk/modules/func_frame_drop.so %{_libdir}/asterisk/modules/func_frame_trace.so %{_libdir}/asterisk/modules/func_global.so %{_libdir}/asterisk/modules/func_groupcount.so @@ -1141,6 +1141,8 @@ fi %{_libdir}/asterisk/modules/func_presencestate.so %{_libdir}/asterisk/modules/func_rand.so %{_libdir}/asterisk/modules/func_realtime.so +%{_libdir}/asterisk/modules/func_sayfiles.so +%{_libdir}/asterisk/modules/func_scramble.so %{_libdir}/asterisk/modules/func_sha1.so %{_libdir}/asterisk/modules/func_shell.so %{_libdir}/asterisk/modules/func_sorcery.so @@ -1234,6 +1236,7 @@ fi %{_libdir}/asterisk/modules/res_stun_monitor.so %{_libdir}/asterisk/modules/res_timing_pthread.so %{_libdir}/asterisk/modules/res_timing_timerfd.so +%{_libdir}/asterisk/modules/res_tonedetect.so %{_sbindir}/astcanary %{_sbindir}/astdb2sqlite3 @@ -1672,6 +1675,9 @@ fi %endif %changelog +* Wed Jun 15 2022 Michal Josef Špaček - 18.7.1-1 +- Update to upstream 18.7.1 release. + * Wed Jun 15 2022 Michal Josef Špaček - 18.6.0-1 - Update to upstream 18.6.0 release. diff --git a/sources b/sources index f1b4e12..0ed9419 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (asterisk-18.6.0.tar.gz) = 17ad7e4dc86f75d4e70f779b6fe6958ee544233b20a36847a6624a7f07b135ddb415f5dca245843ea359e9a6a7c75bfc40ce36fca1df5a7a12549ae522fa2590 -SHA512 (asterisk-18.6.0.tar.gz.asc) = 6f12d18bb8fc7739ba2c0123c7ef1ac92ba1202748c48a21aa41550a5f3f1cfc5618344a468476c6703ed3cd9df782aea39ae7209515e6b730de578cbe15c0af +SHA512 (asterisk-18.7.1.tar.gz) = 5e08ed7e95d00538fd24ed46644818d690fe8c5b8f8d6b9a7d01120c7de28138372f8e166950730b65bd0ffc3e1028af89377bde598bee549ca86d369f9427df +SHA512 (asterisk-18.7.1.tar.gz.asc) = a4ef48fbd91820eb3af9eb3d86cf5726d2ba3db5954555ec605ad74618fdd3c2e421d2549b106462c13eed5fd4b0611ffbd37b786fa6a2a871e1afcb5a9183bf SHA512 (jansson-2.12.tar.bz2) = 6ed665a441c789cdf7eb22b6e69d02575746c81b00e0a81ced90d30aaf2badc93fac32e5841fd4e07751a27726a327a63fe28bb0689c6bef5b6164b435bbc30d SHA512 (pjproject-2.10.tar.bz2) = fe29edccc63a8e72323e1b6f955a8c3475e26aba9cb8f5125546da4409fecc19a09a7950eee6b8e4a3c908943bc043d95130f878ad52958c5eccc617e3bcfb4e From a2fbb085130504bb85f5d9869876900372704815 Mon Sep 17 00:00:00 2001 From: Michal Josef Špaček Date: Jun 15 2022 11:16:12 +0000 Subject: [PATCH 5/9] Update to upstream 18.8.0 release --- diff --git a/asterisk.spec b/asterisk.spec index 938ffe0..4f60e4f 100644 --- a/asterisk.spec +++ b/asterisk.spec @@ -50,7 +50,7 @@ Summary: The Open Source PBX Name: asterisk -Version: 18.7.1 +Version: 18.8.0 Release: %{?_rc||?_beta:0.}1%{?_rc:.rc%{_rc}}%{?_beta:.beta%{_beta}}%{?dist} License: GPLv2 URL: http://www.asterisk.org/ @@ -1675,6 +1675,9 @@ fi %endif %changelog +* Wed Jun 15 2022 Michal Josef Špaček - 18.8.0-1 +- Update to upstream 18.8.0 release. + * Wed Jun 15 2022 Michal Josef Špaček - 18.7.1-1 - Update to upstream 18.7.1 release. diff --git a/sources b/sources index 0ed9419..8b15519 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (asterisk-18.7.1.tar.gz) = 5e08ed7e95d00538fd24ed46644818d690fe8c5b8f8d6b9a7d01120c7de28138372f8e166950730b65bd0ffc3e1028af89377bde598bee549ca86d369f9427df -SHA512 (asterisk-18.7.1.tar.gz.asc) = a4ef48fbd91820eb3af9eb3d86cf5726d2ba3db5954555ec605ad74618fdd3c2e421d2549b106462c13eed5fd4b0611ffbd37b786fa6a2a871e1afcb5a9183bf +SHA512 (asterisk-18.8.0.tar.gz) = aa06077c6e33e35c35bbaf7dcee13782197f2d9f61e159741ade20050a7bd0dd9a7f6a69d539ee3789af950e8c03518d6186abc99d93ace38dd7e9a1e5dcd337 +SHA512 (asterisk-18.8.0.tar.gz.asc) = c69bb6eeea1d51ac08e1561c10e71b7d897734f27bdbf1d6b788a475b5db4a842df40f8ad1a235362dbeab2264e6f12a3a848fea835ccf28c8746c35e5fb0bbd SHA512 (jansson-2.12.tar.bz2) = 6ed665a441c789cdf7eb22b6e69d02575746c81b00e0a81ced90d30aaf2badc93fac32e5841fd4e07751a27726a327a63fe28bb0689c6bef5b6164b435bbc30d SHA512 (pjproject-2.10.tar.bz2) = fe29edccc63a8e72323e1b6f955a8c3475e26aba9cb8f5125546da4409fecc19a09a7950eee6b8e4a3c908943bc043d95130f878ad52958c5eccc617e3bcfb4e From 68beb3b27ceae4b3c64ea63b8722c28423b3dde6 Mon Sep 17 00:00:00 2001 From: Michal Josef Špaček Date: Jun 15 2022 11:16:53 +0000 Subject: [PATCH 6/9] Update to upstream 18.9.0 release --- diff --git a/asterisk-16.1.0-explicit-python3.patch b/asterisk-16.1.0-explicit-python3.patch index 3fc091d..07ed17c 100644 --- a/asterisk-16.1.0-explicit-python3.patch +++ b/asterisk-16.1.0-explicit-python3.patch @@ -102,12 +102,12 @@ Index: asterisk-16.1.0/contrib/scripts/ast_coredumper =================================================================== --- asterisk-16.1.0.orig/contrib/scripts/ast_coredumper +++ asterisk-16.1.0/contrib/scripts/ast_coredumper -@@ -251,7 +251,7 @@ EOF - # For *BSD, the preferred gdb may be in /usr/local/bin so we - # need to search for one that supports python. - for g in $(which -a gdb) ; do -- result=$($g --batch --ex "python print('hello')" 2>/dev/null || : ) -+ result=$($g --batch --ex "python2 print('hello')" 2>/dev/null || : ) - if [[ "$result" =~ ^hello$ ]] ; then - GDB=$g - break +@@ -371,7 +371,7 @@ + EOF + fi + +- result=$($GDB --batch --ex "python print('hello')" 2>/dev/null || : ) ++ result=$($GDB --batch --ex "python2 print('hello')" 2>/dev/null || : ) + if [[ ! "$result" =~ ^hello$ ]] ; then + die -2 <<-EOF + $GDB does not support python. diff --git a/asterisk.spec b/asterisk.spec index 4f60e4f..e1e0bac 100644 --- a/asterisk.spec +++ b/asterisk.spec @@ -50,7 +50,7 @@ Summary: The Open Source PBX Name: asterisk -Version: 18.8.0 +Version: 18.9.0 Release: %{?_rc||?_beta:0.}1%{?_rc:.rc%{_rc}}%{?_beta:.beta%{_beta}}%{?dist} License: GPLv2 URL: http://www.asterisk.org/ @@ -1675,6 +1675,9 @@ fi %endif %changelog +* Wed Jun 15 2022 Michal Josef Špaček - 18.9.0-1 +- Update to upstream 18.9.0 release. + * Wed Jun 15 2022 Michal Josef Špaček - 18.8.0-1 - Update to upstream 18.8.0 release. diff --git a/sources b/sources index 8b15519..5bcced6 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (asterisk-18.8.0.tar.gz) = aa06077c6e33e35c35bbaf7dcee13782197f2d9f61e159741ade20050a7bd0dd9a7f6a69d539ee3789af950e8c03518d6186abc99d93ace38dd7e9a1e5dcd337 -SHA512 (asterisk-18.8.0.tar.gz.asc) = c69bb6eeea1d51ac08e1561c10e71b7d897734f27bdbf1d6b788a475b5db4a842df40f8ad1a235362dbeab2264e6f12a3a848fea835ccf28c8746c35e5fb0bbd +SHA512 (asterisk-18.9.0.tar.gz) = 514f806ac93c2975101133e897c20e4483ad97141b125de5b6fcb96b8acd3248bd0d4fc638381fe9e9be7b504a35ddae24d8437c33ed10c88a37565577af52b6 +SHA512 (asterisk-18.9.0.tar.gz.asc) = 5b0df6f6c2faa17bd4380105a6283131c292817f2fade8bb755fd20e20e9be90819ab23bf1d24086de4e5e95b80497fa95aa28c25d9c80de438967e0008990ad SHA512 (jansson-2.12.tar.bz2) = 6ed665a441c789cdf7eb22b6e69d02575746c81b00e0a81ced90d30aaf2badc93fac32e5841fd4e07751a27726a327a63fe28bb0689c6bef5b6164b435bbc30d SHA512 (pjproject-2.10.tar.bz2) = fe29edccc63a8e72323e1b6f955a8c3475e26aba9cb8f5125546da4409fecc19a09a7950eee6b8e4a3c908943bc043d95130f878ad52958c5eccc617e3bcfb4e From 9f11e8e5c2bce4ce79197fe3b812158faefa9165 Mon Sep 17 00:00:00 2001 From: Michal Josef Špaček Date: Jun 15 2022 11:17:37 +0000 Subject: [PATCH 7/9] Update to upstream 18.10.1 release --- diff --git a/asterisk.spec b/asterisk.spec index e1e0bac..deb1060 100644 --- a/asterisk.spec +++ b/asterisk.spec @@ -50,7 +50,7 @@ Summary: The Open Source PBX Name: asterisk -Version: 18.9.0 +Version: 18.10.1 Release: %{?_rc||?_beta:0.}1%{?_rc:.rc%{_rc}}%{?_beta:.beta%{_beta}}%{?dist} License: GPLv2 URL: http://www.asterisk.org/ @@ -1040,6 +1040,7 @@ fi %{_libdir}/asterisk/modules/app_sayunixtime.so %{_libdir}/asterisk/modules/app_senddtmf.so %{_libdir}/asterisk/modules/app_sendtext.so +%{_libdir}/asterisk/modules/app_sf.so #%%{_libdir}/asterisk/modules/app_setcallerid.so %{_libdir}/asterisk/modules/app_sms.so %{_libdir}/asterisk/modules/app_softhangup.so @@ -1131,6 +1132,7 @@ fi %{_libdir}/asterisk/modules/func_holdintercept.so %{_libdir}/asterisk/modules/func_iconv.so %{_libdir}/asterisk/modules/func_jitterbuffer.so +%{_libdir}/asterisk/modules/func_json.so %{_libdir}/asterisk/modules/func_lock.so %{_libdir}/asterisk/modules/func_logic.so %{_libdir}/asterisk/modules/func_math.so @@ -1675,6 +1677,9 @@ fi %endif %changelog +* Wed Jun 15 2022 Michal Josef Špaček - 18.10.1-1 +- Update to upstream 18.10.1 release. + * Wed Jun 15 2022 Michal Josef Špaček - 18.9.0-1 - Update to upstream 18.9.0 release. diff --git a/sources b/sources index 5bcced6..9cf3d09 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (asterisk-18.9.0.tar.gz) = 514f806ac93c2975101133e897c20e4483ad97141b125de5b6fcb96b8acd3248bd0d4fc638381fe9e9be7b504a35ddae24d8437c33ed10c88a37565577af52b6 -SHA512 (asterisk-18.9.0.tar.gz.asc) = 5b0df6f6c2faa17bd4380105a6283131c292817f2fade8bb755fd20e20e9be90819ab23bf1d24086de4e5e95b80497fa95aa28c25d9c80de438967e0008990ad +SHA512 (asterisk-18.10.1.tar.gz) = c562ae4b385e93da0ada95c6addf9d52939d20c284207c2fb7a599a8f77f71a7324a8cb1ebbed6e1a2dab434227f3198db0ac4dfc4d27bb476802c59a2de1c1d +SHA512 (asterisk-18.10.1.tar.gz.asc) = b24b35253e2e7631c142b3768eab14dc5f8279a4ed7dded6588a1edbd0cecb51dae44bb4082d3a3e2b5baec261bc4655d851a54bcd704d8ee234fe09a5875f5c SHA512 (jansson-2.12.tar.bz2) = 6ed665a441c789cdf7eb22b6e69d02575746c81b00e0a81ced90d30aaf2badc93fac32e5841fd4e07751a27726a327a63fe28bb0689c6bef5b6164b435bbc30d SHA512 (pjproject-2.10.tar.bz2) = fe29edccc63a8e72323e1b6f955a8c3475e26aba9cb8f5125546da4409fecc19a09a7950eee6b8e4a3c908943bc043d95130f878ad52958c5eccc617e3bcfb4e From 75b820697172be987c641ce8fd37a440fd6e420f Mon Sep 17 00:00:00 2001 From: Michal Josef Špaček Date: Jun 15 2022 11:18:20 +0000 Subject: [PATCH 8/9] Update to upstream 18.11.2 release --- diff --git a/asterisk.spec b/asterisk.spec index deb1060..1f6977c 100644 --- a/asterisk.spec +++ b/asterisk.spec @@ -50,7 +50,7 @@ Summary: The Open Source PBX Name: asterisk -Version: 18.10.1 +Version: 18.11.2 Release: %{?_rc||?_beta:0.}1%{?_rc:.rc%{_rc}}%{?_beta:.beta%{_beta}}%{?dist} License: GPLv2 URL: http://www.asterisk.org/ @@ -1677,6 +1677,9 @@ fi %endif %changelog +* Wed Jun 15 2022 Michal Josef Špaček - 18.11.2-1 +- Update to upstream 18.11.2 release. + * Wed Jun 15 2022 Michal Josef Špaček - 18.10.1-1 - Update to upstream 18.10.1 release. diff --git a/sources b/sources index 9cf3d09..1a53c86 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (asterisk-18.10.1.tar.gz) = c562ae4b385e93da0ada95c6addf9d52939d20c284207c2fb7a599a8f77f71a7324a8cb1ebbed6e1a2dab434227f3198db0ac4dfc4d27bb476802c59a2de1c1d -SHA512 (asterisk-18.10.1.tar.gz.asc) = b24b35253e2e7631c142b3768eab14dc5f8279a4ed7dded6588a1edbd0cecb51dae44bb4082d3a3e2b5baec261bc4655d851a54bcd704d8ee234fe09a5875f5c +SHA512 (asterisk-18.11.2.tar.gz) = 6b33949edb26b8dec5c4c79fe07f4fe3c82a83014944b142ffe5cdf9e626a7240e65c31f9215136ab964b14e077829c4ae99e1b0c2067e8b8ac016f628281e06 +SHA512 (asterisk-18.11.2.tar.gz.asc) = ab4404f02469c38e1daeb18817b1ab3ce2d456440143fceb4e9f3d0655f7124a057efdef4a9d0617af509dedf9256f4b9c4cccae14abf12e13dde2996fadf5bb SHA512 (jansson-2.12.tar.bz2) = 6ed665a441c789cdf7eb22b6e69d02575746c81b00e0a81ced90d30aaf2badc93fac32e5841fd4e07751a27726a327a63fe28bb0689c6bef5b6164b435bbc30d SHA512 (pjproject-2.10.tar.bz2) = fe29edccc63a8e72323e1b6f955a8c3475e26aba9cb8f5125546da4409fecc19a09a7950eee6b8e4a3c908943bc043d95130f878ad52958c5eccc617e3bcfb4e From c024679e141362f6a400c76d2bfb8d3df1cb6663 Mon Sep 17 00:00:00 2001 From: Michal Josef Špaček Date: Jun 15 2022 16:17:47 +0000 Subject: [PATCH 9/9] Update to upstream 18.12.1 release Update bundled versions of pjsip and jansson. Added patch to handle ilbc v3 errors. --- diff --git a/asterisk-18.12.1-ilbc_macros.patch b/asterisk-18.12.1-ilbc_macros.patch new file mode 100644 index 0000000..0a8d618 --- /dev/null +++ b/asterisk-18.12.1-ilbc_macros.patch @@ -0,0 +1,14 @@ +--- asterisk-18.12.1.orig/codecs/codec_ilbc.c 2022-06-15 15:43:53.010639561 +0200 ++++ asterisk-18.12.1/codecs/codec_ilbc.c 2022-06-15 15:43:40.388576072 +0200 +@@ -45,6 +45,11 @@ + typedef uint16_t ilbc_bytes; + typedef int16_t ilbc_block; + #define BUF_TYPE i16 ++/* In the ilbc library were removed RFC 3951 compatibility macros */ ++#define initDecode WebRtcIlbcfix_InitDecode ++#define initEncode WebRtcIlbcfix_InitEncode ++#define iLBC_decode WebRtcIlbcfix_DecodeImpl ++#define iLBC_encode WebRtcIlbcfix_EncodeImpl + #else + #include "ilbc/iLBC_encode.h" + #include "ilbc/iLBC_decode.h" diff --git a/asterisk.spec b/asterisk.spec index 1f6977c..73eca5f 100644 --- a/asterisk.spec +++ b/asterisk.spec @@ -1,8 +1,8 @@ #%%global _rc 1 #%%global _beta 3 -%global pjsip_version 2.10 -%global jansson_version 2.12 +%global pjsip_version 2.12 +%global jansson_version 2.14 %global optflags %{optflags} -Werror-implicit-function-declaration -DLUA_COMPAT_MODULE -fPIC %ifarch s390 %{arm} aarch64 %{mips} @@ -50,7 +50,7 @@ Summary: The Open Source PBX Name: asterisk -Version: 18.11.2 +Version: 18.12.1 Release: %{?_rc||?_beta:0.}1%{?_rc:.rc%{_rc}}%{?_beta:.beta%{_beta}}%{?dist} License: GPLv2 URL: http://www.asterisk.org/ @@ -92,6 +92,9 @@ Patch1: asterisk-16.1.0-explicit-python3.patch Patch2: asterisk-18.4.0-astmm_ignore_for_console_board.patch +# Removed macros from ilbc library for RFC 3951 compatibility. +Patch3: asterisk-18.12.1-ilbc_macros.patch + # Asterisk now builds against a bundled copy of pjproject, as they apply some patches # directly to pjproject before the build against it Provides: bundled(pjproject) = %{pjsip_version} @@ -654,6 +657,8 @@ echo '*************************************************************************' %patch2 -p1 +%patch3 -p1 + cp %{S:3} menuselect.makedeps cp %{S:4} menuselect.makeopts @@ -1123,6 +1128,7 @@ fi %{_libdir}/asterisk/modules/func_dialplan.so %{_libdir}/asterisk/modules/func_enum.so %{_libdir}/asterisk/modules/func_env.so +%{_libdir}/asterisk/modules/func_evalexten.so %{_libdir}/asterisk/modules/func_extstate.so %{_libdir}/asterisk/modules/func_frame_drop.so %{_libdir}/asterisk/modules/func_frame_trace.so @@ -1164,6 +1170,7 @@ fi %{_libdir}/asterisk/modules/pbx_realtime.so %{_libdir}/asterisk/modules/pbx_spool.so %{_libdir}/asterisk/modules/res_adsi.so +%{_libdir}/asterisk/modules/res_aeap.so %{_libdir}/asterisk/modules/res_agi.so %{_libdir}/asterisk/modules/res_ari.so %{_libdir}/asterisk/modules/res_ari_applications.so @@ -1226,6 +1233,7 @@ fi %{_libdir}/asterisk/modules/res_sorcery_memory_cache.so %{_libdir}/asterisk/modules/res_sorcery_realtime.so %{_libdir}/asterisk/modules/res_speech.so +%{_libdir}/asterisk/modules/res_speech_aeap.so %{_libdir}/asterisk/modules/res_srtp.so %{_libdir}/asterisk/modules/res_stasis.so %{_libdir}/asterisk/modules/res_stasis_answer.so @@ -1266,6 +1274,7 @@ fi %attr(0750,asterisk,asterisk) %dir %{_sysconfdir}/asterisk %attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/acl.conf %attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/adsi.conf +%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/aeap.conf %attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/agents.conf %attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/alarmreceiver.conf %attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/amd.conf @@ -1677,6 +1686,9 @@ fi %endif %changelog +* Wed Jun 15 2022 Michal Josef Špaček - 18.12.1-1 +- Update to upstream 18.12.1 release. + * Wed Jun 15 2022 Michal Josef Špaček - 18.11.2-1 - Update to upstream 18.11.2 release. diff --git a/menuselect.makeopts b/menuselect.makeopts index 98cc839..5d9f659 100644 --- a/menuselect.makeopts +++ b/menuselect.makeopts @@ -15,7 +15,7 @@ MENUSELECT_MOH= MENUSELECT_OPTS_app_voicemail=FILE_STORAGE MENUSELECT_PBX= MENUSELECT_RES=res_config_sqlite res_timing_kqueue res_stasis_test res_mwi_external res_mwi_external_ami res_stasis_mailbox res_ari_mailboxes res_digium_phone res_calendar_exchange -MENUSELECT_TESTS=test_skel test_heap test_sched test_astobj3 test_dlinklists test_acl test_aoc test_app test_ast_format_str_reduce test_devicestate test_event test_func_file test_gosub test_named_lock test_pbx test_stringfields test_strings test_substitution test_time test_utils test_amihooks test_locale test_logger test_security_events test_poll test_expr test_netsock2 test_db test_linkedlists test_config test_voicemail_api test_jitterbuf test_abstract_jb test_astobj2_thrash test_hashtab_thrash test_xml_escape test_callerid test_ari test_ari_model test_bucket test_cdr test_cel test_channel_feature_hooks test_core_codec test_core_format test_endpoints test_format_cache test_format_cap test_json test_message test_optional_api test_res_pjsip_scheduler test_res_stasis test_scoped_lock test_sorcery test_sorcery_astdb test_sorcery_realtime test_stasis test_stasis_channels test_stasis_endpoints test_taskprocessor test_threadpool test_uri test_uuid test_websocket_client test_vector test_sorcery_memory_cache_thrash test_astobj2_weaken test_dns test_dns_naptr test_dns_query_set test_dns_recurring test_dns_srv test_file test_http_media_cache test_media_cache test_bridging test_channel test_conversions test_sdp test_stream test_data_buffer test_mwi test_res_prometheus test_stasis_state test_res_rtp test_scope_trace test_res_pjsip_session_caps test_astobj2 +MENUSELECT_TESTS=test_skel test_heap test_sched test_astobj3 test_dlinklists test_acl test_aoc test_app test_ast_format_str_reduce test_devicestate test_event test_func_file test_gosub test_named_lock test_pbx test_stringfields test_strings test_substitution test_time test_utils test_amihooks test_locale test_logger test_security_events test_poll test_expr test_netsock2 test_db test_linkedlists test_config test_voicemail_api test_jitterbuf test_abstract_jb test_astobj2_thrash test_hashtab_thrash test_xml_escape test_callerid test_ari test_ari_model test_bucket test_cdr test_cel test_channel_feature_hooks test_core_codec test_core_format test_endpoints test_format_cache test_format_cap test_json test_message test_optional_api test_res_pjsip_scheduler test_res_stasis test_scoped_lock test_sorcery test_sorcery_astdb test_sorcery_realtime test_stasis test_stasis_channels test_stasis_endpoints test_taskprocessor test_threadpool test_uri test_uuid test_websocket_client test_vector test_sorcery_memory_cache_thrash test_astobj2_weaken test_dns test_dns_naptr test_dns_query_set test_dns_recurring test_dns_srv test_file test_http_media_cache test_media_cache test_bridging test_channel test_conversions test_sdp test_stream test_data_buffer test_mwi test_res_prometheus test_stasis_state test_res_rtp test_scope_trace test_res_pjsip_session_caps test_astobj2 test_aeap test_aeap_speech test_aeap_transaction test_aeap_transport MENUSELECT_UTILS=aelparse astcanary astdb2sqlite3 astman muted smsq stereorize streamplayer MENUSELECT_DEPSFAILED=MENUSELECT_APPS=app_osplookup MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_nbs diff --git a/sources b/sources index 1a53c86..2a33340 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (asterisk-18.11.2.tar.gz) = 6b33949edb26b8dec5c4c79fe07f4fe3c82a83014944b142ffe5cdf9e626a7240e65c31f9215136ab964b14e077829c4ae99e1b0c2067e8b8ac016f628281e06 -SHA512 (asterisk-18.11.2.tar.gz.asc) = ab4404f02469c38e1daeb18817b1ab3ce2d456440143fceb4e9f3d0655f7124a057efdef4a9d0617af509dedf9256f4b9c4cccae14abf12e13dde2996fadf5bb -SHA512 (jansson-2.12.tar.bz2) = 6ed665a441c789cdf7eb22b6e69d02575746c81b00e0a81ced90d30aaf2badc93fac32e5841fd4e07751a27726a327a63fe28bb0689c6bef5b6164b435bbc30d -SHA512 (pjproject-2.10.tar.bz2) = fe29edccc63a8e72323e1b6f955a8c3475e26aba9cb8f5125546da4409fecc19a09a7950eee6b8e4a3c908943bc043d95130f878ad52958c5eccc617e3bcfb4e +SHA512 (asterisk-18.12.1.tar.gz) = d172661b4ce4a15532dfbafdd57ee0310e5c6049904213e32f2137a29701b94601cdee40e71e042efaa1a592f84429067dd19a366525785154cde6850733938d +SHA512 (asterisk-18.12.1.tar.gz.asc) = 85e40c4f062ee8029c26fdd5f9d75a8b59ec15d158aca2776a88b3667330bf71cd63efa39ea256a641b7802bdd446766e248de9ee33dc16a846ca99583c03b8c +SHA512 (pjproject-2.12.tar.bz2) = 22de7704b4d52883331fd7ffb0f48c3667ec174efc6f9cdc4bf7df7464019318d97d4ebc5a783b5a30e0cebeeb44aa6b6ecc065cdb14250e08fca12ddc149fe2 +SHA512 (jansson-2.14.tar.bz2) = 1a659c0f41b0672757c13ebd16bd10ad7d6484366aefda078aa816266ce4f5638bc121f1ce8c4234b0b9f201ea73c227b9084125857452cbcba058a111e4a6fd