From 179ebfb3840d31a612adbf036112eddf6db4ec47 Mon Sep 17 00:00:00 2001 From: Victor Seva Date: Wed, 12 May 2021 12:37:40 +0200 Subject: [PATCH] TT#122350 debian: update changelog * refresh patches Change-Id: I34dd6ee778289e1e1e30d666be63c70c4ff82580 --- debian/changelog | 9 ++++++--- ...ginfo-disable-publish-notifications-.patch | 20 ++++++++----------- ...ua_dialoginfo-local_identity_dlg_var.patch | 4 ++-- ...dialoginfo-refresh_pubruri_avps_flag.patch | 12 +++++------ ...use-lock-when-use_puburi_avps-is-set.patch | 4 ++-- ..._pong_interval-only-for-libwebsocket.patch | 6 +----- ...-matching-To-header-in-lw_get_hf_nam.patch | 6 +----- 7 files changed, 26 insertions(+), 35 deletions(-) diff --git a/debian/changelog b/debian/changelog index ac3232ae5..6d5f001f8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,11 @@ -ngcp-kamailio (5.4.5-1+0~mr9.5.0.0) unstable; urgency=medium +ngcp-kamailio (5.5.0-1~mr9.5.0.0) unstable; urgency=medium - * New release. + * TT#119500 core: usr avp, fix from upstream + * New upstream version 5.5.0 + * TT#122350 update patches + * TT#122350 debian: add lwsc modules - -- Sipwise Jenkins Builder Tue, 20 Apr 2021 11:56:59 +0200 + -- Victor Seva Wed, 12 May 2021 12:36:21 +0200 ngcp-kamailio (5.4.5-1+0~mr9.4.0.0) unstable; urgency=medium diff --git a/debian/patches/sipwise/Revert-pua_dialoginfo-disable-publish-notifications-.patch b/debian/patches/sipwise/Revert-pua_dialoginfo-disable-publish-notifications-.patch index f15b8f86f..3fbf4a212 100644 --- a/debian/patches/sipwise/Revert-pua_dialoginfo-disable-publish-notifications-.patch +++ b/debian/patches/sipwise/Revert-pua_dialoginfo-disable-publish-notifications-.patch @@ -1,4 +1,3 @@ -From 58fc634fe98953a2dfa1dd1ba9cf5e5c1d57416f Mon Sep 17 00:00:00 2001 From: Victor Seva Date: Wed, 12 May 2021 11:40:59 +0200 Subject: [PATCH] Revert "pua_dialoginfo: disable publish notifications for @@ -6,14 +5,14 @@ Subject: [PATCH] Revert "pua_dialoginfo: disable publish notifications for This reverts commit 79be32bcc45775f703319730d405727b0a983726. --- - .../pua_dialoginfo/doc/pua_dialoginfo.xml | 9 - - .../doc/pua_dialoginfo_admin.xml | 66 +----- - src/modules/pua_dialoginfo/pua_dialoginfo.c | 188 ++++++------------ - src/modules/pua_dialoginfo/pua_dialoginfo.h | 3 - + src/modules/pua_dialoginfo/doc/pua_dialoginfo.xml | 9 - + .../pua_dialoginfo/doc/pua_dialoginfo_admin.xml | 66 +------- + src/modules/pua_dialoginfo/pua_dialoginfo.c | 188 +++++++-------------- + src/modules/pua_dialoginfo/pua_dialoginfo.h | 3 - 4 files changed, 61 insertions(+), 205 deletions(-) diff --git a/src/modules/pua_dialoginfo/doc/pua_dialoginfo.xml b/src/modules/pua_dialoginfo/doc/pua_dialoginfo.xml -index df1e08557e..fd0a3fac5f 100644 +index df1e085..fd0a3fa 100644 --- a/src/modules/pua_dialoginfo/doc/pua_dialoginfo.xml +++ b/src/modules/pua_dialoginfo/doc/pua_dialoginfo.xml @@ -45,11 +45,6 @@ @@ -40,7 +39,7 @@ index df1e08557e..fd0a3fac5f 100644 diff --git a/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml b/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml -index 191ee5f4e7..81ef722a4f 100644 +index 191ee5f..81ef722 100644 --- a/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml +++ b/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml @@ -536,71 +536,7 @@ modparam("pua_dialoginfo", "callee_trying", 1) @@ -117,7 +116,7 @@ index 191ee5f4e7..81ef722a4f 100644
<varname>attribute_display</varname> (int) diff --git a/src/modules/pua_dialoginfo/pua_dialoginfo.c b/src/modules/pua_dialoginfo/pua_dialoginfo.c -index 7e7afe2eae..9ff64aa023 100644 +index 7e7afe2..9ff64aa 100644 --- a/src/modules/pua_dialoginfo/pua_dialoginfo.c +++ b/src/modules/pua_dialoginfo/pua_dialoginfo.c @@ -63,7 +63,6 @@ MODULE_VERSION @@ -492,7 +491,7 @@ index 7e7afe2eae..9ff64aa023 100644 if (!bind_pua) { diff --git a/src/modules/pua_dialoginfo/pua_dialoginfo.h b/src/modules/pua_dialoginfo/pua_dialoginfo.h -index 2551beb4fa..01fc876999 100644 +index 2551beb..01fc876 100644 --- a/src/modules/pua_dialoginfo/pua_dialoginfo.h +++ b/src/modules/pua_dialoginfo/pua_dialoginfo.h @@ -45,9 +45,6 @@ struct dlginfo_cell { @@ -505,6 +504,3 @@ index 2551beb4fa..01fc876999 100644 }; --- -2.20.1 - diff --git a/debian/patches/sipwise/pua_dialoginfo-local_identity_dlg_var.patch b/debian/patches/sipwise/pua_dialoginfo-local_identity_dlg_var.patch index c65dc86a7..64b7e0894 100644 --- a/debian/patches/sipwise/pua_dialoginfo-local_identity_dlg_var.patch +++ b/debian/patches/sipwise/pua_dialoginfo-local_identity_dlg_var.patch @@ -8,7 +8,7 @@ Subject: pua_dialoginfo: local_identity_dlg_var 2 files changed, 37 insertions(+) diff --git a/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml b/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml -index 49f9f0f8..81156afa 100644 +index 49f9f0f..81156af 100644 --- a/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml +++ b/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml @@ -554,6 +554,26 @@ modparam("pua_dialoginfo", "callee_trying", 1) @@ -39,7 +39,7 @@ index 49f9f0f8..81156afa 100644
diff --git a/src/modules/pua_dialoginfo/pua_dialoginfo.c b/src/modules/pua_dialoginfo/pua_dialoginfo.c -index a39b8f11..b0fb27be 100644 +index a39b8f1..b0fb27b 100644 --- a/src/modules/pua_dialoginfo/pua_dialoginfo.c +++ b/src/modules/pua_dialoginfo/pua_dialoginfo.c @@ -82,6 +82,7 @@ int_str pubruri_callee_avp_name; diff --git a/debian/patches/sipwise/pua_dialoginfo-refresh_pubruri_avps_flag.patch b/debian/patches/sipwise/pua_dialoginfo-refresh_pubruri_avps_flag.patch index d28039b8d..6283f0a56 100644 --- a/debian/patches/sipwise/pua_dialoginfo-refresh_pubruri_avps_flag.patch +++ b/debian/patches/sipwise/pua_dialoginfo-refresh_pubruri_avps_flag.patch @@ -8,7 +8,7 @@ Subject: pua_dialoginfo: refresh_pubruri_avps_flag 2 files changed, 94 insertions(+), 1 deletion(-) diff --git a/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml b/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml -index c869344..bd48956 100644 +index 81ef722..49f9f0f 100644 --- a/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml +++ b/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml @@ -433,7 +433,25 @@ modparam("pua_dialoginfo", "use_pubruri_avps", 1) @@ -39,7 +39,7 @@ index c869344..bd48956 100644 <varname>pubruri_caller_avp</varname> (str) diff --git a/src/modules/pua_dialoginfo/pua_dialoginfo.c b/src/modules/pua_dialoginfo/pua_dialoginfo.c -index eb37c61..cc2fd20 100644 +index 9ff64aa..a39b8f1 100644 --- a/src/modules/pua_dialoginfo/pua_dialoginfo.c +++ b/src/modules/pua_dialoginfo/pua_dialoginfo.c @@ -41,6 +41,7 @@ @@ -66,7 +66,7 @@ index eb37c61..cc2fd20 100644 int callee_trying = DEF_CALLEE_TRYING; int disable_caller_publish_flag = DEF_DISABLE_CALLER_PUBLISH_FLAG; int disable_callee_publish_flag = DEF_DISABLE_CALLEE_PUBLISH_FLAG; -@@ -116,6 +119,7 @@ static param_export_t params[]={ +@@ -118,6 +121,7 @@ static param_export_t params[]={ {"include_req_uri", INT_PARAM, &include_req_uri }, {"send_publish_flag", INT_PARAM, &send_publish_flag }, {"use_pubruri_avps", INT_PARAM, &use_pubruri_avps }, @@ -74,7 +74,7 @@ index eb37c61..cc2fd20 100644 {"pubruri_caller_avp", PARAM_STRING, &pubruri_caller_avp }, {"pubruri_callee_avp", PARAM_STRING, &pubruri_callee_avp }, {"pubruri_caller_dlg_var", PARAM_STR, &caller_dlg_var }, -@@ -244,6 +248,58 @@ __dialog_cbtest(struct dlg_cell *dlg, int type, struct dlg_cb_params *_params) +@@ -247,6 +251,58 @@ __dialog_cbtest(struct dlg_cell *dlg, int type, struct dlg_cb_params *_params) } #endif @@ -133,7 +133,7 @@ index eb37c61..cc2fd20 100644 static void __dialog_sendpublish(struct dlg_cell *dlg, int type, struct dlg_cb_params *_params) { -@@ -266,6 +322,12 @@ __dialog_sendpublish(struct dlg_cell *dlg, int type, struct dlg_cb_params *_para +@@ -274,6 +330,12 @@ __dialog_sendpublish(struct dlg_cell *dlg, int type, struct dlg_cb_params *_para uri = dlginfo->to_uri; } @@ -146,7 +146,7 @@ index eb37c61..cc2fd20 100644 switch (type) { case DLGCB_FAILED: case DLGCB_TERMINATED: -@@ -784,6 +846,19 @@ void free_dlginfo_cell(void *param) { +@@ -792,6 +854,19 @@ void free_dlginfo_cell(void *param) { } diff --git a/debian/patches/sipwise/pua_dialoginfo-use-lock-when-use_puburi_avps-is-set.patch b/debian/patches/sipwise/pua_dialoginfo-use-lock-when-use_puburi_avps-is-set.patch index 478125e2e..69d0cdcae 100644 --- a/debian/patches/sipwise/pua_dialoginfo-use-lock-when-use_puburi_avps-is-set.patch +++ b/debian/patches/sipwise/pua_dialoginfo-use-lock-when-use_puburi_avps-is-set.patch @@ -8,7 +8,7 @@ Subject: pua_dialoginfo: use lock when use_puburi_avps is set 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/src/modules/pua_dialoginfo/pua_dialoginfo.c b/src/modules/pua_dialoginfo/pua_dialoginfo.c -index b0fb27be..d5b1feae 100644 +index b0fb27b..d5b1fea 100644 --- a/src/modules/pua_dialoginfo/pua_dialoginfo.c +++ b/src/modules/pua_dialoginfo/pua_dialoginfo.c @@ -346,6 +346,7 @@ __dialog_sendpublish(struct dlg_cell *dlg, int type, struct dlg_cb_params *_para @@ -86,7 +86,7 @@ index b0fb27be..d5b1feae 100644 } diff --git a/src/modules/pua_dialoginfo/pua_dialoginfo.h b/src/modules/pua_dialoginfo/pua_dialoginfo.h -index 01fc8769..82896699 100644 +index 01fc876..8289669 100644 --- a/src/modules/pua_dialoginfo/pua_dialoginfo.h +++ b/src/modules/pua_dialoginfo/pua_dialoginfo.h @@ -23,6 +23,7 @@ diff --git a/debian/patches/upstream/lwsc-set-ws_ping_pong_interval-only-for-libwebsocket.patch b/debian/patches/upstream/lwsc-set-ws_ping_pong_interval-only-for-libwebsocket.patch index 5e456f8ff..2f711e019 100644 --- a/debian/patches/upstream/lwsc-set-ws_ping_pong_interval-only-for-libwebsocket.patch +++ b/debian/patches/upstream/lwsc-set-ws_ping_pong_interval-only-for-libwebsocket.patch @@ -1,4 +1,3 @@ -From 4a4835e122bb3a53d2a1794640e1dec66736a897 Mon Sep 17 00:00:00 2001 From: Daniel-Constantin Mierla Date: Thu, 6 May 2021 11:37:58 +0200 Subject: [PATCH] lwsc: set ws_ping_pong_interval only for libwebsockets 3.x @@ -9,7 +8,7 @@ Subject: [PATCH] lwsc: set ws_ping_pong_interval only for libwebsockets 3.x 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/lwsc/lwsc_mod.c b/src/modules/lwsc/lwsc_mod.c -index 17eb0ca30a..a6985acb6d 100644 +index 17eb0ca..a6985ac 100644 --- a/src/modules/lwsc/lwsc_mod.c +++ b/src/modules/lwsc/lwsc_mod.c @@ -529,7 +529,7 @@ static lwsc_endpoint_t* lwsc_get_endpoint(str *wsurl, str *wsproto) @@ -21,6 +20,3 @@ index 17eb0ca30a..a6985acb6d 100644 ep->crtinfo.ws_ping_pong_interval = 5; /*secs*/ #endif /* 1 internal and 1 (+ 1 http2 nwsi) */ --- -2.20.1 - diff --git a/debian/patches/upstream/tm-lw-parser-fix-matching-To-header-in-lw_get_hf_nam.patch b/debian/patches/upstream/tm-lw-parser-fix-matching-To-header-in-lw_get_hf_nam.patch index eb7cb4822..9806a1f92 100644 --- a/debian/patches/upstream/tm-lw-parser-fix-matching-To-header-in-lw_get_hf_nam.patch +++ b/debian/patches/upstream/tm-lw-parser-fix-matching-To-header-in-lw_get_hf_nam.patch @@ -1,4 +1,3 @@ -From 33db4ffc558b7a9d4c291c929b9e73b3cf8b16f0 Mon Sep 17 00:00:00 2001 From: Daniel-Constantin Mierla Date: Wed, 5 May 2021 18:56:04 +0200 Subject: [PATCH] tm: lw parser - fix matching To header in lw_get_hf_name() @@ -9,7 +8,7 @@ Subject: [PATCH] tm: lw parser - fix matching To header in lw_get_hf_name() 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/modules/tm/lw_parser.c b/src/modules/tm/lw_parser.c -index d13ec58311..6f48304f53 100644 +index d13ec58..6f48304 100644 --- a/src/modules/tm/lw_parser.c +++ b/src/modules/tm/lw_parser.c @@ -188,9 +188,11 @@ char *lw_get_hf_name(char *begin, char *end, enum _hdr_types_t *type) @@ -27,6 +26,3 @@ index d13ec58311..6f48304f53 100644 } if((*(p + 1) == ' ') || (*(p + 1) == ':')) { p++; --- -2.20.1 -