[rpms/asterisk] rawhide: Merge branch 'rawhide' of ssh://pkgs.fedoraproject.org/rpms/asterisk into rawhide

[Peter Lemenkov <lemenkov@gmail.com>]

A new commit has been pushed.

Repo   : rpms/asterisk
Branch : rawhide
Commit : ea689312311b92b884b968e4f915cdd4b2128eeb
Author : Peter Lemenkov <lemenkov@gmail.com>
Date   : 2026-06-13T17:19:00+02:00
Stats  : +371/-63 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/asterisk/c/ea689312311b92b884b968e4f915cdd4b2128eeb?branch=rawhide

Log:
Merge branch 'rawhide' of ssh://pkgs.fedoraproject.org/rpms/asterisk into rawhide

---
diff --git a/asterisk.spec b/asterisk.spec
index dc71ebd..448bc7c 100644
--- a/asterisk.spec
+++ b/asterisk.spec
@@ -1736,6 +1736,12 @@ fi
 %endif
 
 %changelog
+* Sat Jun 13 2026 Peter Lemenkov <lemenkov@gmail.com> - 23.4.0-1
+- update to 23.4.0
+
+* Fri Jun 12 2026 Yaakov Selkowitz <yselkowi@redhat.com> - 23.3.0-1.1
+- Rebuilt for openssl 4.0
+
 * Wed Apr 29 2026 Peter Lemenkov <lemenkov@gmail.com> - 23.3.0-1
 - update to 23.3.0
 

diff --git a/asterisk.spec b/asterisk.spec
index 97d1739..448bc7c 100644
--- a/asterisk.spec
+++ b/asterisk.spec
@@ -1,7 +1,7 @@
 #%%global _rc 1
 #%%global _beta 3
 
-%global           pjsip_version   2.16
+%global           pjsip_version   2.17
 %global           jansson_version 2.14
 %global           jwt_version 1.15.3
 
@@ -56,8 +56,8 @@
 
 Summary:          The Open Source PBX
 Name:             asterisk
-Version:          23.3.0
-Release:          %{?_rc||?_beta:0.}1%{?_rc:.rc%{_rc}}%{?_beta:.beta%{_beta}}%{?dist}.1
+Version:          23.4.0
+Release:          %{?_rc||?_beta:0.}1%{?_rc:.rc%{_rc}}%{?_beta:.beta%{_beta}}%{?dist}
 # Automatically converted from old format: GPLv2 - review is highly recommended.
 License:          GPL-2.0-only
 URL:              http://www.asterisk.org/
@@ -84,8 +84,8 @@ Source6:          asterisk-tmpfiles
 Source7:          asterisk-gpgkeys.gpg
 
 # Now building Asterisk with bundled pjproject, because they apply custom patches to it
-# wget https://github.com/pjsip/pjproject/archive/2.16/pjproject-2.16.tar.gz
-# zcat pjproject-2.16.tar.gz | bzip2 > pjproject-2.16.tar.bz2
+# wget https://github.com/pjsip/pjproject/archive/%{pjsip_version}/pjproject-%{pjsip_version}.tar.gz
+# zcat pjproject-%{pjsip_version}.tar.gz | bzip2 > pjproject-%{pjsip_version}.tar.bz2
 Source8:          pjproject-%{pjsip_version}.tar.bz2
 
 # Bundling jansson on EL7 and EL8, because the version in CentOS is too old
@@ -258,7 +258,7 @@ BuildRequires:    uw-imap-devel
 %if 0%{?fedora}
 BuildRequires:    jansson-devel
 %else
-Provides:         bundled(jansson) = 2.11
+Provides:         bundled(jansson) = %{jansson_version}
 %endif
 
 # for gpg to be able to verify the signature
@@ -1079,6 +1079,7 @@ fi
 %{_libdir}/asterisk/modules/app_speech_utils.so
 %{_libdir}/asterisk/modules/app_stack.so
 %{_libdir}/asterisk/modules/app_stasis.so
+%{_libdir}/asterisk/modules/app_stasis_broadcast.so
 %{_libdir}/asterisk/modules/app_statsd.so
 %{_libdir}/asterisk/modules/app_stream_echo.so
 %{_libdir}/asterisk/modules/app_system.so
@@ -1270,6 +1271,7 @@ fi
 %{_libdir}/asterisk/modules/res_srtp.so
 %{_libdir}/asterisk/modules/res_stasis.so
 %{_libdir}/asterisk/modules/res_stasis_answer.so
+%{_libdir}/asterisk/modules/res_stasis_broadcast.so
 %{_libdir}/asterisk/modules/res_stasis_device_state.so
 %{_libdir}/asterisk/modules/res_stasis_playback.so
 %{_libdir}/asterisk/modules/res_stasis_recording.so
@@ -1613,6 +1615,7 @@ fi
 %{_libdir}/asterisk/modules/res_pjsip_header_funcs.so
 %{_libdir}/asterisk/modules/res_pjsip_history.so
 %{_libdir}/asterisk/modules/res_pjsip_logger.so
+%{_libdir}/asterisk/modules/res_pjsip_maintenance.so
 %{_libdir}/asterisk/modules/res_pjsip_messaging.so
 #%%{_libdir}/asterisk/modules/res_pjsip_multihomed.so
 %{_libdir}/asterisk/modules/res_pjsip_mwi.so
@@ -1733,6 +1736,9 @@ fi
 %endif
 
 %changelog
+* Sat Jun 13 2026 Peter Lemenkov <lemenkov@gmail.com> - 23.4.0-1
+- update to 23.4.0
+
 * Fri Jun 12 2026 Yaakov Selkowitz <yselkowi@redhat.com> - 23.3.0-1.1
 - Rebuilt for openssl 4.0
 

diff --git a/menuselect.makedeps b/menuselect.makedeps
index 3b02acd..0b1418e 100644
--- a/menuselect.makedeps
+++ b/menuselect.makedeps
@@ -1,52 +1,240 @@
-MENUSELECT_DEPENDS_app_adsiprog=RES_ADSI 
-MENUSELECT_DEPENDS_app_flash=ZAPTEL 
-MENUSELECT_DEPENDS_app_meetme=ZAPTEL 
-MENUSELECT_DEPENDS_app_osplookup=OSPTK SSL 
-MENUSELECT_DEPENDS_app_page=ZAPTEL 
-MENUSELECT_DEPENDS_app_rpt=ZAPTEL TONEZONE 
-MENUSELECT_DEPENDS_app_voicemail=RES_ADSI 
-MENUSELECT_DEPENDS_app_zapbarge=ZAPTEL 
-MENUSELECT_DEPENDS_app_zapras=ZAPTEL 
-MENUSELECT_DEPENDS_app_zapscan=ZAPTEL 
-MENUSELECT_DEPENDS_cdr_odbc=UNIXODBC 
+MENUSELECT_DEPENDS_chan_mobile=BLUETOOTH 
+MENUSELECT_DEPENDS_res_config_mysql=MYSQLCLIENT 
+MENUSELECT_DEPENDS_app_flash=DAHDI 
+MENUSELECT_DEPENDS_app_voicemail_imap=IMAP_TK 
+MENUSELECT_DEPENDS_app_voicemail_odbc=GENERIC_ODBC 
+MENUSELECT_DEPENDS_app_jack=JACK RESAMPLE 
+MENUSELECT_DEPENDS_app_meetme=DAHDI 
+MENUSELECT_DEPENDS_binaural_rendering_in_bridge_softmix=FFTW3 
+MENUSELECT_DEPENDS_cdr_adaptive_odbc=GENERIC_ODBC 
+MENUSELECT_DEPENDS_cdr_beanstalkd=BEANSTALK 
+MENUSELECT_DEPENDS_cdr_odbc=GENERIC_ODBC 
 MENUSELECT_DEPENDS_cdr_pgsql=PGSQL 
 MENUSELECT_DEPENDS_cdr_radius=RADIUS 
-MENUSELECT_DEPENDS_cdr_sqlite=SQLITE 
+MENUSELECT_DEPENDS_cdr_sqlite3_custom=SQLITE3 
 MENUSELECT_DEPENDS_cdr_tds=FREETDS 
-MENUSELECT_DEPENDS_chan_gtalk=IKSEMEL RES_JABBER 
-MENUSELECT_DEPENDS_chan_h323=OPENH323 
-MENUSELECT_DEPENDS_chan_iax2=ZAPTEL 
-MENUSELECT_DEPENDS_chan_misdn=ISDNNET MISDN SUPPSERV 
-MENUSELECT_DEPENDS_chan_nbs=NBS 
-MENUSELECT_DEPENDS_chan_oss=OSSAUDIO 
-MENUSELECT_DEPENDS_chan_phone=IXJUSER 
-MENUSELECT_DEPENDS_chan_vpb=VPBAPI 
-MENUSELECT_DEPENDS_chan_zap=ZAPTEL_VLDTMF ZAPTEL TONEZONE PRI 
+MENUSELECT_DEPENDS_cel_odbc=GENERIC_ODBC 
+MENUSELECT_DEPENDS_cel_beanstalkd=BEANSTALK 
+MENUSELECT_DEPENDS_cel_pgsql=PGSQL 
+MENUSELECT_DEPENDS_cel_radius=RADIUS 
+MENUSELECT_DEPENDS_cel_sqlite3_custom=SQLITE3 
+MENUSELECT_DEPENDS_cel_tds=FREETDS 
+MENUSELECT_DEPENDS_chan_dahdi=DAHDI TONEZONE PRI SS7 OPENR2 
+MENUSELECT_DEPENDS_chan_iax2=CRYPTO 
+MENUSELECT_DEPENDS_chan_motif=IKSEMEL OPENSSL 
+MENUSELECT_DEPENDS_chan_pjsip=PJPROJECT 
+MENUSELECT_DEPENDS_chan_console=PORTAUDIO 
+MENUSELECT_DEPENDS_codec_codec2=CODEC2 
+MENUSELECT_DEPENDS_codec_dahdi=DAHDI 
 MENUSELECT_DEPENDS_codec_gsm=GSM 
-MENUSELECT_DEPENDS_codec_speex=SPEEX 
-MENUSELECT_DEPENDS_codec_zap=ZAPTEL_TRANSCODE ZAPTEL 
+MENUSELECT_DEPENDS_codec_ilbc=ILBC 
+MENUSELECT_DEPENDS_codec_speex=SPEEX SPEEX_PREPROCESS SPEEXDSP 
+MENUSELECT_DEPENDS_codec_opus=XMLSTARLET BASH 
+MENUSELECT_DEPENDS_codec_silk=XMLSTARLET BASH 
+MENUSELECT_DEPENDS_codec_siren7=XMLSTARLET BASH 
+MENUSELECT_DEPENDS_codec_siren14=XMLSTARLET BASH 
+MENUSELECT_DEPENDS_codec_g729a=XMLSTARLET BASH 
 MENUSELECT_DEPENDS_format_ogg_vorbis=VORBIS OGG 
+MENUSELECT_DEPENDS_format_ogg_speex=SPEEX OGG 
+MENUSELECT_DEPENDS_func_aes=CRYPTO 
 MENUSELECT_DEPENDS_func_curl=CURL 
-MENUSELECT_DEPENDS_func_odbc=UNIXODBC RES_ODBC 
-MENUSELECT_DEPENDS_pbx_dundi=ZLIB 
-MENUSELECT_DEPENDS_pbx_gtkconsole=GTK 
-MENUSELECT_DEPENDS_pbx_kdeconsole=QT 
-MENUSELECT_DEPENDS_res_config_odbc=UNIXODBC RES_ODBC 
+MENUSELECT_DEPENDS_func_iconv=ICONV 
+MENUSELECT_DEPENDS_func_odbc=GENERIC_ODBC 
+MENUSELECT_DEPENDS_func_pjsip_aor=PJPROJECT 
+MENUSELECT_DEPENDS_func_pjsip_contact=PJPROJECT 
+MENUSELECT_DEPENDS_func_pjsip_endpoint=PJPROJECT 
+MENUSELECT_DEPENDS_func_speex=SPEEX SPEEX_PREPROCESS SPEEXDSP 
+MENUSELECT_DEPENDS_pbx_dundi=ZLIB CRYPTO 
+MENUSELECT_DEPENDS_pbx_lua=LUA 
+MENUSELECT_DEPENDS_res_cdrel_custom=SQLITE3 
+MENUSELECT_DEPENDS_res_config_curl=CURL 
+MENUSELECT_DEPENDS_res_config_odbc=GENERIC_ODBC 
+MENUSELECT_DEPENDS_res_config_sqlite3=SQLITE3 
+MENUSELECT_DEPENDS_res_crypto=OPENSSL 
+MENUSELECT_DEPENDS_res_curl=CURL 
+MENUSELECT_DEPENDS_res_geolocation=LIBXML2 LIBXSLT 
+MENUSELECT_DEPENDS_res_http_media_cache=CURL 
+MENUSELECT_DEPENDS_res_http_post=GMIME 
+MENUSELECT_DEPENDS_res_odbc=GENERIC_ODBC 
+MENUSELECT_DEPENDS_res_odbc_transaction=GENERIC_ODBC 
+MENUSELECT_DEPENDS_res_pjproject=PJPROJECT 
+MENUSELECT_DEPENDS_res_pjsip=PJPROJECT 
+MENUSELECT_DEPENDS_res_pjsip_acl=PJPROJECT 
+MENUSELECT_DEPENDS_res_pjsip_authenticator_digest=PJPROJECT 
+MENUSELECT_DEPENDS_res_pjsip_caller_id=PJPROJECT 
+MENUSELECT_DEPENDS_res_pjsip_config_wizard=PJPROJECT 
+MENUSELECT_DEPENDS_res_pjsip_dialog_info_body_generator=PJPROJECT 
+MENUSELECT_DEPENDS_res_pjsip_diversion=PJPROJECT 
+MENUSELECT_DEPENDS_res_pjsip_dlg_options=PJPROJECT 
+MENUSELECT_DEPENDS_res_pjsip_dtmf_info=PJPROJECT 
+MENUSELECT_DEPENDS_res_pjsip_empty_info=PJPROJECT 
+MENUSELECT_DEPENDS_res_pjsip_endpoint_identifier_anonymous=PJPROJECT 
+MENUSELECT_DEPENDS_res_pjsip_endpoint_identifier_ip=PJPROJECT 
+MENUSELECT_DEPENDS_res_pjsip_endpoint_identifier_user=PJPROJECT 
+MENUSELECT_DEPENDS_res_pjsip_exten_state=PJPROJECT 
+MENUSELECT_DEPENDS_res_pjsip_geolocation=PJPROJECT LIBXML2 
+MENUSELECT_DEPENDS_res_pjsip_header_funcs=PJPROJECT 
+MENUSELECT_DEPENDS_res_pjsip_logger=PJPROJECT 
+MENUSELECT_DEPENDS_res_pjsip_messaging=PJPROJECT 
+MENUSELECT_DEPENDS_res_pjsip_mwi=PJPROJECT 
+MENUSELECT_DEPENDS_res_pjsip_mwi_body_generator=PJPROJECT 
+MENUSELECT_DEPENDS_res_pjsip_nat=PJPROJECT 
+MENUSELECT_DEPENDS_res_pjsip_notify=PJPROJECT 
+MENUSELECT_DEPENDS_res_pjsip_one_touch_record_info=PJPROJECT 
+MENUSELECT_DEPENDS_res_pjsip_outbound_authenticator_digest=PJPROJECT 
+MENUSELECT_DEPENDS_res_pjsip_outbound_publish=PJPROJECT 
+MENUSELECT_DEPENDS_res_pjsip_outbound_registration=PJPROJECT 
+MENUSELECT_DEPENDS_res_pjsip_path=PJPROJECT 
+MENUSELECT_DEPENDS_res_pjsip_pidf_body_generator=PJPROJECT 
+MENUSELECT_DEPENDS_res_pjsip_pidf_digium_body_supplement=PJPROJECT 
+MENUSELECT_DEPENDS_res_pjsip_pidf_eyebeam_body_supplement=PJPROJECT 
+MENUSELECT_DEPENDS_res_pjsip_publish_asterisk=PJPROJECT 
+MENUSELECT_DEPENDS_res_pjsip_pubsub=PJPROJECT 
+MENUSELECT_DEPENDS_res_pjsip_refer=PJPROJECT 
+MENUSELECT_DEPENDS_res_pjsip_registrar=PJPROJECT 
+MENUSELECT_DEPENDS_res_pjsip_rfc3326=PJPROJECT 
+MENUSELECT_DEPENDS_res_pjsip_rfc3329=PJPROJECT 
+MENUSELECT_DEPENDS_res_pjsip_sdp_rtp=PJPROJECT 
+MENUSELECT_DEPENDS_res_pjsip_send_to_voicemail=PJPROJECT 
+MENUSELECT_DEPENDS_res_pjsip_session=PJPROJECT 
+MENUSELECT_DEPENDS_res_pjsip_sips_contact=PJPROJECT 
+MENUSELECT_DEPENDS_res_pjsip_stir_shaken=PJPROJECT 
+MENUSELECT_DEPENDS_res_pjsip_t38=PJPROJECT 
+MENUSELECT_DEPENDS_res_pjsip_transport_websocket=PJPROJECT 
+MENUSELECT_DEPENDS_res_pjsip_xpidf_body_generator=PJPROJECT 
+MENUSELECT_DEPENDS_res_resolver_unbound=UNBOUND 
+MENUSELECT_DEPENDS_res_rtp_asterisk=OPENSSL PJPROJECT 
+MENUSELECT_DEPENDS_res_srtp=SRTP OPENSSL 
+MENUSELECT_DEPENDS_res_stasis_test=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_res_stir_shaken=CURL LIBJWT 
+MENUSELECT_DEPENDS_res_timing_dahdi=DAHDI 
+MENUSELECT_DEPENDS_res_timing_timerfd=TIMERFD 
+MENUSELECT_DEPENDS_res_xmpp=IKSEMEL OPENSSL 
+MENUSELECT_DEPENDS_res_calendar_caldav=NEON ICAL LIBXML2 
+MENUSELECT_DEPENDS_res_calendar_ews=NEON29 
+MENUSELECT_DEPENDS_res_calendar_exchange=NEON ICAL IKSEMEL 
+MENUSELECT_DEPENDS_res_calendar_icalendar=NEON ICAL 
+MENUSELECT_DEPENDS_res_config_ldap=LDAP 
 MENUSELECT_DEPENDS_res_config_pgsql=PGSQL 
-MENUSELECT_DEPENDS_res_crypto=SSL 
-MENUSELECT_DEPENDS_res_jabber=IKSEMEL 
-MENUSELECT_DEPENDS_res_musiconhold=ZAPTEL 
-MENUSELECT_DEPENDS_res_odbc=UNIXODBC 
+MENUSELECT_DEPENDS_res_corosync=COROSYNC 
+MENUSELECT_DEPENDS_res_fax_spandsp=SPANDSP 
+MENUSELECT_DEPENDS_res_hep_pjsip=PJPROJECT 
+MENUSELECT_DEPENDS_res_pjsip_aoc=PJPROJECT 
+MENUSELECT_DEPENDS_res_pjsip_history=PJPROJECT 
+MENUSELECT_DEPENDS_res_pjsip_maintenance=PJPROJECT 
+MENUSELECT_DEPENDS_res_pjsip_phoneprov_provider=PJPROJECT 
+MENUSELECT_DEPENDS_res_prometheus=PJPROJECT 
 MENUSELECT_DEPENDS_res_snmp=NETSNMP 
+MENUSELECT_DEPENDS_res_timing_kqueue=KQUEUE 
+MENUSELECT_DEPENDS_res_digium_phone=XMLSTARLET BASH 
+MENUSELECT_DEPENDS_res_pjsip_config_sangoma=XMLSTARLET BASH 
+MENUSELECT_DEPENDS_ENABLE_SRTP_AES_192=SRTP HAVE_SRTP_192 
+MENUSELECT_DEPENDS_ENABLE_SRTP_AES_256=SRTP HAVE_SRTP_256 
+MENUSELECT_DEPENDS_ENABLE_SRTP_AES_GCM=SRTP HAVE_SRTP_GCM 
+MENUSELECT_DEPENDS_test_abstract_jb=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_acl=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_aeap=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_aeap_speech=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_aeap_transaction=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_aeap_transport=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_amihooks=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_aoc=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_app=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_ari=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_ari_model=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_ast_format_str_reduce=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_astobj2=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_astobj2_thrash=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_astobj2_weaken=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_bridging=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_bucket=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_callerid=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_capture=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_cdr=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_cel=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_channel=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_channel_feature_hooks=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_config=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_conversions=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_core_codec=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_core_format=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_crypto=TEST_FRAMEWORK CRYPTO 
+MENUSELECT_DEPENDS_test_data_buffer=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_db=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_devicestate=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_dlinklists=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_dns=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_dns_naptr=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_dns_query_set=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_dns_recurring=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_dns_srv=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_endpoints=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_event=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_expr=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_file=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_format_cache=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_format_cap=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_func_file=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_gosub=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_hashtab_thrash=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_heap=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_http_media_cache=TEST_FRAMEWORK CURL 
+MENUSELECT_DEPENDS_test_jitterbuf=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_json=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_linkedlists=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_locale=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_logger=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_media_cache=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_message=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_mwi=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_named_lock=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_netsock2=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_optional_api=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_pbx=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_poll=TEST_FRAMEWORK 
 MENUSELECT_DEPENDS_test_res_pjsip_scheduler=TEST_FRAMEWORK PJPROJECT 
-MENUSELECT_DEPENDS_ODBC_STORAGE=UNIXODBC 
-MENUSELECT_DEPENDS_IMAP_STORAGE=IMAP_TK SSL 
-MENUSELECT_DEPENDS_apps=GNU_LD 
-MENUSELECT_DEPENDS_cdr=GNU_LD 
-MENUSELECT_DEPENDS_channels=GNU_LD 
-MENUSELECT_DEPENDS_codecs=GNU_LD 
-MENUSELECT_DEPENDS_formats=GNU_LD 
-MENUSELECT_DEPENDS_funcs=GNU_LD 
-MENUSELECT_DEPENDS_pbx=GNU_LD 
-MENUSELECT_DEPENDS_res=GNU_LD 
-MENUSELECT_DEPENDS_cel_radius=RADIUS
+MENUSELECT_DEPENDS_test_res_pjsip_session_caps=TEST_FRAMEWORK PJPROJECT 
+MENUSELECT_DEPENDS_test_res_rtp=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_res_stasis=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_sched=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_scope_trace=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_scoped_lock=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_security_events=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_skel=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_sorcery=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_sorcery_astdb=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_sorcery_memory_cache_thrash=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_sorcery_realtime=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_stasis=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_stasis_channels=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_stasis_endpoints=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_stasis_state=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_stream=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_stringfields=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_strings=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_substitution=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_taskpool=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_taskprocessor=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_threadpool=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_time=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_uri=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_utils=TEST_FRAMEWORK CRYPTO 
+MENUSELECT_DEPENDS_test_uuid=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_vector=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_voicemail_api=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_websocket_client=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_xml_escape=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_codec_translations=TEST_FRAMEWORK 
+MENUSELECT_DEPENDS_test_res_prometheus=TEST_FRAMEWORK CURL 
+MENUSELECT_DEPENDS_channelstorage_cpp_map_name_id=CXX11 
+MENUSELECT_DEPENDS_BETTER_BACKTRACES=BFD DLADDR 
+MENUSELECT_DEPENDS_BUILD_NATIVE=NATIVE_ARCH 
+MENUSELECT_DEPENDS_REBUILD_PARSERS=BISON FLEX 
+MENUSELECT_DEPENDS_USE_HOARD_ALLOCATOR=HOARD 
+MENUSELECT_DEPENDS_ADDRESS_SANITIZER=HAVE_ADDRESS_SANITIZER 
+MENUSELECT_DEPENDS_THREAD_SANITIZER=HAVE_THREAD_SANITIZER 
+MENUSELECT_DEPENDS_LEAK_SANITIZER=HAVE_LEAK_SANITIZER 
+MENUSELECT_DEPENDS_UNDEFINED_SANITIZER=HAVE_UNDEFINED_SANITIZER 
+MENUSELECT_DEPENDS_smsq=POPT 
+MENUSELECT_DEPENDS_conf_bridge_binaural_hrir_importer=SNDFILE 
+MENUSELECT_DEPENDS_astman=NEWT 

diff --git a/menuselect.makeopts b/menuselect.makeopts
index 3bd48cf..20b2ff2 100644
--- a/menuselect.makeopts
+++ b/menuselect.makeopts
@@ -1,20 +1,128 @@
-MENUSELECT_ADDONS=format_mp3
-MENUSELECT_APPS=app_ivrdemo app_mp3 app_skel
+MENUSELECT_ADDONS=format_mp3 
+MENUSELECT_APPS=app_skel app_voicemail_imap app_ivrdemo app_jack app_mp3 
+MENUSELECT_BRIDGES=binaural_rendering_in_bridge_softmix 
 MENUSELECT_CDR=cdr_beanstalkd 
-MENUSELECT_CEL=cel_beanstalkd
-MENUSELECT_BRIDGES=binaural_rendering_in_bridge_softmix
-MENUSELECT_CHANNELS=chan_motif
-MENUSELECT_CODECS=codec_opus codec_silk codec_siren7 codec_siren14 codec_g729a codec_codec2
-MENUSELECT_CORE_SOUNDS=
-MENUSELECT_EMBED=
-MENUSELECT_EXTRA_SOUNDS=
+MENUSELECT_CEL=cel_beanstalkd 
+MENUSELECT_CHANNELS=chan_motif 
+MENUSELECT_CODECS=codec_codec2 codec_opus codec_silk codec_siren7 codec_siren14 codec_g729a 
 MENUSELECT_FORMATS=
 MENUSELECT_FUNCS=
-MENUSELECT_MOH=
-MENUSELECT_OPTS_app_voicemail=FILE_STORAGE
 MENUSELECT_PBX=
-MENUSELECT_RES=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 res_pjsip_config_sangoma
-MENUSELECT_TESTS=test_skel test_heap test_sched 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_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 test_capture test_crypto test_taskpool
-MENUSELECT_UTILS=aelparse astcanary astman smsq stereorize streamplayer
+MENUSELECT_RES=res_ari_mailboxes res_geolocation res_mwi_external res_mwi_external_ami res_pjsip_geolocation res_pjsip_stir_shaken res_stasis_mailbox res_stasis_test res_stir_shaken res_xmpp res_calendar_exchange res_timing_kqueue res_digium_phone res_pjsip_config_sangoma 
+MENUSELECT_TESTS=test_abstract_jb test_acl test_aeap test_aeap_speech test_aeap_transaction test_aeap_transport test_amihooks test_aoc test_app test_ari test_ari_model test_ast_format_str_reduce test_astobj2 test_astobj2_thrash test_astobj2_weaken test_bridging test_bucket test_callerid test_capture test_cdr test_cel test_channel test_channel_feature_hooks test_config test_conversions test_core_codec test_core_format test_crypto test_data_buffer test_db test_devicestate test_dlinklists test_dns test_dns_naptr test_dns_query_set test_dns_recurring test_dns_srv test_endpoints test_event test_expr test_file test_format_cache test_format_cap test_func_file test_gosub test_hashtab_thrash test_heap test_http_media_cache test_jitterbuf test_json test_linkedlists test_locale test_logger test_media_cache test_message test_mwi test_named_lock test_netsock2 test_optional_api test_pbx test_poll test_res_pjsip_scheduler test_res_pjsip_session_caps test_res_rtp test_res_stasis test_sched test_scope_trace test_scoped_lock test_security_events test_skel test_sorcery test_sorcery_astdb test_sorcery_memory_cache_thrash test_sorcery_realtime test_stasis test_stasis_channels test_stasis_endpoints test_stasis_state test_stream test_stringfields test_strings test_substitution test_taskpool test_taskprocessor test_threadpool test_time test_uri test_utils test_uuid test_vector test_voicemail_api test_websocket_client test_xml_escape test_codec_translations test_res_prometheus 
+MENUSELECT_CHANNELSTORAGE=
+MENUSELECT_CFLAGS=
+MENUSELECT_UTILS=astcanary smsq stereorize streamplayer aelparse astman 
+MENUSELECT_AGIS=
+MENUSELECT_CORE_SOUNDS=
+MENUSELECT_MOH=
+MENUSELECT_EXTRA_SOUNDS=
+MENUSELECT_BUILD_DEPS=bridge_holding app_cdr func_periodic_hook app_confbridge res_speech res_agi res_stasis res_ari res_adsi res_smdi res_audiosocket res_stasis_broadcast res_statsd res_odbc res_cdrel_custom res_crypto res_pjsip res_pjsip_pubsub res_pjsip_session res_rtp_multicast res_http_websocket res_websocket_client res_curl app_chanspy func_cut func_groupcount func_uri res_ael_share res_ari_model res_stasis_recording res_stasis_playback res_stasis_answer res_stasis_snoop res_stasis_device_state func_curl res_odbc_transaction res_sorcery_config res_pjproject res_sorcery_memory res_sorcery_astdb res_geolocation res_pjsip_outbound_publish res_calendar res_fax res_hep res_phoneprov res_pjsip_outbound_registration res_srtp DONT_OPTIMIZE G711_NEW_ALGORITHM 
+MENUSELECT_DEPSFAILED=MENUSELECT_APPS=app_jack
 MENUSELECT_DEPSFAILED=MENUSELECT_CDR=cdr_beanstalkd
 MENUSELECT_DEPSFAILED=MENUSELECT_CEL=cel_beanstalkd
+MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_motif
+MENUSELECT_DEPSFAILED=MENUSELECT_CODECS=codec_codec2
+MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_geolocation
+MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_pjsip_geolocation
+MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_pjsip_stir_shaken
+MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_stasis_test
+MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_stir_shaken
+MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_xmpp
+MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_calendar_exchange
+MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_timing_kqueue
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_abstract_jb
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_acl
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_aeap
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_aeap_speech
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_aeap_transaction
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_aeap_transport
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_amihooks
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_aoc
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_app
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_ari
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_ari_model
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_ast_format_str_reduce
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_astobj2
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_astobj2_thrash
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_astobj2_weaken
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_bridging
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_bucket
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_callerid
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_capture
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_cdr
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_cel
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_channel
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_channel_feature_hooks
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_config
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_conversions
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_core_codec
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_core_format
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_crypto
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_data_buffer
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_db
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_devicestate
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_dlinklists
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_dns
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_dns_naptr
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_dns_query_set
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_dns_recurring
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_dns_srv
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_endpoints
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_event
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_expr
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_file
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_format_cache
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_format_cap
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_func_file
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_gosub
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_hashtab_thrash
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_heap
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_http_media_cache
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_jitterbuf
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_json
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_linkedlists
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_locale
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_logger
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_media_cache
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_message
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_mwi
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_named_lock
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_netsock2
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_optional_api
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_pbx
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_poll
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_res_pjsip_scheduler
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_res_pjsip_session_caps
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_res_rtp
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_res_stasis
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_sched
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_scope_trace
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_scoped_lock
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_security_events
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_skel
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_sorcery
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_sorcery_astdb
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_sorcery_memory_cache_thrash
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_sorcery_realtime
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_stasis
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_stasis_channels
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_stasis_endpoints
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_stasis_state
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_stream
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_stringfields
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_strings
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_substitution
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_taskpool
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_taskprocessor
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_threadpool
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_time
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_uri
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_utils
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_uuid
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_vector
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_voicemail_api
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_websocket_client
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_xml_escape
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_codec_translations
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_res_prometheus