pjproject: sync patches with asterisk 18.7.1

Switch to AUTORELEASE while at it.

Signed-off-by: Andre Heider <a.heider@gmail.com>

diff --git a/libs/pjproject/Makefile b/libs/pjproject/Makefile
index 7d441cbee93f8b044738191530660b91b86f66fa..3347b3ee7fa0ca6e9ab214c5cacfd46531794e04 100644 (file)
--- 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:=4
+PKG_RELEASE:=$(AUTORELEASE)
 
 # 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/0120-pjmedia_sdp_attr_get_rtpmap-Strip-param-trailing-whi.patch b/libs/pjproject/patches/0120-pjmedia_sdp_attr_get_rtpmap-Strip-param-trailing-whi.patch
new file mode 100644 (file)
index 0000000..a3e668c
--- /dev/null
+++ b/libs/pjproject/patches/0120-pjmedia_sdp_attr_get_rtpmap-Strip-param-trailing-whi.patch
@@ -0,0 +1,27 @@
+From 2ae784030b0d9cf217c3d562af20e4967f19a3dc Mon Sep 17 00:00:00 2001
+From: George Joseph <gjoseph@sangoma.com>
+Date: Tue, 14 Sep 2021 10:47:29 -0600
+Subject: [PATCH] pjmedia_sdp_attr_get_rtpmap: Strip param trailing whitespace
+
+Use pj_scan_get() to parse the param part of rtpmap so
+trailing whitespace is automatically stripped.
+
+Fixes #2827
+---
+ pjmedia/src/pjmedia/sdp.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/pjmedia/src/pjmedia/sdp.c
++++ b/pjmedia/src/pjmedia/sdp.c
+@@ -313,9 +313,9 @@ PJ_DEF(pj_status_t) pjmedia_sdp_attr_get
+ 
+       /* Expecting either '/' or EOF */
+       if (*scanner.curptr == '/') {
++          /* Skip the '/' */
+           pj_scan_get_char(&scanner);
+-          rtpmap->param.ptr = scanner.curptr;
+-          rtpmap->param.slen = scanner.end - scanner.curptr;
++          pj_scan_get(&scanner, &cs_token, &rtpmap->param);
+       } else {
+           rtpmap->param.slen = 0;
+       }