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

update to asterisk-13.21.0

Browse Source
This commit is contained in:
sthen 2018-05-03 21:10:49 +00:00
parent b0ffc09fc2
commit 33c17030a7
8 changed files with 54 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
telephony/asterisk/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.278 2018/03/16 20:57:09 sthen Exp $
# $OpenBSD: Makefile,v 1.279 2018/05/03 21:10:49 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.20.0
PJ_V= 2.7.1
VER= 13.21.0
PJ_V= 2.7.2
PORTROACH= limitw:0,odd
DISTNAME= asterisk-${VER:S/beta/-beta/:S/rc/-rc/}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} pjproject-${PJ_V}.tar.bz2:0
@ -25,26 +25,27 @@ PERMIT_PACKAGE_CDROM= patent licensing clauses
PERMIT_PACKAGE_FTP= Yes
WANTLIB-main += ${MODGCC4_CPPWANTLIB}
# XXX somehow COMPILER_LIBCXX doesn't get set to gcc libs?
WANTLIB-main += c crypto curl curses edit execinfo gsm iconv iksemel
WANTLIB-main += jansson lzma m nghttp2 ogg portaudio pthread spandsp
WANTLIB-main += sqlite3 ssl tiff uriparser uuid vorbis vorbisenc
WANTLIB-main += vorbisfile xml2 xslt z
WANTLIB-main += jansson lzma m nghttp2 ogg portaudio pthread radcli
WANTLIB-main += spandsp sqlite3 ssl tiff uriparser uuid vorbis
WANTLIB-main += vorbisenc vorbisfile xml2 xslt z
# XXX Requires either nested functions (gcc only), or -fblocks (clang).
# Asterisk requires either nested functions (gcc extension), or -fblocks (clang).
# However -fblocks fails:
#
# With clang -fblocks, configure test fails on ld.bfd arches:
# - configure test fails on ld.bfd arches:
#
# echo 'int main(){return ^{return 42;}();}' | \
# clang -o /tmp/blockstest -fblocks -x c -L/usr/local/lib -lBlocksRuntime -
#
# -> undefined reference to `_NSConcreteGlobalBlock'
#
# Runtime fails on ld.lld arches: dlopen()ing the .so modules results in
# - runtime fails on ld.lld arches: dlopen()ing the .so modules results in
# undefined symbols from the BlocksRuntime lib.
#
# keep telephony/asterisk-g729 in sync with this
# If changing this, keep telephony/asterisk-g729 in sync.
COMPILER= base-gcc ports-gcc
COMPILER_LANGS= c
SHARED_LIBS+= asteriskssl 0.0 # 1
SHARED_LIBS+= asteriskpj 0.0 # 2
@ -64,6 +65,7 @@ LIB_DEPENDS-main= ${MODGCC4_CPPLIBDEP} \
devel/jansson \
graphics/tiff \
net/curl \
net/radcli \
sysutils/e2fsprogs \
telephony/spandsp \
textproc/iksemel \
@ -135,7 +137,6 @@ CONFIGURE_ARGS+= --with-asound=no \
CONFIGURE_ARGS+= --with-jack=no \
--with-lua=no \
--with-radius=no \
--with-resample=no
# Some build options (including a useful malloc debug) are available

8
telephony/asterisk/distinfo
View File

@ -1,4 +1,4 @@
SHA256 (asterisk-13.20.0.tar.gz) = o9bZU/hEhn6hHgviLuYiUEnNT1hw32qyNFRiO8+8lNU=
SHA256 (pjproject-2.7.1.tar.bz2) = Wfq8YqArK4CFcpfPsQ4saMRz9KCsxuhIz+/oQh8sMSY=
SIZE (asterisk-13.20.0.tar.gz) = 32986236
SIZE (pjproject-2.7.1.tar.bz2) = 4880007
SHA256 (asterisk-13.21.0.tar.gz) = cwQ+Tnch8++Rm0cJMuDDA+miEMdeLPtmlxGlFXH3lDg=
SHA256 (pjproject-2.7.2.tar.bz2) = nCyCirq3Ym7fGOBLBB7ydL+qhvma3ywl/1bxUJ6BN3I=
SIZE (asterisk-13.21.0.tar.gz) = 32998111
SIZE (pjproject-2.7.2.tar.bz2) = 4994233

4
telephony/asterisk/patches/patch-build_tools_cflags_xml
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-build_tools_cflags_xml,v 1.10 2017/09/01 09:55:28 sthen Exp $
$OpenBSD: patch-build_tools_cflags_xml,v 1.11 2018/05/03 21:10:49 sthen Exp $
Index: build_tools/cflags.xml
--- build_tools/cflags.xml.orig
+++ build_tools/cflags.xml
@ -10,7 +10,7 @@ Index: build_tools/cflags.xml
</member>
<member name="COMPILE_DOUBLE" displayname="Pre-compile with optimizations to detect errors, then discard and recompile with DONT_OPTIMIZE. Creates intermediate .i files">
<depend>DONT_OPTIMIZE</depend>
@@ -130,7 +131,7 @@
@@ -128,7 +129,7 @@
</member>
<member name="BUILD_NATIVE" displayname="Allow compiler to generate code optimized for the CPU on which the build is performed.">
<support_level>core</support_level>

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

@ -1,13 +0,0 @@
$OpenBSD: patch-configure_ac,v 1.50 2018/03/15 23:00:19 sthen Exp $
Index: configure.ac
--- configure.ac.orig
+++ configure.ac
@@ -2136,7 +2136,7 @@ AST_EXT_TOOL_CHECK([NETSNMP], [net-snmp-config], , [--
AST_EXT_LIB_CHECK([NEWT], [newt], [newtBell], [newt.h])
-AST_EXT_LIB_CHECK([UNIXODBC], [odbc], [SQLConnect], [sql.h], [])
+AST_EXT_LIB_CHECK([UNIXODBC], [iodbc], [SQLConnect], [sql.h], [-lpthread])
AST_EXT_LIB_CHECK([OGG], [ogg], [ogg_sync_init], [])

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

@ -1,8 +1,8 @@
$OpenBSD: patch-contrib_scripts_ast_coredumper,v 1.2 2018/01/14 13:11:48 sthen Exp $
$OpenBSD: patch-contrib_scripts_ast_coredumper,v 1.3 2018/05/03 21:10:49 sthen Exp $
Index: contrib/scripts/ast_coredumper
--- contrib/scripts/ast_coredumper.orig
+++ contrib/scripts/ast_coredumper
@@ -231,7 +231,7 @@ declare -a ARGS_COREDUMPS
@@ -232,7 +232,7 @@ declare -a ARGS_COREDUMPS
# 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
@@ -252,7 +252,7 @@ if [ -n "$OUTPUTDIR" ] ; then
@@ -253,7 +253,7 @@ if [ -n "$OUTPUTDIR" ] ; then
fi
if [ ${#COREDUMPS[@]} -eq 0 ] ; then

47
telephony/asterisk/patches/patch-third-party_pjproject_source_pjlib_src_pj_ssl_sock_ossl_c
View File

@ -1,6 +1,7 @@
$OpenBSD: patch-third-party_pjproject_source_pjlib_src_pj_ssl_sock_ossl_c,v 1.4 2018/01/15 09:43:45 sthen Exp $
$OpenBSD: patch-third-party_pjproject_source_pjlib_src_pj_ssl_sock_ossl_c,v 1.5 2018/05/03 21:10:49 sthen Exp $
excise openssl-1.0.2 EC and various openssl-1.1.0 pieces
we don't have SSL_get_shared_curve, SSL_set1_curves, SSL_CTX_set1_curves,
SSL_set1_{client_,}sigalgs_list etc.
Index: third-party/pjproject/source/pjlib/src/pj/ssl_sock_ossl.c
--- third-party/pjproject/source/pjlib/src/pj/ssl_sock_ossl.c.orig
@ -14,34 +15,7 @@ Index: third-party/pjproject/source/pjlib/src/pj/ssl_sock_ossl.c
# include <openssl/obj_mac.h>
@@ -111,7 +111,7 @@ static unsigned get_nid_from_cid(unsigned cid)
#endif
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+#if !defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L
# 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)
@@ -535,7 +535,7 @@ static pj_status_t init_openssl(void)
pj_assert(status == PJ_SUCCESS);
/* Init OpenSSL lib */
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if defined(LIBRESSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L
SSL_library_init();
SSL_load_error_strings();
#else
@@ -569,7 +569,7 @@ static pj_status_t init_openssl(void)
meth = (SSL_METHOD*)SSLv2_server_method();
#endif
-#else
+#else /* ok with libressl */
/* Specific version methods are deprecated in 1.1.0 */
meth = (SSL_METHOD*)TLS_method();
#endif
@@ -599,7 +599,7 @@ static pj_status_t init_openssl(void)
@@ -600,7 +600,7 @@ static pj_status_t init_openssl(void)
SSL_set_session(ssl, SSL_SESSION_new());
@ -50,16 +24,7 @@ Index: third-party/pjproject/source/pjlib/src/pj/ssl_sock_ossl.c
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);
@@ -807,7 +807,7 @@ static pj_status_t create_ssl(pj_ssl_sock_t *ssock)
#endif
break;
}
-#else
+#else /* ok with libressl */
/* Specific version methods are deprecated in 1.1.0 */
ssl_method = (SSL_METHOD*)TLS_method();
#endif
@@ -1228,7 +1228,7 @@ static pj_status_t set_cipher_list(pj_ssl_sock_t *ssoc
@@ -1229,7 +1229,7 @@ static pj_status_t set_cipher_list(pj_ssl_sock_t *ssoc
static pj_status_t set_curves_list(pj_ssl_sock_t *ssock)
{
@ -68,7 +33,7 @@ Index: third-party/pjproject/source/pjlib/src/pj/ssl_sock_ossl.c
int ret;
int curves[PJ_SSL_SOCK_MAX_CURVES];
unsigned cnt;
@@ -1259,7 +1259,7 @@ static pj_status_t set_curves_list(pj_ssl_sock_t *ssoc
@@ -1260,7 +1260,7 @@ static pj_status_t set_curves_list(pj_ssl_sock_t *ssoc
static pj_status_t set_sigalgs(pj_ssl_sock_t *ssock)
{

12
telephony/asterisk/patches/patch-utils_Makefile
View File

@ -1,11 +1,13 @@
$OpenBSD: patch-utils_Makefile,v 1.5 2015/10/12 22:07:29 sthen Exp $
--- utils/Makefile.orig Sun Oct 11 22:53:21 2015
+++ utils/Makefile Sun Oct 11 22:53:10 2015
@@ -168,6 +168,7 @@ threadstorage.c: $(ASTTOPDIR)/main/threadstorage.c
$OpenBSD: patch-utils_Makefile,v 1.6 2018/05/03 21:10:49 sthen Exp $
Index: utils/Makefile
--- utils/Makefile.orig
+++ utils/Makefile
@@ -168,7 +168,7 @@ threadstorage.c: $(ASTTOPDIR)/main/threadstorage.c
extconf.o: extconf.c
+conf2ael: LIBS+=-lpthread
-conf2ael: LIBS+=$(AST_CLANG_BLOCKS_LIBS)
+conf2ael: LIBS+=$(AST_CLANG_BLOCKS_LIBS) -lpthread
conf2ael: conf2ael.o ast_expr2f.o ast_expr2.o hashtab.o lock.o aelbison.o aelparse.o pbx_ael.o pval.o extconf.o strcompat.o
check_expr2: $(ASTTOPDIR)/main/ast_expr2f.c $(ASTTOPDIR)/main/ast_expr2.c $(ASTTOPDIR)/main/ast_expr2.h

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

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.74 2018/03/16 20:57:09 sthen Exp $
@comment $OpenBSD: PLIST-main,v 1.75 2018/05/03 21:10:50 sthen Exp $
@conflict asterisk-sounds-<=1.2.1p2
@conflict asterisk-curl-*
@conflict asterisk-fax-*
@ -300,10 +300,12 @@ lib/asterisk/modules/bridge_softmix.so
lib/asterisk/modules/cdr_csv.so
lib/asterisk/modules/cdr_custom.so
lib/asterisk/modules/cdr_manager.so
lib/asterisk/modules/cdr_radius.so
lib/asterisk/modules/cdr_sqlite3_custom.so
lib/asterisk/modules/cdr_syslog.so
lib/asterisk/modules/cel_custom.so
lib/asterisk/modules/cel_manager.so
lib/asterisk/modules/cel_radius.so
lib/asterisk/modules/cel_sqlite3_custom.so
lib/asterisk/modules/chan_bridge_media.so
lib/asterisk/modules/chan_console.so
@ -343,7 +345,6 @@ lib/asterisk/modules/format_vox.so
lib/asterisk/modules/format_wav.so
lib/asterisk/modules/format_wav_gsm.so
lib/asterisk/modules/func_aes.so
lib/asterisk/modules/func_audiohookinherit.so
lib/asterisk/modules/func_base64.so
lib/asterisk/modules/func_blacklist.so
lib/asterisk/modules/func_callcompletion.so
@ -480,7 +481,6 @@ lib/asterisk/modules/res_pjsip_publish_asterisk.so
lib/asterisk/modules/res_pjsip_pubsub.so
lib/asterisk/modules/res_pjsip_refer.so
lib/asterisk/modules/res_pjsip_registrar.so
lib/asterisk/modules/res_pjsip_registrar_expire.so
lib/asterisk/modules/res_pjsip_rfc3326.so
lib/asterisk/modules/res_pjsip_sdp_rtp.so
lib/asterisk/modules/res_pjsip_send_to_voicemail.so
@ -769,25 +769,25 @@ share/examples/asterisk/openbsd/voicemail.conf.sample
@sample ${SYSCONFDIR}/asterisk/voicemail.conf
@mode 750
@owner _asterisk
@sample /var/spool/asterisk/
@sample /var/spool/asterisk/dictate/
@sample /var/spool/asterisk/meetme/
@sample /var/spool/asterisk/monitor/
@sample /var/spool/asterisk/outgoing/
@sample /var/spool/asterisk/system/
@sample /var/spool/asterisk/tmp/
@sample ${LOCALSTATEDIR}/spool/asterisk/
@sample ${LOCALSTATEDIR}/spool/asterisk/dictate/
@sample ${LOCALSTATEDIR}/spool/asterisk/meetme/
@sample ${LOCALSTATEDIR}/spool/asterisk/monitor/
@sample ${LOCALSTATEDIR}/spool/asterisk/outgoing/
@sample ${LOCALSTATEDIR}/spool/asterisk/system/
@sample ${LOCALSTATEDIR}/spool/asterisk/tmp/
@mode 770
@owner root
@sample /var/db/asterisk/
@sample /var/log/asterisk/
@sample /var/log/asterisk/cdr-csv/
@sample /var/log/asterisk/cdr-custom/
@sample /var/spool/asterisk/voicemail/
@sample ${LOCALSTATEDIR}/db/asterisk/
@sample ${LOCALSTATEDIR}/log/asterisk/
@sample ${LOCALSTATEDIR}/log/asterisk/cdr-csv/
@sample ${LOCALSTATEDIR}/log/asterisk/cdr-custom/
@sample ${LOCALSTATEDIR}/spool/asterisk/voicemail/
@mode 755
@owner _asterisk
@sample /var/spool/asterisk/voicemail/default/
@sample /var/spool/asterisk/voicemail/default/1234/
@group
@owner
@sample ${LOCALSTATEDIR}/spool/asterisk/voicemail/default/
@sample ${LOCALSTATEDIR}/spool/asterisk/voicemail/default/1234/
@mode
@owner
@group
@rcscript ${RCDIR}/asterisk