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

MT#64231 Remove already applied upstream patches and refresh old

Browse Source 
Just updating patches during new version backport.

Change-Id: I2d67387637de0b6a7a1ea0f22b0c1dbed6635798
pull/12/head
Donat Zenichev 4 months ago
parent bb34bcc8d7
commit 3b931532d3
12 changed files with 61 additions and 76 deletions
Show Stats Download Patch File Download Diff File

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

@ -7,7 +7,7 @@ Subject: fix_export
1 file changed, 2 insertions(+)
diff --git a/src/Makefile b/src/Makefile
index edad3d2..8de3eb2 100644
index a4be4cc..2362e7c 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -139,6 +139,8 @@ endif

4
debian/patches/debian/no_INSTALL_file.patch vendored
Unescape View File

@ -7,10 +7,10 @@ Subject: no_INSTALL_file
1 file changed, 2 deletions(-)
diff --git a/src/Makefile b/src/Makefile
index 4ba6625..edad3d2 100644
index 744b1e1..a4be4cc 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -859,8 +859,6 @@ install-modules-all: install-every-module install-every-module-doc
@@ -860,8 +860,6 @@ install-modules-all: install-every-module install-every-module-doc
install-doc: $(doc_prefix)/$(doc_dir) install-every-module-doc

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(-)
diff --git a/src/Makefile.defs b/src/Makefile.defs
index 855f83c..56309f7 100644
index d7520fe..a6df36e 100644
--- a/src/Makefile.defs
+++ b/src/Makefile.defs
@@ -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/usrloc-don-t-synchronize-on-destroy-for-DB_ONLY.patch
sipwise/presence_offline_cleanup.patch
sipwise/rtpengine-flags.patch
### active development
sipwise/permissions-don-t-allow-reloads-in-the-middle-of-ong.patch
sipwise/dlg_get_var_error_more_verbose_on_dlg

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

@ -47,7 +47,7 @@ index fae0dbd..f54d81d 100644
### --- Groups defined for pacKaging ###
diff --git a/src/core/mod_fix.c b/src/core/mod_fix.c
index 767c6a4..d0f1841 100644
index 900c982..0757a5f 100644
--- a/src/core/mod_fix.c
+++ b/src/core/mod_fix.c
@@ -598,6 +598,7 @@ int fixup_free_igp_spve(void **param, int param_no)
@ -68,7 +68,7 @@ index 767c6a4..d0f1841 100644
}
diff --git a/src/core/mod_fix.h b/src/core/mod_fix.h
index 6ec0280..26968a7 100644
index f0e6f0e..cb7182d 100644
--- a/src/core/mod_fix.h
+++ b/src/core/mod_fix.h
@@ -138,6 +138,8 @@ int fixup_spve_uint(void **param, int param_no);

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: Tue, 13 Jan 2026 09:50: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
+++ b/src/modules/db_redis/db_redis_mod.c
@@ -42,6 +42,7 @@ MODULE_VERSION
@ -16,9 +29,11 @@
#ifdef WITH_SSL
{"opt_tls", PARAM_INT, &db_redis_opt_tls},
{"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
+++ 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");
goto err;
}
@ -27,7 +42,7 @@
!= 0) {
LM_ERR("Failed to add scan command to scan query\n");
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");
goto err;
}
@ -37,7 +52,7 @@
!= 0) {
LM_ERR("Failed to add match pattern to scan query\n");
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");
goto err;
}
@ -46,6 +61,8 @@
LM_ERR("Failed to add count value to scan query\n");
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
+++ b/src/modules/db_redis/redis_table.c
@@ -24,14 +24,24 @@
@ -105,9 +122,11 @@
k = (redis_key_t *)pkg_malloc(sizeof(redis_key_t));
if(!k) {
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
+++ 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_keys(km_redis_con_t *con);

10
debian/patches/sipwise/dialog-dlg_get_ttag.patch vendored
Unescape View File

@ -9,7 +9,7 @@ Subject: dialog: dlg_get_ttag()
3 files changed, 211 insertions(+)
diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c
index d74a36e..980ef3c 100644
index 3394ece..4b681b2 100644
--- a/src/modules/dialog/dialog.c
+++ b/src/modules/dialog/dialog.c
@@ -56,6 +56,7 @@
@ -39,7 +39,7 @@ index d74a36e..980ef3c 100644
{"dlg_set_timeout", (cmd_function)w_dlg_set_timeout, 1,fixup_igp_null,
0, ANY_ROUTE },
{"dlg_set_timeout", (cmd_function)w_dlg_set_timeout, 3,fixup_igp_all,
@@ -2066,6 +2072,121 @@ static int fixup_dlg_set_var_free(void **param, int param_no)
@@ -2090,6 +2096,121 @@ static int fixup_dlg_set_var_free(void **param, int param_no)
return -1;
}
@ -161,7 +161,7 @@ index d74a36e..980ef3c 100644
static int ki_dlg_get(sip_msg_t *msg, str *sc, str *sf, str *st)
{
dlg_cell_t *dlg = NULL;
@@ -2657,6 +2778,11 @@ static sr_kemi_t sr_kemi_dialog_exports[] = {
@@ -2681,6 +2802,11 @@ static sr_kemi_t sr_kemi_dialog_exports[] = {
{ SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR,
SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE }
},
@ -264,10 +264,10 @@ index a37adee..a382ad5 100644
/*!
* \brief Search dialog that corresponds to CallId, From Tag and To Tag
diff --git a/src/modules/dialog/dlg_hash.h b/src/modules/dialog/dlg_hash.h
index 5d19841..a0a919f 100644
index 20b0371..b847753 100644
--- a/src/modules/dialog/dlg_hash.h
+++ b/src/modules/dialog/dlg_hash.h
@@ -396,6 +396,19 @@ dlg_cell_t *dlg_get_by_iuid(dlg_iuid_t *diuid);
@@ -399,6 +399,19 @@ dlg_cell_t *dlg_get_by_iuid(dlg_iuid_t *diuid);
*/
dlg_cell_t *get_dlg(str *callid, str *ftag, str *ttag, unsigned int *dir);

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

@ -10,10 +10,10 @@ Subject: dialog: support profile_get_size for all profiles
4 files changed, 69 insertions(+)
diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c
index 4cdfe7a..d74a36e 100644
index 9ccb073..3394ece 100644
--- a/src/modules/dialog/dialog.c
+++ b/src/modules/dialog/dialog.c
@@ -3127,6 +3127,31 @@ static void internal_rpc_profile_get_size(
@@ -3151,6 +3151,31 @@ static void internal_rpc_profile_get_size(
return;
}
@ -45,7 +45,7 @@ index 4cdfe7a..d74a36e 100644
/*!
* \brief Helper function that outputs the dialogs belonging to a given profile via the RPC interface
* \see rpc_profile_print_dlgs
@@ -3211,6 +3236,8 @@ static const char *rpc_dlg_set_state_doc[3] = {
@@ -3235,6 +3260,8 @@ static const char *rpc_dlg_set_state_doc[3] = {
0};
static const char *rpc_profile_get_size_doc[2] = {
"Returns the number of dialogs belonging to a profile", 0};
@ -54,7 +54,7 @@ index 4cdfe7a..d74a36e 100644
static const char *rpc_profile_print_dlgs_doc[2] = {
"Lists all the dialogs belonging to a profile", 0};
static const char *rpc_dlg_bridge_doc[2] = {
@@ -3427,6 +3454,11 @@ static void rpc_profile_get_size(rpc_t *rpc, void *c)
@@ -3451,6 +3478,11 @@ static void rpc_profile_get_size(rpc_t *rpc, void *c)
}
return;
}
@ -66,7 +66,7 @@ index 4cdfe7a..d74a36e 100644
static void rpc_profile_print_dlgs(rpc_t *rpc, void *c)
{
str profile_name = {NULL, 0};
@@ -3844,6 +3876,8 @@ static rpc_export_t rpc_methods[] = {
@@ -3868,6 +3900,8 @@ static rpc_export_t rpc_methods[] = {
{"dlg.end_dlg", rpc_end_dlg_entry_id, rpc_end_dlg_entry_id_doc, 0},
{"dlg.profile_get_size", rpc_profile_get_size, rpc_profile_get_size_doc,
0},
@ -111,7 +111,7 @@ index 209c4ea..fd71c30 100644
/*!
* \brief Search a dialog profile in the global list
diff --git a/src/modules/dialog/doc/dialog_admin.xml b/src/modules/dialog/doc/dialog_admin.xml
index 2653f15..4486405 100644
index 4ae623a..a417212 100644
--- a/src/modules/dialog/doc/dialog_admin.xml
+++ b/src/modules/dialog/doc/dialog_admin.xml
@@ -3070,6 +3070,28 @@ dlg_set_state("early");

14
debian/patches/sipwise/dlg_get_var_error_more_verbose_on_dlg vendored
Unescape View File

@ -1,6 +1,16 @@
From: Sipwise Development Team <support@sipwise.com>
Date: Tue, 13 Jan 2026 09:50:54 +0100
Subject: dlg_get_var_error_more_verbose_on_dlg
---
src/modules/dialog/dialog.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c
index 4b681b2..3a9bd3c 100644
--- a/src/modules/dialog/dialog.c
+++ b/src/modules/dialog/dialog.c
@@ -1955,7 +1955,8 @@ static int w_dlg_get_var(
@@ -1979,7 +1979,8 @@ static int w_dlg_get_var(
pv_get_null(msg, NULL, &dst_val);
}
if(pv_set_spec_value(msg, dst_pv, 0, &dst_val) != 0) {
@ -10,7 +20,7 @@
if(val)
goto error;
else
@@ -1966,7 +1967,8 @@ static int w_dlg_get_var(
@@ -1990,7 +1991,8 @@ static int w_dlg_get_var(
error:
pv_get_null(msg, NULL, &dst_val);
if(pv_set_spec_value(msg, dst_pv, 0, &dst_val) != 0) {

4
debian/patches/sipwise/do-not-install-default-config.patch vendored
Unescape View File

@ -8,10 +8,10 @@ Subject: do-not-install-default-config
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/Makefile b/src/Makefile
index 8de3eb2..63644c8 100644
index 2362e7c..3b916e9 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -650,7 +650,7 @@ sunpkg:
@@ -651,7 +651,7 @@ sunpkg:
.PHONY: install
install: mk_params="compile_for_install=yes"

14
debian/patches/sipwise/lost-add-method-parameter-to-http_connect-calls.patch vendored
Unescape View File

@ -3,14 +3,14 @@ Date: Fri, 30 Aug 2024 11:23:13 +0200
Subject: lost: add method parameter to http_connect() calls
---
src/modules/lost/functions.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
src/modules/lost/functions.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/modules/lost/functions.c b/src/modules/lost/functions.c
index 278f5ea69..e84904798 100644
index 278f5ea..e849047 100644
--- a/src/modules/lost/functions.c
+++ b/src/modules/lost/functions.c
@@ -192,6 +192,7 @@ int lost_held_function(struct sip_msg *_
@@ -192,6 +192,7 @@ int lost_held_function(struct sip_msg *_m, char *_con, char *_pidf, char *_url,
str res = STR_NULL; /* return value pidf */
str err = STR_NULL; /* return value error */
@ -18,7 +18,7 @@ index 278f5ea69..e84904798 100644
str url = STR_NULL;
str did = STR_NULL;
str que = STR_NULL;
@@ -295,7 +296,7 @@ int lost_held_function(struct sip_msg *_
@@ -295,7 +296,7 @@ int lost_held_function(struct sip_msg *_m, char *_con, char *_pidf, char *_url,
LM_DBG("using connection [%.*s]\n", con.len, con.s);
/* send via connection */
@ -27,7 +27,7 @@ index 278f5ea69..e84904798 100644
} else {
/* we have no connection ... do a NAPTR lookup */
if(lost_parse_host(did.s, &host, &flag) > 0) {
@@ -814,6 +815,7 @@ int lost_function(struct sip_msg *_m, ch
@@ -814,6 +815,7 @@ int lost_function(struct sip_msg *_m, char *_con, char *_uri, char *_name,
str err = STR_NULL; /* return value error */
str tmp = STR_NULL;
@ -35,7 +35,7 @@ index 278f5ea69..e84904798 100644
str url = STR_NULL;
str urn = STR_NULL;
str req = STR_NULL;
@@ -1088,7 +1090,7 @@ int lost_function(struct sip_msg *_m, ch
@@ -1088,7 +1090,7 @@ int lost_function(struct sip_msg *_m, char *_con, char *_uri, char *_name,
pkg_free(urlrep); /* clean up */
urlrep = NULL;
} else {

43
debian/patches/sipwise/rtpengine-flags.patch vendored
Unescape View File

@ -1,43 +0,0 @@
--- a/src/modules/rtpengine/rtpengine.c
+++ b/src/modules/rtpengine/rtpengine.c
@@ -3354,9 +3354,6 @@
/* initialize some basic bencode items */
if(!extra_dict) {
ng_flags.dict = bencode_dictionary(bencbuf);
- if(parse_by_module) {
- ng_flags.flags = bencode_list(bencbuf);
- }
} else {
ng_flags.dict = extra_dict;
ng_flags.flags = bencode_dictionary_get(ng_flags.dict, "flags");
@@ -3366,6 +3363,9 @@
}
}
+ if (!ng_flags.flags)
+ ng_flags.flags = bencode_list(bencbuf);
+
if(parse_by_module) {
ng_flags.received_from = bencode_list(bencbuf);
}
@@ -3440,9 +3440,6 @@
if(ng_flags.direction && ng_flags.direction->child)
bencode_dictionary_add(
ng_flags.dict, "direction", ng_flags.direction);
- /* flags */
- if(ng_flags.flags && ng_flags.flags->child)
- bencode_dictionary_add(ng_flags.dict, "flags", ng_flags.flags);
/* replace */
if(ng_flags.replace && ng_flags.replace->child)
bencode_dictionary_add(ng_flags.dict, "replace", ng_flags.replace);
@@ -3522,6 +3519,10 @@
sip_type_strings[msg->first_line.type]);
}
+ /* flags */
+ if(ng_flags.flags && ng_flags.flags->child)
+ bencode_dictionary_add(ng_flags.dict, "flags", ng_flags.flags);
+
/* add rtpp flags, if parsed by daemon */
if(!parse_by_module && flags)
bencode_dictionary_add_str(ng_flags.dict, "rtpp-flags", flags);
Write Preview
Loading…
Cancel
Save