main/pjproject: security upgrade to 2.11.1

* supercedes !23272

3 files changed, 122 insertions, 7 deletions

diff --git a/main/pjproject/APKBUILD b/main/pjproject/APKBUILD
index 74a8f1f311..3de7ec9bec 100644
--- a/main/pjproject/APKBUILD
+++ b/main/pjproject/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Michael Mason <ms13sp@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=pjproject
-pkgver=2.9
+pkgver=2.11.1
 pkgrel=0
 pkgdesc="CLI Softphone"
 url="https://www.pjsip.org/pjsua.htm"
@@ -9,13 +9,21 @@ arch="all"
 license="GPL-2.0-or-later"
 depends_dev="openssl-dev alsa-lib-dev gsm-dev speex-dev speexdsp-dev
 	portaudio-dev libsrtp-dev libsamplerate-dev"
-makedepends="$depends_dev"
+makedepends="$depends_dev linux-headers"
 subpackages="$pkgname-dbg $pkgname-dev pjsua"
 source="https://github.com/pjsip/pjproject/archive/$pkgver/pjproject-$pkgver.tar.gz
-	fix-bb-cp-uniqueness.patch
 	pjproject_no_third_party.patch
+	execinfo.patch
+	libpjsua2-install.patch
 	"
 
+# secfixes:
+#   2.11.1-r0:
+#     - CVE-2021-32686
+#   2.11-r0:
+#     - CVE-2020-15260
+#     - CVE-2021-21375
+
 prepare() {
 	default_prepare
 	update_config_sub
@@ -62,7 +70,7 @@ build() {
 	# TODO: make it build with only shared libs from system
 	# rm -r third_party
 	make dep
-	make -j1 all
+	make all
 }
 
 package() {
@@ -78,6 +86,9 @@ pjsua() {
 	install -D -m755 pjsua "$subpkgdir"/usr/bin/pjsua
 }
 
-sha512sums="b2e684102f8dff2286dce8b78a92eac9a1bdb6089e206c987638b53a34d52d2da8ff30960877c8e273ef6df651619bed0e216d4c777c03c6a802f5d469434627  pjproject-2.9.tar.gz
-8688885d5d7b4c6725c6b9a98935401a292757533ac859cdec6bcd5210c9668206fc4be09561890541de8842c4b7beba456ae1a044b4793dfc1275278d7f2cd5  fix-bb-cp-uniqueness.patch
-fe53b4e8a654dc4025a4bf6350f405953609abc9e7ed967882cb9eb9e6a659e348a0c3c7496c8093562a0dcc4a40459896d8ee1da7275dd089244338111bccbb  pjproject_no_third_party.patch"
+sha512sums="
+fda8e4bf9d5f34d3940c69414a20f177d09ca79c76753f6597326f8afc72f847dd70df4e1f2c34fae173f5728d5ac1419ed602651c68167c747c40280dbe117e  pjproject-2.11.1.tar.gz
+fe53b4e8a654dc4025a4bf6350f405953609abc9e7ed967882cb9eb9e6a659e348a0c3c7496c8093562a0dcc4a40459896d8ee1da7275dd089244338111bccbb  pjproject_no_third_party.patch
+59337a5ddf5f989b1cb5644cc644f4b7efc17f8f92ef595667813662eaeee4ad25494a3386385b1114c604fd028f9b22f150cf32879c03e9255d737dee20f436  execinfo.patch
+53a96e301ed32102735a454f7d24225884d8acea66ebf9b6ec8ea42159935c183a0390013b3ea2e460380ce2b808f59373a12eafaa9caac69f6f6a7edc6aa8f5  libpjsua2-install.patch
+"
diff --git a/main/pjproject/execinfo.patch b/main/pjproject/execinfo.patch
new file mode 100644
index 0000000000..30b5fa2aa7
--- /dev/null
+++ b/main/pjproject/execinfo.patch
@@ -0,0 +1,78 @@
+diff --git a/pjlib-util/src/pjlib-util-test/main.c b/pjlib-util/src/pjlib-util-test/main.c
+index 7178b09..5b5a8ec 100644
+--- a/pjlib-util/src/pjlib-util-test/main.c
++++ b/pjlib-util/src/pjlib-util-test/main.c
+@@ -33,7 +33,7 @@ static void init_signals()
+     sigaction(SIGALRM, &act, NULL);
+ }
+ 
+-#elif PJ_LINUX || PJ_DARWINOS
++#elif (PJ_LINUX && defined(__GLIBC__)) || PJ_DARWINOS
+ 
+ #include <execinfo.h>

+ #include <signal.h>
+diff --git a/pjlib/src/pjlib-test/main.c b/pjlib/src/pjlib-test/main.c
+index caebfa8..d3ca1b1 100644
+--- a/pjlib/src/pjlib-test/main.c
++++ b/pjlib/src/pjlib-test/main.c
+@@ -54,7 +54,7 @@ static void init_signals()
+     sigaction(SIGALRM, &act, NULL);
+ }
+ 
+-#elif PJ_LINUX || PJ_DARWINOS
++#elif (PJ_LINUX && defined(__GLIBC__)) || PJ_DARWINOS
+ 
+ #include <execinfo.h>

+ #include <signal.h>
+diff --git a/pjmedia/src/test/main.c b/pjmedia/src/test/main.c
+index fc91756..4ad230e 100644
+--- a/pjmedia/src/test/main.c
++++ b/pjmedia/src/test/main.c
+@@ -32,7 +32,7 @@
+ #endif
+ 
+ 
+-#if PJ_LINUX || PJ_DARWINOS
++#if (PJ_LINUX && defined(__GLIBC__)) || PJ_DARWINOS
+ 
+ #include <execinfo.h>

+ #include <signal.h>
+diff --git a/pjnath/src/pjnath-test/main.c b/pjnath/src/pjnath-test/main.c
+index fffdc4f..78a64ab 100644
+--- a/pjnath/src/pjnath-test/main.c
++++ b/pjnath/src/pjnath-test/main.c
+@@ -32,7 +32,7 @@ static void init_signals()
+     sigaction(SIGALRM, &act, NULL);
+ }
+ 
+-#elif PJ_LINUX || PJ_DARWINOS
++#elif (PJ_LINUX && defined(__GLIBC__)) || PJ_DARWINOS
+ 
+ #include <execinfo.h>

+ #include <signal.h>
+diff --git a/pjsip-apps/src/pjsua/main.c b/pjsip-apps/src/pjsua/main.c
+index 5396ff0..4fe8dfc 100644
+--- a/pjsip-apps/src/pjsua/main.c
++++ b/pjsip-apps/src/pjsua/main.c
+@@ -80,7 +80,7 @@ static void setup_signal_handler(void)
+     SetConsoleCtrlHandler(&CtrlHandler, TRUE);
+ }
+ 
+-#elif PJ_LINUX || PJ_DARWINOS
++#elif (PJ_LINUX && defined(__GLIBC__)) || PJ_DARWINOS
+ 
+ #include <execinfo.h>
+ #include <signal.h>
+diff --git a/pjsip/src/test/main.c b/pjsip/src/test/main.c
+index 914c592..ff594ab 100644
+--- a/pjsip/src/test/main.c
++++ b/pjsip/src/test/main.c
+@@ -33,7 +33,7 @@ static void usage()
+     puts(" -l,--log-level N    Set log level (0-6)");
+ }
+ 
+-#if PJ_LINUX || PJ_DARWINOS
++#if (PJ_LINUX && defined(__GLIBC__)) || PJ_DARWINOS
+ 
+ #include <execinfo.h>

+ #include <signal.h>
diff --git a/main/pjproject/libpjsua2-install.patch b/main/pjproject/libpjsua2-install.patch
new file mode 100644
index 0000000000..706c82db40
--- /dev/null
+++ b/main/pjproject/libpjsua2-install.patch
@@ -0,0 +1,26 @@
+From 4fafe94319a6b714ebb4086fe0be69c3ca9ff5ab Mon Sep 17 00:00:00 2001
+From: Hubert LOBIT <hubert.lobit@allocloud.com>
+Date: Thu, 18 Mar 2021 19:00:54 +0100
+Subject: [PATCH] Fix installation of libpjsua2 shared libraries
+
+---
+ Makefile | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 31a6d39d4..74e246a44 100644
+--- a/Makefile
++++ b/Makefile
+@@ -121,9 +121,10 @@ cmp_wav:
+ 
+ install:
+ 	mkdir -p $(DESTDIR)$(libdir)/
+-	cp -af $(APP_LIB_FILES) $(DESTDIR)$(libdir)/
+ 	if [ "$(PJ_EXCLUDE_PJSUA2)x" = "x" ] ; then \
+-	    cp -af $(PJ_DIR)/pjsip/lib/libpjsua2-$(LIB_SUFFIX) $(DESTDIR)$(libdir)/; \
++	    cp -af $(APP_LIBXX_FILES) $(DESTDIR)$(libdir)/; \
++	else \
++	    cp -af $(APP_LIB_FILES) $(DESTDIR)$(libdir)/; \
+ 	fi
+ 	mkdir -p $(DESTDIR)$(includedir)/
+ 	for d in pjlib pjlib-util pjnath pjmedia pjsip; do \