MT#61980 remove already applied fixes, and refresh

Change-Id: Ic032447f7bc70cbca3112969a69c3f1a583d5097
mr13.2.1
Victor Seva 12 months ago
parent 95f1ca62d6
commit c3c1177b23

@ -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 87d02a3..51ce027 100644
index 30a1de0..618d1d9 100644
--- a/src/Makefile.defs
+++ b/src/Makefile.defs
@@ -454,15 +454,7 @@ endif

@ -63,7 +63,6 @@ sipwise/http_client-add-method-parameter-to-http_connect.patch
sipwise/lost-add-method-parameter-to-http_connect-calls.patch
sipwise/rtpengine_add_sip_code.patch
sipwise/usrloc-don-t-synchronize-on-destroy-for-DB_ONLY.patch
sipwise/db_redis-stop-searching-for-keys-if-scan_key-is-set.patch
### active development
#
### Don't just put stuff in any order

@ -1,20 +0,0 @@
From: Victor Seva <vseva@sipwise.com>
Date: Thu, 19 Dec 2024 20:43:50 +0100
Subject: db_redis: stop searching for keys if scan_key is set
---
src/modules/db_redis/redis_dbase.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/modules/db_redis/redis_dbase.c b/src/modules/db_redis/redis_dbase.c
index 84c0c3a..f7bace1 100644
--- a/src/modules/db_redis/redis_dbase.c
+++ b/src/modules/db_redis/redis_dbase.c
@@ -794,6 +794,7 @@ static int db_redis_build_query_keys(km_redis_con_t *con, const str *table_name,
type->type.s);
}
keyname.s = NULL;
+ break;
} else if(keyname.s) {
pkg_free(keyname.s);
keyname.s = NULL;

@ -7,7 +7,7 @@ Subject: lost: add method parameter to http_connect() calls
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/modules/lost/functions.c b/src/modules/lost/functions.c
index 9495a69..bc75bf4 100644
index d2c0f0c..565e134 100644
--- a/src/modules/lost/functions.c
+++ b/src/modules/lost/functions.c
@@ -188,7 +188,7 @@ int lost_held_function(struct sip_msg *_m, char *_con, char *_pidf, char *_url,

@ -7,7 +7,7 @@ Subject: pua_dialoginfo: use_uuid
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/modules/pua_dialoginfo/pua_dialoginfo.c b/src/modules/pua_dialoginfo/pua_dialoginfo.c
index e7a38b0..5960202 100644
index d1e704f..cbb406a 100644
--- a/src/modules/pua_dialoginfo/pua_dialoginfo.c
+++ b/src/modules/pua_dialoginfo/pua_dialoginfo.c
@@ -51,6 +51,7 @@

Loading…
Cancel
Save