From 78de190c7904efecdecf14a269cdf7505164561c Mon Sep 17 00:00:00 2001
From: sthen <sthen@openbsd.org>
Date: Fri, 25 Nov 2022 12:52:51 +0000
Subject: [PATCH] update to pjsip/pjsua-2.13, including some security fixes -
 Potential media transport downgrade from SRTP to RTP - Potential buffer
 overflow in pjlib scanner and pjmedia - Potential stack buffer overflow when
 parsing message as a STUN client

---
 telephony/pjsua/Makefile                   |  3 ++-
 telephony/pjsua/distinfo                   |  4 ++--
 telephony/pjsua/patches/patch-build_mak_in | 10 +++++-----
 telephony/pjsua/pkg/PLIST-main             |  1 +
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/telephony/pjsua/Makefile b/telephony/pjsua/Makefile
index 3e653844073..281c32d380e 100644
--- a/telephony/pjsua/Makefile
+++ b/telephony/pjsua/Makefile
@@ -1,7 +1,7 @@
 COMMENT-main=	multimedia communication library (SIP, RTP, ICE, etc)
 COMMENT-pjsua=	lightweight sip client
 
-V=		2.12.1
+V=		2.13
 GH_ACCOUNT=	pjsip
 GH_PROJECT=	pjproject
 GH_TAGNAME=	$V
@@ -88,6 +88,7 @@ MODPY_RUNDEP=	No
 TEST_DEPENDS=	${MODPY_RUN_DEPENDS} \
 		pjsip-=$V:${BUILD_PKGPATH}
 ALL_TARGET=	dep all
+# some tests require network
 TEST_TARGET=	selftest
 
 # distributed with a wrapper script that runs the real autoconf script
diff --git a/telephony/pjsua/distinfo b/telephony/pjsua/distinfo
index 3b4fc7a9350..6b09e661c99 100644
--- a/telephony/pjsua/distinfo
+++ b/telephony/pjsua/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pjproject-2.12.1.tar.gz) = 0P7vaWOweTToIbpDKK7LTDY1hRXBs+UH2lh0VV1xNTM=
-SIZE (pjproject-2.12.1.tar.gz) = 9660659
+SHA256 (pjproject-2.13.tar.gz) = QXi7n1himREUY/wW6gTkYa3KSnPmRvjd72HqU9r6ktk=
+SIZE (pjproject-2.13.tar.gz) = 9744716
diff --git a/telephony/pjsua/patches/patch-build_mak_in b/telephony/pjsua/patches/patch-build_mak_in
index 1217a8832ec..3115ca19b73 100644
--- a/telephony/pjsua/patches/patch-build_mak_in
+++ b/telephony/pjsua/patches/patch-build_mak_in
@@ -1,11 +1,11 @@
 Index: build.mak.in
 --- build.mak.in.orig
 +++ build.mak.in
-@@ -328,7 +328,6 @@ export APP_LDLIBS := $(PJSUA_LIB_LDLIB) \
- 	$(PJLIB_LDLIB) \
- 	@LIBS@
+@@ -331,7 +331,6 @@ export APP_LDLIBS := $(PJSUA_LIB_LDLIB) \
+         $(PJLIB_LDLIB) \
+         @LIBS@
  export APP_LDXXLIBS := $(PJSUA2_LIB_LDLIB) \
--	-lstdc++ \
- 	$(APP_LDLIBS)
+-        -lstdc++ \
+         $(APP_LDLIBS)
  
  # Here are the variables to use if application is using the library
diff --git a/telephony/pjsua/pkg/PLIST-main b/telephony/pjsua/pkg/PLIST-main
index 78659d56c8c..758879241f3 100644
--- a/telephony/pjsua/pkg/PLIST-main
+++ b/telephony/pjsua/pkg/PLIST-main
@@ -256,6 +256,7 @@ include/pjnath/stun_transaction.h
 include/pjnath/turn_session.h
 include/pjnath/turn_sock.h
 include/pjnath/types.h
+include/pjnath/upnp.h
 include/pjsip/
 include/pjsip-simple/
 include/pjsip-simple/errno.h