diff --git a/asterisk.spec b/asterisk.spec index d09d6a8..3ba2605 100644 --- a/asterisk.spec +++ b/asterisk.spec @@ -1,6 +1,8 @@ #global _rc 2 #global _beta 3 +%global pjsip_version 2.8 + %global optflags %{optflags} -Werror-implicit-function-declaration -DLUA_COMPAT_MODULE %ifarch s390 %{arm} aarch64 %{mips} %global ldflags -Wl,--as-needed,--library-path=%{_libdir} %{__global_ldflags} @@ -38,7 +40,7 @@ Summary: The Open Source PBX Name: asterisk -Version: 16.0.1 +Version: 16.1.0 Release: 1%{?dist} License: GPLv2 Group: Applications/Internet @@ -62,10 +64,17 @@ Source6: asterisk-tmpfiles #"57E7 69BC 3790 6C09 1E7F 641F 6CB4 4E55 7BD9 82D8" > asterisk-gpgkeys.gpg Source7: asterisk-gpgkeys.gpg +# Now building Asterisk with bundled pjproject, because they apply custom patches to it +Source8: https://raw.githubusercontent.com/asterisk/third-party/master/pjproject/%{pjsip_version}/pjproject-%{pjsip_version}.tar.bz2 + %if 0%{?fedora} Patch0: asterisk-mariadb.patch %endif +# 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} + # Does not build on s390x: https://bugzilla.redhat.com/show_bug.cgi?id=1465162 #ExcludeArch: s390x @@ -613,6 +622,11 @@ Jabber/XMPP resources for Asterisk. gpgv2 --keyring %{SOURCE7} %{SOURCE1} %{SOURCE0} %setup -q -n asterisk-%{version}%{?_rc:-rc%{_rc}}%{?_beta:-beta%{_beta}} +# copy the pjproject tarball to the cache/ directory +mkdir cache +cp %{SOURCE8} cache/ +ls -altr cache/ + %if 0%{?fedora} %patch0 -p1 %endif @@ -1117,6 +1131,7 @@ fi # res_pjproject is required by res_rtp_asterisk %{_libdir}/asterisk/modules/res_pjproject.so %{_libdir}/asterisk/modules/res_realtime.so +%{_libdir}/asterisk/modules/res_remb_modifier.so %{_libdir}/asterisk/modules/res_resolver_unbound.so %{_libdir}/asterisk/modules/res_rtp_asterisk.so %{_libdir}/asterisk/modules/res_rtp_multicast.so @@ -1148,8 +1163,8 @@ fi %{_sbindir}/astman %{_sbindir}/astversion %{_sbindir}/autosupport -%{_sbindir}/check_expr -%{_sbindir}/check_expr2 +#%%{_sbindir}/check_expr +#%%{_sbindir}/check_expr2 %{_sbindir}/muted %{_sbindir}/rasterisk #%%{_sbindir}/refcounter @@ -1258,7 +1273,7 @@ fi %files ael %attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/extensions.ael %{_sbindir}/aelparse -%{_sbindir}/conf2ael +#%%{_sbindir}/conf2ael %{_libdir}/asterisk/modules/pbx_ael.so %{_libdir}/asterisk/modules/res_ael_share.so @@ -1569,6 +1584,9 @@ fi %endif %changelog +* Wed Dec 12 2018 Jared Smith - 16.1.0-1 +- Update to upstream 16.1.0 security release + * Wed Nov 14 2018 Jared Smith - 16.0.1-1 - Update to upstream 16.0.1 security release diff --git a/menuselect.makeopts b/menuselect.makeopts index 6264c00..69b1d40 100644 --- a/menuselect.makeopts +++ b/menuselect.makeopts @@ -16,7 +16,7 @@ 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_UTILS=aelparse astcanary astdb2sqlite3 astman check_expr check_expr2 conf2ael muted smsq stereorize streamplayer +MENUSELECT_UTILS=aelparse astcanary astdb2sqlite3 astman muted smsq stereorize streamplayer MENUSELECT_DEPSFAILED=MENUSELECT_APPS=app_osplookup MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_nbs MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_vpb diff --git a/sources b/sources index 905b002..b23998c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (asterisk-16.0.1.tar.gz) = 49ef314187a6818beafa18d5d9bb59954c87fb3b920a416bb2509ad1f452281dd22600a78105d7965836ad8ae060955485503945dcea78da3842d3ecb97611bb -SHA512 (asterisk-16.0.1.tar.gz.asc) = d31cc43094bcf922bed46e917905158d0051f4bec29b60f1d3984189b6bc7cc9cdbe2f42676b0afdb05e11f95661d8a40984f6e48fd00abc13a2b409ff58067b +SHA512 (asterisk-16.1.0.tar.gz) = 36b64a343aa6663b6c149644a1f6b862f1c4110787f36faec4b3cac81a8c478e22567a16a619c3c9d339cce8def0946a6f9f0b281cbc0fe4a085cdf09dc4893c +SHA512 (asterisk-16.1.0.tar.gz.asc) = a2b66bd893214c831cbd34367aaf58888c4050c2a394043da9cd6ade102454f881babcb55da003a1186fcd2a1b3cf121e900bbb876a7c124b191d1a67da38982