cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to asterisk-18.7.1

Browse Source
This commit is contained in:
sthen 2021-10-14 14:32:54 +00:00
parent 114a9d68fc
commit 7f48129b38
6 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
telephony/asterisk/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.350 2021/08/13 19:08:03 sthen Exp $
# $OpenBSD: Makefile,v 1.351 2021/10/14 14:32:54 sthen Exp $
COMMENT-main= open source multi-protocol PBX and telephony toolkit
VER= 18.6.0
VER= 18.7.1
PJ_V= 2.10
DISTNAME= asterisk-${VER:S/beta/-beta/:S/rc/-rc/}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} pjproject-${PJ_V}.tar.bz2:0
@ -317,6 +317,7 @@ post-configure:
.if defined(MENUSELECT)
@echo "enabling menuselect options: ${MENUSELECT}"
cd ${WRKSRC}; menuselect/menuselect ${MENUSELECT}
@echo "menuselect options available/not enabled:"
@cd ${WRKSRC}; diff -u0 menuselect.makeopts{.orig,} || true
.endif

4
telephony/asterisk/distinfo
View File

@ -1,4 +1,4 @@
SHA256 (asterisk-18.6.0.tar.gz) = GhOFjftov7wyNu+OMK+vhjIPjH6UwOGlE158JdD2q1Y=
SHA256 (asterisk-18.7.1.tar.gz) = Echyhxi1mvdEQCdrqIhIS8kgEhdxnVZDbh4Ohb9TPBc=
SHA256 (pjproject-2.10.tar.bz2) = LooaSgBWLKiO6IvbaNoqnZg8RiiPc0BzKHuRamNrFZM=
SIZE (asterisk-18.6.0.tar.gz) = 27970531
SIZE (asterisk-18.7.1.tar.gz) = 27995503
SIZE (pjproject-2.10.tar.bz2) = 7339188

6
telephony/asterisk/patches/patch-apps_app_voicemail_c
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-apps_app_voicemail_c,v 1.6 2021/06/24 17:12:04 sthen Exp $
$OpenBSD: patch-apps_app_voicemail_c,v 1.7 2021/10/14 14:32:54 sthen Exp $
test for alpine-2.22's c-client and cope with API change.
parts borrowed from slackware patch for PHP with alpine-2.22.
@ -16,7 +16,7 @@ Index: apps/app_voicemail.c
#else
#include "c-client.h"
#include "imap4r1.h"
@@ -3309,7 +3312,11 @@ void mm_dlog(char *string)
@@ -3316,7 +3319,11 @@ void mm_dlog(char *string)
}
@ -28,7 +28,7 @@ Index: apps/app_voicemail.c
{
struct ast_vm_user *vmu;
@@ -3319,22 +3326,41 @@ void mm_login(NETMBX * mb, char *user, char *pwd, long
@@ -3326,22 +3333,41 @@ void mm_login(NETMBX * mb, char *user, char *pwd, long
/* We should only do this when necessary */
if (!ast_strlen_zero(authpassword)) {

8
telephony/asterisk/patches/patch-configure_ac
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-configure_ac,v 1.59 2021/03/27 15:20:38 sthen Exp $
$OpenBSD: patch-configure_ac,v 1.60 2021/10/14 14:32:54 sthen Exp $
test for alpine-2.22's c-client and cope with API change.
parts borrowed from slackware patch for PHP with alpine-2.22.
@ -8,7 +8,7 @@ last hunk: adapt to openbsd's lua directory naming
Index: configure.ac
--- configure.ac.orig
+++ configure.ac
@@ -2119,6 +2119,67 @@ if test "${USE_IMAP_TK}" != "no"; then
@@ -2120,6 +2120,67 @@ if test "${USE_IMAP_TK}" != "no"; then
[ac_cv_imap_tk="no"]
)
if test "${ac_cv_imap_tk}" = "no"; then
@ -76,7 +76,7 @@ Index: configure.ac
imap_libs="-lcrypto -lssl -lc-client4"
LIBS="${saved_libs} ${imap_libs} "`echo ${imap_ldflags}`
AC_LINK_IFELSE(
@@ -2247,6 +2308,9 @@ if test "${USE_IMAP_TK}" != "no"; then
@@ -2248,6 +2309,9 @@ if test "${USE_IMAP_TK}" != "no"; then
if test "${ac_cv_imap_tk2006}" = "yes"; then
AC_DEFINE([HAVE_IMAP_TK2006], 1, [Define if your system has the UW IMAP Toolkit c-client library version 2006 or greater.])
fi
@ -86,7 +86,7 @@ Index: configure.ac
else
AC_MSG_RESULT(no)
fi
@@ -2556,10 +2620,10 @@ fi
@@ -2557,10 +2621,10 @@ fi
AST_EXT_LIB_CHECK([OPUSFILE], [opusfile], [op_open_callbacks], [opus/opusfile.h], [], [$__opus_include])
for ver in ${LUA_VERSIONS:-5.4 5.3 5.2 5.1}; do

13
telephony/asterisk/patches/patch-res_res_rtp_asterisk_c
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-res_res_rtp_asterisk_c,v 1.10 2021/06/24 17:12:04 sthen Exp $
$OpenBSD: patch-res_res_rtp_asterisk_c,v 1.11 2021/10/14 14:32:54 sthen Exp $
libressl *does* have this now
Index: res/res_rtp_asterisk.c
--- res/res_rtp_asterisk.c.orig
+++ res/res_rtp_asterisk.c
@@ -1845,7 +1845,7 @@ static int dtls_setup_rtcp(struct ast_rtp_instance *in
@@ -1860,7 +1860,7 @@ static int dtls_setup_rtcp(struct ast_rtp_instance *in
static const SSL_METHOD *get_dtls_method(void)
{
@ -14,3 +14,12 @@ Index: res/res_rtp_asterisk.c
return DTLSv1_method();
#else
return DTLS_method();
@@ -9066,7 +9066,7 @@ static int store_stunaddr_resolved(const struct ast_dn
const unsigned char *data = (unsigned char *)ast_dns_record_get_data(record);
const int rr_type = ast_dns_record_get_rr_type(record);
- if (rr_type == ns_t_a && data_size == 4) {
+ if (rr_type == T_A && data_size == 4) {
ast_rwlock_wrlock(&stunaddr_lock);
memcpy(&stunaddr.sin_addr, data, data_size);
stunaddr.sin_family = AF_INET;

7
telephony/asterisk/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.92 2021/08/13 19:08:03 sthen Exp $
@comment $OpenBSD: PLIST-main,v 1.93 2021/10/14 14:32:55 sthen Exp $
@conflict asterisk-sounds-<=1.2.1p2
@conflict asterisk-curl-*
@conflict asterisk-fax-*
@ -283,6 +283,7 @@ lib/asterisk/modules/
@so lib/asterisk/modules/app_getcpeid.so
@so lib/asterisk/modules/app_ices.so
@so lib/asterisk/modules/app_image.so
@so lib/asterisk/modules/app_mf.so
@so lib/asterisk/modules/app_milliwatt.so
@so lib/asterisk/modules/app_minivm.so
@so lib/asterisk/modules/app_mixmonitor.so
@ -391,6 +392,7 @@ lib/asterisk/modules/
@so lib/asterisk/modules/func_enum.so
@so lib/asterisk/modules/func_env.so
@so lib/asterisk/modules/func_extstate.so
@so lib/asterisk/modules/func_frame_drop.so
@so lib/asterisk/modules/func_frame_trace.so
@so lib/asterisk/modules/func_global.so
@so lib/asterisk/modules/func_groupcount.so
@ -411,6 +413,8 @@ lib/asterisk/modules/
@so lib/asterisk/modules/func_presencestate.so
@so lib/asterisk/modules/func_rand.so
@so lib/asterisk/modules/func_realtime.so
@so lib/asterisk/modules/func_sayfiles.so
@so lib/asterisk/modules/func_scramble.so
@so lib/asterisk/modules/func_sha1.so
@so lib/asterisk/modules/func_shell.so
@so lib/asterisk/modules/func_sorcery.so
@ -548,6 +552,7 @@ lib/asterisk/modules/
@so lib/asterisk/modules/res_stir_shaken.so
@so lib/asterisk/modules/res_stun_monitor.so
@so lib/asterisk/modules/res_timing_pthread.so
@so lib/asterisk/modules/res_tonedetect.so
@so lib/asterisk/modules/res_xmpp.so
@comment lib/libasteriskpj.so
@lib lib/libasteriskpj.so.${LIBasteriskpj_VERSION}