diff --git a/debian/patches/series b/debian/patches/series index 5147ad60c..648409cd1 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -31,11 +31,7 @@ sipwise/sca-debug.patch sipwise/sca-fix-notify-after-bye.patch sipwise/sca-add-pai_avp-parameter.patch ## upstream 5.8 -upstream/0001-db_mysql-switch-warn-to-dbg-for-log-messages-for-opt.patch -upstream/0002-db_mysql-switch-warn-to-dbg-for-log-messages-for-opt.patch -upstream/regex-remove-pcre2_free-warning.patch -upstream/lcr-remove-pcre2_free-warning.patch -upstream/dialplan-remove-pcre2_free-warning.patch +# ## upstream master upstream/rtpengine_rework_rtpp_flags.patch upstream/cfgutils-expose-optional-second-string-key-for-lock.patch @@ -53,7 +49,6 @@ sipwise/dialog-support-profile_get_size-for-all-profiles.patch sipwise/presence_vqr.patch sipwise/dialog-dlg_get_ttag.patch sipwise/app_lua_sr-support-second-str-for-cfgutils-lock.patch -sipwise/tls-remove-confusing-error-message-when-trying-to-pr.patch sipwise/pua-get_record_puadb-add-pres_uri-to-the-query.patch sipwise/pua_dialoginfo-use_uuid.patch ### active development diff --git a/debian/patches/sipwise/tls-remove-confusing-error-message-when-trying-to-pr.patch b/debian/patches/sipwise/tls-remove-confusing-error-message-when-trying-to-pr.patch deleted file mode 100644 index 00d534c21..000000000 --- a/debian/patches/sipwise/tls-remove-confusing-error-message-when-trying-to-pr.patch +++ /dev/null @@ -1,41 +0,0 @@ -From: Victor Seva -Date: Wed, 12 Jun 2024 10:13:56 +0200 -Subject: tls: remove confusing error message when trying to print socket for - server - -> CRITICAL: [core/ip_addr.c:232]: ip_addr2sbuf(): unknown address family 0 -> NOTICE: tls [tls_domain.c:1176]: ksr_tls_fix_domain(): registered server_name callback handler for socket [:0], server_name='' ... ---- - src/modules/tls/tls_domain.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/modules/tls/tls_domain.c b/src/modules/tls/tls_domain.c -index e056a70..810a7e9 100644 ---- a/src/modules/tls/tls_domain.c -+++ b/src/modules/tls/tls_domain.c -@@ -1155,14 +1155,14 @@ static int ksr_tls_fix_domain(tls_domain_t *d, tls_domain_t *def) - d->ctx[i], tls_server_name_cb)) { - LM_ERR("register server_name callback handler for socket " - "[%s:%d], server_name='%s' failed for proc %d\n", -- ip_addr2a(&d->ip), d->port, -+ (d->ip.af > 0) ? ip_addr2a(&d->ip) : "0.0.0.0", d->port, - (d->server_name.s) ? d->server_name.s : "", i); - return -1; - } - if(!SSL_CTX_set_tlsext_servername_arg(d->ctx[i], d)) { - LM_ERR("register server_name callback handler data for socket " - "[%s:%d], server_name='%s' failed for proc %d\n", -- ip_addr2a(&d->ip), d->port, -+ (d->ip.af > 0) ? ip_addr2a(&d->ip) : "0.0.0.0", d->port, - (d->server_name.s) ? d->server_name.s : "", i); - return -1; - } -@@ -1175,7 +1175,7 @@ static int ksr_tls_fix_domain(tls_domain_t *d, tls_domain_t *def) - && (d->server_name.len > 0 || (d->type & TLS_DOMAIN_DEF))) { - LM_NOTICE("registered server_name callback handler for socket " - "[%s:%d], server_name='%s' ...\n", -- ip_addr2a(&d->ip), d->port, -+ (d->ip.af > 0) ? ip_addr2a(&d->ip) : "0.0.0.0", d->port, - (d->server_name.s) ? d->server_name.s : ""); - } - #endif diff --git a/debian/patches/upstream/0001-db_mysql-switch-warn-to-dbg-for-log-messages-for-opt.patch b/debian/patches/upstream/0001-db_mysql-switch-warn-to-dbg-for-log-messages-for-opt.patch deleted file mode 100644 index 73ded731d..000000000 --- a/debian/patches/upstream/0001-db_mysql-switch-warn-to-dbg-for-log-messages-for-opt.patch +++ /dev/null @@ -1,33 +0,0 @@ -From: Daniel-Constantin Mierla -Date: Wed, 19 Jun 2024 10:43:12 +0200 -Subject: db_mysql: switch warn to dbg for log messages for opt_ssl_mode - -- GH #3884 - -(cherry picked from commit 8f98317e92da61160a1c416e0da45938a205d358) ---- - src/modules/db_mysql/km_my_con.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/modules/db_mysql/km_my_con.c b/src/modules/db_mysql/km_my_con.c -index 561a003..50e3375 100644 ---- a/src/modules/db_mysql/km_my_con.c -+++ b/src/modules/db_mysql/km_my_con.c -@@ -143,7 +143,7 @@ struct my_con *db_mysql_new_connection(const struct db_id *id) - #if MYSQL_VERSION_ID >= 100339 - mysql_options(ptr->con, MYSQL_OPT_SSL_ENFORCE, (void *)&(int){1}); - #else -- LM_WARN("ssl mode not supported by %s\n", MARIADB_BASE_VERSION); -+ LM_DBG("ssl mode not supported by %s\n", MARIADB_BASE_VERSION); - #endif - break; - case 5: /* SSL_MODE_VERIFY_IDENTITY */ -@@ -151,7 +151,7 @@ struct my_con *db_mysql_new_connection(const struct db_id *id) - (void *)&(int){1}); - break; - default: -- LM_WARN("opt_ssl_mode = %d not supported by MariaDB Connector/C\n", -+ LM_DBG("opt_ssl_mode = %d not supported by MariaDB Connector/C\n", - db_mysql_opt_ssl_mode); - break; - } diff --git a/debian/patches/upstream/0002-db_mysql-switch-warn-to-dbg-for-log-messages-for-opt.patch b/debian/patches/upstream/0002-db_mysql-switch-warn-to-dbg-for-log-messages-for-opt.patch deleted file mode 100644 index 5f45ee4ac..000000000 --- a/debian/patches/upstream/0002-db_mysql-switch-warn-to-dbg-for-log-messages-for-opt.patch +++ /dev/null @@ -1,26 +0,0 @@ -From: Victor Seva -Date: Wed, 19 Jun 2024 15:00:12 +0200 -Subject: db_mysql: switch warn to dbg for log messages for opt_ssl_ca option - -fixes #3884 - -(cherry picked from commit be5172a84b02a1ab4fc7e97e7dc0813056302bdd) ---- - src/modules/db_mysql/km_my_con.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/modules/db_mysql/km_my_con.c b/src/modules/db_mysql/km_my_con.c -index 50e3375..240d3f5 100644 ---- a/src/modules/db_mysql/km_my_con.c -+++ b/src/modules/db_mysql/km_my_con.c -@@ -184,8 +184,8 @@ struct my_con *db_mysql_new_connection(const struct db_id *id) - mysql_options( - ptr->con, MYSQL_OPT_SSL_CA, (const void *)db_mysql_opt_ssl_ca); - #else -- LM_WARN("opt_ssl_ca option not supported by mysql version (value %s) - " -- "ignoring\n", -+ LM_DBG("opt_ssl_ca option not supported by mysql version (value %s) - " -+ "ignoring\n", - db_mysql_opt_ssl_ca); - #endif /* MYSQL_OPT_SSL_CA */ - diff --git a/debian/patches/upstream/dialplan-remove-pcre2_free-warning.patch b/debian/patches/upstream/dialplan-remove-pcre2_free-warning.patch deleted file mode 100644 index 510fd57ce..000000000 --- a/debian/patches/upstream/dialplan-remove-pcre2_free-warning.patch +++ /dev/null @@ -1,28 +0,0 @@ -From: Victor Seva -Date: Thu, 18 Jul 2024 13:40:24 +0200 -Subject: dialplan: remove pcre2_free() warning - -related to #3851 - -(cherry picked from commit 70563ca0629a8de5aa5427b003f441e6c3a40c6a) ---- - src/modules/dialplan/dp_db.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/modules/dialplan/dp_db.c b/src/modules/dialplan/dp_db.c -index 857a2e4..64d2a4f 100644 ---- a/src/modules/dialplan/dp_db.c -+++ b/src/modules/dialplan/dp_db.c -@@ -203,8 +203,10 @@ static void *pcre2_malloc(size_t size, void *ext) - - static void pcre2_free(void *ptr, void *ext) - { -- shm_free(ptr); -- ptr = NULL; -+ if(ptr) { -+ shm_free(ptr); -+ ptr = NULL; -+ } - } - - int init_data(void) diff --git a/debian/patches/upstream/lcr-remove-pcre2_free-warning.patch b/debian/patches/upstream/lcr-remove-pcre2_free-warning.patch deleted file mode 100644 index b0a7ac75e..000000000 --- a/debian/patches/upstream/lcr-remove-pcre2_free-warning.patch +++ /dev/null @@ -1,28 +0,0 @@ -From: Victor Seva -Date: Thu, 18 Jul 2024 13:38:10 +0200 -Subject: lcr: remove pcre2_free() warning - -related to #3851 - -(cherry picked from commit 310b631007082f553117d126b6b9bd915be596ac) ---- - src/modules/lcr/lcr_mod.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/modules/lcr/lcr_mod.c b/src/modules/lcr/lcr_mod.c -index dac215a..bbd397d 100644 ---- a/src/modules/lcr/lcr_mod.c -+++ b/src/modules/lcr/lcr_mod.c -@@ -433,8 +433,10 @@ static void *pcre2_malloc(size_t size, void *ext) - - static void pcre2_free(void *ptr, void *ext) - { -- shm_free(ptr); -- ptr = NULL; -+ if(ptr) { -+ shm_free(ptr); -+ ptr = NULL; -+ } - } - - /* diff --git a/debian/patches/upstream/regex-remove-pcre2_free-warning.patch b/debian/patches/upstream/regex-remove-pcre2_free-warning.patch deleted file mode 100644 index 765569217..000000000 --- a/debian/patches/upstream/regex-remove-pcre2_free-warning.patch +++ /dev/null @@ -1,28 +0,0 @@ -From: Victor Seva -Date: Thu, 18 Jul 2024 13:36:09 +0200 -Subject: regex: remove pcre2_free() warning - -related to #3851 - -(cherry picked from commit b86030cfbd66ba95f33f312595edae29e2b5cde0) ---- - src/modules/regex/regex_mod.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/modules/regex/regex_mod.c b/src/modules/regex/regex_mod.c -index 52ed60b..f4e93e4 100644 ---- a/src/modules/regex/regex_mod.c -+++ b/src/modules/regex/regex_mod.c -@@ -170,8 +170,10 @@ static void *pcre2_malloc(size_t size, void *ext) - - static void pcre2_free(void *ptr, void *ext) - { -- shm_free(ptr); -- ptr = NULL; -+ if(ptr) { -+ shm_free(ptr); -+ ptr = NULL; -+ } - } - - /*! \brief