From 6febdcb0e1006debe26d06b5f3bea9bd7d5948e0 Mon Sep 17 00:00:00 2001 From: Victor Seva Date: Mon, 2 Oct 2023 13:18:48 +0200 Subject: [PATCH] refresh patches Change-Id: Ica540c5be759662f97c92cf9c3f48d329142c27e --- .../patches/debian/no_lib64_on_64_bits.patch | 2 +- debian/patches/series | 2 +- .../sipwise/db_redis_graceful_scan.patch | 2 +- .../sipwise/db_redis_skip_empty_keys.patch | 2 +- debian/patches/sipwise/db_redis_sscan.patch | 32 +++++++++---------- .../db_redis_sscan_fix_empty_key.patch | 2 +- .../sipwise/kamctl-TMPDIR-config.patch | 2 +- ...lags_as_id => lcr_stats_flags_as_id.patch} | 14 ++++++-- 8 files changed, 34 insertions(+), 24 deletions(-) rename debian/patches/sipwise/{lcr_stats_flags_as_id => lcr_stats_flags_as_id.patch} (62%) diff --git a/debian/patches/debian/no_lib64_on_64_bits.patch b/debian/patches/debian/no_lib64_on_64_bits.patch index eec8206b0..e404b7b63 100644 --- a/debian/patches/debian/no_lib64_on_64_bits.patch +++ b/debian/patches/debian/no_lib64_on_64_bits.patch @@ -7,7 +7,7 @@ Subject: no_lib64_on_64_bits 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Makefile.defs b/src/Makefile.defs -index 4ff899c..3dcb470 100644 +index 287efec..59e80d3 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -458,15 +458,7 @@ endif diff --git a/debian/patches/series b/debian/patches/series index 3723b20df..4dd7ea99a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -49,7 +49,7 @@ sipwise/db_redis_sscan_fix_empty_key.patch sipwise/kamctl-TMPDIR-config.patch sipwise/lcr-stopper_mode-parameter.patch sipwise/lcr-stats.patch -sipwise/lcr_stats_flags_as_id +sipwise/lcr_stats_flags_as_id.patch sipwise/dialog-support-profile_get_size-for-all-profiles.patch sipwise/rtpengine-set-mime-content-length.patch ### active development diff --git a/debian/patches/sipwise/db_redis_graceful_scan.patch b/debian/patches/sipwise/db_redis_graceful_scan.patch index 8ff105fd4..bbf50fe9c 100644 --- a/debian/patches/sipwise/db_redis_graceful_scan.patch +++ b/debian/patches/sipwise/db_redis_graceful_scan.patch @@ -7,7 +7,7 @@ Subject: db_redis_graceful_scan 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/src/modules/db_redis/redis_dbase.c b/src/modules/db_redis/redis_dbase.c -index aa0a9fd..8166d29 100644 +index 4dc4959..2569e0a 100644 --- a/src/modules/db_redis/redis_dbase.c +++ b/src/modules/db_redis/redis_dbase.c @@ -754,7 +754,7 @@ static int db_redis_scan_query_keys_pattern(km_redis_con_t *con, const str *matc diff --git a/debian/patches/sipwise/db_redis_skip_empty_keys.patch b/debian/patches/sipwise/db_redis_skip_empty_keys.patch index bc32d7214..2333401fb 100644 --- a/debian/patches/sipwise/db_redis_skip_empty_keys.patch +++ b/debian/patches/sipwise/db_redis_skip_empty_keys.patch @@ -7,7 +7,7 @@ Subject: db_redis_skip_empty_keys 1 file changed, 3 insertions(+) diff --git a/src/modules/db_redis/redis_dbase.c b/src/modules/db_redis/redis_dbase.c -index 254e0f6..aa0a9fd 100644 +index 8f7056b..4dc4959 100644 --- a/src/modules/db_redis/redis_dbase.c +++ b/src/modules/db_redis/redis_dbase.c @@ -641,6 +641,9 @@ static int db_redis_build_query_keys(km_redis_con_t *con, const str *table_name, diff --git a/debian/patches/sipwise/db_redis_sscan.patch b/debian/patches/sipwise/db_redis_sscan.patch index 0a2c1a427..24804b8e9 100644 --- a/debian/patches/sipwise/db_redis_sscan.patch +++ b/debian/patches/sipwise/db_redis_sscan.patch @@ -7,7 +7,7 @@ Subject: db_redis_sscan 1 file changed, 65 insertions(+), 21 deletions(-) diff --git a/src/modules/db_redis/redis_dbase.c b/src/modules/db_redis/redis_dbase.c -index 8166d29..8569aa0 100644 +index 2569e0a..8511630 100644 --- a/src/modules/db_redis/redis_dbase.c +++ b/src/modules/db_redis/redis_dbase.c @@ -591,7 +591,7 @@ err: @@ -174,7 +174,7 @@ index 8166d29..8569aa0 100644 LM_ERR("failed to scan query keys\n"); goto error; } -@@ -2433,6 +2462,7 @@ int db_redis_query(const db1_con_t* _h, const db_key_t* _k, const db_op_t* _op, +@@ -2435,6 +2464,7 @@ int db_redis_query(const db1_con_t* _h, const db_key_t* _k, const db_op_t* _op, int do_table_scan = 0; uint64_t ts_scan_start = 0; str ts_scan_key = {0,}; @@ -182,7 +182,7 @@ index 8166d29..8569aa0 100644 redis_key_t *keys = NULL; int keys_count = 0; -@@ -2504,7 +2534,7 @@ int db_redis_query(const db1_con_t* _h, const db_key_t* _k, const db_op_t* _op, +@@ -2506,7 +2536,7 @@ int db_redis_query(const db1_con_t* _h, const db_key_t* _k, const db_op_t* _op, if (_n > 0) { if (db_redis_build_query_keys(con, CON_TABLE(_h), _k, _v, query_ops, _n, &keys, &keys_count, &manual_keys, &manual_keys_count, &do_table_scan, &ts_scan_start, @@ -191,7 +191,7 @@ index 8166d29..8569aa0 100644 LM_ERR("failed to build query keys\n"); goto error; } -@@ -2522,7 +2552,7 @@ int db_redis_query(const db1_con_t* _h, const db_key_t* _k, const db_op_t* _op, +@@ -2524,7 +2554,7 @@ int db_redis_query(const db1_con_t* _h, const db_key_t* _k, const db_op_t* _op, } if (db_redis_perform_query(_h, con, _k, _v, query_ops, _c, _n, _nc, _r, @@ -200,7 +200,7 @@ index 8166d29..8569aa0 100644 goto error; } -@@ -2538,6 +2568,8 @@ int db_redis_query(const db1_con_t* _h, const db_key_t* _k, const db_op_t* _op, +@@ -2540,6 +2570,8 @@ int db_redis_query(const db1_con_t* _h, const db_key_t* _k, const db_op_t* _op, } if (ts_scan_key.s) pkg_free(ts_scan_key.s); @@ -209,7 +209,7 @@ index 8166d29..8569aa0 100644 db_redis_consume_replies(con); return 0; -@@ -2553,6 +2585,8 @@ error: +@@ -2555,6 +2587,8 @@ error: } if (ts_scan_key.s) pkg_free(ts_scan_key.s); @@ -218,7 +218,7 @@ index 8166d29..8569aa0 100644 db_redis_consume_replies(con); -@@ -2738,6 +2772,7 @@ int db_redis_delete(const db1_con_t* _h, const db_key_t* _k, +@@ -2740,6 +2774,7 @@ int db_redis_delete(const db1_con_t* _h, const db_key_t* _k, int do_table_scan = 0; uint64_t ts_scan_start = 0; str ts_scan_key = {0,}; @@ -226,7 +226,7 @@ index 8166d29..8569aa0 100644 db_op_t *query_ops = NULL; int i; -@@ -2783,7 +2818,7 @@ int db_redis_delete(const db1_con_t* _h, const db_key_t* _k, +@@ -2785,7 +2820,7 @@ int db_redis_delete(const db1_con_t* _h, const db_key_t* _k, if (_n > 0) { if (db_redis_build_query_keys(con, CON_TABLE(_h), _k, _v, query_ops, _n, &keys, &keys_count, &manual_keys, &manual_keys_count, &do_table_scan, &ts_scan_start, @@ -235,7 +235,7 @@ index 8166d29..8569aa0 100644 LM_ERR("failed to build query keys\n"); goto error; } -@@ -2801,7 +2836,7 @@ int db_redis_delete(const db1_con_t* _h, const db_key_t* _k, +@@ -2803,7 +2838,7 @@ int db_redis_delete(const db1_con_t* _h, const db_key_t* _k, } if (db_redis_perform_delete(_h, con, _k, _v, query_ops, _n, @@ -244,7 +244,7 @@ index 8166d29..8569aa0 100644 goto error; } -@@ -2815,6 +2850,8 @@ int db_redis_delete(const db1_con_t* _h, const db_key_t* _k, +@@ -2817,6 +2852,8 @@ int db_redis_delete(const db1_con_t* _h, const db_key_t* _k, pkg_free(manual_keys); if (ts_scan_key.s) pkg_free(ts_scan_key.s); @@ -253,7 +253,7 @@ index 8166d29..8569aa0 100644 db_redis_consume_replies(con); return 0; -@@ -2829,6 +2866,8 @@ error: +@@ -2831,6 +2868,8 @@ error: pkg_free(manual_keys); if (ts_scan_key.s) pkg_free(ts_scan_key.s); @@ -262,7 +262,7 @@ index 8166d29..8569aa0 100644 db_redis_consume_replies(con); return -1; } -@@ -2853,6 +2892,7 @@ int db_redis_update(const db1_con_t* _h, const db_key_t* _k, +@@ -2855,6 +2894,7 @@ int db_redis_update(const db1_con_t* _h, const db_key_t* _k, int do_table_scan = 0; uint64_t ts_scan_start = 0; str ts_scan_key = {0,}; @@ -270,7 +270,7 @@ index 8166d29..8569aa0 100644 redis_key_t *keys = NULL; int keys_count = 0; -@@ -2903,7 +2943,7 @@ int db_redis_update(const db1_con_t* _h, const db_key_t* _k, +@@ -2905,7 +2945,7 @@ int db_redis_update(const db1_con_t* _h, const db_key_t* _k, if (_n > 0) { if (db_redis_build_query_keys(con, CON_TABLE(_h), _k, _v, query_ops, _n, &keys, &keys_count, &manual_keys, &manual_keys_count, &do_table_scan, &ts_scan_start, @@ -279,7 +279,7 @@ index 8166d29..8569aa0 100644 LM_ERR("failed to build query keys\n"); goto error; } -@@ -2920,7 +2960,7 @@ int db_redis_update(const db1_con_t* _h, const db_key_t* _k, +@@ -2922,7 +2962,7 @@ int db_redis_update(const db1_con_t* _h, const db_key_t* _k, } if (db_redis_perform_update(_h, con, _k, _v, query_ops, _uk, _uv, _n, _nu, @@ -288,7 +288,7 @@ index 8166d29..8569aa0 100644 goto error; } -@@ -2936,6 +2976,8 @@ int db_redis_update(const db1_con_t* _h, const db_key_t* _k, +@@ -2938,6 +2978,8 @@ int db_redis_update(const db1_con_t* _h, const db_key_t* _k, } if (ts_scan_key.s) pkg_free(ts_scan_key.s); @@ -297,7 +297,7 @@ index 8166d29..8569aa0 100644 db_redis_consume_replies(con); return 0; -@@ -2950,6 +2992,8 @@ error: +@@ -2952,6 +2994,8 @@ error: } if (ts_scan_key.s) pkg_free(ts_scan_key.s); diff --git a/debian/patches/sipwise/db_redis_sscan_fix_empty_key.patch b/debian/patches/sipwise/db_redis_sscan_fix_empty_key.patch index b8bcfafd1..191a5cd30 100644 --- a/debian/patches/sipwise/db_redis_sscan_fix_empty_key.patch +++ b/debian/patches/sipwise/db_redis_sscan_fix_empty_key.patch @@ -7,7 +7,7 @@ Subject: db_redis_sscan_fix_empty_key 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/db_redis/redis_dbase.c b/src/modules/db_redis/redis_dbase.c -index 8569aa0..f61a6b1 100644 +index 8511630..a806f78 100644 --- a/src/modules/db_redis/redis_dbase.c +++ b/src/modules/db_redis/redis_dbase.c @@ -784,7 +784,7 @@ static int db_redis_scan_query_keys_pattern(km_redis_con_t *con, const str *matc diff --git a/debian/patches/sipwise/kamctl-TMPDIR-config.patch b/debian/patches/sipwise/kamctl-TMPDIR-config.patch index 2f1c3b4db..9f9bf159e 100644 --- a/debian/patches/sipwise/kamctl-TMPDIR-config.patch +++ b/debian/patches/sipwise/kamctl-TMPDIR-config.patch @@ -13,7 +13,7 @@ Subject: kamctl: TMPDIR config 5 files changed, 23 insertions(+), 13 deletions(-) diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl -index 214cd21..7a49826 100755 +index b4e552e..b95f707 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -77,6 +77,10 @@ if [ -z "$STARTUP_CONFIG_FILE" ]; then diff --git a/debian/patches/sipwise/lcr_stats_flags_as_id b/debian/patches/sipwise/lcr_stats_flags_as_id.patch similarity index 62% rename from debian/patches/sipwise/lcr_stats_flags_as_id rename to debian/patches/sipwise/lcr_stats_flags_as_id.patch index df7d78cbb..2658b017f 100644 --- a/debian/patches/sipwise/lcr_stats_flags_as_id +++ b/debian/patches/sipwise/lcr_stats_flags_as_id.patch @@ -1,6 +1,16 @@ +From: Sipwise Development Team +Date: Mon, 2 Oct 2023 13:16:46 +0200 +Subject: lcr_stats_flags_as_id + +--- + src/modules/lcr/lcr_rpc.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/src/modules/lcr/lcr_rpc.c b/src/modules/lcr/lcr_rpc.c +index fb38912..00a7a9e 100644 --- a/src/modules/lcr/lcr_rpc.c +++ b/src/modules/lcr/lcr_rpc.c -@@ -109,7 +109,8 @@ static void print_gw_stat(rpc_t *rpc, vo +@@ -109,7 +109,8 @@ static void print_gw_stat(rpc_t *rpc, void *st, struct gw_info *gw) { str gw_name; @@ -10,7 +20,7 @@ gw_name.s = gw->gw_name; gw_name.len = gw->gw_name_len; rpc->struct_add(st, "S", "gw_name", &gw_name); -@@ -558,7 +559,7 @@ static void lcr_print_stats(rpc_t *rpc, +@@ -558,7 +559,7 @@ static void lcr_print_stats(rpc_t *rpc, void *ctx) } #define CREATE_RPC_ENTRY(var1, var2) \