sipwise
/
kamailio
mirror of https://github.com/sipwise/kamailio.git
1
0
Fork 0
Code Issues Releases Wiki Activity

MT#64611 Remove already applied upstream patches and refresh old ones

Browse Source 
Upgrading to 6.0.6

* sipwise/rtpengine-directional-flag.patch removed

Change-Id: Ice16c0af574b53d76ed3b1f581dfa6413a45b179
mr13.5.1
Donat Zenichev 2 months ago
parent 7c73a37064
commit 08d97e3550
10 changed files with 48 additions and 31 deletions
Show Stats Download Patch File Download Diff File

2
debian/patches/debian/no_lib64_on_64_bits.patch vendored
Unescape View File

@ -7,7 +7,7 @@ Subject: no_lib64_on_64_bits
1 file changed, 1 insertion(+), 9 deletions(-) 1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/src/Makefile.defs b/src/Makefile.defs diff --git a/src/Makefile.defs b/src/Makefile.defs
index d7520fe..a6df36e 100644 index 594af77..9bed4c9 100644
--- a/src/Makefile.defs --- a/src/Makefile.defs
+++ b/src/Makefile.defs +++ b/src/Makefile.defs
@@ -454,15 +454,7 @@ endif @@ -454,15 +454,7 @@ endif

1
debian/patches/series vendored
Unescape View File

@ -42,7 +42,6 @@ sipwise/http_client-add-method-parameter-to-http_connect.patch
sipwise/lost-add-method-parameter-to-http_connect-calls.patch sipwise/lost-add-method-parameter-to-http_connect-calls.patch
sipwise/usrloc-don-t-synchronize-on-destroy-for-DB_ONLY.patch sipwise/usrloc-don-t-synchronize-on-destroy-for-DB_ONLY.patch
sipwise/presence_offline_cleanup.patch sipwise/presence_offline_cleanup.patch
sipwise/rtpengine-directional-flag.patch
### active development ### active development
sipwise/permissions-don-t-allow-reloads-in-the-middle-of-ong.patch sipwise/permissions-don-t-allow-reloads-in-the-middle-of-ong.patch
sipwise/db_redis_protect_length_overflow.patch sipwise/db_redis_protect_length_overflow.patch

8
debian/patches/sipwise/add_lcr_rate_module.patch vendored
Unescape View File

@ -13,10 +13,10 @@ Subject: add_lcr_rate_module
create mode 100644 src/modules/lcr_rate/lcr_rate_mod.c create mode 100644 src/modules/lcr_rate/lcr_rate_mod.c
diff --git a/src/Makefile.groups b/src/Makefile.groups diff --git a/src/Makefile.groups b/src/Makefile.groups
index fae0dbd..f54d81d 100644 index 6ccd7db..4ee6fb6 100644
--- a/src/Makefile.groups --- a/src/Makefile.groups
+++ b/src/Makefile.groups +++ b/src/Makefile.groups
@@ -109,6 +109,9 @@ mod_list_sctp=sctp @@ -110,6 +110,9 @@ mod_list_sctp=sctp
# - modules depending on openssl library # - modules depending on openssl library
mod_list_autheph=auth_ephemeral mod_list_autheph=auth_ephemeral
@ -26,7 +26,7 @@ index fae0dbd..f54d81d 100644
# - modules related to SIMPLE presence extensions # - modules related to SIMPLE presence extensions
mod_list_presence=presence presence_conference presence_dialoginfo \ mod_list_presence=presence presence_conference presence_dialoginfo \
presence_mwi presence_profile presence_reginfo \ presence_mwi presence_profile presence_reginfo \
@@ -287,8 +290,8 @@ mod_list_all=$(sort $(mod_list_basic) $(mod_list_extra) \ @@ -288,8 +291,8 @@ mod_list_all=$(sort $(mod_list_basic) $(mod_list_extra) \
$(mod_list_microhttpd) \ $(mod_list_microhttpd) \
$(mod_list_nghttp2) \ $(mod_list_nghttp2) \
$(mod_list_gcrypt) \ $(mod_list_gcrypt) \
@ -37,7 +37,7 @@ index fae0dbd..f54d81d 100644
### --- Groups defined for source code compilation ### ### --- Groups defined for source code compilation ###
@@ -345,6 +348,8 @@ module_group_cassandra=$(module_group_cassandra_driver) $(module_group_db) @@ -346,6 +349,8 @@ module_group_cassandra=$(module_group_cassandra_driver) $(module_group_db)
module_group_ignore= $(sort $(filter-out $(module_group_default), $(mod_list_all))) module_group_ignore= $(sort $(filter-out $(module_group_default), $(mod_list_all)))

4
debian/patches/sipwise/add_pcem_module.patch vendored
Unescape View File

@ -17,10 +17,10 @@ Subject: add_pcem_module
create mode 100644 src/modules/pcem/pcem_mod.h create mode 100644 src/modules/pcem/pcem_mod.h
diff --git a/src/Makefile.groups b/src/Makefile.groups diff --git a/src/Makefile.groups b/src/Makefile.groups
index b6fed63..fae0dbd 100644 index 181ca22..6ccd7db 100644
--- a/src/Makefile.groups --- a/src/Makefile.groups
+++ b/src/Makefile.groups +++ b/src/Makefile.groups
@@ -30,8 +30,8 @@ mod_list_db=acc alias_db auth_db avpops cfg_db db_text db_flatstore \ @@ -31,8 +31,8 @@ mod_list_db=acc alias_db auth_db avpops cfg_db db_text db_flatstore \
db_cluster dialog dispatcher domain drouting group \ db_cluster dialog dispatcher domain drouting group \
htable topos_htable imc matrix mohqueue msilo mtree p_usrloc pdt permissions \ htable topos_htable imc matrix mohqueue msilo mtree p_usrloc pdt permissions \
pipelimit prefix_route registrar sipcapture siptrace speeddial \ pipelimit prefix_route registrar sipcapture siptrace speeddial \

6
debian/patches/sipwise/add_tcap_module.patch vendored
Unescape View File

@ -11,10 +11,10 @@ Subject: add_tcap_module
create mode 100644 src/modules/tcap/tcap_mod.c create mode 100644 src/modules/tcap/tcap_mod.c
diff --git a/src/Makefile.groups b/src/Makefile.groups diff --git a/src/Makefile.groups b/src/Makefile.groups
index f54d81d..6242bb7 100644 index 4ee6fb6..faeb6ff 100644
--- a/src/Makefile.groups --- a/src/Makefile.groups
+++ b/src/Makefile.groups +++ b/src/Makefile.groups
@@ -208,6 +208,9 @@ mod_list_erlang=erlang @@ -209,6 +209,9 @@ mod_list_erlang=erlang
# - modules depending on systemd library # - modules depending on systemd library
mod_list_systemd=log_systemd systemdops mod_list_systemd=log_systemd systemdops
@ -24,7 +24,7 @@ index f54d81d..6242bb7 100644
# - modules depending on libnsq (+libev libevbuffsock libcurl libjson-c) library # - modules depending on libnsq (+libev libevbuffsock libcurl libjson-c) library
mod_list_nsq=nsq mod_list_nsq=nsq
@@ -351,6 +354,9 @@ module_group_ignore= $(sort $(filter-out $(module_group_default), $(mod_list_all @@ -352,6 +355,9 @@ module_group_ignore= $(sort $(filter-out $(module_group_default), $(mod_list_all
# pkg lcrrate module # pkg lcrrate module
module_group_klcrrate=$(mod_list_lcrrate) module_group_klcrrate=$(mod_list_lcrrate)

27
debian/patches/sipwise/db_redis_protect_length_overflow.patch vendored
Unescape View File

@ -1,3 +1,16 @@
From: Sipwise Development Team <support@sipwise.com>
Date: Fri, 6 Mar 2026 10:21:54 +0100
Subject: db_redis_protect_length_overflow
---
src/modules/db_redis/db_redis_mod.c | 2 ++
src/modules/db_redis/redis_dbase.c | 7 +++----
src/modules/db_redis/redis_table.c | 33 ++++++++++++++++++++++++++++-----
src/modules/db_redis/redis_table.h | 4 ++--
4 files changed, 35 insertions(+), 11 deletions(-)
diff --git a/src/modules/db_redis/db_redis_mod.c b/src/modules/db_redis/db_redis_mod.c
index 11c7b8c..fafafbb 100644
--- a/src/modules/db_redis/db_redis_mod.c --- a/src/modules/db_redis/db_redis_mod.c
+++ b/src/modules/db_redis/db_redis_mod.c +++ b/src/modules/db_redis/db_redis_mod.c
@@ -42,6 +42,7 @@ MODULE_VERSION @@ -42,6 +42,7 @@ MODULE_VERSION
@ -16,9 +29,11 @@
#ifdef WITH_SSL #ifdef WITH_SSL
{"opt_tls", PARAM_INT, &db_redis_opt_tls}, {"opt_tls", PARAM_INT, &db_redis_opt_tls},
{"ca_path", PARAM_STRING, &db_redis_ca_path}, {"ca_path", PARAM_STRING, &db_redis_ca_path},
diff --git a/src/modules/db_redis/redis_dbase.c b/src/modules/db_redis/redis_dbase.c
index b98f401..6725bf5 100644
--- a/src/modules/db_redis/redis_dbase.c --- a/src/modules/db_redis/redis_dbase.c
+++ b/src/modules/db_redis/redis_dbase.c +++ b/src/modules/db_redis/redis_dbase.c
@@ -876,7 +876,7 @@ static int db_redis_scan_query_keys_patt @@ -876,7 +876,7 @@ static int db_redis_scan_query_keys_pattern(km_redis_con_t *con,
LM_ERR("Failed to add scan command to scan query\n"); LM_ERR("Failed to add scan command to scan query\n");
goto err; goto err;
} }
@ -27,7 +42,7 @@
!= 0) { != 0) {
LM_ERR("Failed to add scan command to scan query\n"); LM_ERR("Failed to add scan command to scan query\n");
goto err; goto err;
@@ -891,8 +891,7 @@ static int db_redis_scan_query_keys_patt @@ -891,8 +891,7 @@ static int db_redis_scan_query_keys_pattern(km_redis_con_t *con,
LM_ERR("Failed to add match command to scan query\n"); LM_ERR("Failed to add match command to scan query\n");
goto err; goto err;
} }
@ -37,7 +52,7 @@
!= 0) { != 0) {
LM_ERR("Failed to add match pattern to scan query\n"); LM_ERR("Failed to add match pattern to scan query\n");
goto err; goto err;
@@ -907,7 +906,7 @@ static int db_redis_scan_query_keys_patt @@ -907,7 +906,7 @@ static int db_redis_scan_query_keys_pattern(km_redis_con_t *con,
LM_ERR("Failed to print integer for scan query\n"); LM_ERR("Failed to print integer for scan query\n");
goto err; goto err;
} }
@ -46,6 +61,8 @@
LM_ERR("Failed to add count value to scan query\n"); LM_ERR("Failed to add count value to scan query\n");
goto err; goto err;
} }
diff --git a/src/modules/db_redis/redis_table.c b/src/modules/db_redis/redis_table.c
index af3700d..2100884 100644
--- a/src/modules/db_redis/redis_table.c --- a/src/modules/db_redis/redis_table.c
+++ b/src/modules/db_redis/redis_table.c +++ b/src/modules/db_redis/redis_table.c
@@ -24,14 +24,24 @@ @@ -24,14 +24,24 @@
@ -105,9 +122,11 @@
k = (redis_key_t *)pkg_malloc(sizeof(redis_key_t)); k = (redis_key_t *)pkg_malloc(sizeof(redis_key_t));
if(!k) { if(!k) {
LM_ERR("Failed to allocate memory for key list entry\n"); LM_ERR("Failed to allocate memory for key list entry\n");
diff --git a/src/modules/db_redis/redis_table.h b/src/modules/db_redis/redis_table.h
index 6ba4e8c..879b50c 100644
--- a/src/modules/db_redis/redis_table.h --- a/src/modules/db_redis/redis_table.h
+++ b/src/modules/db_redis/redis_table.h +++ b/src/modules/db_redis/redis_table.h
@@ -61,9 +61,9 @@ void db_redis_free_tables(km_redis_con_t @@ -61,9 +61,9 @@ void db_redis_free_tables(km_redis_con_t *con);
int db_redis_parse_schema(km_redis_con_t *con); int db_redis_parse_schema(km_redis_con_t *con);
int db_redis_parse_keys(km_redis_con_t *con); int db_redis_parse_keys(km_redis_con_t *con);

14
debian/patches/sipwise/db_redis_support_null_key_values.patch vendored
Unescape View File

@ -1,6 +1,16 @@
From: Sipwise Development Team <support@sipwise.com>
Date: Fri, 6 Mar 2026 10:21:54 +0100
Subject: db_redis_support_null_key_values
---
src/modules/db_redis/redis_table.c | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/modules/db_redis/redis_table.c b/src/modules/db_redis/redis_table.c
index 2100884..09b1225 100644
--- a/src/modules/db_redis/redis_table.c --- a/src/modules/db_redis/redis_table.c
+++ b/src/modules/db_redis/redis_table.c +++ b/src/modules/db_redis/redis_table.c
@@ -32,11 +32,6 @@ int db_redis_key_add_string(redis_key_t @@ -32,11 +32,6 @@ int db_redis_key_add_string(redis_key_t **list, const char *entry, size_t len)
{ {
redis_key_t *k; redis_key_t *k;
@ -12,7 +22,7 @@
if (db_redis_max_key_len > 0 && len > db_redis_max_key_len) { if (db_redis_max_key_len > 0 && len > db_redis_max_key_len) {
LM_ERR("Too big length for key being added: allowed '%u' / given '%zu'\n", LM_ERR("Too big length for key being added: allowed '%u' / given '%zu'\n",
db_redis_max_key_len, len); db_redis_max_key_len, len);
@@ -56,8 +51,14 @@ int db_redis_key_add_string(redis_key_t @@ -56,8 +51,14 @@ int db_redis_key_add_string(redis_key_t **list, const char *entry, size_t len)
goto err; goto err;
} }

2
debian/patches/sipwise/dialog-support-profile_get_size-for-all-profiles.patch vendored
Unescape View File

@ -76,7 +76,7 @@ index 9ccb073..3394ece 100644
RET_ARRAY}, RET_ARRAY},
{"dlg.bridge_dlg", rpc_dlg_bridge, rpc_dlg_bridge_doc, 0}, {"dlg.bridge_dlg", rpc_dlg_bridge, rpc_dlg_bridge_doc, 0},
diff --git a/src/modules/dialog/dlg_profile.c b/src/modules/dialog/dlg_profile.c diff --git a/src/modules/dialog/dlg_profile.c b/src/modules/dialog/dlg_profile.c
index 9fc1a97..76aa768 100644 index 80fac2d..a2ec325 100644
--- a/src/modules/dialog/dlg_profile.c --- a/src/modules/dialog/dlg_profile.c
+++ b/src/modules/dialog/dlg_profile.c +++ b/src/modules/dialog/dlg_profile.c
@@ -129,6 +129,14 @@ int add_profile_definitions(char *profiledef, unsigned int has_value) @@ -129,6 +129,14 @@ int add_profile_definitions(char *profiledef, unsigned int has_value)

4
debian/patches/sipwise/presence_vqr.patch vendored
Unescape View File

@ -25,10 +25,10 @@ Subject: presence_vqr
create mode 100644 src/modules/presence_vqr/presence_vqr.h create mode 100644 src/modules/presence_vqr/presence_vqr.h
diff --git a/src/Makefile.groups b/src/Makefile.groups diff --git a/src/Makefile.groups b/src/Makefile.groups
index 6242bb7..ed8b1c6 100644 index faeb6ff..5320c96 100644
--- a/src/Makefile.groups --- a/src/Makefile.groups
+++ b/src/Makefile.groups +++ b/src/Makefile.groups
@@ -115,7 +115,7 @@ mod_list_lcrrate=lcr_rate @@ -116,7 +116,7 @@ mod_list_lcrrate=lcr_rate
# - modules related to SIMPLE presence extensions # - modules related to SIMPLE presence extensions
mod_list_presence=presence presence_conference presence_dialoginfo \ mod_list_presence=presence presence_conference presence_dialoginfo \
presence_mwi presence_profile presence_reginfo \ presence_mwi presence_profile presence_reginfo \

11
debian/patches/sipwise/rtpengine-directional-flag.patch vendored
Unescape View File

@ -1,11 +0,0 @@
--- a/src/modules/rtpengine/rtpengine.c
+++ b/src/modules/rtpengine/rtpengine.c
@@ -2992,6 +2992,8 @@
if(ng_flags->to && ng_flags->to_tag.s && ng_flags->to_tag.len)
bencode_dictionary_add_str(
ng_flags->dict, "to-tag", &ng_flags->to_tag);
+ if(ng_flags->flags)
+ bencode_list_add_string(ng_flags->flags, "directional");
}
} else if(op == OP_SUBSCRIBE_REQUEST || op == OP_UNSUBSCRIBE) {
bencode_dictionary_add_str(
Write Preview
Loading…
Cancel
Save