diff options
| author | prspkt <prspkt@protonmail.com> | 2018-06-01 17:15:35 +0000 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2018-07-19 09:54:06 +0300 |
| commit | 91cc299cf8f42569fb68139c94f76e2cb528e1dc (patch) | |
| tree | 2458e4e8f1fef6860b23b1779bd8ee15235b3593 | |
| parent | 62bd7fbdc69c22c4b0311bdb8b1a1fa77e395498 (diff) | |
| download | aports-91cc299cf8f42569fb68139c94f76e2cb528e1dc.tar.bz2 aports-91cc299cf8f42569fb68139c94f76e2cb528e1dc.tar.xz | |
main/pjproject: upgrade to 2.7.2, patch for libressl-2.7
| -rw-r--r-- | main/pjproject/APKBUILD | 18 | ||||
| -rw-r--r-- | main/pjproject/fix-bb-cp-uniqueness.patch | 2 | ||||
| -rw-r--r-- | main/pjproject/libressl-2.7.patch | 48 |
3 files changed, 56 insertions, 12 deletions
diff --git a/main/pjproject/APKBUILD b/main/pjproject/APKBUILD index 0aa6f39552..d6d90a0284 100644 --- a/main/pjproject/APKBUILD +++ b/main/pjproject/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Michael Mason <ms13sp@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=pjproject -pkgver=2.5.5 -pkgrel=4 +pkgver=2.7.2 +pkgrel=0 pkgdesc="CLI Softphone" url="http://www.pjsip.org/pjsua.htm" arch="all" @@ -16,6 +16,7 @@ subpackages="$pkgname-dev pjsua" source="http://www.pjsip.org/release/$pkgver/$pkgname-$pkgver.tar.bz2 fix-bb-cp-uniqueness.patch pjproject_no_third_party.patch + libressl-2.7.patch " builddir="$srcdir/$pkgname-$pkgver" @@ -77,12 +78,7 @@ pjsua() { install -D -m755 pjsua "$subpkgdir"/usr/bin/pjsua } -md5sums="183f7144b9aa238884243c0fc52ece36 pjproject-2.5.5.tar.bz2 -1f152ad611b5fb0e44676e2701b53a15 fix-bb-cp-uniqueness.patch -e835a442abf0fdc6614d5ba1cb961c11 pjproject_no_third_party.patch" -sha256sums="ab39207b761d3485199cd881410afeb2d171dff7c2bf75e8caae91c6dca508f3 pjproject-2.5.5.tar.bz2 -cae0255ddb8b6b6e07f6da5b448ec669b0727dc6d6c795e0d1cd8ce9ae504d40 fix-bb-cp-uniqueness.patch -f95cb0e03efd5995b2ea5e130831edbf831c01fd5bbcf10b4dcbd77133d18a12 pjproject_no_third_party.patch" -sha512sums="7204326ed7d06241f7de02111641de792274fb126bb5c06ba6d7e2fbb6c6475b84fd4e1e63d44863207cbd79e75b654588567125476ce9d66bd1397708827a09 pjproject-2.5.5.tar.bz2 -cc4077c9999d4eb28cfc34080ea2cdfdc905726565afdca96d26979d734a1d70522c5e6307ec33c0d4f5f1a5b26699787cbd31fecb73b860b6b417eda50f37a1 fix-bb-cp-uniqueness.patch -fe53b4e8a654dc4025a4bf6350f405953609abc9e7ed967882cb9eb9e6a659e348a0c3c7496c8093562a0dcc4a40459896d8ee1da7275dd089244338111bccbb pjproject_no_third_party.patch" +sha512sums="3d355ffcbbeed62cfc711e574a987dc06043ccf4f2625820adffa89167022b8306fcee3fada71d3d45e7b902fc9c65ac8221de101cbafed25362a3921f702afd pjproject-2.7.2.tar.bz2 +8688885d5d7b4c6725c6b9a98935401a292757533ac859cdec6bcd5210c9668206fc4be09561890541de8842c4b7beba456ae1a044b4793dfc1275278d7f2cd5 fix-bb-cp-uniqueness.patch +fe53b4e8a654dc4025a4bf6350f405953609abc9e7ed967882cb9eb9e6a659e348a0c3c7496c8093562a0dcc4a40459896d8ee1da7275dd089244338111bccbb pjproject_no_third_party.patch +c15db991ac704502f00ca67f5afe81292343e0453116f93b5358b956782bbc718655fd062e2b5833b6a3a36de1dd29cf21f2cfd24dcded2706cba8080438eea9 libressl-2.7.patch" diff --git a/main/pjproject/fix-bb-cp-uniqueness.patch b/main/pjproject/fix-bb-cp-uniqueness.patch index c6846cd569..e844204e70 100644 --- a/main/pjproject/fix-bb-cp-uniqueness.patch +++ b/main/pjproject/fix-bb-cp-uniqueness.patch @@ -1,7 +1,7 @@ diff -ru pjproject-2.2.1.orig/Makefile pjproject-2.2.1/Makefile --- pjproject-2.2.1.orig/Makefile 2014-04-15 08:14:35.075716775 -0300 +++ pjproject-2.2.1/Makefile 2014-04-15 08:21:39.683417350 -0300 -@@ -108,7 +108,7 @@ +@@ -119,7 +119,7 @@ install: mkdir -p $(DESTDIR)$(libdir)/ # cp -af $(APP_LIB_FILES) $(DESTDIR)$(libdir)/ diff --git a/main/pjproject/libressl-2.7.patch b/main/pjproject/libressl-2.7.patch new file mode 100644 index 0000000000..a98b068dd5 --- /dev/null +++ b/main/pjproject/libressl-2.7.patch @@ -0,0 +1,48 @@ +--- a/pjlib/src/pj/ssl_sock_ossl.c ++++ b/pjlib/src/pj/ssl_sock_ossl.c +@@ -111,7 +111,7 @@ + #endif + + +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) + # define OPENSSL_NO_SSL2 /* seems to be removed in 1.1.0 */ + # define M_ASN1_STRING_data(x) ASN1_STRING_get0_data(x) + # define M_ASN1_STRING_length(x) ASN1_STRING_length(x) +@@ -535,7 +535,7 @@ + pj_assert(status == PJ_SUCCESS); + + /* Init OpenSSL lib */ +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + SSL_library_init(); + SSL_load_error_strings(); + #else +@@ -599,7 +599,7 @@ + + SSL_set_session(ssl, SSL_SESSION_new()); + +-#if !defined(OPENSSL_NO_EC) && OPENSSL_VERSION_NUMBER >= 0x1000200fL ++#if !defined(OPENSSL_NO_EC) && OPENSSL_VERSION_NUMBER >= 0x1000200fL && !defined(LIBRESSL_VERSION_NUMBER) + openssl_curves_num = SSL_get_shared_curve(ssl,-1); + if (openssl_curves_num > PJ_ARRAY_SIZE(openssl_curves)) + openssl_curves_num = PJ_ARRAY_SIZE(openssl_curves); +@@ -1228,7 +1228,7 @@ + + static pj_status_t set_curves_list(pj_ssl_sock_t *ssock) + { +-#if !defined(OPENSSL_NO_EC) && OPENSSL_VERSION_NUMBER >= 0x1000200fL ++#if !defined(OPENSSL_NO_EC) && OPENSSL_VERSION_NUMBER >= 0x1000200fL && !defined(LIBRESSL_VERSION_NUMBER) + int ret; + int curves[PJ_SSL_SOCK_MAX_CURVES]; + unsigned cnt; +@@ -1259,7 +1259,7 @@ + + static pj_status_t set_sigalgs(pj_ssl_sock_t *ssock) + { +-#if OPENSSL_VERSION_NUMBER >= 0x1000200fL ++#if OPENSSL_VERSION_NUMBER >= 0x1000200fL && !defined(LIBRESSL_VERSION_NUMBER) + int ret; + + if (ssock->param.sigalgs.ptr && ssock->param.sigalgs.slen) { +Only in .: pjlib/src/pj/ssl_sock_ossl.c.orig |