diff options
| author | Leo <thinkabit.ukim@gmail.com> | 2019-06-08 07:44:04 -0300 |
|---|---|---|
| committer | Kevin Daudt <kdaudt@alpinelinux.org> | 2019-06-09 16:54:21 +0000 |
| commit | 6a62b30513ee8f429d8a6834b483d7482af8aba0 (patch) | |
| tree | 4ec36d8116bfb11afed11573a9ed14a9bf8e0781 /main | |
| parent | 4c384e38aabd0ee36edc8c4037788d69a2a54e2e (diff) | |
| download | aports-6a62b30513ee8f429d8a6834b483d7482af8aba0.tar.bz2 aports-6a62b30513ee8f429d8a6834b483d7482af8aba0.tar.xz | |
main/pjproject: upgrade to 2.8
Closes GH-8653
Diffstat (limited to 'main')
| -rw-r--r-- | main/pjproject/APKBUILD | 19 | ||||
| -rw-r--r-- | main/pjproject/libressl-2.7.patch | 48 |
2 files changed, 8 insertions, 59 deletions
diff --git a/main/pjproject/APKBUILD b/main/pjproject/APKBUILD index 85ba289725..2f03084853 100644 --- a/main/pjproject/APKBUILD +++ b/main/pjproject/APKBUILD @@ -1,25 +1,21 @@ # Contributor: Michael Mason <ms13sp@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=pjproject -pkgver=2.7.2 -pkgrel=4 +pkgver=2.8 +pkgrel=0 pkgdesc="CLI Softphone" -url="http://www.pjsip.org/pjsua.htm" +url="https://www.pjsip.org/pjsua.htm" arch="all" license="GPL-2.0-or-later" -depends= depends_dev="openssl-dev alsa-lib-dev gsm-dev speex-dev speexdsp-dev portaudio-dev libsrtp-dev libsamplerate-dev" makedepends="$depends_dev" -install= subpackages="$pkgname-dbg $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" prepare() { default_prepare update_config_sub @@ -60,7 +56,8 @@ build() { --with-external-gsm \ --with-external-srtp \ --with-external-pa \ - --disable-libwebrtc + --disable-libwebrtc \ + --disable-static # TODO: make it build with only shared libs from system # rm -r third_party @@ -72,6 +69,7 @@ package() { cd "$builddir" install -d "$pkgdir"/usr/lib make -j1 DESTDIR="$pkgdir" prefix=/usr install + rm -f "$pkgdir"/usr/lib/*.a } pjsua() { @@ -80,7 +78,6 @@ pjsua() { install -D -m755 pjsua "$subpkgdir"/usr/bin/pjsua } -sha512sums="3d355ffcbbeed62cfc711e574a987dc06043ccf4f2625820adffa89167022b8306fcee3fada71d3d45e7b902fc9c65ac8221de101cbafed25362a3921f702afd pjproject-2.7.2.tar.bz2 +sha512sums="0a0ee66932959710f806cb1d88a3b946b214d2caecd54ecc9eabdbdb17f7f4fa0b7d27567dc3796d845a25b850c974536e7c7538d51f93771d13dd2fd309eaf5 pjproject-2.8.tar.bz2 8688885d5d7b4c6725c6b9a98935401a292757533ac859cdec6bcd5210c9668206fc4be09561890541de8842c4b7beba456ae1a044b4793dfc1275278d7f2cd5 fix-bb-cp-uniqueness.patch -fe53b4e8a654dc4025a4bf6350f405953609abc9e7ed967882cb9eb9e6a659e348a0c3c7496c8093562a0dcc4a40459896d8ee1da7275dd089244338111bccbb pjproject_no_third_party.patch -c15db991ac704502f00ca67f5afe81292343e0453116f93b5358b956782bbc718655fd062e2b5833b6a3a36de1dd29cf21f2cfd24dcded2706cba8080438eea9 libressl-2.7.patch" +fe53b4e8a654dc4025a4bf6350f405953609abc9e7ed967882cb9eb9e6a659e348a0c3c7496c8093562a0dcc4a40459896d8ee1da7275dd089244338111bccbb pjproject_no_third_party.patch" diff --git a/main/pjproject/libressl-2.7.patch b/main/pjproject/libressl-2.7.patch deleted file mode 100644 index a98b068dd5..0000000000 --- a/main/pjproject/libressl-2.7.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- 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 |