From 5a916dc3511d01a1dcc629b69cd10ec360a71a15 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Sun, 14 Mar 2021 18:14:30 +0100 Subject: [PATCH] pjproject: sync patches with asterisk 18.2.2 Signed-off-by: Sebastian Kemper --- libs/pjproject/Makefile | 2 +- ...correct-copying-when-creating-cancel.patch | 32 +++++++++++++++++++ ...0080-fix-sdp-neg-modify-local-offer.patch} | 6 ++-- 3 files changed, 35 insertions(+), 5 deletions(-) create mode 100644 libs/pjproject/patches/0070-fix-incorrect-copying-when-creating-cancel.patch rename libs/pjproject/patches/{0070-fix-sdp-neg-modify-local-offer.patch => 0080-fix-sdp-neg-modify-local-offer.patch} (78%) diff --git a/libs/pjproject/Makefile b/libs/pjproject/Makefile index 556f441..28cc734 100644 --- a/libs/pjproject/Makefile +++ b/libs/pjproject/Makefile @@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=pjproject PKG_VERSION:=2.10 -PKG_RELEASE:=2 +PKG_RELEASE:=3 # download "vX.Y.tar.gz" as "pjproject-vX.Y.tar.gz" PKG_SOURCE_URL_FILE:=$(PKG_VERSION).tar.gz diff --git a/libs/pjproject/patches/0070-fix-incorrect-copying-when-creating-cancel.patch b/libs/pjproject/patches/0070-fix-incorrect-copying-when-creating-cancel.patch new file mode 100644 index 0000000..c8e4b4c --- /dev/null +++ b/libs/pjproject/patches/0070-fix-incorrect-copying-when-creating-cancel.patch @@ -0,0 +1,32 @@ +From ce18018cc17bef8f80c08686e3a7b28384ef3ba5 Mon Sep 17 00:00:00 2001 +From: sauwming +Date: Mon, 12 Oct 2020 13:31:25 +0800 +Subject: [PATCH] Fix incorrect copying of destination info when creating + CANCEL (#2546) + +--- + pjsip/src/pjsip/sip_util.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +--- a/pjsip/src/pjsip/sip_util.c ++++ b/pjsip/src/pjsip/sip_util.c +@@ -779,14 +779,14 @@ PJ_DEF(pj_status_t) pjsip_endpt_create_c + pjsip_hdr_clone(cancel_tdata->pool, req_tdata->saved_strict_route); + } + +- /* Copy the destination host name from the original request */ +- pj_strdup(cancel_tdata->pool, &cancel_tdata->dest_info.name, +- &req_tdata->dest_info.name); +- +- /* Finally copy the destination info from the original request */ ++ /* Copy the destination info from the original request */ + pj_memcpy(&cancel_tdata->dest_info, &req_tdata->dest_info, + sizeof(req_tdata->dest_info)); + ++ /* Finally, copy the destination host name from the original request */ ++ pj_strdup(cancel_tdata->pool, &cancel_tdata->dest_info.name, ++ &req_tdata->dest_info.name); ++ + /* Done. + * Return the transmit buffer containing the CANCEL request. + */ diff --git a/libs/pjproject/patches/0070-fix-sdp-neg-modify-local-offer.patch b/libs/pjproject/patches/0080-fix-sdp-neg-modify-local-offer.patch similarity index 78% rename from libs/pjproject/patches/0070-fix-sdp-neg-modify-local-offer.patch rename to libs/pjproject/patches/0080-fix-sdp-neg-modify-local-offer.patch index c27a489..889d012 100644 --- a/libs/pjproject/patches/0070-fix-sdp-neg-modify-local-offer.patch +++ b/libs/pjproject/patches/0080-fix-sdp-neg-modify-local-offer.patch @@ -1,8 +1,6 @@ -diff --git a/pjmedia/src/pjmedia/sdp_neg.c b/pjmedia/src/pjmedia/sdp_neg.c -index 3b85b4273..a14009662 100644 --- a/pjmedia/src/pjmedia/sdp_neg.c +++ b/pjmedia/src/pjmedia/sdp_neg.c -@@ -304,7 +304,6 @@ PJ_DEF(pj_status_t) pjmedia_sdp_neg_modify_local_offer2( +@@ -304,7 +304,6 @@ PJ_DEF(pj_status_t) pjmedia_sdp_neg_modi { pjmedia_sdp_session *new_offer; pjmedia_sdp_session *old_offer; @@ -10,7 +8,7 @@ index 3b85b4273..a14009662 100644 unsigned oi; /* old offer media index */ pj_status_t status; -@@ -323,8 +322,19 @@ PJ_DEF(pj_status_t) pjmedia_sdp_neg_modify_local_offer2( +@@ -323,8 +322,19 @@ PJ_DEF(pj_status_t) pjmedia_sdp_neg_modi /* Change state to STATE_LOCAL_OFFER */ neg->state = PJMEDIA_SDP_NEG_STATE_LOCAL_OFFER; -- 2.30.2