diff --git a/.github/workflows/make_and_publish_pkgs.yml b/.github/workflows/make_and_publish_pkgs.yml index f840907..23a77f7 100644 --- a/.github/workflows/make_and_publish_pkgs.yml +++ b/.github/workflows/make_and_publish_pkgs.yml @@ -6,7 +6,7 @@ on: ast-ver: description: 'Asterisk LTS Version Base' type: string - default: '22.1.0' + default: '22.1.1' required: true rpt-ver: description: 'app_rpt Version Tag' diff --git a/build-asl3 b/build-asl3 index 4898b4a..610231b 100755 --- a/build-asl3 +++ b/build-asl3 @@ -279,6 +279,7 @@ apply_patch() prepare_patch_series() { for patch in $(cat debian/patches/series); do + [[ $patch =~ ^# ]] && continue prepare_patched_files "debian/patches/$patch" done } diff --git a/debian/NEWS b/debian/NEWS index 83c7d41..fb60328 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -1,3 +1,14 @@ +asterisk (1:22.0.0~~rc2~dfsg+~cs6.14.60671435-1) unstable; urgency=medium + + Several Asterisk modules are no longer provided: + * app_macro + * chan_sip + + If you used any of the above modules in the past, + you need to adapt your configuration. + + -- Jonas Smedegaard Sat, 05 Oct 2024 10:59:01 +0200 + asterisk (1:20.0.1~dfsg+~cs6.12.40431414-1) unstable; urgency=high Asterisk Manager Interface (AMI) now restricts access diff --git a/debian/README.Debian b/debian/README.Debian index 8590879..5b82df1 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -248,14 +248,12 @@ Extra Channels ============== This package includes and enables by default a number of rather not so popular protocols. Having them enabled by default means that any -security volnurability in them (such as CVE-2017-17090 / AST-2017-013 in -chan_skinny) may open your system to attacks for no good reason. +security volnurability in them may open your system to attacks +for no good reason. Thus the following configuration files have been removed from the default set of configuration files installed to /etc/asterisk: * dundi.conf (DUNDi call routing, UDP port 4520) -* mgcp.conf (chan_mgcp: MGCP voip protocol, UDP port 2727) -* skinny.conf (chan_skinny: SCCP voip protocol, TCP port 2000) * unistim.conf (chan_unistim: UNISTIM voip protocol, UDP port 5000) If you do need any of those protocols, copy the sample file from diff --git a/debian/changelog b/debian/changelog index e88253e..c5da454 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,154 @@ +asterisk (1:22.1.1~dfsg+~cs6.14.60671435-1) unstable; urgency=medium + + [ upstream ] + * new release + + Restrict ListCategories to the configuration directory; + CVE-2024-53566 + + [ Jonas Smedegaard ] + * update git-buildpackage config: + + avoid variable abstraction in usage comment + + -- Jonas Smedegaard Mon, 13 Jan 2025 00:01:35 +0100 + +asterisk (1:22.1.0~dfsg+~cs6.14.60671435-1) unstable; urgency=medium + + [ upstream ] + * new release + + [ Jonas Smedegaard ] + * update and trust only upstream team signing key 5D984BE337191CE7 + * update copyright info: update coverage + + -- Jonas Smedegaard Wed, 27 Nov 2024 12:37:42 +0100 + +asterisk (1:22.0.0~dfsg+~cs6.14.60671435-1) unstable; urgency=medium + + [ upstream ] + * new release + + -- Jonas Smedegaard Wed, 23 Oct 2024 13:39:34 +0200 + +asterisk (1:22.0.0~~rc2~dfsg+~cs6.14.60671435-1) experimental; urgency=medium + + [ upstream ] + * new prerelease(s) + + [ Jonas Smedegaard ] + * update and unfuzz patches + * adapt build routines and add NEWS entry + related to no longer provided modules app_macro chan_sip + * stop build-depend on libasound2-dev; + stop mention ALSA in long description + (module chan_alsa not provided for some time) + * update copyright info: update coverage + * cleanup new upstream hint file .lastclean + * fix handle prerelease changelog file + + -- Jonas Smedegaard Sat, 05 Oct 2024 11:28:05 +0200 + +asterisk (1:20.9.3~dfsg+~cs6.14.60671435-1) unstable; urgency=high + + [ upstream ] + * new release(s) + + add entries to Originate blacklist; + CVE-2024-42365; + closes: bug#1078574, thanks to Salvatore Bonaccorso + + test for NULL ub_result in unbound_resolver_callback; + CVE-2024-42491 + + [ Jonas Smedegaard ] + * fix minor privilege escalation; thanks to Niels Galjaard + * update watch file: track mp3 component from git clone + * unfuzz patch 2012 + * set urgency=high due to security-related bugfixes + + -- Jonas Smedegaard Sat, 07 Sep 2024 22:14:21 +0200 + +asterisk (1:20.8.1~dfsg+~cs6.14.40431414-1) unstable; urgency=medium + + [ upstream ] + * new release + + use PJProject 2.14.1, + which fixes Use-after-free in SRTP media transport; + CVE-2023-37457 CVE-2023-38703; + closes: bug#1059303, thanks to Moritz Mühlenhoff + + fix regression issues with DTLS client check; + closes: bug#1068296, thanks to Oleksandr Kozmenko + + [ Jonas Smedegaard ] + * update watch file: + + track only LTS releases + + bump to track pjproject 2.14.1 + * unfuzz patches + * update copyright info: update coverage + * declare compliance with Debian Policy 4.7.0 + * create and restrict access to cache dir; + closes: bug#1072739, thanks to Bastian Triller + * fix rotate main logfiles, + as logfiles use suffix .log since Asterisk 19; + thanks to James Bottomley (see bug#1024822) + + -- Jonas Smedegaard Fri, 07 Jun 2024 14:10:19 +0200 + +asterisk (1:20.6.0~dfsg+~cs6.13.40431414-2) unstable; urgency=medium + + * update patch 2016 to avoid excessive logging; + closes: bug#1060275, thanks to Daniel + + -- Jonas Smedegaard Tue, 30 Jan 2024 11:42:08 +0100 + +asterisk (1:20.6.0~dfsg+~cs6.13.40431414-1) unstable; urgency=medium + + [ upstream ] + * new release + + [ Jonas Smedegaard ] + * unfuzz patches + * update copyright info: update coverage + * build-depend on libjwt-dev + + -- Jonas Smedegaard Fri, 26 Jan 2024 14:53:47 +0100 + +asterisk (1:20.5.2~dfsg+~cs6.13.40431414-1) unstable; urgency=medium + + [ upstream ] + * new release + + [ Jonas Smedegaard ] + * use systemd.pc to place systemd service unit; + build-depend on systemd-dev; + closes: bug#1059180, thanks to Chris Hofstaedtler + + -- Jonas Smedegaard Fri, 22 Dec 2023 13:58:28 +0100 + +asterisk (1:20.5.1~dfsg+~cs6.13.40431414-1) unstable; urgency=high + + [ upstream ] + * new release + + fixes these upstream bugs: + CVE-2023-49294 CVE-2023-49786; + closes: bug#1059032, #1059033, thanks to Salvatore Bonaccorso + + [ Jonas Smedegaard ] + * fix enable opus codec; + build-depend on libopusenc-dev; + closes: bug#1025165, + thanks to Paweł Bogusławski, Faidon Liambotis and Athos Ribeiro + * set urgency=high due to multiple security bugfixes + + -- Jonas Smedegaard Tue, 19 Dec 2023 17:38:11 +0100 + +asterisk (1:20.5.0~dfsg+~cs6.13.40431414-1) unstable; urgency=medium + + [ upstream ] + * new release + + [ Jonas Smedegaard ] + * unfuzz patches + + -- Jonas Smedegaard Sat, 25 Nov 2023 12:25:03 +0100 + asterisk (1:20.4.0~dfsg+~cs6.13.40431414-2) unstable; urgency=medium * build-depend on liblua5.1-dev (not liblua5.2-dev); @@ -14,7 +165,9 @@ asterisk (1:20.4.0~dfsg+~cs6.13.40431414-1) unstable; urgency=medium [ Jonas Smedegaard ] * stop depend on lsb-base * update watch file: - + fixate component pjproject at upstream release 2.13.1 + + fixate component pjproject at upstream release 2.13.1; + fixes these upstream bugs: + CVE-2022-23537 CVE-2022-23547 CVE-2022-39269 CVE-2023-27585 * unfuzz patches * update copyright info: update coverage diff --git a/debian/control b/debian/control index ebbec37..f7b8f12 100644 --- a/debian/control +++ b/debian/control @@ -77,7 +77,7 @@ Build-Depends: uuid-dev, zlib1g-dev, lsb-release -Standards-Version: 4.6.2 +Standards-Version: 4.7.0 Homepage: https://www.allstarlink.org/ Vcs-Git: https://salsa.debian.org/pkg-voip-team/asterisk.git Vcs-Browser: https://salsa.debian.org/pkg-voip-team/asterisk diff --git a/debian/copyright b/debian/copyright index bc0666a..384e257 100644 --- a/debian/copyright +++ b/debian/copyright @@ -95,7 +95,7 @@ Copyright: 2012, 2015 Matt Jordan 2022 Michael Kuron 2005 Mikael Magnusson - 2021-2022 Naveen Albert + 2021-2022, 2024 Naveen Albert 1999-2006 Oleksiy Krivoshey 2005, 2009 Olle E. Johansson 2005 Oxymium sarl @@ -108,7 +108,7 @@ Copyright: 2008 Roberto Casas 1999-2006 Russell Bryant 2005-2008, 2012 Russell Bryant - 2019-2022 Sangoma Technologies Corporation + 2019-2023 Sangoma Technologies Corporation 2014 Schmooze Com, Inc. 2008, 2017, 2020 Sean Bright 2006 Sergey Basmanov @@ -309,10 +309,9 @@ License: BSD-3-Clause Files: contrib/scripts/live_ast - contrib/scripts/sip_nat_settings menuselect/contrib/menuselect-dummy Copyright: - 2005, 2007-2008 Tzafrir Cohen + 2007-2008 Tzafrir Cohen License: GPL-2+ Files: @@ -714,7 +713,7 @@ Comment: Files: debian/* Copyright: - 2016, 2023 Jonas Smedegaard + 2016, 2022-2024 Jonas Smedegaard License-Grant: This packaging is free software; you can redistribute it and/or modify it diff --git a/debian/copyright_hints b/debian/copyright_hints index 158e0f8..70c8be2 100644 --- a/debian/copyright_hints +++ b/debian/copyright_hints @@ -6,13 +6,11 @@ Disclaimer: Autogenerated by licensecheck Files: BSDmakefile BUGS - ChangeLogs/ChangeLog-20.3.0.md - ChangeLogs/ChangeLog-20.3.1.md - ChangeLogs/ChangeLog-20.4.0.md - ChangeLogs/historical/CHANGES + ChangeLogs/ChangeLog-22.0.0.md + ChangeLogs/ChangeLog-22.1.0.md + ChangeLogs/ChangeLog-22.1.1.md README-SERIOUSLY.bestpractices.md SECURITY.md - UPGRADE.txt Zaptel-to-DAHDI.txt agi/DialAnMp3.agi agi/agi-test.agi @@ -27,7 +25,6 @@ Files: BSDmakefile autoconf/ast_c_define_check.m4 autoconf/ast_check_gnu_make.m4 autoconf/ast_check_mandatory.m4 - autoconf/ast_check_osptk.m4 autoconf/ast_check_raii.m4 autoconf/ast_check_strsep_array_bounds.m4 autoconf/ast_ext_lib.m4 @@ -65,6 +62,7 @@ Files: BSDmakefile build_tools/prep_tarball build_tools/sha1sum-sh channels/console_gui.c + channels/pjsip/dialplan_functions_doc.xml codecs/codecs.xml codecs/gsm/libgsm.vcproj codecs/lpc10/Makefile @@ -125,7 +123,6 @@ Files: BSDmakefile configs/samples/aeap.conf.sample configs/samples/agents.conf.sample configs/samples/alarmreceiver.conf.sample - configs/samples/alsa.conf.sample configs/samples/amd.conf.sample configs/samples/app_skel.conf.sample configs/samples/ari.conf.sample @@ -182,13 +179,11 @@ Files: BSDmakefile configs/samples/logger.conf.sample configs/samples/manager.conf.sample configs/samples/meetme.conf.sample - configs/samples/mgcp.conf.sample configs/samples/minivm.conf.sample configs/samples/modules.conf.sample configs/samples/motif.conf.sample configs/samples/musiconhold.conf.sample configs/samples/ooh323.conf.sample - configs/samples/osp.conf.sample configs/samples/phoneprov.conf.sample configs/samples/pjproject.conf.sample configs/samples/pjsip.conf.sample @@ -198,6 +193,7 @@ Files: BSDmakefile configs/samples/queuerules.conf.sample configs/samples/queues.conf.sample configs/samples/res_config_mysql.conf.sample + configs/samples/res_config_odbc.conf.sample configs/samples/res_config_sqlite3.conf.sample configs/samples/res_corosync.conf.sample configs/samples/res_curl.conf.sample @@ -207,15 +203,11 @@ Files: BSDmakefile configs/samples/res_odbc.conf.sample configs/samples/res_parking.conf.sample configs/samples/res_pgsql.conf.sample - configs/samples/res_pktccops.conf.sample configs/samples/res_snmp.conf.sample configs/samples/res_stun_monitor.conf.sample configs/samples/resolver_unbound.conf.sample configs/samples/rtp.conf.sample configs/samples/say.conf.sample - configs/samples/sip.conf.sample - configs/samples/sip_notify.conf.sample - configs/samples/skinny.conf.sample configs/samples/sla.conf.sample configs/samples/smdi.conf.sample configs/samples/sorcery.conf.sample @@ -258,11 +250,13 @@ Files: BSDmakefile contrib/ast-db-manage/config/versions/1d50859ed02e_create_accountcode.py contrib/ast-db-manage/config/versions/20abce6d1e3c_add_pjsip_identify_by_ip.py contrib/ast-db-manage/config/versions/21e526ad3040_add_pjsip_debug_option.py + contrib/ast-db-manage/config/versions/24c12d8e9014_add_user_agent_header_to_ps_.py contrib/ast-db-manage/config/versions/26d7f3bf0fa5_add_bind_rtp_to_media_address_to_pjsip.py contrib/ast-db-manage/config/versions/26f10cadc157_add_pjsip_timeout_options.py contrib/ast-db-manage/config/versions/28ab27a7826d_add_srv_lookups_to_identify.py contrib/ast-db-manage/config/versions/28b8e71e541f_add_g726_non_standard.py contrib/ast-db-manage/config/versions/28ce1e718f05_add_fatal_response_interval.py + contrib/ast-db-manage/config/versions/2b7c507d7d12_add_queue_log_option_log_restricted_.py contrib/ast-db-manage/config/versions/2bb1a85135ad_pjsip_add_use_callerid_contact.py contrib/ast-db-manage/config/versions/2d078ec071b7_increaes_contact_column_size.py contrib/ast-db-manage/config/versions/2da192dbbc65_add_publish_tables.py @@ -271,6 +265,7 @@ Files: BSDmakefile contrib/ast-db-manage/config/versions/339a3bdf53fc_expand_accountcode_to_80.py contrib/ast-db-manage/config/versions/371a3bf4143e_add_user_eq_phone_option_to_pjsip.py contrib/ast-db-manage/config/versions/3772f8f828da_update_identify_by.py + contrib/ast-db-manage/config/versions/37a5332640e2_update_pjsip_tls_method_list.py contrib/ast-db-manage/config/versions/3855ee4e5f85_add_missing_pjsip_options.py contrib/ast-db-manage/config/versions/39959b9c2566_pjsip_stream_maximum.py contrib/ast-db-manage/config/versions/3a094a18e75b_pjsip_add_norefersub.py @@ -289,6 +284,7 @@ Files: BSDmakefile contrib/ast-db-manage/config/versions/4a6c67fa9b7a_add_fax_detect_timeout_option.py contrib/ast-db-manage/config/versions/4c573e7135bd_fix_tos_field_types.py contrib/ast-db-manage/config/versions/4e2493ef32e6_add_contact_user_to_endpoint.py + contrib/ast-db-manage/config/versions/4f91fc18c979_add_suppress_moh_on_sendonly.py contrib/ast-db-manage/config/versions/51f8cb66540e_add_further_dtls_options.py contrib/ast-db-manage/config/versions/52798ad97bdf_add_pjsip_identify_by_header.py contrib/ast-db-manage/config/versions/539f68bede2c_add_peer_supported_to_100rel.py @@ -297,12 +293,16 @@ Files: BSDmakefile contrib/ast-db-manage/config/versions/5950038a6ead_fix_pjsip_verifiy_typo.py contrib/ast-db-manage/config/versions/5a2247c957d2_add_aoc_option.py contrib/ast-db-manage/config/versions/61797b9fced6_add_stir_shaken.py + contrib/ast-db-manage/config/versions/655054a68ad5_add_pjsip_tenantid.py contrib/ast-db-manage/config/versions/65eb22eb195_add_unidentified_request_options_to_.py + contrib/ast-db-manage/config/versions/6c475a93f48a_correct_nullability_of_pjsip_id_columns.py contrib/ast-db-manage/config/versions/6d8c104e6184_res_pjsip_add_contact_via_addr_and_.py contrib/ast-db-manage/config/versions/7197536bb68d_geoloc_endpoint_params.py + contrib/ast-db-manage/config/versions/74dc751dfe8e_more_permission_boolean_columns.py contrib/ast-db-manage/config/versions/79290b511e4b_pjsip_add_disable_rport.py contrib/ast-db-manage/config/versions/7f3e21abe318_add_preferred_codec_only_option_to_pjsip.py contrib/ast-db-manage/config/versions/7f85dd44c775_fix_suppress_q850_reason_headers.py + contrib/ast-db-manage/config/versions/801b9fced8b7_add_generator_data_to_ps_subscription_.py contrib/ast-db-manage/config/versions/80473bad3c16_ignore_183_without_sdp.py contrib/ast-db-manage/config/versions/81b01a191a46_pjsip_add_contact_reg_server.py contrib/ast-db-manage/config/versions/837aa67461fb_add_pjsip_endpoint_ip_access_control_.py @@ -312,6 +312,7 @@ Files: BSDmakefile contrib/ast-db-manage/config/versions/8d478ab86e29_pjsip_add_disable_multi_domain.py contrib/ast-db-manage/config/versions/8f72185e437f_res_pjsip_pubsub_add_resource_list_.py contrib/ast-db-manage/config/versions/8fce4c573e15_add_pjsip_allow_overlap.py + contrib/ast-db-manage/config/versions/8fce8496f03e_add_tcp_keepalive_settings_to_ps_.py contrib/ast-db-manage/config/versions/945b1098bdd_add_media_encryption_optimistic_to_pjsip.py contrib/ast-db-manage/config/versions/9deac0ae4717_pjsip_add_subscribe_context.py contrib/ast-db-manage/config/versions/9f3692b1654b_add_stir_shaken_profile_and_codec_.py @@ -321,13 +322,18 @@ Files: BSDmakefile contrib/ast-db-manage/config/versions/a6ef36f1309_ps_globals_add_ignore_uri_user_options.py contrib/ast-db-manage/config/versions/b80485ff4dd0_add_pjsip_endpoint_acn_options.py contrib/ast-db-manage/config/versions/b83645976fdd_add_dtls_fingerprint_to_ps_endpoints.py + contrib/ast-db-manage/config/versions/bd335bae5d33_create_stir_shaken_tn_table.py + contrib/ast-db-manage/config/versions/bd9c5159c7ea_revert_d5122576cca8_add_transport_.py contrib/ast-db-manage/config/versions/c20d6e3992f4_add_allow_unauthenticated_options.py contrib/ast-db-manage/config/versions/c6d929b23a8_create_pjsip_subscription_persistence_.py contrib/ast-db-manage/config/versions/c7a44a5a0851_pjsip_add_global_mwi_options.py contrib/ast-db-manage/config/versions/ccf795ee535f_all_codecs_on_empty_reinvite.py + contrib/ast-db-manage/config/versions/cf150a175fd3_add_match_request_uri_attribute_to_.py contrib/ast-db-manage/config/versions/d39508cb8d8_create_queue_rules.py contrib/ast-db-manage/config/versions/d3e4284f8707_add_prune_on_boot_to_ps_subscription_.py + contrib/ast-db-manage/config/versions/d5122576cca8_add_transport_attribute_to_identify.py contrib/ast-db-manage/config/versions/d7983954dd96_add_ps_endpoints_notify_early_inuse_.py + contrib/ast-db-manage/config/versions/dac2b4c328b8_incease_pjsip_id_length.py contrib/ast-db-manage/config/versions/dbc44d5a908_add_missing_columns_to_sys_and_reg.py contrib/ast-db-manage/config/versions/de83fac997e2_add_bundle_to_ps_endpoints.py contrib/ast-db-manage/config/versions/e2f04d309071_add_wrapuptime_to_queue_members.py @@ -348,6 +354,8 @@ Files: BSDmakefile contrib/ast-db-manage/queue_log/versions/4105ee839f58_create_queue_log_table.py contrib/ast-db-manage/voicemail.ini.sample contrib/ast-db-manage/voicemail/script.py.mako + contrib/ast-db-manage/voicemail/versions/1c55c341360f_remove_macrocontext_field.py + contrib/ast-db-manage/voicemail/versions/64fae6bbe7fb_drop_redundant_index.py contrib/asterisk-ices.xml contrib/dictionary.digium contrib/docker/Dockerfile.asterisk @@ -399,7 +407,6 @@ Files: BSDmakefile contrib/scripts/loadtest.tcl contrib/scripts/messages-expire.pl contrib/scripts/retrieve_extensions_from_mysql.pl - contrib/scripts/retrieve_sip_conf_from_mysql.pl contrib/scripts/safe_asterisk contrib/scripts/safe_asterisk_restart contrib/scripts/sip_to_pjsip/astdicts.py @@ -442,6 +449,7 @@ Files: BSDmakefile debian/asterisk-config.lintian-overrides debian/asterisk-config.postinst debian/asterisk-config.preinst + debian/asterisk-dahdi.install debian/asterisk-dev.install debian/asterisk-dev.lintian-overrides debian/asterisk-dev.manpages @@ -449,6 +457,9 @@ Files: BSDmakefile debian/asterisk-mobile.install debian/asterisk-modules.install debian/asterisk-modules.lintian-overrides + debian/asterisk-mp3.install + debian/asterisk-mysql.install + debian/asterisk-ooh323.install debian/asterisk-tests.install debian/asterisk-tests.lintian-overrides debian/asterisk.default @@ -480,7 +491,6 @@ Files: BSDmakefile debian/patches/1009_build_reproducibly.patch debian/patches/2001_keep_sounds_on_distclean.patch debian/patches/2002_no_download_sounds.patch - debian/patches/2004_mgcp.patch debian/patches/2006_enable_test_framework.patch debian/patches/2008_disable_ilbc.patch debian/patches/2010_astdatadir.patch @@ -499,16 +509,6 @@ Files: BSDmakefile debian/tests/asttestmods debian/tests/control debian/tests/testmods/asterisk - debian/upstream/073B0C1FC9B2E352.key - debian/upstream/123FD04E861FFB7D.key - debian/upstream/368AB332B59975F3.key - debian/upstream/5D984BE337191CE7.key - debian/upstream/6CB44E557BD982D8.key - debian/upstream/7C2C8A8BCB3F61BD.key - debian/upstream/8438CBA18D0CAA72.key - debian/upstream/9C59F000777DCC45.key - debian/upstream/9E76E3A42341CE04.key - debian/upstream/DAB29B236B940F89.key debian/upstream/signing-key.asc debian/watch default.exports @@ -538,6 +538,8 @@ Files: BSDmakefile main/asterisk.exports.in main/ecdisa.h main/libasteriskssl.exports.in + main/logger_doc.xml + main/manager_doc.xml main/stdtime/Makefile main/stdtime/test.c makeopts.in @@ -668,7 +670,6 @@ Files: BSDmakefile res/res_geolocation/wiki/URI.md res/res_hep.exports.in res/res_http_websocket.exports.in - res/res_monitor.exports.in res/res_mwi_external.exports.in res/res_odbc.exports.in res/res_odbc_transaction.exports.in @@ -682,7 +683,6 @@ Files: BSDmakefile res/res_pjsip_outbound_publish.exports.in res/res_pjsip_pubsub.exports.in res/res_pjsip_session.exports.in - res/res_pktccops.exports.in res/res_prometheus.exports.in res/res_rtp_multicast.exports.in res/res_smdi.exports.in @@ -698,6 +698,7 @@ Files: BSDmakefile res/res_stasis_test.exports.in res/res_statsd.exports.in res/res_stir_shaken.exports.in + res/res_stir_shaken/stir_shaken_doc.xml res/res_xmpp.exports.in res/srtp/srtp_compat.h rest-api-templates/README.txt @@ -738,6 +739,11 @@ Files: BSDmakefile third-party/jansson/configure.m4 third-party/jansson/jansson-2.14.tar.bz2.md5 third-party/jansson/patches/README + third-party/libjwt/Makefile + third-party/libjwt/Makefile.rules + third-party/libjwt/configure.m4 + third-party/libjwt/libjwt-1.15.3.tar.gz.md5 + third-party/libjwt/patches/README third-party/pjproject/Makefile third-party/pjproject/Makefile.rules third-party/pjproject/README-hacking.md @@ -745,11 +751,10 @@ Files: BSDmakefile third-party/pjproject/dependency_utils third-party/pjproject/patches/0000-configure-ssl-library-path.patch third-party/pjproject/patches/0000-remove-third-party.patch - third-party/pjproject/patches/0010-Make-sure-that-NOTIFY-tdata-is-set-before-sending-it_new-129fb323a66dd1fd16880fe5ba5e6a57.patch third-party/pjproject/patches/README third-party/pjproject/patches/config_site.h third-party/pjproject/patches/user.mak - third-party/pjproject/pjproject-2.13.1.tar.bz2.md5 + third-party/pjproject/pjproject-2.14.1.tar.bz2.md5 third-party/versions.mak utils/ael_main.c utils/clicompat.c @@ -786,12 +791,10 @@ Files: addons/chan_mobile.c apps/app_flash.c apps/app_getcpeid.c apps/app_ivrdemo.c - apps/app_macro.c apps/app_meetme.c apps/app_milliwatt.c apps/app_minivm.c apps/app_mp3.c - apps/app_osplookup.c apps/app_page.c apps/app_playback.c apps/app_playtones.c @@ -839,16 +842,13 @@ Files: addons/chan_mobile.c cel/cel_radius.c cel/cel_sqlite3_custom.c cel/cel_tds.c - channels/chan_alsa.c channels/chan_bridge_media.c channels/chan_console.c channels/chan_dahdi.h channels/chan_iax2.c - channels/chan_mgcp.c channels/chan_motif.c channels/chan_pjsip.c channels/chan_rtp.c - channels/chan_skinny.c channels/dahdi/bridge_native_dahdi.c channels/dahdi/bridge_native_dahdi.h channels/iax2/codec_pref.c @@ -871,21 +871,6 @@ Files: addons/chan_mobile.c channels/sig_pri.h channels/sig_ss7.c channels/sig_ss7.h - channels/sip/config_parser.c - channels/sip/dialplan_functions.c - channels/sip/include/config_parser.h - channels/sip/include/dialog.h - channels/sip/include/dialplan_functions.h - channels/sip/include/globals.h - channels/sip/include/reqresp_parser.h - channels/sip/include/route.h - channels/sip/include/security_events.h - channels/sip/include/sip.h - channels/sip/include/sip_utils.h - channels/sip/reqresp_parser.c - channels/sip/route.c - channels/sip/security_events.c - channels/sip/utils.c codecs/codec_a_mu.c codecs/codec_adpcm.c codecs/codec_alaw.c @@ -1048,7 +1033,6 @@ Files: addons/chan_mobile.c include/asterisk/message.h include/asterisk/mixmonitor.h include/asterisk/mod_format.h - include/asterisk/monitor.h include/asterisk/multicast_rtp.h include/asterisk/musiconhold.h include/asterisk/netsock2.h @@ -1348,7 +1332,6 @@ Files: addons/chan_mobile.c res/res_http_websocket.c res/res_manager_devicestate.c res/res_manager_presencestate.c - res/res_monitor.c res/res_musiconhold.c res/res_mwi_external.c res/res_mwi_external_ami.c @@ -1687,23 +1670,27 @@ Files: include/asterisk/logger_category.h res/res_geolocation/geoloc_gml.c res/res_geolocation/geoloc_private.h res/res_pjsip_geolocation.c + res/res_pjsip_session/pjsip_session.h res/res_pjsip_session/pjsip_session_caps.c + res/res_pjsip_session/pjsip_session_reason_header.c res/res_pjsip_stir_shaken.c res/res_speech_aeap.c res/res_stir_shaken.c - res/res_stir_shaken/certificate.c - res/res_stir_shaken/certificate.h - res/res_stir_shaken/curl.c - res/res_stir_shaken/curl.h - res/res_stir_shaken/general.c - res/res_stir_shaken/general.h - res/res_stir_shaken/profile.c - res/res_stir_shaken/profile.h - res/res_stir_shaken/profile_private.h - res/res_stir_shaken/stir_shaken.c + res/res_stir_shaken/attestation.c + res/res_stir_shaken/attestation.h + res/res_stir_shaken/attestation_config.c + res/res_stir_shaken/common_config.c + res/res_stir_shaken/common_config.h + res/res_stir_shaken/crypto_utils.c + res/res_stir_shaken/crypto_utils.h + res/res_stir_shaken/curl_utils.c + res/res_stir_shaken/curl_utils.h + res/res_stir_shaken/profile_config.c res/res_stir_shaken/stir_shaken.h - res/res_stir_shaken/store.c - res/res_stir_shaken/store.h + res/res_stir_shaken/tn_config.c + res/res_stir_shaken/verification.c + res/res_stir_shaken/verification.h + res/res_stir_shaken/verification_config.c tests/test_aeap.c tests/test_aeap_speech.c tests/test_aeap_transaction.c @@ -1715,6 +1702,7 @@ Copyright: 2019, Sangoma Technologies Corporation 2020, Sangoma Technologies Corporation 2021, Sangoma Technologies Corporation 2022, Sangoma Technologies Corporation + 2023, Sangoma Technologies Corporation License: GPL-2 FIXME @@ -1875,6 +1863,7 @@ Files: apps/app_broadcast.c apps/app_reload.c apps/app_sf.c apps/app_signal.c + apps/app_sla.c apps/app_waitforcond.c funcs/func_evalexten.c funcs/func_export.c @@ -1883,7 +1872,8 @@ Files: apps/app_broadcast.c funcs/func_scramble.c res/res_cliexec.c res/res_tonedetect.c -Copyright: 2021, Naveen Albert +Copyright: 2021, 2024, Naveen Albert + 2021, Naveen Albert 2021-2022, Naveen Albert 2022, Naveen Albert License: GPL-2 @@ -2058,6 +2048,15 @@ Copyright: 2005, Attractel OOD License: GPL-2 FIXME +Files: include/asterisk/refer.h + main/refer.c + res/res_pjsip/security_agreements.c + res/res_pjsip_rfc3329.c +Copyright: 2022, Commend International + 2023, Commend International +License: GPL-2 + FIXME + Files: apps/app_audiosocket.c channels/chan_audiosocket.c include/asterisk/res_audiosocket.h @@ -2245,18 +2244,6 @@ Copyright: 2004-2005, Anthony Minessale II. License: GPL-2 FIXME -Files: include/asterisk/pktccops.h - res/res_pktccops.c -Copyright: 2009, Attila Domjan -License: GPL-2 - FIXME - -Files: res/res_pjsip/security_agreements.c - res/res_pjsip_rfc3329.c -Copyright: 2022, Commend International -License: GPL-2 - FIXME - Files: tests/test_astobj2_thrash.c tests/test_hashtab_thrash.c Copyright: 2012, David M. Lee, II @@ -2669,12 +2656,6 @@ Copyright: 1999-2008, Digium, Inc. License: GPL-2 FIXME -Files: channels/chan_sip.c -Copyright: 1999-2012, Digium, Inc. - is unlocked, we need to go ahead and unlock pvt for both -License: GPL-2 - FIXME - Files: apps/app_queue.c Copyright: 1999-2018, Digium, Inc. option @@ -2990,9 +2971,5 @@ Copyright: 2004-2006, Tilghman Lesher License: UNKNOWN FIXME -Files: ChangeLogs/historical/ChangeLog -Copyright: also conforms to an - always consistent -License: UNKNOWN FIXME diff --git a/debian/patches/1006_systemd.patch b/debian/patches/1006_systemd.patch index b23a63e..f35bba1 100644 --- a/debian/patches/1006_systemd.patch +++ b/debian/patches/1006_systemd.patch @@ -91,7 +91,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ + +[Service] +Type=notify -+ExecStart=__ASTERISK_SBIN_DIR__/asterisk -g -f -p -U asterisk ++ExecStart=__ASTERISK_SBIN_DIR__/asterisk -g -f -p -U asterisk -G asterisk +ExecReload=__ASTERISK_SBIN_DIR__/asterisk -rx 'core reload' +Restart=on-failure +RestartSec=5 diff --git a/debian/patches/1007_ffmpeg_detect.patch b/debian/patches/1007_ffmpeg_detect.patch index 84eb42a..4fbdf85 100644 --- a/debian/patches/1007_ffmpeg_detect.patch +++ b/debian/patches/1007_ffmpeg_detect.patch @@ -14,7 +14,7 @@ Last-Update: 2022-01-22 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- a/configure.ac +++ b/configure.ac -@@ -534,7 +534,7 @@ +@@ -542,7 +542,7 @@ AST_EXT_LIB_SETUP_OPTIONAL([COROSYNC_CFG_STATE_TRACK], [A callback only in corosync 1.x], [COROSYNC], [cfg]) AST_EXT_LIB_SETUP([CRYPT], [password and data encryption], [crypt]) AST_EXT_LIB_SETUP([DAHDI], [DAHDI], [dahdi]) @@ -23,7 +23,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ AST_EXT_LIB_SETUP([GSM], [External GSM], [gsm], [, use 'internal' GSM otherwise]) AST_EXT_LIB_SETUP([ILBC], [System iLBC], [ilbc], [, use 'internal' iLBC otherwise]) AST_EXT_LIB_SETUP([GTK2], [gtk2], [gtk2]) -@@ -2801,7 +2801,18 @@ +@@ -2810,7 +2810,18 @@ AST_EXT_TOOL_CHECK([SDL], [sdl-config]) AST_EXT_LIB_CHECK([SDL_IMAGE], [SDL_image], [IMG_Load], [SDL_image.h], [${SDL_LIB}], [${SDL_INCLUDE}]) diff --git a/debian/patches/1009_build_reproducibly.patch b/debian/patches/1009_build_reproducibly.patch index 52838e8..3a2cef0 100644 --- a/debian/patches/1009_build_reproducibly.patch +++ b/debian/patches/1009_build_reproducibly.patch @@ -20,3 +20,14 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ cat << END /* * build.h +--- a/build_tools/make_xml_documentation ++++ b/build_tools/make_xml_documentation +@@ -193,7 +193,7 @@ + for subdir in ${mod_subdirs} ; do + printf "%s " "${subdir}" + subdir_path=$(make_absolute "$subdir") +- for i in $(${FIND} "${subdir_path}" -name '*.c' -or -name '*.cc'); do ++ for i in $(${FIND} "${subdir_path}" -name '*.c' -or -name '*.cc' | LC_ALL=C sort); do + if [ "${with_moduleinfo}" -eq "1" ] ; then + MODULEINFO=$(${AWK} -f "${source_tree}/build_tools/get_moduleinfo" "${i}") + if [ "${MODULEINFO}" != "" ] ; then diff --git a/debian/patches/2001_keep_sounds_on_distclean.patch b/debian/patches/2001_keep_sounds_on_distclean.patch new file mode 100644 index 0000000..fa647a3 --- /dev/null +++ b/debian/patches/2001_keep_sounds_on_distclean.patch @@ -0,0 +1,35 @@ +Description: Don't remove sounds on dist-clean + Upstream build system may optionally download some extra sound files. + Thus those sound files are deleted on dist-clean. + The tarballs include some soundfiles tarballs by default. + Thus the normal procedure of running 'make dist-clean' + before building the package would delete them. + . + Not used ATM as we ship a tarball with the sound files stripped out. + May be re-used in the future. +Author: Faidon Liambotis +Forwarded: not-needed +Last-Update: 2022-01-22 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/Makefile ++++ b/Makefile +@@ -442,7 +442,6 @@ + + distclean: $(SUBDIRS_DIST_CLEAN) _clean + @$(MAKE) -C menuselect dist-clean +- @$(MAKE) -C sounds dist-clean + rm -f menuselect.makeopts makeopts menuselect-tree menuselect.makedeps + rm -f makeopts.embed_rules + rm -f config.log config.status config.cache +@@ -452,6 +451,10 @@ + rm -rf doc/api + rm -f build_tools/menuselect-deps + ++# tarballs distributed by Digium include sounds ++all-clean: distclean ++ @$(MAKE) -C sounds dist-clean ++ + datafiles: _all doc/core-en_US.xml + CFLAGS="$(_ASTCFLAGS) $(ASTCFLAGS)" build_tools/mkpkgconfig "$(DESTDIR)$(libdir)/pkgconfig"; + # Should static HTTP be installed during make samples or even with its own target ala diff --git a/debian/patches/2002_no_download_sounds.patch b/debian/patches/2002_no_download_sounds.patch new file mode 100644 index 0000000..89688ec --- /dev/null +++ b/debian/patches/2002_no_download_sounds.patch @@ -0,0 +1,32 @@ +Description: Avoid downloading extra sound files + Asterisk configures several sound files to be installed + that are not included in the distribution tarball. + Those files are downloaded by the 'install' target. + . + The exact files to be downloaded is configurable. + Here we change the default to avoid downloading any. + We believe those should be part of a separate source package + (as they rarely change, and have their own versioning). +Author: Tzafrir Cohen +Forwarded: not-needed +Last-Update: 2023-08-27 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/sounds/sounds.xml ++++ b/sounds/sounds.xml +@@ -10,7 +10,6 @@ + + + core +- yes + + + core +@@ -273,7 +272,6 @@ + + + +- yes + core + + diff --git a/debian/patches/2006_enable_test_framework.patch b/debian/patches/2006_enable_test_framework.patch index 9f4d5b2..6816f23 100644 --- a/debian/patches/2006_enable_test_framework.patch +++ b/debian/patches/2006_enable_test_framework.patch @@ -1,6 +1,17 @@ -diff -ur a/build_tools/cflags-devmode.xml b/build_tools/cflags-devmode.xml ---- a/build_tools/cflags-devmode.xml 2024-03-18 09:21:48.000000000 -0400 -+++ b/build_tools/cflags-devmode.xml 2024-03-29 09:00:12.112673898 -0400 +Description: Enable the test framework + Test modules are normally only enabled in development mode. + This patch enables them without the need to enable dev-mode. + . + The modules provide simple tests. Try: asterisk -rx 'test execute all' + . + Those modules should not be confused with the tests in the asterisk-testsute package. +Author: Tzafrir Cohen +Forwarded: not-needed +Last-Update: 2023-08-27 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/build_tools/cflags-devmode.xml ++++ b/build_tools/cflags-devmode.xml @@ -20,7 +20,4 @@ extended @@ -9,10 +20,8 @@ diff -ur a/build_tools/cflags-devmode.xml b/build_tools/cflags-devmode.xml - extended - -Only in b/build_tools: cflags-devmode.xml.orig -diff -ur a/build_tools/cflags.xml b/build_tools/cflags.xml ---- a/build_tools/cflags.xml 2024-03-18 09:21:48.000000000 -0400 -+++ b/build_tools/cflags.xml 2024-03-29 09:00:12.112673898 -0400 +--- a/build_tools/cflags.xml ++++ b/build_tools/cflags.xml @@ -132,4 +132,8 @@ core no @@ -22,4 +31,3 @@ diff -ur a/build_tools/cflags.xml b/build_tools/cflags.xml + extended + -Only in b/build_tools: cflags.xml.orig diff --git a/debian/patches/2011_amr_build_tools.patch b/debian/patches/2011_amr_build_tools.patch index b85a0c2..6065df4 100644 --- a/debian/patches/2011_amr_build_tools.patch +++ b/debian/patches/2011_amr_build_tools.patch @@ -10,8 +10,7 @@ Last-Update: 2023-08-27 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- a/build_tools/menuselect-deps.in +++ b/build_tools/menuselect-deps.in -@@ -1,4 +1,7 @@ - ALSA=@PBX_ALSA@ +@@ -1,3 +1,6 @@ +AMR_NB=@PBX_AMR_NB@ +AMR_WB_DECODER=@PBX_AMR_WB_DECODER@ +AMR_WB_ENCODER=@PBX_AMR_WB_ENCODER@ @@ -20,19 +19,19 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ COROSYNC=@PBX_COROSYNC@ --- a/configure.ac +++ b/configure.ac -@@ -522,6 +522,9 @@ +@@ -530,6 +530,9 @@ + # by the --with option name (the third field), # to make things easier for the users. - AST_EXT_LIB_SETUP([ALSA], [Advanced Linux Sound Architecture], [asound]) +AST_EXT_LIB_SETUP([AMR_NB], [AMR Audio Codec (Narrowband) Decoder/Encoder], [opencore-amrnb]) +AST_EXT_LIB_SETUP([AMR_WB_DECODER], [AMR-WB Audio Codec (Wideband) Decoder], [opencore-amrwb]) +AST_EXT_LIB_SETUP([AMR_WB_ENCODER], [AMR-WB Audio Codec (Wideband) Encoder], [vo-amrwbenc]) AST_EXT_LIB_SETUP([BFD], [Debug symbol decoding], [bfd]) # BKTR is used for backtrace support on platforms that do not -@@ -1616,6 +1619,10 @@ +@@ -1630,6 +1633,10 @@ - AST_EXT_LIB_CHECK([ALSA], [asound], [snd_pcm_open], [alsa/asoundlib.h]) + # do the package library checks now +AST_EXT_LIB_CHECK([AMR_NB], [opencore-amrnb], [Encoder_Interface_init], [opencore-amrnb/interf_enc.h]) +AST_EXT_LIB_CHECK([AMR_WB_DECODER], [opencore-amrwb], [D_IF_init], [opencore-amrwb/dec_if.h]) @@ -43,9 +42,9 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ AST_EXT_LIB_CHECK([BFD], [bfd], [bfd_openr], [bfd.h], [-ldl -liberty]) --- a/makeopts.in +++ b/makeopts.in -@@ -133,6 +133,13 @@ - ALSA_INCLUDE=@ALSA_INCLUDE@ - ALSA_LIB=@ALSA_LIB@ +@@ -130,6 +130,13 @@ + AST_RPATH=@AST_RPATH@ + AST_FORTIFY_SOURCE=@AST_FORTIFY_SOURCE@ +AMR_NB_INCLUDE=@AMR_NB_INCLUDE@ +AMR_NB_LIB=@AMR_NB_LIB@ diff --git a/debian/patches/2012_amr_codec.patch b/debian/patches/2012_amr_codec.patch index 1f0ec81..e507ae7 100644 --- a/debian/patches/2012_amr_codec.patch +++ b/debian/patches/2012_amr_codec.patch @@ -29,7 +29,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ * \retval 0 success --- a/main/codec_builtin.c +++ b/main/codec_builtin.c -@@ -898,6 +898,54 @@ +@@ -925,6 +925,54 @@ .samples_count = silk_samples }; @@ -84,7 +84,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ #define CODEC_REGISTER_AND_CACHE(codec) \ ({ \ int __res_ ## __LINE__ = 0; \ -@@ -930,6 +978,9 @@ +@@ -957,6 +1005,9 @@ { int res = 0; @@ -136,7 +136,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ } else if (!strcmp(name, "png")) { --- a/main/rtp_engine.c +++ b/main/rtp_engine.c -@@ -3721,6 +3721,9 @@ +@@ -3906,6 +3906,9 @@ set_next_mime_type(ast_format_vp8, 0, "video", "VP8", 90000); set_next_mime_type(ast_format_vp9, 0, "video", "VP9", 90000); @@ -146,7 +146,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ /* Define the static rtp payload mappings */ add_static_payload(0, ast_format_ulaw, 0); #ifdef USE_DEPRECATED_G726 -@@ -3764,6 +3767,9 @@ +@@ -3949,6 +3952,9 @@ add_static_payload(109, ast_format_h265, 0); add_static_payload(110, ast_format_speex, 0); diff --git a/debian/patches/2015_opus.patch b/debian/patches/2015_opus.patch index c5aa651..c86d06a 100644 --- a/debian/patches/2015_opus.patch +++ b/debian/patches/2015_opus.patch @@ -17,19 +17,19 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ OPUS=@PBX_OPUS@ +OPUSENC=@PBX_OPUSENC@ OPUSFILE=@PBX_OPUSFILE@ - OSPTK=@PBX_OSPTK@ PGSQL=@PBX_PGSQL@ + PJPROJECT=@PBX_PJPROJECT@ --- a/configure.ac +++ b/configure.ac -@@ -570,6 +570,7 @@ +@@ -579,6 +579,7 @@ AST_EXT_LIB_SETUP([OGG], [OGG], [ogg]) AST_EXT_LIB_SETUP([OPENR2], [MFR2], [openr2]) AST_EXT_LIB_SETUP([OPUS], [Opus], [opus]) +AST_EXT_LIB_SETUP([OPUSENC], [Opusenc], [opusenc]) AST_EXT_LIB_SETUP([OPUSFILE], [Opusfile], [opusfile]) - AST_EXT_LIB_SETUP([OSPTK], [OSP Toolkit], [osptk]) AST_EXT_LIB_SETUP([PGSQL], [PostgreSQL], [postgres]) -@@ -2607,6 +2608,7 @@ + AST_EXT_LIB_SETUP([BEANSTALK], [Beanstalk Job Queue], [beanstalk]) +@@ -2624,6 +2625,7 @@ if test -z "$__opus_include" -o x"$__opus_include" = x" " ; then __opus_include=-I/usr/include/opus fi @@ -39,7 +39,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ for ver in ${LUA_VERSIONS:-5.4 5.3 5.2 5.1}; do --- a/makeopts.in +++ b/makeopts.in -@@ -228,6 +228,9 @@ +@@ -230,6 +230,9 @@ OPUS_INCLUDE=@OPUS_INCLUDE@ OPUS_LIB=@OPUS_LIB@ diff --git a/debian/patches/2016_opus_plc.patch b/debian/patches/2016_opus_plc.patch index ea6ec4d..9be4345 100644 --- a/debian/patches/2016_opus_plc.patch +++ b/debian/patches/2016_opus_plc.patch @@ -1,16 +1,19 @@ Description: detect lost (and late) RTP packets for native PLC - Original patch adapted by Jonas Smedegaard to fit Debian packaging, + Original patch adapted by Jonas Smedegaard + to fit Debian packaging, + disable debugging NOTICEs, and to remove original patch file to help detect later upstream changes. Author: Alexander Traud Author: Jonas Smedegaard Source: https://github.com/traud/asterisk-opus/blob/asterisk-13.7/enable_native_plc.patch +Bug-Debian: https://bugs.debian.org/1060275 Forwarded: not-needed -Last-Update: 2023-08-27 +Last-Update: 2024-01-30 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- a/main/translate.c +++ b/main/translate.c -@@ -356,6 +356,7 @@ +@@ -357,6 +357,7 @@ pvt->f.offset = AST_FRIENDLY_OFFSET; pvt->f.src = pvt->t->name; pvt->f.data.ptr = pvt->outbuf.c; @@ -18,7 +21,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ /* * If the translator has not provided a format -@@ -564,13 +565,46 @@ +@@ -565,13 +566,47 @@ /*! \brief do the actual translation */ struct ast_frame *ast_translate(struct ast_trans_pvt *path, struct ast_frame *f, int consume) { @@ -58,8 +61,9 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ + if (frames_missing > 96) { + struct ast_str *str = ast_str_alloca(256); + -+ /* not DEBUG but NOTICE because of WARNING in main/cannel.c:__ast_queue_frame */ -+ ast_log(LOG_NOTICE, "%d lost frame(s) %d/%d %s\n", frames_missing, f->seqno, path->f.seqno, ast_translate_path_to_str(path, &str)); ++ /* disabled by default to not flood log in production even in non-Opus use ++ /* not DEBUG but NOTICE because of WARNING in main/channel.c:__ast_queue_frame */ ++ //ast_log(LOG_NOTICE, "%d lost frame(s) %d/%d %s\n", frames_missing, f->seqno, path->f.seqno, ast_translate_path_to_str(path, &str)); + } + } else { + frames_missing = 0; @@ -67,7 +71,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ if (f->frametype == AST_FRAME_RTCP) { /* Just pass the feedback to the right callback, if it exists. -@@ -611,19 +645,94 @@ +@@ -612,19 +647,94 @@ f->samples, ast_format_get_sample_rate(f->subclass.format))); } delivery = f->delivery; diff --git a/debian/patches/series b/debian/patches/series index 6680ba0..02fe3b2 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,9 +3,17 @@ 1007_ffmpeg_detect.patch 1008_ffmpeg_include.patch 1009_build_reproducibly.patch +#2001_keep_sounds_on_distclean.patch +#2002_no_download_sounds.patch 2006_enable_test_framework.patch 2008_disable_ilbc.patch 2010_astdatadir.patch +#2011_amr_build_tools.patch +#2012_amr_codec.patch +#2013_mp3.patch +#2014_pjproject_unbreak.patch +#2015_opus.patch +#2016_opus_plc.patch alsa_detect.patch config_c_fix_template_inheritance_overrides.patch config_c_fix_template_writing.patch diff --git a/debian/rules b/debian/rules index 1187cf7..1067089 100755 --- a/debian/rules +++ b/debian/rules @@ -7,7 +7,7 @@ include /usr/share/dpkg/pkg-info.mk include /usr/share/dpkg/architecture.mk # generate documentation unless nodoc requested -#CHANGELOGS_stem = ChangeLogs/ChangeLog-$(DEB_VERSION_UPSTREAM) +#CHANGELOGS_stem = ChangeLogs/ChangeLog-$(firstword $(subst ~, ,$(subst ~~,-,$(DEB_VERSION_UPSTREAM)))) DOCS_stem = README SECURITY ifeq (,$(filter nodoc,$(DEB_BUILD_OPTIONS))) #CHANGELOGS = $(CHANGELOGS_stem:=.html) $(CHANGELOGS_stem:=.txt) @@ -123,7 +123,7 @@ override_dh_gencontrol: | sed -e 's/.\+ "\(.\+\)\"/\1/g'); \ dh_gencontrol -- -Vasterisk:ABI=$$AST_BUILDOPT_SUM -REMOVED_PROTO_CONFS = dundi mgcp skinny unistim +REMOVED_PROTO_CONFS = dundi unistim REMOVED_PROTO_FILES = $(REMOVED_PROTO_CONFS:%=debian/tmp/etc/asterisk/%.conf) SUBPACKS_EXTRA = Dooh323 mysql mp3 ifeq (linux,$(DEB_BUILD_ARCH_OS)) diff --git a/debian/watch b/debian/watch index 5a1d985..8e6bfa7 100644 --- a/debian/watch +++ b/debian/watch @@ -8,4 +8,4 @@ pgpmode=auto,\ uversionmangle=s/\d\K-(rc)/~~$1/,\ dversionmangle=auto \ https://downloads.asterisk.org/pub/telephony/asterisk/releases/ \ -asterisk-(20(?:\.\d+)+(?:-rc\d)?)@ARCHIVE_EXT@ group +asterisk-(22(?:\.\d+)+(?:-rc\d)?)@ARCHIVE_EXT@ group