update to asterisk-18.4.0

add a patch from tb@ to fix upcoming build breakage with libressl;
we do have SSL_CIPHER_get_id() and SSL_set_session() so no need to #define
them; currently tis works but SSL_CIPHER is going to become opaque which
will break the redefinitions.
This commit is contained in:
sthen 2021-05-07 19:35:11 +00:00
parent 855d864d81
commit 4e5884d491
4 changed files with 21 additions and 6 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.344 2021/03/27 15:20:38 sthen Exp $
# $OpenBSD: Makefile,v 1.345 2021/05/07 19:35:11 sthen Exp $
COMMENT-main= open source multi-protocol PBX and telephony toolkit
VER= 18.3.0
VER= 18.4.0
PJ_V= 2.10
DISTNAME= asterisk-${VER:S/beta/-beta/:S/rc/-rc/}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} pjproject-${PJ_V}.tar.bz2:0

View File

@ -1,4 +1,4 @@
SHA256 (asterisk-18.3.0.tar.gz) = y5Vmu+DynAGvj1KB8LZmV9teWivxR7Qb2wJ5leIoafU=
SHA256 (asterisk-18.4.0.tar.gz) = kcDDWgxTCXZHqz57KdNN0IYf7QqNUuNhdAjp7O1ATbE=
SHA256 (pjproject-2.10.tar.bz2) = LooaSgBWLKiO6IvbaNoqnZg8RiiPc0BzKHuRamNrFZM=
SIZE (asterisk-18.3.0.tar.gz) = 27917957
SIZE (asterisk-18.4.0.tar.gz) = 27926601
SIZE (pjproject-2.10.tar.bz2) = 7339188

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-res_res_rtp_asterisk_c,v 1.8 2021/03/27 15:20:38 sthen Exp $
$OpenBSD: patch-res_res_rtp_asterisk_c,v 1.9 2021/05/07 19:35:11 sthen Exp $
Index: res/res_rtp_asterisk.c
--- res/res_rtp_asterisk.c.orig
+++ res/res_rtp_asterisk.c
@@ -1832,7 +1832,7 @@ static int dtls_setup_rtcp(struct ast_rtp_instance *in
@@ -1835,7 +1835,7 @@ static int dtls_setup_rtcp(struct ast_rtp_instance *in
static const SSL_METHOD *get_dtls_method(void)
{

View File

@ -0,0 +1,15 @@
$OpenBSD: patch-third-party_pjproject_source_pjlib_src_pj_ssl_sock_ossl_c,v 1.8 2021/05/07 19:35:11 sthen Exp $
Index: third-party/pjproject/source/pjlib/src/pj/ssl_sock_ossl.c
--- third-party/pjproject/source/pjlib/src/pj/ssl_sock_ossl.c.orig
+++ third-party/pjproject/source/pjlib/src/pj/ssl_sock_ossl.c
@@ -130,9 +130,6 @@ static unsigned get_nid_from_cid(unsigned cid)
# define X509_get_notBefore(x) X509_get0_notBefore(x)
# define X509_get_notAfter(x) X509_get0_notAfter(x)
# endif
-#else
-# define SSL_CIPHER_get_id(c) (c)->id
-# define SSL_set_session(ssl, s) (ssl)->session = (s)
#endif