added new patch from Asterisk 14.6.0

Release: 3

diff --git a/0070-Set-PJSIP_INV_SUPPORT_UPDATE-correctly-in-pjsip_inv_.patch b/0070-Set-PJSIP_INV_SUPPORT_UPDATE-correctly-in-pjsip_inv_.patch
new file mode 100644 (file)
index 0000000..9238e3e
--- /dev/null
+++ b/0070-Set-PJSIP_INV_SUPPORT_UPDATE-correctly-in-pjsip_inv_.patch
@@ -0,0 +1,29 @@
+From 1193681959816effa121c4470748d5faa3a59272 Mon Sep 17 00:00:00 2001
+From: George Joseph <gjoseph@digium.com>
+Date: Thu, 29 Jun 2017 13:42:10 -0600
+Subject: [PATCH] Set PJSIP_INV_SUPPORT_UPDATE correctly in
+ pjsip_inv_verify_request3
+
+pjsip_inv_verify_request3 was setting rem_options when UPDATE was
+detected in the Allow header.  That's just an internal variable and
+doesn't go anywhere.  It's '*options' that needs to be set.
+---
+ pjsip/src/pjsip-ua/sip_inv.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pjsip/src/pjsip-ua/sip_inv.c b/pjsip/src/pjsip-ua/sip_inv.c
+index fbc8ebe..6db7e6b 100644
+--- a/pjsip/src/pjsip-ua/sip_inv.c
++++ b/pjsip/src/pjsip-ua/sip_inv.c
+@@ -1237,7 +1237,7 @@ PJ_DEF(pj_status_t) pjsip_inv_verify_request3(pjsip_rx_data *rdata,
+ 
+       if (i != allow->count) {
+           /* UPDATE is present in Allow */
+-          rem_option |= PJSIP_INV_SUPPORT_UPDATE;
++          *options |= PJSIP_INV_SUPPORT_UPDATE;
+       }
+ 
+     }
+-- 
+2.9.4
+

diff --git a/pjproject.spec b/pjproject.spec
index fa04b326c9b7fdc98d0774c46d3dd840e74521a9..5c3febde967fa83675830481b7a331275aa2f84d 100644 (file)
--- a/pjproject.spec
+++ b/pjproject.spec
@@ -20,7 +20,7 @@
 Summary:       PJSIP - free and open source multimedia communication library
 Name:          pjproject
 Version:       2.6
-Release:       2
+Release:       3
 License:       GPL v2+
 Group:         Libraries
 Source0:       http://www.pjsip.org/release/%{version}/%{name}-%{version}.tar.bz2
@@ -41,6 +41,7 @@ Patch107:     0037-r5576-svn-backport-session-timer-crash.patch
 Patch108:      0048-r5576-svn-backport-tls-crash.patch
 Patch109:      0058-Parse-zero-length-multipart-body-parts-correctly.patch
 Patch110:      0059-Ensure-2543-transaction-key-buffer-is-large-enough.patch
+Patch111:      0070-Set-PJSIP_INV_SUPPORT_UPDATE-correctly-in-pjsip_inv_.patch
 URL:           http://www.pjsip.org/
 %{?with_video:BuildRequires:   SDL2-devel}
 BuildRequires: SILK_SDK-devel
@@ -124,6 +125,7 @@ Statyczna biblioteka %{name}.
 %patch108 -p1
 %patch109 -p1
 %patch110 -p1
+%patch111 -p1
 
 cp -p %{SOURCE1} pjlib/include/pj/config_site.h