teldra/vp-build
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

pjproject: update to 2.8.

Browse Source
This commit is contained in:
Piotr Wójcik 2018-06-01 12:56:57 +02:00 committed by Helmut Pozimski
parent f7dd78105f
commit 08afcb3f88
3 changed files with 5 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
srcpkgs/pjproject/patches/libressl.patch
View File

@ -1,49 +0,0 @@
--- pjlib/src/pj/ssl_sock_ossl.c.orig 2017-02-08 18:48:12.031664919 -0800
+++ pjlib/src/pj/ssl_sock_ossl.c 2017-02-08 18:50:04.302064334 -0800
@@ -112,7 +112,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)
@@ -452,7 +452,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);
@@ -1069,7 +1069,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;
@@ -1100,7 +1100,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) {
--- ssl_sock_ossl.c 2017-09-29 17:33:19.315010416 +0200
+++ pjlib/src/pj/ssl_sock_ossl.c 2017-09-29 17:35:19.055014980 +0200
@@ -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

8
srcpkgs/pjproject/template
View File

@ -2,8 +2,8 @@
# no-third-party.patch comes from Alpine,
# and this template is heavily based on Alpine's APKBUILD.
pkgname=pjproject
version=2.7.1
revision=4
version=2.8
revision=1
disable_parallel_build=yes
build_style=gnu-configure
configure_args="--enable-shared \
@ -20,10 +20,10 @@ makedepends="libressl-devel alsa-lib-devel libgsm-devel speex-devel speexdsp-dev
libsrtp-devel libsamplerate-devel"
short_desc="Open source SIP and media stack"
maintainer="Christopher Brannon <chris@the-brannons.com>"
license="GPL-2"
license="GPL-2.0-or-later"
homepage="http://www.pjsip.org/pjsua.htm"
distfiles="http://www.pjsip.org/release/${version}/${pkgname}-${version}.tar.bz2"
checksum=59fabc62a02b2b80857297cfb10e2c68c473f4a0acc6e848cfefe8421f2c3126
checksum=503d0bd7f9f13dc1492ac9b71b761b1089851fbb608b9a13996edc3c42006f79
pre_configure() {
export LD="${CC}"

1
srcpkgs/pjproject/update Normal file
View File

@ -0,0 +1 @@
site='http://www.pjsip.org/download.htm'