update to asterisk-13.22.0

This commit is contained in:
sthen 2018-07-18 08:47:28 +00:00
parent 2eca0f8e0b
commit aee6279ab9
6 changed files with 14 additions and 17 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.281 2018/06/12 15:52:03 sthen Exp $
# $OpenBSD: Makefile,v 1.282 2018/07/18 08:47:28 sthen Exp $
BROKEN-aarch64= linker problems with BlocksRuntime that only show up at runtime
COMMENT-main= open source multi-protocol PBX and telephony toolkit
VER= 13.21.1
VER= 13.22.0
PJ_V= 2.7.2
PORTROACH= limitw:0,odd
DISTNAME= asterisk-${VER:S/beta/-beta/:S/rc/-rc/}

View File

@ -1,4 +1,4 @@
SHA256 (asterisk-13.21.1.tar.gz) = AT9hFVu1PBTIJE2NR3nfkx+koTmJXXpCDbmcXzOQJN8=
SHA256 (asterisk-13.22.0.tar.gz) = vVki8Z43xM/DaOAHsV5EC9jHCbXtU+VUlqAwQp7XdZ4=
SHA256 (pjproject-2.7.2.tar.bz2) = nCyCirq3Ym7fGOBLBB7ydL+qhvma3ywl/1bxUJ6BN3I=
SIZE (asterisk-13.21.1.tar.gz) = 32980220
SIZE (asterisk-13.22.0.tar.gz) = 33036487
SIZE (pjproject-2.7.2.tar.bz2) = 4994233

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-autoconf_ast_check_raii_m4,v 1.1 2017/05/26 15:30:49 sthen Exp $
$OpenBSD: patch-autoconf_ast_check_raii_m4,v 1.2 2018/07/18 08:47:28 sthen Exp $
Index: autoconf/ast_check_raii.m4
--- autoconf/ast_check_raii.m4.orig
@ -7,8 +7,8 @@ Index: autoconf/ast_check_raii.m4
AST_CLANG_BLOCKS_LIBS=""
AST_CLANG_BLOCKS="-Wno-unknown-warning-option -fblocks"
AC_MSG_RESULT(yes)
- elif test "`echo "int main(){return ^{return 42;}();}" | ${CC} -o /dev/null -fblocks -x c -lBlocksRuntime - 2>&1`" = ""; then
+ elif test "`echo "int main(){return ^{return 42;}();}" | ${CC} -o /dev/null -fblocks -x c ${LDFLAGS} -lBlocksRuntime - 2>&1`" = ""; then
- elif test "`echo 'int main(){return ^{return 42;}();}' | ${CC} -o /dev/null -fblocks -x c -lBlocksRuntime - 2>&1`" = ""; then
+ elif test "`echo 'int main(){return ^{return 42;}();}' | ${CC} -o /dev/null -fblocks -x c ${LDFLAGS} -lBlocksRuntime - 2>&1`" = ""; then
AST_CLANG_BLOCKS_LIBS="-lBlocksRuntime"
AST_CLANG_BLOCKS="-fblocks"
AC_MSG_RESULT(yes)

View File

@ -1,8 +1,8 @@
$OpenBSD: patch-contrib_scripts_ast_coredumper,v 1.3 2018/05/03 21:10:49 sthen Exp $
$OpenBSD: patch-contrib_scripts_ast_coredumper,v 1.4 2018/07/18 08:47:28 sthen Exp $
Index: contrib/scripts/ast_coredumper
--- contrib/scripts/ast_coredumper.orig
+++ contrib/scripts/ast_coredumper
@@ -232,7 +232,7 @@ declare -a ARGS_COREDUMPS
@@ -250,7 +250,7 @@ EOF
# For *BSD, the preferred gdb may be in /usr/local/bin so we
# need to search for one that supports python.
@ -11,7 +11,7 @@ Index: contrib/scripts/ast_coredumper
result=$($g --batch --ex "python print('hello')" 2>/dev/null || : )
if [[ "$result" =~ ^hello$ ]] ; then
GDB=$g
@@ -253,7 +253,7 @@ if [ -n "$OUTPUTDIR" ] ; then
@@ -271,7 +271,7 @@ if [ -n "$OUTPUTDIR" ] ; then
fi
if [ ${#COREDUMPS[@]} -eq 0 ] ; then

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-res_res_pjsip_location_c,v 1.1 2018/05/03 21:11:41 sthen Exp $
$OpenBSD: patch-res_res_pjsip_location_c,v 1.2 2018/07/18 08:47:28 sthen Exp $
Index: res/res_pjsip/location.c
--- res/res_pjsip/location.c.orig
+++ res/res_pjsip/location.c
@@ -501,7 +501,7 @@ static int expiration_str2struct(const struct aco_opti
@@ -500,7 +500,7 @@ static int expiration_str2struct(const struct aco_opti
static int expiration_struct2str(const void *obj, const intptr_t *args, char **buf)
{
const struct ast_sip_contact *contact = obj;

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.75 2018/05/03 21:10:50 sthen Exp $
@comment $OpenBSD: PLIST-main,v 1.76 2018/07/18 08:47:28 sthen Exp $
@conflict asterisk-sounds-<=1.2.1p2
@conflict asterisk-curl-*
@conflict asterisk-fax-*
@ -15,6 +15,7 @@
@pkgpath telephony/asterisk,-fax,h323
@newgroup _asterisk:545
@newuser _asterisk:545:_asterisk:daemon:asterisk user:/nonexistent:/sbin/nologin
@rcscript ${RCDIR}/asterisk
include/asterisk/
include/asterisk.h
include/asterisk/_private.h
@ -787,7 +788,3 @@ share/examples/asterisk/openbsd/voicemail.conf.sample
@owner _asterisk
@sample ${LOCALSTATEDIR}/spool/asterisk/voicemail/default/
@sample ${LOCALSTATEDIR}/spool/asterisk/voicemail/default/1234/
@mode
@owner
@group
@rcscript ${RCDIR}/asterisk