From 9824198ad2b301d7dbdba5f148c3a67962f2423e Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Sat, 23 Dec 2023 23:40:37 +0100 Subject: [PATCH] freeswitch: bump to 1.10.11 See [1]. [1] https://github.com/signalwire/freeswitch/security/advisories/GHSA-39gv-hq72-j6m6 Signed-off-by: Sebastian Kemper (cherry picked from commit 390b0aabe6bfaacf5f397af831bebffe7c2e214d) --- net/freeswitch/Makefile | 6 +- ...490-build-properly-fix-time_t-issues.patch | 2 +- ...ore-fix-switch_mprintf-format-string.patch | 2 +- ...px-VP8-disallow-thread-count-changes.patch | 23 ----- ...x-bug-with-smaller-width-bigger-size.patch | 88 ------------------- 5 files changed, 5 insertions(+), 116 deletions(-) delete mode 100644 net/freeswitch/patches/500-libvpx-VP8-disallow-thread-count-changes.patch delete mode 100644 net/freeswitch/patches/501-libvpx-Fix-bug-with-smaller-width-bigger-size.patch diff --git a/net/freeswitch/Makefile b/net/freeswitch/Makefile index 96dfe7c..213e45b 100644 --- a/net/freeswitch/Makefile +++ b/net/freeswitch/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=freeswitch -PKG_VERSION:=1.10.10 -PKG_RELEASE:=2 +PKG_VERSION:=1.10.11 +PKG_RELEASE:=1 PKG_MAINTAINER:=Sebastian Kemper PKG_SOURCE:=freeswitch-$(PKG_VERSION).-release.tar.xz PKG_SOURCE_URL:=https://files.freeswitch.org/releases/freeswitch -PKG_HASH:=d2c702c7f4bd6eca539c3981cf859ad5c1846d9283829e24cd75686f2322b9df +PKG_HASH:=7f9603a691220d9f47da42f3b19290b629b69dceb2eee56448f0a7cefcf9d1a1 PKG_CPE_ID:=cpe:/a:freeswitch:freeswitch diff --git a/net/freeswitch/patches/490-build-properly-fix-time_t-issues.patch b/net/freeswitch/patches/490-build-properly-fix-time_t-issues.patch index 395f7ac..9ead97f 100644 --- a/net/freeswitch/patches/490-build-properly-fix-time_t-issues.patch +++ b/net/freeswitch/patches/490-build-properly-fix-time_t-issues.patch @@ -166,7 +166,7 @@ The most portable fix for time_t handling is to always cast it to switch_channel_set_variable(channel, "end_uepoch", tmp); --- a/src/switch_ivr_originate.c +++ b/src/switch_ivr_originate.c -@@ -800,7 +800,7 @@ static uint8_t check_channel_status(orig +@@ -804,7 +804,7 @@ static uint8_t check_channel_status(orig time_t elapsed = switch_epoch_time_now(NULL) - start; oglobals->originate_status[i].per_channel_progress_timelimit_sec = elapsed + extend_timeout; oglobals->originate_status[i].per_channel_timelimit_sec = elapsed + extend_timeout; diff --git a/net/freeswitch/patches/493-core-fix-switch_mprintf-format-string.patch b/net/freeswitch/patches/493-core-fix-switch_mprintf-format-string.patch index effb550..7454977 100644 --- a/net/freeswitch/patches/493-core-fix-switch_mprintf-format-string.patch +++ b/net/freeswitch/patches/493-core-fix-switch_mprintf-format-string.patch @@ -12,7 +12,7 @@ Reported-by: Sebastian Kemper --- a/src/switch_core_sqldb.c +++ b/src/switch_core_sqldb.c -@@ -3551,7 +3551,7 @@ SWITCH_DECLARE(switch_status_t) switch_c +@@ -3553,7 +3553,7 @@ SWITCH_DECLARE(switch_status_t) switch_c if (force) { sql = switch_mprintf("delete from registrations where hostname='%q'", switch_core_get_switchname()); } else { diff --git a/net/freeswitch/patches/500-libvpx-VP8-disallow-thread-count-changes.patch b/net/freeswitch/patches/500-libvpx-VP8-disallow-thread-count-changes.patch deleted file mode 100644 index c857884..0000000 --- a/net/freeswitch/patches/500-libvpx-VP8-disallow-thread-count-changes.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 6f9e72c585265d8def8a613b36cd4f524c201980 Mon Sep 17 00:00:00 2001 -From: Andrey Volk -Date: Wed, 4 Oct 2023 00:47:39 +0300 -Subject: [PATCH] [libvpx] VP8: disallow thread count changes - ---- - libs/libvpx/vp8/encoder/onyx_if.c | 5 +++++ - 1 file changed, 5 insertions(+) - ---- a/libs/libvpx/vp8/encoder/onyx_if.c -+++ b/libs/libvpx/vp8/encoder/onyx_if.c -@@ -1447,6 +1447,11 @@ void vp8_change_config(VP8_COMP *cpi, VP - last_h = cpi->oxcf.Height; - prev_number_of_layers = cpi->oxcf.number_of_layers; - -+ if (cpi->initial_width) { -+ // TODO(https://crbug.com/1486441): Allow changing thread counts; the -+ // allocation is done once in vp8_create_compressor(). -+ oxcf->multi_threaded = cpi->oxcf.multi_threaded; -+ } - cpi->oxcf = *oxcf; - - switch (cpi->oxcf.Mode) { diff --git a/net/freeswitch/patches/501-libvpx-Fix-bug-with-smaller-width-bigger-size.patch b/net/freeswitch/patches/501-libvpx-Fix-bug-with-smaller-width-bigger-size.patch deleted file mode 100644 index 5390dc6..0000000 --- a/net/freeswitch/patches/501-libvpx-Fix-bug-with-smaller-width-bigger-size.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 2ab7a3d323984a4df969ea19dadf86213308a361 Mon Sep 17 00:00:00 2001 -From: Andrey Volk -Date: Fri, 6 Oct 2023 00:42:10 +0300 -Subject: [PATCH] [libvpx] Fix bug with smaller width bigger size - ---- - libs/libvpx/vp9/common/vp9_alloccommon.c | 12 +++++------ - libs/libvpx/vp9/encoder/vp9_encoder.c | 27 ++++++++++++++++++++++-- - 2 files changed, 31 insertions(+), 8 deletions(-) - ---- a/libs/libvpx/vp9/common/vp9_alloccommon.c -+++ b/libs/libvpx/vp9/common/vp9_alloccommon.c -@@ -123,12 +123,6 @@ int vp9_alloc_context_buffers(VP9_COMMON - if (cm->alloc_mi(cm, new_mi_size)) goto fail; - } - -- if (cm->seg_map_alloc_size < cm->mi_rows * cm->mi_cols) { -- // Create the segmentation map structure and set to 0. -- free_seg_map(cm); -- if (alloc_seg_map(cm, cm->mi_rows * cm->mi_cols)) goto fail; -- } -- - if (cm->above_context_alloc_cols < cm->mi_cols) { - vpx_free(cm->above_context); - cm->above_context = (ENTROPY_CONTEXT *)vpx_calloc( -@@ -143,6 +137,12 @@ int vp9_alloc_context_buffers(VP9_COMMON - cm->above_context_alloc_cols = cm->mi_cols; - } - -+ if (cm->seg_map_alloc_size < cm->mi_rows * cm->mi_cols) { -+ // Create the segmentation map structure and set to 0. -+ free_seg_map(cm); -+ if (alloc_seg_map(cm, cm->mi_rows * cm->mi_cols)) goto fail; -+ } -+ - if (vp9_alloc_loop_filter(cm)) goto fail; - - return 0; ---- a/libs/libvpx/vp9/encoder/vp9_encoder.c -+++ b/libs/libvpx/vp9/encoder/vp9_encoder.c -@@ -1915,6 +1915,17 @@ static void alloc_copy_partition_data(VP - } - } - -+static void free_copy_partition_data(VP9_COMP *cpi) { -+ vpx_free(cpi->prev_partition); -+ cpi->prev_partition = NULL; -+ vpx_free(cpi->prev_segment_id); -+ cpi->prev_segment_id = NULL; -+ vpx_free(cpi->prev_variance_low); -+ cpi->prev_variance_low = NULL; -+ vpx_free(cpi->copied_frame_cnt); -+ cpi->copied_frame_cnt = NULL; -+} -+ - void vp9_change_config(struct VP9_COMP *cpi, const VP9EncoderConfig *oxcf) { - VP9_COMMON *const cm = &cpi->common; - RATE_CONTROL *const rc = &cpi->rc; -@@ -1999,6 +2010,8 @@ void vp9_change_config(struct VP9_COMP * - new_mi_size = cm->mi_stride * calc_mi_size(cm->mi_rows); - if (cm->mi_alloc_size < new_mi_size) { - vp9_free_context_buffers(cm); -+ vp9_free_pc_tree(&cpi->td); -+ vpx_free(cpi->mbmi_ext_base); - alloc_compressor_data(cpi); - realloc_segmentation_maps(cpi); - cpi->initial_width = cpi->initial_height = 0; -@@ -2014,8 +2027,18 @@ void vp9_change_config(struct VP9_COMP * - update_frame_size(cpi); - - if (last_w != cpi->oxcf.width || last_h != cpi->oxcf.height) { -- memset(cpi->consec_zero_mv, 0, -- cm->mi_rows * cm->mi_cols * sizeof(*cpi->consec_zero_mv)); -+ vpx_free(cpi->consec_zero_mv); -+ CHECK_MEM_ERROR( -+ cm, cpi->consec_zero_mv, -+ vpx_calloc(cm->mi_rows * cm->mi_cols, sizeof(*cpi->consec_zero_mv))); -+ -+ vpx_free(cpi->skin_map); -+ CHECK_MEM_ERROR( -+ cm, cpi->skin_map, -+ vpx_calloc(cm->mi_rows * cm->mi_cols, sizeof(cpi->skin_map[0]))); -+ -+ free_copy_partition_data(cpi); -+ alloc_copy_partition_data(cpi); - if (cpi->oxcf.aq_mode == CYCLIC_REFRESH_AQ) - vp9_cyclic_refresh_reset_resize(cpi); - rc->rc_1_frame = 0; -- 2.30.2