update to asterisk-16.23.0

This commit is contained in:
sthen 2021-12-10 11:19:59 +00:00
parent 9128388ad9
commit f862a17028
10 changed files with 61 additions and 45 deletions

View File

@ -1,6 +1,6 @@
# $OpenBSD: Makefile,v 1.3 2021/11/23 10:21:48 sthen Exp $
# $OpenBSD: Makefile,v 1.4 2021/12/10 11:19:59 sthen Exp $
VER= 16.22.0
VER= 16.23.0
PJ_V= 2.10
SHLIB_V= 0.0
VERSION_SPEC= >=16.0,<17.0

View File

@ -1,4 +1,4 @@
SHA256 (asterisk-16.22.0.tar.gz) = RpkkgnYoGOCW2SZUuayW1C+pUFrUvI5iimg0E3k6sm8=
SHA256 (asterisk-16.23.0.tar.gz) = wq0yvfRb/Cl6Txcs2aapjlPDDHX1+RbL0bouJODfgFQ=
SHA256 (pjproject-2.10.tar.bz2) = LooaSgBWLKiO6IvbaNoqnZg8RiiPc0BzKHuRamNrFZM=
SIZE (asterisk-16.22.0.tar.gz) = 27925083
SIZE (asterisk-16.23.0.tar.gz) = 27960909
SIZE (pjproject-2.10.tar.bz2) = 7339188

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-apps_app_voicemail_c,v 1.1 2021/11/02 12:47:08 sthen Exp $
$OpenBSD: patch-apps_app_voicemail_c,v 1.2 2021/12/10 11:19:59 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"
@@ -3421,7 +3424,11 @@ void mm_dlog(char *string)
@@ -3395,7 +3398,11 @@ void mm_dlog(char *string)
}
@ -28,7 +28,7 @@ Index: apps/app_voicemail.c
{
struct ast_vm_user *vmu;
@@ -3431,22 +3438,41 @@ void mm_login(NETMBX * mb, char *user, char *pwd, long
@@ -3405,22 +3412,41 @@ void mm_login(NETMBX * mb, char *user, char *pwd, long
/* We should only do this when necessary */
if (!ast_strlen_zero(authpassword)) {

View File

@ -1,14 +1,15 @@
$OpenBSD: patch-configs_samples_ast_debug_tools_conf_sample,v 1.1 2021/11/02 12:47:08 sthen Exp $
$OpenBSD: patch-configs_samples_ast_debug_tools_conf_sample,v 1.2 2021/12/10 11:19:59 sthen Exp $
Index: configs/samples/ast_debug_tools.conf.sample
--- configs/samples/ast_debug_tools.conf.sample.orig
+++ configs/samples/ast_debug_tools.conf.sample
@@ -18,7 +18,7 @@
@@ -24,7 +24,8 @@
# The exclusion of files ending ".txt" is just for
# demonstration purposes as non-coredumps will be ignored
# anyway.
-COREDUMPS=(/tmp/core[-._]asterisk!(*.txt) /tmp/core[-._]$(hostname)!(*.txt))
+COREDUMPS=(/var/crash/asterisk/*.core /tmp/asterisk.core)
# demonstration purposes as non-asterisk-coredumps will be
# ignored anyway.
-COREDUMPS=( /tmp/core!(*.txt) )
+#COREDUMPS=( /tmp/core!(*.txt) )
+COREDUMPS=( /var/crash/asterisk/*.core /tmp/asterisk.core )
# The directory to contain output files and work directories.
# For output from existing core files, the default is the
# OUTPUTDIR is the directory to contain output files and
# work directories.

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-configure_ac,v 1.1 2021/11/02 12:47:08 sthen Exp $
$OpenBSD: patch-configure_ac,v 1.2 2021/12/10 11:19:59 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
@@ -2118,6 +2118,67 @@ if test "${USE_IMAP_TK}" != "no"; then
@@ -2161,6 +2161,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(
@@ -2246,6 +2307,9 @@ if test "${USE_IMAP_TK}" != "no"; then
@@ -2289,6 +2350,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
@@ -2553,10 +2617,10 @@ fi
@@ -2597,10 +2661,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

View File

@ -1,23 +1,38 @@
$OpenBSD: patch-contrib_scripts_ast_coredumper,v 1.1 2021/11/02 12:47:08 sthen Exp $
$OpenBSD: patch-contrib_scripts_ast_coredumper,v 1.2 2021/12/10 11:19:59 sthen Exp $
Index: contrib/scripts/ast_coredumper
--- contrib/scripts/ast_coredumper.orig
+++ contrib/scripts/ast_coredumper
@@ -250,7 +250,7 @@ EOF
@@ -16,7 +16,8 @@ source <(sed -n -r -e "/^#@@@FUNCSSTART@@@/,\${p;/^#@@
# For *BSD, the preferred gdb may be in /usr/local/bin so we
# need to search for one that supports python.
-for g in $(which -a gdb) ; do
+for g in $(which -a egdb; which -a gdb) ; do
result=$($g --batch --ex "python print('hello')" 2>/dev/null || : )
if [[ "$result" =~ ^hello$ ]] ; then
GDB=$g
@@ -271,7 +271,7 @@ if [ -n "$OUTPUTDIR" ] ; then
fi
# The "!(*.txt)" is a bash construct that excludes files ending with .txt
# from the glob match.
-declare -a COREDUMPS=( /tmp/core!(*.txt) )
+#declare -a COREDUMPS=( /tmp/core!(*.txt) )
+declare -a COREDUMPS=( /var/crash/asterisk/*.core /tmp/asterisk.core )
if [ ${#COREDUMPS[@]} -eq 0 ] ; then
- COREDUMPS+=(/tmp/core[-._]asterisk!(*.txt) /tmp/core[-._]$(hostname)!(*.txt))
+ COREDUMPS+=(/var/crash/asterisk/*.core /tmp/asterisk.core)
fi
# A line starting with ': ' is a POSIX construct that makes the shell
# perform the operation but ignore the result. This is an alternative to
@@ -27,7 +28,7 @@ declare -a COREDUMPS=( /tmp/core!(*.txt) )
: ${DELETE_COREDUMPS_AFTER:=false}
: ${DELETE_RESULTS_AFTER:=false}
: ${DRY_RUN:=false}
-: ${GDB:=$(which gdb)}
+: ${GDB:=$(which egdb)}
: ${HELP:=false}
: ${LATEST:=false}
: ${OUTPUTDIR:=/tmp}
@@ -562,11 +563,8 @@ DESCRIPTION
A list of coredumps or coredump search patterns. These
will override the default and those specified in the config files.
DATEFORMAT=${DATEFORMAT:-'date +%FT%H-%M-%S%z'}
- The default pattern is "/tmp/core!(*.txt)"
-
- The "!(*.txt)" tells bash to ignore any files that match
- the base pattern and end in ".txt". It$'s not strictly
- needed as non asterisk coredumps are always ignored.
+ The default pattern in the OpenBSD package is
+ "/var/crash/asterisk/*.core /tmp/asterisk.core"
NOTES
You must be root to use this program.

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-main_audiohook_c,v 1.1 2021/11/02 12:47:09 sthen Exp $
$OpenBSD: patch-main_audiohook_c,v 1.2 2021/12/10 11:19:59 sthen Exp $
Raise level of audiohook debug messages, they are very frequent on OpenBSD
making any debug levels unusable.
@ -6,7 +6,7 @@ making any debug levels unusable.
Index: main/audiohook.c
--- main/audiohook.c.orig
+++ main/audiohook.c
@@ -272,19 +272,19 @@ static struct ast_frame *audiohook_read_frame_both(str
@@ -254,19 +254,19 @@ static struct ast_frame *audiohook_read_frame_both(str
if (!usable_read && !usable_write) {
/* If both factories are unusable bail out */
@ -29,7 +29,7 @@ Index: main/audiohook.c
return NULL;
}
@@ -309,7 +309,7 @@ static struct ast_frame *audiohook_read_frame_both(str
@@ -291,7 +291,7 @@ static struct ast_frame *audiohook_read_frame_both(str
}
}
} else {
@ -38,7 +38,7 @@ Index: main/audiohook.c
}
/* Move on to the write factory... if there are enough samples, read them in */
@@ -333,7 +333,7 @@ static struct ast_frame *audiohook_read_frame_both(str
@@ -315,7 +315,7 @@ static struct ast_frame *audiohook_read_frame_both(str
}
}
} else {

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-main_utils_c,v 1.1 2021/11/02 12:47:09 sthen Exp $
$OpenBSD: patch-main_utils_c,v 1.2 2021/12/10 11:19:59 sthen Exp $
Index: main/utils.c
--- main/utils.c.orig
+++ main/utils.c
@@ -2515,6 +2515,8 @@ int ast_get_tid(void)
@@ -2659,6 +2659,8 @@ int ast_get_tid(void)
long lwpid;
thr_self(&lwpid); /* available since sys/thr.h creation 2003 */
ret = lwpid;

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-res_res_odbc_c,v 1.1 2021/11/02 12:47:09 sthen Exp $
$OpenBSD: patch-res_res_odbc_c,v 1.2 2021/12/10 11:19:59 sthen Exp $
Index: res/res_odbc.c
--- res/res_odbc.c.orig
+++ res/res_odbc.c
@@ -1038,7 +1038,7 @@ static odbc_status odbc_obj_connect(struct odbc_obj *o
@@ -1029,7 +1029,7 @@ static odbc_status odbc_obj_connect(struct odbc_obj *o
/* Dont connect while server is marked as unreachable via negative_connection_cache */
negative_cache_expiration = obj->parent->last_negative_connect.tv_sec + obj->parent->negative_connection_cache.tv_sec;
if (time(NULL) < negative_cache_expiration) {

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-res_res_pjsip_registrar_c,v 1.1 2021/11/02 12:47:09 sthen Exp $
$OpenBSD: patch-res_res_pjsip_registrar_c,v 1.2 2021/12/10 11:19:59 sthen Exp $
Index: res/res_pjsip_registrar.c
--- res/res_pjsip_registrar.c.orig
+++ res/res_pjsip_registrar.c
@@ -1373,7 +1373,7 @@ static void *check_expiration_thread(void *data)
@@ -1370,7 +1370,7 @@ static void *check_expiration_thread(void *data)
while (check_interval) {
sleep(check_interval);