diff --git a/asterisk.spec b/asterisk.spec index 5d11b16..f45f0ef 100644 --- a/asterisk.spec +++ b/asterisk.spec @@ -19,7 +19,7 @@ %global postgresql 1 %global radius 1 %global snmp 1 -%global misdn 1 +%global misdn 0 %global ldap 1 %global gmime 1 %global corosync 1 @@ -40,8 +40,8 @@ Summary: The Open Source PBX Name: asterisk -Version: 16.6.0 -Release: 1%{?dist} +Version: 16.10.0 +Release: 2%{?dist} License: GPLv2 URL: http://www.asterisk.org/ @@ -62,7 +62,6 @@ Source6: asterisk-tmpfiles #0x639D932D5170532F8C200CCD9C59F000777DCC45 \ #0x551F29104B2106080C6C2851073B0C1FC9B2E352 \ #0x57E769BC37906C091E7F641F6CB44E557BD982D8 \ -#0x0F77FB5D216A02390B4C51DB7C2C8A8BCB3F61BD \ #0xF2FC93DB7587BD1FB49E045A5D984BE337191CE7 Source7: asterisk-gpgkeys.gpg @@ -72,6 +71,7 @@ Source8: https://raw.githubusercontent.com/asterisk/third-party/master/ %if 0%{?fedora} Patch0: asterisk-mariadb.patch Patch1: asterisk-16.1.0-explicit-python2.patch +Patch2: asterisk_earlier-pjproject-pjsip-sc-null.patch %endif # Asterisk now builds against a bundled copy of pjproject, as they apply some patches @@ -590,6 +590,7 @@ cp %{SOURCE8} cache/ %if 0%{?fedora} %patch0 -p1 %patch1 -p1 +%patch2 -p1 %endif cp %{S:3} menuselect.makedeps @@ -918,6 +919,7 @@ fi %{_libdir}/asterisk/modules/app_morsecode.so %{_libdir}/asterisk/modules/app_nbscat.so %{_libdir}/asterisk/modules/app_originate.so +%{_libdir}/asterisk/modules/app_page.so #%%{_libdir}/asterisk/modules/app_parkandannounce.so %{_libdir}/asterisk/modules/app_playback.so %{_libdir}/asterisk/modules/app_playtones.so @@ -1281,7 +1283,6 @@ fi %attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/ss7.timers %{_libdir}/asterisk/modules/app_flash.so %{_libdir}/asterisk/modules/app_meetme.so -%{_libdir}/asterisk/modules/app_page.so %{_libdir}/asterisk/modules/app_dahdiras.so %{_libdir}/asterisk/modules/chan_dahdi.so %{_libdir}/asterisk/modules/codec_dahdi.so @@ -1549,13 +1550,16 @@ fi %endif %changelog -* Wed Oct 09 2019 Jared K. Smith - 16.6.0-1 -- Update to upstream 16.6.0 for security and bug fixes -- Update to using bundled pjproject release 2.9 +* Mon May 11 2020 Jared K. Smith - 16.10.0-2 +- app_page no longer depends on meetme +- fix usage of PJSIP_SC_NULL with older versions of pjproject +- stop building chan_misdn again + +* Thu Apr 30 2020 Jared K. Smith - 16.10.0-1 +- Update to upstream 16.10.0 release for bug fixes -* Fri Sep 06 2019 Jared K. Smith - 16.5.1-1 -- Update for upstream security release 16.5.1, with AST-2019-004 and - AST-2019-005 +* Thu Mar 12 2020 Jared K. Smith - 16.9.0-1 +- Update to upstream 16.9.0 release for bug fixes * Thu Jul 25 2019 Jared K. Smith - 16.5.0-1 - Update to upstream 16.5.0 release for security and bug fixes diff --git a/asterisk_earlier-pjproject-pjsip-sc-null.patch b/asterisk_earlier-pjproject-pjsip-sc-null.patch new file mode 100644 index 0000000..0091c76 --- /dev/null +++ b/asterisk_earlier-pjproject-pjsip-sc-null.patch @@ -0,0 +1,13 @@ +diff --git a/channels/chan_pjsip.c b/channels/chan_pjsip.c +index c8b6fe7..ea79abb 100644 +--- a/channels/chan_pjsip.c ++++ b/channels/chan_pjsip.c +@@ -1996,7 +1996,7 @@ static void xfer_client_on_evsub_state(pjsip_evsub *sub, pjsip_event *event) + /* Check for NOTIFY complete or error. */ + pjsip_msg *msg; + pjsip_msg_body *body; +- pjsip_status_line status_line = { .code = PJSIP_SC_NULL }; ++ pjsip_status_line status_line = { .code = 0 }; + pj_bool_t is_last; + pj_status_t status; + diff --git a/menuselect.makeopts b/menuselect.makeopts index 69b1d40..85389c2 100644 --- a/menuselect.makeopts +++ b/menuselect.makeopts @@ -2,9 +2,9 @@ MENUSELECT_ADDONS=format_mp3 MENUSELECT_APPS=app_ivrdemo app_mp3 app_osplookup app_skel MENUSELECT_CDR=cdr_beanstalkd MENUSELECT_CEL=cel_beanstalkd -MENUSELECT_BRIDGES= +MENUSELECT_BRIDGES=binaural_rendering_in_bridge_softmix MENUSELECT_CFLAGS=LOADABLE_MODULES -MENUSELECT_CHANNELS=chan_nbs chan_vpb chan_phone +MENUSELECT_CHANNELS=chan_nbs chan_vpb chan_phone chan_misdn MENUSELECT_CODECS=codec_opus codec_silk codec_siren7 codec_siren14 codec_g729a codec_codec2 MENUSELECT_CORE_SOUNDS= MENUSELECT_EMBED= @@ -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_astobj2 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 +MENUSELECT_TESTS=test_skel test_heap test_sched test_astobj2 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_res_rtp 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 bf7f0e5..8aa4ab2 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (asterisk-16.6.0.tar.gz) = 24845115dff0e8fb67e413d2d9705640835b7a74a9cc1c9d1d65ca3a504dd45cd6594d543f737c47687e80f57eb8e30114641362aea600ddfd47c3908fd65d22 -SHA512 (asterisk-16.6.0.tar.gz.asc) = 8fedf1ebbf62ccecaa17d5b07d7d165265586d3194b3ad944dab21903f28aae2a3a4b49b510b8f111452950b364f21d64498ff421dc3dd21abc93d8b68f0e75c SHA512 (pjproject-2.9.tar.bz2) = a65823a86ad0cd76890cf7dd2485f7547fd90aea2ef631c5420c009b35f39eda3b78551a42fc2816c2470de9eb728c26497774a8494824472ecaa1d2889cc20b +SHA512 (asterisk-16.10.0.tar.gz) = 254c582593cf6ec691649d995a8d73260d2e340ad6ae65f0af62f6b8c3ef59c4da6ad9172bc04cc29a907d1e8d2ef105ae2ae20190b30115d5d402423c8c08cb +SHA512 (asterisk-16.10.0.tar.gz.asc) = 535c02378e136506186948fec6b73b85a077ace262a8858d0595cfba35e23cba270bfb4079057a9110970b49e2d95828bfac42f9afcec3f826f110d04b3c256b