UPDATE: telephony/asterisk

classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

UPDATE: telephony/asterisk

Stuart Henderson
I'd be interested in any test reports, this needs the telephony/pjsua
update that I committed earlier today.

asterisk-g729 update to go with this available on request (needs
earlier submitted bcg729 port), but I guess most people using asterisk
probably aren't using g729.

Index: Makefile
===================================================================
RCS file: /cvs/ports/telephony/asterisk/Makefile,v
retrieving revision 1.219
diff -u -p -r1.219 Makefile
--- Makefile 21 Sep 2015 14:10:21 -0000 1.219
+++ Makefile 9 Oct 2015 22:18:57 -0000
@@ -1,11 +1,10 @@
-# $OpenBSD: Makefile,v 1.219 2015/09/21 14:10:21 sthen Exp $
+# $OpenBSD: Makefile,v 1.215 2015/04/02 17:09:30 sthen Exp $
 
 SHARED_ONLY= Yes
 
 COMMENT-main= open source multi-protocol PBX and telephony toolkit
 
-VER= 11.18.0
-REVISION-main= 0
+VER= 13.5.0
 PORTROACH= limitw:0,odd
 DISTNAME= asterisk-${VER:S/beta/-beta/:S/rc/-rc/}
 PKGNAME-main= asterisk-${VER}
@@ -23,10 +22,10 @@ MAINTAINER= Stuart Henderson <sthen@ope
 PERMIT_PACKAGE_CDROM= patent licensing clauses
 PERMIT_PACKAGE_FTP= Yes
 
-WANTLIB-main += avcodec avformat avutil c crypto curl execinfo gsm idn
-WANTLIB-main += iksemel m ogg opencore-amrnb portaudio pthread spandsp
-WANTLIB-main += sqlite3 ssl stdc++ swscale termcap tiff uuid vorbis
-WANTLIB-main += vorbisenc vorbisfile xml2 z ${MODGETTEXT_WANTLIB}
+WANTLIB-main += c crypto curl execinfo gsm idn iksemel jansson m ogg
+WANTLIB-main += ogg portaudio pthread spandsp sqlite3 ssl stdc++ termcap
+WANTLIB-main += tiff uriparser uuid vorbis vorbisenc vorbisfile xml2 z
+WANTLIB-main += ${MODGETTEXT_WANTLIB}
 
 SHARED_LIBS= asteriskssl 0.0 # 1
 
@@ -40,16 +39,17 @@ PSEUDO_FLAVORS= no_calendar no_http_pos
 LIB_DEPENDS-main= audio/gsm \
  audio/libogg \
  audio/libvorbis \
- audio/opencore-amr \
  audio/portaudio-svn \
  devel/libexecinfo \
- graphics/ffmpeg \
+ devel/jansson \
  graphics/tiff \
  net/curl \
  sysutils/e2fsprogs \
+ telephony/pjsua,-main \
  telephony/spandsp \
  textproc/iksemel \
  textproc/libxml \
+ www/uriparser \
  ${MODGETTEXT_LIB_DEPENDS}
 RUN_DEPENDS-main= ${MODGETTEXT_RUN_DEPENDS} \
  telephony/asterisk-sounds/core-sounds/en,gsm>=1.4.25 \
@@ -249,7 +249,7 @@ post-install:
  ${PREFIX}/share/doc/asterisk
  ${INSTALL_DATA_DIR} ${EXAMPLEDIR}/openbsd
 .for i in ${EXAMPLEFILES}
- @${SUBST_CMD} -m 0644 -c ${FILESDIR}/$i.sample \
+ @${SUBST_CMD} -c ${FILESDIR}/$i.sample \
     ${EXAMPLEDIR}/openbsd/$i.sample
 .endfor
  ${INSTALL_DATA} ${WRKSRC}/contrib/scripts/asterisk.ldif \
Index: distinfo
===================================================================
RCS file: /cvs/ports/telephony/asterisk/distinfo,v
retrieving revision 1.133
diff -u -p -r1.133 distinfo
--- distinfo 8 Jun 2015 08:44:52 -0000 1.133
+++ distinfo 9 Oct 2015 22:18:57 -0000
@@ -1,2 +1,2 @@
-SHA256 (asterisk-11.18.0.tar.gz) = YFuCPiNixUNRKgr3Qn2xI8O4Ru30W+1yIjLMNciCSxA=
-SIZE (asterisk-11.18.0.tar.gz) = 34831035
+SHA256 (asterisk-13.5.0.tar.gz) = 6LjQcfeD7eqC3lEBlN0nIHD/u3zbL19rAgvl0Vtn6Lk=
+SIZE (asterisk-13.5.0.tar.gz) = 32107014
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/telephony/asterisk/patches/patch-Makefile,v
retrieving revision 1.36
diff -u -p -r1.36 patch-Makefile
--- patches/patch-Makefile 8 Jun 2015 08:44:52 -0000 1.36
+++ patches/patch-Makefile 9 Oct 2015 22:18:57 -0000
@@ -1,7 +1,7 @@
-$OpenBSD: patch-Makefile,v 1.36 2015/06/08 08:44:52 sthen Exp $
---- Makefile.orig Thu Jun  4 01:44:42 2015
-+++ Makefile Fri Jun  5 10:41:19 2015
-@@ -126,7 +126,7 @@ ASTTOPDIR:=$(subst $(space),\$(space),$(CURDIR))
+$OpenBSD$
+--- Makefile.orig Fri Aug  7 20:14:21 2015
++++ Makefile Fri Oct  9 15:30:56 2015
+@@ -128,7 +128,7 @@ ASTTOPDIR:=$(subst $(space),\$(space),$(CURDIR))
  OVERWRITE=y
 
  # Include debug and macro symbols in the executables (-g) and profiling info (-pg)
@@ -10,7 +10,7 @@ $OpenBSD: patch-Makefile,v 1.36 2015/06/
 
  # Asterisk.conf is located in ASTETCDIR or by using the -C flag
  # when starting Asterisk
-@@ -178,7 +178,9 @@ endif
+@@ -183,7 +183,9 @@ endif
 
  ifeq ($(findstring -save-temps,$(_ASTCFLAGS) $(ASTCFLAGS)),)
    ifeq ($(findstring -pipe,$(_ASTCFLAGS) $(ASTCFLAGS)),)
Index: patches/patch-bootstrap_sh
===================================================================
RCS file: /cvs/ports/telephony/asterisk/patches/patch-bootstrap_sh,v
retrieving revision 1.4
diff -u -p -r1.4 patch-bootstrap_sh
--- patches/patch-bootstrap_sh 13 Mar 2012 23:17:46 -0000 1.4
+++ patches/patch-bootstrap_sh 9 Oct 2015 22:18:57 -0000
@@ -1,6 +1,6 @@
-$OpenBSD: patch-bootstrap_sh,v 1.4 2012/03/13 23:17:46 sthen Exp $
---- bootstrap.sh.orig Fri Jan 13 21:40:32 2012
-+++ bootstrap.sh Tue Mar  6 14:23:21 2012
+$OpenBSD$
+--- bootstrap.sh.orig Fri Jan 13 21:42:12 2012
++++ bootstrap.sh Thu Feb 19 21:08:57 2015
 @@ -18,8 +18,8 @@ case `uname -sr` in
  MY_AM_VER=19
  ;;
Index: patches/patch-channels_chan_sip_c
===================================================================
RCS file: patches/patch-channels_chan_sip_c
diff -N patches/patch-channels_chan_sip_c
--- patches/patch-channels_chan_sip_c 8 Jun 2015 08:44:52 -0000 1.24
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,36 +0,0 @@
-$OpenBSD: patch-channels_chan_sip_c,v 1.24 2015/06/08 08:44:52 sthen Exp $
-
-https://issues.asterisk.org/jira/secure/attachment/46850/fax-deadlock-v2.patch-11.3.0
-
---- channels/chan_sip.c.orig Thu Jun  4 01:44:42 2015
-+++ channels/chan_sip.c Fri Jun  5 10:41:19 2015
-@@ -8306,8 +8306,6 @@ static struct ast_frame *sip_read(struct ast_channel *
- ast_channel_unlock(ast);
- if (ast_exists_extension(ast, target_context, "fax", 1,
- S_COR(ast_channel_caller(ast)->id.number.valid, ast_channel_caller(ast)->id.number.str, NULL))) {
-- ast_channel_lock(ast);
-- sip_pvt_lock(p);
- ast_verb(2, "Redirecting '%s' to fax extension due to CNG detection\n", ast_channel_name(ast));
- pbx_builtin_setvar_helper(ast, "FAXEXTEN", ast_channel_exten(ast));
- if (ast_async_goto(ast, target_context, "fax", 1)) {
-@@ -8316,10 +8314,10 @@ static struct ast_frame *sip_read(struct ast_channel *
- ast_frfree(fr);
- fr = &ast_null_frame;
- } else {
-- ast_channel_lock(ast);
-- sip_pvt_lock(p);
- ast_log(LOG_NOTICE, "FAX CNG detected but no fax extension\n");
- }
-+ ast_channel_lock(ast);
-+ sip_pvt_lock(p);
- }
- }
-
-@@ -10632,6 +10630,7 @@ static int process_sdp(struct sip_pvt *p, struct sip_r
- ast_channel_unlock(p->owner);
- if (ast_exists_extension(p->owner, target_context, "fax", 1,
- S_COR(ast_channel_caller(p->owner)->id.number.valid, ast_channel_caller(p->owner)->id.number.str, NULL))) {
-+ ast_log(LOG_WARNING, "Usage of 'faxdetect=[yes|t38]' setting in sip.conf is not recommended. Please consider Set(FAXOPT(faxdetect)=[yes|t38]) instead.\n");
- ast_verb(2, "Redirecting '%s' to fax extension due to peer T.38 re-INVITE\n", ast_channel_name(p->owner));
- pbx_builtin_setvar_helper(p->owner, "FAXEXTEN", ast_channel_exten(p->owner));
- if (ast_async_goto(p->owner, target_context, "fax", 1)) {
Index: patches/patch-configs_asterisk_conf_sample
===================================================================
RCS file: patches/patch-configs_asterisk_conf_sample
diff -N patches/patch-configs_asterisk_conf_sample
--- patches/patch-configs_asterisk_conf_sample 31 May 2014 00:35:31 -0000 1.7
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,41 +0,0 @@
-$OpenBSD: patch-configs_asterisk_conf_sample,v 1.7 2014/05/31 00:35:31 sthen Exp $
---- configs/asterisk.conf.sample.orig Fri Apr  4 19:46:18 2014
-+++ configs/asterisk.conf.sample Thu May 29 21:32:09 2014
-@@ -60,8 +60,8 @@ astsbindir => /usr/sbin
- ; not otherwise require one.
- ;transcode_via_sln = yes ; Build transcode paths via SLINEAR, instead of
- ; directly.
--;runuser = asterisk ; The user to run as.
--;rungroup = asterisk ; The group to run as.
-+runuser = _asterisk ; The user to run as.
-+rungroup = _asterisk ; The group to run as.
- ;lightbackground = yes ; If your terminal is set for a light-colored
- ; background.
- ;forceblackbackground = yes     ; Force the background of the terminal to be
-@@ -82,7 +82,8 @@ documentation_language = en_US ; Set the language you
- ; gosub - Invoke the stdexten using a gosub as
- ;         documented in extensions.conf.sample.
- ; Default gosub.
--;live_dangerously = no ; Enable the execution of 'dangerous' dialplan
-+live_dangerously = no
-+;live_dangerously = yes ; Enable the execution of 'dangerous' dialplan
- ; functions from external sources (AMI,
- ; etc.) These functions (such as SHELL) are
- ; considered dangerous because they can allow
-@@ -90,11 +91,11 @@ documentation_language = en_US ; Set the language you
- ; Default yes, for backward compatability.
-
- ; Changing the following lines may compromise your security.
--;[files]
--;astctlpermissions = 0660
--;astctlowner = root
--;astctlgroup = apache
--;astctl = asterisk.ctl
-+[files]
-+astctlpermissions = 0660
-+astctlowner = _asterisk
-+astctlgroup = wheel
-+astctl = asterisk.ctl
-
- [compat]
- pbx_realtime=1.6
Index: patches/patch-configs_res_odbc_conf_sample
===================================================================
RCS file: patches/patch-configs_res_odbc_conf_sample
diff -N patches/patch-configs_res_odbc_conf_sample
--- patches/patch-configs_res_odbc_conf_sample 31 May 2014 00:35:31 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-configs_res_odbc_conf_sample,v 1.4 2014/05/31 00:35:31 sthen Exp $
---- configs/res_odbc.conf.sample.orig Mon Apr  7 15:48:07 2014
-+++ configs/res_odbc.conf.sample Thu May 29 21:32:09 2014
-@@ -19,8 +19,7 @@
- ; If not specified, it is assumed the section is enabled.
- enabled => no
- ;
--; This value should match an entry in /etc/odbc.ini
--; (or /usr/local/etc/odbc.ini, on FreeBSD and similar systems).
-+; This value should match an entry in /etc/iodbc/odbc.ini
- dsn => asterisk
- ;
- ; Username for connecting to the database.  The user defaults to the context
Index: patches/patch-configs_samples_asterisk_conf_sample
===================================================================
RCS file: patches/patch-configs_samples_asterisk_conf_sample
diff -N patches/patch-configs_samples_asterisk_conf_sample
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-configs_samples_asterisk_conf_sample 9 Oct 2015 22:18:57 -0000
@@ -0,0 +1,38 @@
+$OpenBSD$
+--- configs/samples/asterisk.conf.sample.orig Thu Jul 17 22:17:28 2014
++++ configs/samples/asterisk.conf.sample Thu Feb 19 21:09:28 2015
+@@ -60,8 +60,8 @@ astsbindir => /usr/sbin
+ ; not otherwise require one.
+ ;transcode_via_sln = yes ; Build transcode paths via SLINEAR, instead of
+ ; directly.
+-;runuser = asterisk ; The user to run as.
+-;rungroup = asterisk ; The group to run as.
++runuser = _asterisk ; The user to run as.
++rungroup = _asterisk ; The group to run as.
+ ;lightbackground = yes ; If your terminal is set for a light-colored
+ ; background.
+ ;forceblackbackground = yes     ; Force the background of the terminal to be
+@@ -82,7 +82,8 @@ documentation_language = en_US ; Set the language you
+ ; gosub - Invoke the stdexten using a gosub as
+ ;         documented in extensions.conf.sample.
+ ; Default gosub.
+-;live_dangerously = no ; Enable the execution of 'dangerous' dialplan
++live_dangerously = no
++;live_dangerously = yes ; Enable the execution of 'dangerous' dialplan
+ ; functions from external sources (AMI,
+ ; etc.) These functions (such as SHELL) are
+ ; considered dangerous because they can allow
+@@ -90,8 +91,8 @@ documentation_language = en_US ; Set the language you
+ ; Default no
+
+ ; Changing the following lines may compromise your security.
+-;[files]
+-;astctlpermissions = 0660
+-;astctlowner = root
+-;astctlgroup = apache
+-;astctl = asterisk.ctl
++[files]
++astctlpermissions = 0660
++astctlowner = _asterisk
++astctlgroup = wheel
++astctl = asterisk.ctl
Index: patches/patch-configs_samples_res_odbc_conf_sample
===================================================================
RCS file: patches/patch-configs_samples_res_odbc_conf_sample
diff -N patches/patch-configs_samples_res_odbc_conf_sample
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-configs_samples_res_odbc_conf_sample 9 Oct 2015 22:18:57 -0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+--- configs/samples/res_odbc.conf.sample.orig Thu Jul 17 22:17:28 2014
++++ configs/samples/res_odbc.conf.sample Thu Feb 19 21:08:57 2015
+@@ -19,8 +19,7 @@
+ ; If not specified, it is assumed the section is enabled.
+ enabled => no
+ ;
+-; This value should match an entry in /etc/odbc.ini
+-; (or /usr/local/etc/odbc.ini, on FreeBSD and similar systems).
++; This value should match an entry in /etc/iodbc/odbc.ini
+ dsn => asterisk
+ ;
+ ; Username for connecting to the database.  The user defaults to the context name if unspecified.
Index: patches/patch-configs_samples_sip_conf_sample
===================================================================
RCS file: patches/patch-configs_samples_sip_conf_sample
diff -N patches/patch-configs_samples_sip_conf_sample
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-configs_samples_sip_conf_sample 9 Oct 2015 22:18:57 -0000
@@ -0,0 +1,18 @@
+$OpenBSD$
+--- configs/samples/sip.conf.sample.orig Sun Sep 14 16:53:35 2014
++++ configs/samples/sip.conf.sample Thu Feb 19 21:08:57 2015
+@@ -158,11 +158,11 @@ allowoverlap=no                 ; Disable overlap dial
+ ;  a) Listen on a specific IPv4 address.      Example: bindaddr=192.0.2.1
+ ;  b) Listen on a specific IPv6 address.      Example: bindaddr=2001:db8::1
+ ;  c) Listen on the IPv4 wildcard.            Example: bindaddr=0.0.0.0
+-;  d) Listen on the IPv4 and IPv6 wildcards.  Example: bindaddr=::
++;  d) Listen on the IPv6 wildcard.            Example: bindaddr=::
+ ; (You can choose independently for UDP, TCP, and TLS, by specifying different values for
+ ; "udpbindaddr", "tcpbindaddr", and "tlsbindaddr".)
+-; (Note that using bindaddr=:: will show only a single IPv6 socket in netstat.
+-;  IPv4 is supported at the same time using IPv4-mapped IPv6 addresses.)
++; (Note that on OpenBSD, using bindaddr=:: will only allow IPv6 connections.
++;  OpenBSD does *not* permit IPv4-mapped IPv6 addresses.)
+ ;
+ ; You may optionally add a port number. (The default is port 5060 for UDP and TCP, 5061
+ ; for TLS).
Index: patches/patch-configs_sip_conf_sample
===================================================================
RCS file: patches/patch-configs_sip_conf_sample
diff -N patches/patch-configs_sip_conf_sample
--- patches/patch-configs_sip_conf_sample 28 Mar 2013 20:24:53 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-$OpenBSD: patch-configs_sip_conf_sample,v 1.2 2013/03/28 20:24:53 sthen Exp $
---- configs/sip.conf.sample.orig Tue Sep 25 19:52:12 2012
-+++ configs/sip.conf.sample Fri Oct 26 14:17:04 2012
-@@ -158,11 +158,11 @@ allowoverlap=no                 ; Disable overlap dial
- ;  a) Listen on a specific IPv4 address.      Example: bindaddr=192.0.2.1
- ;  b) Listen on a specific IPv6 address.      Example: bindaddr=2001:db8::1
- ;  c) Listen on the IPv4 wildcard.            Example: bindaddr=0.0.0.0
--;  d) Listen on the IPv4 and IPv6 wildcards.  Example: bindaddr=::
-+;  d) Listen on the IPv6 wildcard.            Example: bindaddr=::
- ; (You can choose independently for UDP, TCP, and TLS, by specifying different values for
- ; "udpbindaddr", "tcpbindaddr", and "tlsbindaddr".)
--; (Note that using bindaddr=:: will show only a single IPv6 socket in netstat.
--;  IPv4 is supported at the same time using IPv4-mapped IPv6 addresses.)
-+; (Note that on OpenBSD, using bindaddr=:: will only allow IPv6 connections.
-+;  OpenBSD does *not* permit IPv4-mapped IPv6 addresses.)
- ;
- ; You may optionally add a port number. (The default is port 5060 for UDP and TCP, 5061
- ; for TLS).
Index: patches/patch-configure_ac
===================================================================
RCS file: /cvs/ports/telephony/asterisk/patches/patch-configure_ac,v
retrieving revision 1.38
diff -u -p -r1.38 patch-configure_ac
--- patches/patch-configure_ac 8 Jun 2015 08:44:52 -0000 1.38
+++ patches/patch-configure_ac 9 Oct 2015 22:18:57 -0000
@@ -1,9 +1,9 @@
-$OpenBSD: patch-configure_ac,v 1.38 2015/06/08 08:44:52 sthen Exp $
+$OpenBSD: patch-configure_ac,v 1.37 2015/04/02 17:09:30 sthen Exp $
 
 c-client requires both kerbV libs *and* (separately) libssl.
 
---- configure.ac.orig Thu Jun  4 01:44:42 2015
-+++ configure.ac Fri Jun  5 10:41:19 2015
+--- configure.ac.orig Fri Aug  7 20:14:21 2015
++++ configure.ac Fri Oct  9 15:30:56 2015
 @@ -60,7 +60,7 @@ AC_SUBST([astvarrundir],      ['${localstatedir}/run/a
 
  case "${host_os}" in
@@ -13,7 +13,7 @@ c-client requires both kerbV libs *and*
          astvarlibdir='${prefix}/share/asterisk'
          astdbdir='${localstatedir}/db/asterisk'
       fi
-@@ -1739,7 +1739,7 @@ if test "${USE_IMAP_TK}" != "no"; then
+@@ -1813,7 +1813,7 @@ if test "${USE_IMAP_TK}" != "no"; then
  )
  else #looking in imap directory didn't work, try c-client
  imap_ldflags=""
@@ -22,7 +22,7 @@ c-client requires both kerbV libs *and*
  imap_include="-DUSE_SYSTEM_CCLIENT"
  CPPFLAGS="${saved_cppflags}"
  LIBS="${saved_libs}"
-@@ -1925,7 +1925,7 @@ AST_EXT_TOOL_CHECK([NETSNMP], [net-snmp-config], , [--
+@@ -1999,7 +1999,7 @@ AST_EXT_TOOL_CHECK([NETSNMP], [net-snmp-config], , [--
 
  AST_EXT_LIB_CHECK([NEWT], [newt], [newtBell], [newt.h])
 
Index: patches/patch-contrib_scripts_safe_asterisk
===================================================================
RCS file: /cvs/ports/telephony/asterisk/patches/patch-contrib_scripts_safe_asterisk,v
retrieving revision 1.18
diff -u -p -r1.18 patch-contrib_scripts_safe_asterisk
--- patches/patch-contrib_scripts_safe_asterisk 10 Nov 2014 20:43:18 -0000 1.18
+++ patches/patch-contrib_scripts_safe_asterisk 9 Oct 2015 22:18:57 -0000
@@ -1,11 +1,7 @@
-$OpenBSD: patch-contrib_scripts_safe_asterisk,v 1.18 2014/11/10 20:43:18 sthen Exp $
-
-- more useful defaults
-- create /var/run/asterisk with sane ownership/perms
-
---- contrib/scripts/safe_asterisk.orig Thu Oct  9 09:06:26 2014
-+++ contrib/scripts/safe_asterisk Mon Nov 10 19:52:06 2014
-@@ -5,21 +5,22 @@ ASTVARRUNDIR="__ASTERISK_VARRUN_DIR__"
+$OpenBSD$
+--- contrib/scripts/safe_asterisk.orig Thu Oct  9 09:08:43 2014
++++ contrib/scripts/safe_asterisk Thu Feb 19 21:08:57 2015
+@@ -6,21 +6,22 @@ ASTVARRUNDIR="__ASTERISK_VARRUN_DIR__"
  ASTVARLOGDIR="__ASTERISK_LOG_DIR__"
 
  CLIARGS="$*" # Grab any args passed to safe_asterisk
@@ -33,7 +29,7 @@ $OpenBSD: patch-contrib_scripts_safe_ast
 
  # run asterisk with this priority
  PRIORITY=0
-@@ -47,6 +48,19 @@ message() {
+@@ -48,6 +49,19 @@ message() {
  fi
  }
 
@@ -53,7 +49,7 @@ $OpenBSD: patch-contrib_scripts_safe_ast
  # Check if Asterisk is already running.  If it is, then bug out, because
  # starting safe_asterisk when Asterisk is running is very bad.
  VERSION=`"${ASTSBINDIR}/asterisk" -nrx 'core show version' 2>/dev/null`
-@@ -80,7 +94,7 @@ else
+@@ -81,7 +95,7 @@ else
  fi
  fi
  SYSCTL_MAXFILES="fs.file-max"
@@ -62,7 +58,7 @@ $OpenBSD: patch-contrib_scripts_safe_ast
  SYSCTL_MAXFILES="kern.maxfiles"
  fi
 
-@@ -91,8 +105,10 @@ else
+@@ -92,8 +106,10 @@ else
  fi
  fi
 
Index: patches/patch-main_editline_configure
===================================================================
RCS file: /cvs/ports/telephony/asterisk/patches/patch-main_editline_configure,v
retrieving revision 1.1
diff -u -p -r1.1 patch-main_editline_configure
--- patches/patch-main_editline_configure 16 Sep 2011 12:49:21 -0000 1.1
+++ patches/patch-main_editline_configure 9 Oct 2015 22:18:57 -0000
@@ -1,6 +1,6 @@
-$OpenBSD: patch-main_editline_configure,v 1.1 2011/09/16 12:49:21 naddy Exp $
---- main/editline/configure.orig Thu Sep 15 18:37:10 2011
-+++ main/editline/configure Thu Sep 15 18:37:45 2011
+$OpenBSD$
+--- main/editline/configure.orig Wed Jul 25 13:21:54 2012
++++ main/editline/configure Thu Feb 19 21:08:57 2015
 @@ -1963,7 +1963,7 @@ if test "x$enable_debug" = "xyes" ; then
    CPPFLAGS="$CPPFLAGS -DDEBUG_TTY -DDEBUG_KEY -DDEBUG_READ -DDEBUG"
    CPPFLAGS="$CPPFLAGS -DDEBUG_REFRESH -DDEBUG_PASTE"
Index: patches/patch-main_features_c
===================================================================
RCS file: patches/patch-main_features_c
diff -N patches/patch-main_features_c
--- patches/patch-main_features_c 28 Mar 2013 20:24:53 -0000 1.7
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-main_features_c,v 1.7 2013/03/28 20:24:53 sthen Exp $
---- main/features.c.orig Tue Oct  2 02:27:19 2012
-+++ main/features.c Fri Oct 26 14:17:04 2012
-@@ -1199,7 +1199,9 @@ static void bridge_call_thread_launch(struct ast_bridg
- }
- pthread_attr_destroy(&attr);
- memset(&sched, 0, sizeof(sched));
-+#if defined(_POSIX_THREAD_PRIORITY_SCHEDULING) && (_POSIX_THREAD_PRIORITY_SCHEDULING > 0)
- pthread_setschedparam(thread, SCHED_RR, &sched);
-+#endif
- }
-
- /*!
Index: patches/patch-main_utils_c
===================================================================
RCS file: patches/patch-main_utils_c
diff -N patches/patch-main_utils_c
--- patches/patch-main_utils_c 5 May 2015 12:47:02 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-main_utils_c,v 1.2 2015/05/05 12:47:02 sthen Exp $
-
-Store p_tid that can be tied through to gdb or kern_procinfo.
-
---- main/utils.c.orig Tue Mar 17 22:28:41 2015
-+++ main/utils.c Tue May  5 13:35:32 2015
-@@ -2441,6 +2441,8 @@ int ast_get_tid(void)
- long lwpid;
- thr_self(&lwpid); /* available since sys/thr.h creation 2003 */
- ret = lwpid;
-+#elif defined(__OpenBSD__)
-+ ret = getthrid();
- #endif
- return ret;
- }
Index: patches/patch-res_res_fax_c
===================================================================
RCS file: patches/patch-res_res_fax_c
diff -N patches/patch-res_res_fax_c
--- patches/patch-res_res_fax_c 8 Jun 2015 08:44:52 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,33 +0,0 @@
-$OpenBSD: patch-res_res_fax_c,v 1.5 2015/06/08 08:44:52 sthen Exp $
-
-https://issues.asterisk.org/jira/secure/attachment/46850/fax-deadlock-v2.patch-11.3.0
-
---- res/res_fax.c.orig Thu Jun  4 01:44:42 2015
-+++ res/res_fax.c Fri Jun  5 10:41:19 2015
-@@ -3398,10 +3398,13 @@ static struct ast_frame *fax_detect_framehook(struct a
- switch (result) {
- case 'f':
- case 't':
-+ if (!strcmp(ast_channel_exten(chan), "fax")) {
-+ ast_debug(1, "Already in a fax extension, not redirecting\n");
-+ break;
-+ }
- ast_channel_unlock(chan);
- if (ast_exists_extension(chan, target_context, "fax", 1,
-    S_COR(ast_channel_caller(chan)->id.number.valid, ast_channel_caller(chan)->id.number.str, NULL))) {
-- ast_channel_lock(chan);
- ast_verb(2, "Redirecting '%s' to fax extension due to %s detection\n",
- ast_channel_name(chan), (result == 'f') ? "CNG" : "T38");
- pbx_builtin_setvar_helper(chan, "FAXEXTEN", ast_channel_exten(chan));
-@@ -3411,10 +3414,10 @@ static struct ast_frame *fax_detect_framehook(struct a
- ast_frfree(f);
- f = &ast_null_frame;
- } else {
-- ast_channel_lock(chan);
- ast_log(LOG_NOTICE, "FAX %s detected but no fax extension in context (%s)\n",
- (result == 'f') ? "CNG" : "T38", target_context);
- }
-+ ast_channel_lock(chan);
- }
- ast_framehook_detach(chan, details->faxdetect_id);
- details->faxdetect_id = -1;
Index: patches/patch-sounds_sounds_xml
===================================================================
RCS file: /cvs/ports/telephony/asterisk/patches/patch-sounds_sounds_xml,v
retrieving revision 1.5
diff -u -p -r1.5 patch-sounds_sounds_xml
--- patches/patch-sounds_sounds_xml 8 Jun 2015 08:44:52 -0000 1.5
+++ patches/patch-sounds_sounds_xml 9 Oct 2015 22:18:57 -0000
@@ -1,6 +1,6 @@
-$OpenBSD: patch-sounds_sounds_xml,v 1.5 2015/06/08 08:44:52 sthen Exp $
---- sounds/sounds.xml.orig Thu Jun  4 01:44:42 2015
-+++ sounds/sounds.xml Fri Jun  5 10:41:19 2015
+$OpenBSD$
+--- sounds/sounds.xml.orig Fri Aug  7 20:14:21 2015
++++ sounds/sounds.xml Fri Oct  9 15:30:56 2015
 @@ -10,7 +10,6 @@
  </member>
  <member name="CORE-SOUNDS-EN-GSM" displayname="English, GSM format" >
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/telephony/asterisk/pkg/PLIST-main,v
retrieving revision 1.57
diff -u -p -r1.57 PLIST-main
--- pkg/PLIST-main 8 Jun 2015 08:44:52 -0000 1.57
+++ pkg/PLIST-main 9 Oct 2015 22:18:57 -0000
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-main,v 1.57 2015/06/08 08:44:52 sthen Exp $
+@comment $OpenBSD: PLIST-main,v 1.56 2014/09/20 20:37:44 sthen Exp $
 @conflict asterisk-sounds-<=1.2.1p2
 @conflict asterisk-curl-*
 @conflict asterisk-fax-*
@@ -26,6 +26,7 @@ include/asterisk/agi.h
 include/asterisk/alaw.h
 include/asterisk/aoc.h
 include/asterisk/app.h
+include/asterisk/ari.h
 include/asterisk/ast_expr.h
 include/asterisk/ast_version.h
 include/asterisk/astdb.h
@@ -36,9 +37,18 @@ include/asterisk/astosp.h
 include/asterisk/audiohook.h
 include/asterisk/autochan.h
 include/asterisk/autoconfig.h
-include/asterisk/bridging.h
-include/asterisk/bridging_features.h
-include/asterisk/bridging_technology.h
+include/asterisk/backtrace.h
+include/asterisk/beep.h
+include/asterisk/bridge.h
+include/asterisk/bridge_after.h
+include/asterisk/bridge_basic.h
+include/asterisk/bridge_channel.h
+include/asterisk/bridge_channel_internal.h
+include/asterisk/bridge_features.h
+include/asterisk/bridge_internal.h
+include/asterisk/bridge_roles.h
+include/asterisk/bridge_technology.h
+include/asterisk/bucket.h
 include/asterisk/build.h
 include/asterisk/buildinfo.h
 include/asterisk/buildopts.h
@@ -54,10 +64,13 @@ include/asterisk/channel_internal.h
 include/asterisk/channelstate.h
 include/asterisk/chanvars.h
 include/asterisk/cli.h
+include/asterisk/codec.h
 include/asterisk/compat.h
 include/asterisk/compiler.h
 include/asterisk/config.h
 include/asterisk/config_options.h
+include/asterisk/core_local.h
+include/asterisk/core_unreal.h
 include/asterisk/crypto.h
 include/asterisk/data.h
 include/asterisk/datastore.h
@@ -71,24 +84,25 @@ include/asterisk/doxygen/architecture.h
 include/asterisk/doxygen/asterisk-git-howto.h
 include/asterisk/doxygen/commits.h
 include/asterisk/doxygen/licensing.h
-include/asterisk/doxygen/mantisworkflow.h
 include/asterisk/doxygen/releases.h
 include/asterisk/doxygen/reviewboard.h
 include/asterisk/doxyref.h
 include/asterisk/dsp.h
 include/asterisk/dundi.h
 include/asterisk/endian.h
+include/asterisk/endpoints.h
 include/asterisk/enum.h
 include/asterisk/event.h
 include/asterisk/event_defs.h
 include/asterisk/extconf.h
 include/asterisk/features.h
+include/asterisk/features_config.h
 include/asterisk/file.h
 include/asterisk/format.h
+include/asterisk/format_cache.h
 include/asterisk/format_cap.h
-include/asterisk/format_pref.h
+include/asterisk/format_compatibility.h
 include/asterisk/frame.h
-include/asterisk/frame_defs.h
 include/asterisk/framehook.h
 include/asterisk/fskmodem.h
 include/asterisk/fskmodem_float.h
@@ -102,15 +116,17 @@ include/asterisk/image.h
 include/asterisk/indications.h
 include/asterisk/inline_api.h
 include/asterisk/io.h
-include/asterisk/jabber.h
-include/asterisk/jingle.h
+include/asterisk/json.h
 include/asterisk/linkedlists.h
 include/asterisk/localtime.h
 include/asterisk/lock.h
 include/asterisk/logger.h
 include/asterisk/manager.h
+include/asterisk/max_forwards.h
 include/asterisk/md5.h
+include/asterisk/media_index.h
 include/asterisk/message.h
+include/asterisk/mixmonitor.h
 include/asterisk/mod_format.h
 include/asterisk/module.h
 include/asterisk/monitor.h
@@ -120,8 +136,12 @@ include/asterisk/netsock2.h
 include/asterisk/network.h
 include/asterisk/optional_api.h
 include/asterisk/options.h
+include/asterisk/opus.h
+include/asterisk/parking.h
 include/asterisk/paths.h
 include/asterisk/pbx.h
+include/asterisk/phoneprov.h
+include/asterisk/pickup.h
 include/asterisk/pktccops.h
 include/asterisk/plc.h
 include/asterisk/poll-compat.h
@@ -129,21 +149,53 @@ include/asterisk/presencestate.h
 include/asterisk/privacy.h
 include/asterisk/pval.h
 include/asterisk/res_fax.h
+include/asterisk/res_hep.h
+include/asterisk/res_mwi_external.h
+include/asterisk/res_pjsip.h
+include/asterisk/res_pjsip_body_generator_types.h
+include/asterisk/res_pjsip_cli.h
+include/asterisk/res_pjsip_outbound_publish.h
+include/asterisk/res_pjsip_presence_xml.h
+include/asterisk/res_pjsip_pubsub.h
+include/asterisk/res_pjsip_session.h
 include/asterisk/res_srtp.h
 include/asterisk/rtp_engine.h
 include/asterisk/say.h
 include/asterisk/sched.h
+include/asterisk/sdp_srtp.h
 include/asterisk/security_events.h
 include/asterisk/security_events_defs.h
 include/asterisk/select.h
+include/asterisk/sem.h
 include/asterisk/sha1.h
 include/asterisk/silk.h
 include/asterisk/sip_api.h
 include/asterisk/slin.h
 include/asterisk/slinfactory.h
 include/asterisk/smdi.h
+include/asterisk/smoother.h
+include/asterisk/sorcery.h
+include/asterisk/sounds_index.h
 include/asterisk/speech.h
+include/asterisk/spinlock.h
 include/asterisk/srv.h
+include/asterisk/stasis.h
+include/asterisk/stasis_app.h
+include/asterisk/stasis_app_device_state.h
+include/asterisk/stasis_app_impl.h
+include/asterisk/stasis_app_mailbox.h
+include/asterisk/stasis_app_playback.h
+include/asterisk/stasis_app_recording.h
+include/asterisk/stasis_app_snoop.h
+include/asterisk/stasis_bridges.h
+include/asterisk/stasis_cache_pattern.h
+include/asterisk/stasis_channels.h
+include/asterisk/stasis_endpoints.h
+include/asterisk/stasis_internal.h
+include/asterisk/stasis_message_router.h
+include/asterisk/stasis_system.h
+include/asterisk/stasis_test.h
+include/asterisk/statsd.h
 include/asterisk/stringfields.h
 include/asterisk/strings.h
 include/asterisk/stun.h
@@ -153,6 +205,7 @@ include/asterisk/tcptls.h
 include/asterisk/tdd.h
 include/asterisk/term.h
 include/asterisk/test.h
+include/asterisk/threadpool.h
 include/asterisk/threadstorage.h
 include/asterisk/time.h
 include/asterisk/timing.h
@@ -161,7 +214,9 @@ include/asterisk/translate.h
 include/asterisk/udptl.h
 include/asterisk/ulaw.h
 include/asterisk/unaligned.h
+include/asterisk/uri.h
 include/asterisk/utils.h
+include/asterisk/uuid.h
 include/asterisk/vector.h
 include/asterisk/version.h
 include/asterisk/xml.h
@@ -170,9 +225,11 @@ include/asterisk/xmpp.h
 lib/asterisk/
 lib/asterisk/modules/
 lib/asterisk/modules/app_adsiprog.so
+lib/asterisk/modules/app_agent_pool.so
 lib/asterisk/modules/app_alarmreceiver.so
 lib/asterisk/modules/app_amd.so
 lib/asterisk/modules/app_authenticate.so
+lib/asterisk/modules/app_bridgewait.so
 lib/asterisk/modules/app_cdr.so
 lib/asterisk/modules/app_celgenuserevent.so
 lib/asterisk/modules/app_chanisavail.so
@@ -205,7 +262,6 @@ lib/asterisk/modules/app_mp3.so
 lib/asterisk/modules/app_nbscat.so
 lib/asterisk/modules/app_originate.so
 lib/asterisk/modules/app_page.so
-lib/asterisk/modules/app_parkandannounce.so
 lib/asterisk/modules/app_playback.so
 lib/asterisk/modules/app_playtones.so
 lib/asterisk/modules/app_privacy.so
@@ -220,6 +276,7 @@ lib/asterisk/modules/app_sms.so
 lib/asterisk/modules/app_softhangup.so
 lib/asterisk/modules/app_speech_utils.so
 lib/asterisk/modules/app_stack.so
+lib/asterisk/modules/app_stasis.so
 lib/asterisk/modules/app_system.so
 lib/asterisk/modules/app_talkdetect.so
 lib/asterisk/modules/app_test.so
@@ -234,7 +291,9 @@ lib/asterisk/modules/app_waituntil.so
 lib/asterisk/modules/app_while.so
 lib/asterisk/modules/app_zapateller.so
 lib/asterisk/modules/bridge_builtin_features.so
-lib/asterisk/modules/bridge_multiplexed.so
+lib/asterisk/modules/bridge_builtin_interval_features.so
+lib/asterisk/modules/bridge_holding.so
+lib/asterisk/modules/bridge_native_rtp.so
 lib/asterisk/modules/bridge_simple.so
 lib/asterisk/modules/bridge_softmix.so
 lib/asterisk/modules/cdr_csv.so
@@ -245,11 +304,9 @@ lib/asterisk/modules/cdr_syslog.so
 lib/asterisk/modules/cel_custom.so
 lib/asterisk/modules/cel_manager.so
 lib/asterisk/modules/cel_sqlite3_custom.so
-lib/asterisk/modules/chan_agent.so
-lib/asterisk/modules/chan_bridge.so
+lib/asterisk/modules/chan_bridge_media.so
 lib/asterisk/modules/chan_console.so
 lib/asterisk/modules/chan_iax2.so
-lib/asterisk/modules/chan_local.so
 lib/asterisk/modules/chan_mgcp.so
 lib/asterisk/modules/chan_motif.so
 lib/asterisk/modules/chan_multicast_rtp.so
@@ -312,16 +369,19 @@ lib/asterisk/modules/func_logic.so
 lib/asterisk/modules/func_math.so
 lib/asterisk/modules/func_md5.so
 lib/asterisk/modules/func_module.so
+lib/asterisk/modules/func_periodic_hook.so
 lib/asterisk/modules/func_pitchshift.so
 lib/asterisk/modules/func_presencestate.so
 lib/asterisk/modules/func_rand.so
 lib/asterisk/modules/func_realtime.so
 lib/asterisk/modules/func_sha1.so
 lib/asterisk/modules/func_shell.so
+lib/asterisk/modules/func_sorcery.so
 lib/asterisk/modules/func_sprintf.so
 lib/asterisk/modules/func_srv.so
 lib/asterisk/modules/func_strings.so
 lib/asterisk/modules/func_sysinfo.so
+lib/asterisk/modules/func_talkdetect.so
 lib/asterisk/modules/func_timeout.so
 lib/asterisk/modules/func_uri.so
 lib/asterisk/modules/func_version.so
@@ -336,6 +396,18 @@ lib/asterisk/modules/pbx_spool.so
 lib/asterisk/modules/res_adsi.so
 lib/asterisk/modules/res_ael_share.so
 lib/asterisk/modules/res_agi.so
+lib/asterisk/modules/res_ari.so
+lib/asterisk/modules/res_ari_applications.so
+lib/asterisk/modules/res_ari_asterisk.so
+lib/asterisk/modules/res_ari_bridges.so
+lib/asterisk/modules/res_ari_channels.so
+lib/asterisk/modules/res_ari_device_states.so
+lib/asterisk/modules/res_ari_endpoints.so
+lib/asterisk/modules/res_ari_events.so
+lib/asterisk/modules/res_ari_model.so
+lib/asterisk/modules/res_ari_playbacks.so
+lib/asterisk/modules/res_ari_recordings.so
+lib/asterisk/modules/res_ari_sounds.so
 lib/asterisk/modules/res_clialiases.so
 lib/asterisk/modules/res_clioriginate.so
 lib/asterisk/modules/res_config_curl.so
@@ -348,20 +420,38 @@ lib/asterisk/modules/res_fax_spandsp.so
 lib/asterisk/modules/res_format_attr_celt.so
 lib/asterisk/modules/res_format_attr_h263.so
 lib/asterisk/modules/res_format_attr_h264.so
+lib/asterisk/modules/res_format_attr_opus.so
 lib/asterisk/modules/res_format_attr_silk.so
+lib/asterisk/modules/res_hep.so
+lib/asterisk/modules/res_hep_rtcp.so
 lib/asterisk/modules/res_http_websocket.so
 lib/asterisk/modules/res_limit.so
+lib/asterisk/modules/res_manager_devicestate.so
+lib/asterisk/modules/res_manager_presencestate.so
 lib/asterisk/modules/res_monitor.so
 lib/asterisk/modules/res_musiconhold.so
 lib/asterisk/modules/res_mutestream.so
+lib/asterisk/modules/res_parking.so
 lib/asterisk/modules/res_phoneprov.so
 lib/asterisk/modules/res_realtime.so
 lib/asterisk/modules/res_rtp_asterisk.so
 lib/asterisk/modules/res_rtp_multicast.so
 lib/asterisk/modules/res_security_log.so
 lib/asterisk/modules/res_smdi.so
+lib/asterisk/modules/res_sorcery_astdb.so
+lib/asterisk/modules/res_sorcery_config.so
+lib/asterisk/modules/res_sorcery_memory.so
+lib/asterisk/modules/res_sorcery_memory_cache.so
+lib/asterisk/modules/res_sorcery_realtime.so
 lib/asterisk/modules/res_speech.so
 lib/asterisk/modules/res_srtp.so
+lib/asterisk/modules/res_stasis.so
+lib/asterisk/modules/res_stasis_answer.so
+lib/asterisk/modules/res_stasis_device_state.so
+lib/asterisk/modules/res_stasis_playback.so
+lib/asterisk/modules/res_stasis_recording.so
+lib/asterisk/modules/res_stasis_snoop.so
+lib/asterisk/modules/res_statsd.so
 lib/asterisk/modules/res_stun_monitor.so
 @comment lib/asterisk/modules/res_timing_kqueue.so
 lib/asterisk/modules/res_timing_pthread.so
@@ -386,6 +476,7 @@ sbin/safe_asterisk
 share/asterisk/agi-bin/
 share/asterisk/documentation/
 share/asterisk/documentation/appdocsxml.dtd
+share/asterisk/documentation/appdocsxml.xslt
 share/asterisk/documentation/core-en_US.xml
 share/asterisk/documentation/thirdparty/
 share/asterisk/firmware/
@@ -401,15 +492,29 @@ share/asterisk/phoneprov/000000000000.cf
 share/asterisk/phoneprov/polycom.xml
 share/asterisk/phoneprov/polycom_line.xml
 share/asterisk/phoneprov/snom-mac.xml
+share/asterisk/rest-api/
+share/asterisk/rest-api/applications.json
+share/asterisk/rest-api/asterisk.json
+share/asterisk/rest-api/bridges.json
+share/asterisk/rest-api/channels.json
+share/asterisk/rest-api/deviceStates.json
+share/asterisk/rest-api/endpoints.json
+share/asterisk/rest-api/events.json
+share/asterisk/rest-api/mailboxes.json
+share/asterisk/rest-api/playbacks.json
+share/asterisk/rest-api/recordings.json
+share/asterisk/rest-api/resources.json
+share/asterisk/rest-api/sounds.json
 share/asterisk/static-http/
 share/asterisk/static-http/ajamdemo.html
+share/asterisk/static-http/appdocsxml.xslt
 share/asterisk/static-http/astman.css
 share/asterisk/static-http/astman.js
 share/asterisk/static-http/core-en_US.xml
 share/asterisk/static-http/mantest.html
 share/asterisk/static-http/prototype.js
 share/doc/asterisk/
-share/doc/asterisk/Asterisk-11-Reference.pdf
+share/doc/asterisk/Asterisk-13-Reference.pdf
 share/doc/asterisk/Asterisk-Admin-Guide.pdf
 share/doc/asterisk/BUGS
 share/doc/asterisk/CHANGES
@@ -428,6 +533,8 @@ share/doc/asterisk/UPGRADE-1.4.txt
 share/doc/asterisk/UPGRADE-1.6.txt
 share/doc/asterisk/UPGRADE-1.8.txt
 share/doc/asterisk/UPGRADE-10.txt
+share/doc/asterisk/UPGRADE-11.txt
+share/doc/asterisk/UPGRADE-12.txt
 share/doc/asterisk/UPGRADE.txt
 share/doc/asterisk/api-1.6.0-changes.odt
 share/doc/asterisk/api-1.6.2-changes.txt
@@ -447,6 +554,7 @@ share/examples/asterisk/default/alarmrec
 share/examples/asterisk/default/amd.conf
 @comment share/examples/asterisk/default/app_mysql.conf
 share/examples/asterisk/default/app_skel.conf
+share/examples/asterisk/default/ari.conf
 share/examples/asterisk/default/asterisk.adsi
 share/examples/asterisk/default/asterisk.conf
 @sample ${SYSCONFDIR}/asterisk/asterisk.conf
@@ -489,20 +597,12 @@ share/examples/asterisk/default/extensio
 share/examples/asterisk/default/features.conf
 share/examples/asterisk/default/festival.conf
 share/examples/asterisk/default/followme.conf
-share/examples/asterisk/default/gtalk.conf
-@comment share/examples/asterisk/default/h323.conf
+share/examples/asterisk/default/hep.conf
 share/examples/asterisk/default/http.conf
 share/examples/asterisk/default/iax.conf
 share/examples/asterisk/default/iaxprov.conf
 share/examples/asterisk/default/indications.conf
 @sample ${SYSCONFDIR}/asterisk/indications.conf
-share/examples/asterisk/default/jabber.conf
-@mode 640
-@group _asterisk
-@sample ${SYSCONFDIR}/asterisk/jabber.conf
-@mode
-@group
-share/examples/asterisk/default/jingle.conf
 share/examples/asterisk/default/logger.conf
 share/examples/asterisk/default/manager.conf
 @comment share/examples/asterisk/default/meetme.conf
@@ -518,6 +618,9 @@ share/examples/asterisk/default/osp.conf
 @comment share/examples/asterisk/default/oss.conf
 share/examples/asterisk/default/phone.conf
 share/examples/asterisk/default/phoneprov.conf
+share/examples/asterisk/default/pjsip.conf
+share/examples/asterisk/default/pjsip_notify.conf
+share/examples/asterisk/default/pjsip_wizard.conf
 share/examples/asterisk/default/queuerules.conf
 share/examples/asterisk/default/queues.conf
 @comment share/examples/asterisk/default/res_config_mysql.conf
@@ -526,6 +629,7 @@ share/examples/asterisk/default/res_conf
 share/examples/asterisk/default/res_corosync.conf
 share/examples/asterisk/default/res_curl.conf
 share/examples/asterisk/default/res_fax.conf
+share/examples/asterisk/default/res_parking.conf
 share/examples/asterisk/default/res_pktccops.conf
 share/examples/asterisk/default/res_stun_monitor.conf
 share/examples/asterisk/default/rtp.conf
@@ -535,7 +639,12 @@ share/examples/asterisk/default/sip_noti
 share/examples/asterisk/default/skinny.conf
 share/examples/asterisk/default/sla.conf
 share/examples/asterisk/default/smdi.conf
+share/examples/asterisk/default/sorcery.conf
+share/examples/asterisk/default/ss7.timers
+share/examples/asterisk/default/stasis.conf
+share/examples/asterisk/default/statsd.conf
 share/examples/asterisk/default/telcordia-1.adsi
+share/examples/asterisk/default/test_sorcery.conf
 share/examples/asterisk/default/udptl.conf
 share/examples/asterisk/default/unistim.conf
 share/examples/asterisk/default/users.conf

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE: telephony/asterisk

Roman Kravchuk
Hi Stuart,

I not see *_pjsip_* modules in PLIST, this is not working?

Thanks.

- Roman

2015-10-10 1:23 GMT+03:00 Stuart Henderson <[hidden email]>:
> I'd be interested in any test reports, this needs the telephony/pjsua
> update that I committed earlier today.
>
> asterisk-g729 update to go with this available on request (needs
> earlier submitted bcg729 port), but I guess most people using asterisk
> probably aren't using g729.
>

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE: telephony/asterisk

Stuart Henderson-6
On 2015/10/11 18:07, Roman Kravchuk wrote:
> Hi Stuart,
>
> I not see *_pjsip_* modules in PLIST, this is not working?
>
> Thanks.

Well spotted, I'm not sure why but they didn't show up when I regenerated
plists earlier, though I think that may have been with pjsip 2.3.

Updated diff for -current following the update to 11.20.0 - this updates
to 13.6.0 and includes the pjsip modules.

Index: Makefile
===================================================================
RCS file: /cvs/ports/telephony/asterisk/Makefile,v
retrieving revision 1.220
diff -u -p -r1.220 Makefile
--- Makefile 10 Oct 2015 19:58:47 -0000 1.220
+++ Makefile 11 Oct 2015 21:58:41 -0000
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.220 2015/10/10 19:58:47 sthen Exp $
+# $OpenBSD: Makefile,v 1.215 2015/04/02 17:09:30 sthen Exp $
 
 SHARED_ONLY= Yes
 
 COMMENT-main= open source multi-protocol PBX and telephony toolkit
 
-VER= 11.20.0
+VER= 13.6.0
 PORTROACH= limitw:0,odd
 DISTNAME= asterisk-${VER:S/beta/-beta/:S/rc/-rc/}
 PKGNAME-main= asterisk-${VER}
@@ -22,10 +22,14 @@ MAINTAINER= Stuart Henderson <sthen@ope
 PERMIT_PACKAGE_CDROM= patent licensing clauses
 PERMIT_PACKAGE_FTP= Yes
 
-WANTLIB-main += avcodec avformat avutil c crypto curl execinfo gsm idn
-WANTLIB-main += iksemel m ogg opencore-amrnb portaudio pthread spandsp
-WANTLIB-main += sqlite3 ssl stdc++ swscale termcap tiff uuid vorbis
-WANTLIB-main += vorbisenc vorbisfile xml2 z ${MODGETTEXT_WANTLIB}
+WANTLIB-main += c crypto curl execinfo g7221codec gsm idn iksemel ilbccodec
+WANTLIB-main += jansson m ogg opencore-amrnb opencore-amrwb pj pjlib-util
+WANTLIB-main += pjmedia pjmedia-audiodev pjmedia-codec pjmedia-videodev
+WANTLIB-main += pjnath pjsip pjsip-simple pjsip-ua pjsua pjsua2 portaudio
+WANTLIB-main += pthread resample spandsp speex speexdsp sqlite3 ssl
+WANTLIB-main += stdc++ termcap tiff uriparser uuid vorbis vorbisenc
+WANTLIB-main += vorbisfile xml2 xslt z
+WANTLIB-main += ${MODGETTEXT_WANTLIB}
 
 SHARED_LIBS= asteriskssl 0.0 # 1
 
@@ -39,16 +43,18 @@ PSEUDO_FLAVORS= no_calendar no_http_pos
 LIB_DEPENDS-main= audio/gsm \
  audio/libogg \
  audio/libvorbis \
- audio/opencore-amr \
  audio/portaudio-svn \
  devel/libexecinfo \
- graphics/ffmpeg \
+ devel/jansson \
  graphics/tiff \
  net/curl \
  sysutils/e2fsprogs \
+ telephony/pjsua,-main \
  telephony/spandsp \
  textproc/iksemel \
  textproc/libxml \
+ textproc/libxslt \
+ www/uriparser \
  ${MODGETTEXT_LIB_DEPENDS}
 RUN_DEPENDS-main= ${MODGETTEXT_RUN_DEPENDS} \
  telephony/asterisk-sounds/core-sounds/en,gsm>=1.4.25 \
@@ -248,7 +254,7 @@ post-install:
  ${PREFIX}/share/doc/asterisk
  ${INSTALL_DATA_DIR} ${EXAMPLEDIR}/openbsd
 .for i in ${EXAMPLEFILES}
- @${SUBST_CMD} -m 0644 -c ${FILESDIR}/$i.sample \
+ @${SUBST_CMD} -c ${FILESDIR}/$i.sample \
     ${EXAMPLEDIR}/openbsd/$i.sample
 .endfor
  ${INSTALL_DATA} ${WRKSRC}/contrib/scripts/asterisk.ldif \
Index: distinfo
===================================================================
RCS file: /cvs/ports/telephony/asterisk/distinfo,v
retrieving revision 1.134
diff -u -p -r1.134 distinfo
--- distinfo 10 Oct 2015 19:58:47 -0000 1.134
+++ distinfo 11 Oct 2015 21:58:41 -0000
@@ -1,2 +1,2 @@
-SHA256 (asterisk-11.20.0.tar.gz) = ujomp+ordohK1JhLBpT8mBTZi7Nz4MvkLGSWL2ZnIPQ=
-SIZE (asterisk-11.20.0.tar.gz) = 34864289
+SHA256 (asterisk-13.6.0.tar.gz) = igG1PJRtCSrFYcEbQE9ozTKDBtDjtDSnSFoR1LF1AFo=
+SIZE (asterisk-13.6.0.tar.gz) = 32146107
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/telephony/asterisk/patches/patch-Makefile,v
retrieving revision 1.36
diff -u -p -r1.36 patch-Makefile
--- patches/patch-Makefile 8 Jun 2015 08:44:52 -0000 1.36
+++ patches/patch-Makefile 11 Oct 2015 21:58:41 -0000
@@ -1,7 +1,7 @@
-$OpenBSD: patch-Makefile,v 1.36 2015/06/08 08:44:52 sthen Exp $
---- Makefile.orig Thu Jun  4 01:44:42 2015
-+++ Makefile Fri Jun  5 10:41:19 2015
-@@ -126,7 +126,7 @@ ASTTOPDIR:=$(subst $(space),\$(space),$(CURDIR))
+$OpenBSD$
+--- Makefile.orig Fri Aug  7 20:14:21 2015
++++ Makefile Fri Oct  9 15:30:56 2015
+@@ -128,7 +128,7 @@ ASTTOPDIR:=$(subst $(space),\$(space),$(CURDIR))
  OVERWRITE=y
 
  # Include debug and macro symbols in the executables (-g) and profiling info (-pg)
@@ -10,7 +10,7 @@ $OpenBSD: patch-Makefile,v 1.36 2015/06/
 
  # Asterisk.conf is located in ASTETCDIR or by using the -C flag
  # when starting Asterisk
-@@ -178,7 +178,9 @@ endif
+@@ -183,7 +183,9 @@ endif
 
  ifeq ($(findstring -save-temps,$(_ASTCFLAGS) $(ASTCFLAGS)),)
    ifeq ($(findstring -pipe,$(_ASTCFLAGS) $(ASTCFLAGS)),)
Index: patches/patch-bootstrap_sh
===================================================================
RCS file: /cvs/ports/telephony/asterisk/patches/patch-bootstrap_sh,v
retrieving revision 1.4
diff -u -p -r1.4 patch-bootstrap_sh
--- patches/patch-bootstrap_sh 13 Mar 2012 23:17:46 -0000 1.4
+++ patches/patch-bootstrap_sh 11 Oct 2015 21:58:41 -0000
@@ -1,6 +1,6 @@
-$OpenBSD: patch-bootstrap_sh,v 1.4 2012/03/13 23:17:46 sthen Exp $
---- bootstrap.sh.orig Fri Jan 13 21:40:32 2012
-+++ bootstrap.sh Tue Mar  6 14:23:21 2012
+$OpenBSD$
+--- bootstrap.sh.orig Fri Jan 13 21:42:12 2012
++++ bootstrap.sh Thu Feb 19 21:08:57 2015
 @@ -18,8 +18,8 @@ case `uname -sr` in
  MY_AM_VER=19
  ;;
Index: patches/patch-build_tools_cflags_xml
===================================================================
RCS file: patches/patch-build_tools_cflags_xml
diff -N patches/patch-build_tools_cflags_xml
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-build_tools_cflags_xml 11 Oct 2015 21:58:41 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- build_tools/cflags.xml.orig Sun Oct 11 22:29:10 2015
++++ build_tools/cflags.xml Sun Oct 11 22:30:08 2015
+@@ -103,7 +103,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>
+- <defaultenabled>yes</defaultenabled>
++ <defaultenabled>no</defaultenabled>
+ <depend>native_arch</depend>
+ </member>
+ </category>
Index: patches/patch-channels_chan_sip_c
===================================================================
RCS file: patches/patch-channels_chan_sip_c
diff -N patches/patch-channels_chan_sip_c
--- patches/patch-channels_chan_sip_c 10 Oct 2015 19:58:47 -0000 1.25
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,36 +0,0 @@
-$OpenBSD: patch-channels_chan_sip_c,v 1.25 2015/10/10 19:58:47 sthen Exp $
-
-https://issues.asterisk.org/jira/secure/attachment/46850/fax-deadlock-v2.patch-11.3.0
-
---- channels/chan_sip.c.orig Fri Oct  9 23:23:39 2015
-+++ channels/chan_sip.c Sat Oct 10 14:18:22 2015
-@@ -8306,8 +8306,6 @@ static struct ast_frame *sip_read(struct ast_channel *
- ast_channel_unlock(ast);
- if (ast_exists_extension(ast, target_context, "fax", 1,
- S_COR(ast_channel_caller(ast)->id.number.valid, ast_channel_caller(ast)->id.number.str, NULL))) {
-- ast_channel_lock(ast);
-- sip_pvt_lock(p);
- ast_verb(2, "Redirecting '%s' to fax extension due to CNG detection\n", ast_channel_name(ast));
- pbx_builtin_setvar_helper(ast, "FAXEXTEN", ast_channel_exten(ast));
- if (ast_async_goto(ast, target_context, "fax", 1)) {
-@@ -8316,10 +8314,10 @@ static struct ast_frame *sip_read(struct ast_channel *
- ast_frfree(fr);
- fr = &ast_null_frame;
- } else {
-- ast_channel_lock(ast);
-- sip_pvt_lock(p);
- ast_log(LOG_NOTICE, "FAX CNG detected but no fax extension\n");
- }
-+ ast_channel_lock(ast);
-+ sip_pvt_lock(p);
- }
- }
-
-@@ -10641,6 +10639,7 @@ static int process_sdp(struct sip_pvt *p, struct sip_r
- ast_channel_unlock(p->owner);
- if (ast_exists_extension(p->owner, target_context, "fax", 1,
- S_COR(ast_channel_caller(p->owner)->id.number.valid, ast_channel_caller(p->owner)->id.number.str, NULL))) {
-+ ast_log(LOG_WARNING, "Usage of 'faxdetect=[yes|t38]' setting in sip.conf is not recommended. Please consider Set(FAXOPT(faxdetect)=[yes|t38]) instead.\n");
- ast_verb(2, "Redirecting '%s' to fax extension due to peer T.38 re-INVITE\n", ast_channel_name(p->owner));
- pbx_builtin_setvar_helper(p->owner, "FAXEXTEN", ast_channel_exten(p->owner));
- if (ast_async_goto(p->owner, target_context, "fax", 1)) {
Index: patches/patch-configs_asterisk_conf_sample
===================================================================
RCS file: patches/patch-configs_asterisk_conf_sample
diff -N patches/patch-configs_asterisk_conf_sample
--- patches/patch-configs_asterisk_conf_sample 31 May 2014 00:35:31 -0000 1.7
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,41 +0,0 @@
-$OpenBSD: patch-configs_asterisk_conf_sample,v 1.7 2014/05/31 00:35:31 sthen Exp $
---- configs/asterisk.conf.sample.orig Fri Apr  4 19:46:18 2014
-+++ configs/asterisk.conf.sample Thu May 29 21:32:09 2014
-@@ -60,8 +60,8 @@ astsbindir => /usr/sbin
- ; not otherwise require one.
- ;transcode_via_sln = yes ; Build transcode paths via SLINEAR, instead of
- ; directly.
--;runuser = asterisk ; The user to run as.
--;rungroup = asterisk ; The group to run as.
-+runuser = _asterisk ; The user to run as.
-+rungroup = _asterisk ; The group to run as.
- ;lightbackground = yes ; If your terminal is set for a light-colored
- ; background.
- ;forceblackbackground = yes     ; Force the background of the terminal to be
-@@ -82,7 +82,8 @@ documentation_language = en_US ; Set the language you
- ; gosub - Invoke the stdexten using a gosub as
- ;         documented in extensions.conf.sample.
- ; Default gosub.
--;live_dangerously = no ; Enable the execution of 'dangerous' dialplan
-+live_dangerously = no
-+;live_dangerously = yes ; Enable the execution of 'dangerous' dialplan
- ; functions from external sources (AMI,
- ; etc.) These functions (such as SHELL) are
- ; considered dangerous because they can allow
-@@ -90,11 +91,11 @@ documentation_language = en_US ; Set the language you
- ; Default yes, for backward compatability.
-
- ; Changing the following lines may compromise your security.
--;[files]
--;astctlpermissions = 0660
--;astctlowner = root
--;astctlgroup = apache
--;astctl = asterisk.ctl
-+[files]
-+astctlpermissions = 0660
-+astctlowner = _asterisk
-+astctlgroup = wheel
-+astctl = asterisk.ctl
-
- [compat]
- pbx_realtime=1.6
Index: patches/patch-configs_res_odbc_conf_sample
===================================================================
RCS file: patches/patch-configs_res_odbc_conf_sample
diff -N patches/patch-configs_res_odbc_conf_sample
--- patches/patch-configs_res_odbc_conf_sample 31 May 2014 00:35:31 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-configs_res_odbc_conf_sample,v 1.4 2014/05/31 00:35:31 sthen Exp $
---- configs/res_odbc.conf.sample.orig Mon Apr  7 15:48:07 2014
-+++ configs/res_odbc.conf.sample Thu May 29 21:32:09 2014
-@@ -19,8 +19,7 @@
- ; If not specified, it is assumed the section is enabled.
- enabled => no
- ;
--; This value should match an entry in /etc/odbc.ini
--; (or /usr/local/etc/odbc.ini, on FreeBSD and similar systems).
-+; This value should match an entry in /etc/iodbc/odbc.ini
- dsn => asterisk
- ;
- ; Username for connecting to the database.  The user defaults to the context
Index: patches/patch-configs_samples_asterisk_conf_sample
===================================================================
RCS file: patches/patch-configs_samples_asterisk_conf_sample
diff -N patches/patch-configs_samples_asterisk_conf_sample
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-configs_samples_asterisk_conf_sample 11 Oct 2015 21:58:41 -0000
@@ -0,0 +1,38 @@
+$OpenBSD$
+--- configs/samples/asterisk.conf.sample.orig Thu Jul 17 22:17:28 2014
++++ configs/samples/asterisk.conf.sample Thu Feb 19 21:09:28 2015
+@@ -60,8 +60,8 @@ astsbindir => /usr/sbin
+ ; not otherwise require one.
+ ;transcode_via_sln = yes ; Build transcode paths via SLINEAR, instead of
+ ; directly.
+-;runuser = asterisk ; The user to run as.
+-;rungroup = asterisk ; The group to run as.
++runuser = _asterisk ; The user to run as.
++rungroup = _asterisk ; The group to run as.
+ ;lightbackground = yes ; If your terminal is set for a light-colored
+ ; background.
+ ;forceblackbackground = yes     ; Force the background of the terminal to be
+@@ -82,7 +82,8 @@ documentation_language = en_US ; Set the language you
+ ; gosub - Invoke the stdexten using a gosub as
+ ;         documented in extensions.conf.sample.
+ ; Default gosub.
+-;live_dangerously = no ; Enable the execution of 'dangerous' dialplan
++live_dangerously = no
++;live_dangerously = yes ; Enable the execution of 'dangerous' dialplan
+ ; functions from external sources (AMI,
+ ; etc.) These functions (such as SHELL) are
+ ; considered dangerous because they can allow
+@@ -90,8 +91,8 @@ documentation_language = en_US ; Set the language you
+ ; Default no
+
+ ; Changing the following lines may compromise your security.
+-;[files]
+-;astctlpermissions = 0660
+-;astctlowner = root
+-;astctlgroup = apache
+-;astctl = asterisk.ctl
++[files]
++astctlpermissions = 0660
++astctlowner = _asterisk
++astctlgroup = wheel
++astctl = asterisk.ctl
Index: patches/patch-configs_samples_res_odbc_conf_sample
===================================================================
RCS file: patches/patch-configs_samples_res_odbc_conf_sample
diff -N patches/patch-configs_samples_res_odbc_conf_sample
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-configs_samples_res_odbc_conf_sample 11 Oct 2015 21:58:41 -0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+--- configs/samples/res_odbc.conf.sample.orig Thu Jul 17 22:17:28 2014
++++ configs/samples/res_odbc.conf.sample Thu Feb 19 21:08:57 2015
+@@ -19,8 +19,7 @@
+ ; If not specified, it is assumed the section is enabled.
+ enabled => no
+ ;
+-; This value should match an entry in /etc/odbc.ini
+-; (or /usr/local/etc/odbc.ini, on FreeBSD and similar systems).
++; This value should match an entry in /etc/iodbc/odbc.ini
+ dsn => asterisk
+ ;
+ ; Username for connecting to the database.  The user defaults to the context name if unspecified.
Index: patches/patch-configs_samples_sip_conf_sample
===================================================================
RCS file: patches/patch-configs_samples_sip_conf_sample
diff -N patches/patch-configs_samples_sip_conf_sample
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-configs_samples_sip_conf_sample 11 Oct 2015 21:58:41 -0000
@@ -0,0 +1,18 @@
+$OpenBSD$
+--- configs/samples/sip.conf.sample.orig Sun Sep 14 16:53:35 2014
++++ configs/samples/sip.conf.sample Thu Feb 19 21:08:57 2015
+@@ -158,11 +158,11 @@ allowoverlap=no                 ; Disable overlap dial
+ ;  a) Listen on a specific IPv4 address.      Example: bindaddr=192.0.2.1
+ ;  b) Listen on a specific IPv6 address.      Example: bindaddr=2001:db8::1
+ ;  c) Listen on the IPv4 wildcard.            Example: bindaddr=0.0.0.0
+-;  d) Listen on the IPv4 and IPv6 wildcards.  Example: bindaddr=::
++;  d) Listen on the IPv6 wildcard.            Example: bindaddr=::
+ ; (You can choose independently for UDP, TCP, and TLS, by specifying different values for
+ ; "udpbindaddr", "tcpbindaddr", and "tlsbindaddr".)
+-; (Note that using bindaddr=:: will show only a single IPv6 socket in netstat.
+-;  IPv4 is supported at the same time using IPv4-mapped IPv6 addresses.)
++; (Note that on OpenBSD, using bindaddr=:: will only allow IPv6 connections.
++;  OpenBSD does *not* permit IPv4-mapped IPv6 addresses.)
+ ;
+ ; You may optionally add a port number. (The default is port 5060 for UDP and TCP, 5061
+ ; for TLS).
Index: patches/patch-configs_sip_conf_sample
===================================================================
RCS file: patches/patch-configs_sip_conf_sample
diff -N patches/patch-configs_sip_conf_sample
--- patches/patch-configs_sip_conf_sample 28 Mar 2013 20:24:53 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-$OpenBSD: patch-configs_sip_conf_sample,v 1.2 2013/03/28 20:24:53 sthen Exp $
---- configs/sip.conf.sample.orig Tue Sep 25 19:52:12 2012
-+++ configs/sip.conf.sample Fri Oct 26 14:17:04 2012
-@@ -158,11 +158,11 @@ allowoverlap=no                 ; Disable overlap dial
- ;  a) Listen on a specific IPv4 address.      Example: bindaddr=192.0.2.1
- ;  b) Listen on a specific IPv6 address.      Example: bindaddr=2001:db8::1
- ;  c) Listen on the IPv4 wildcard.            Example: bindaddr=0.0.0.0
--;  d) Listen on the IPv4 and IPv6 wildcards.  Example: bindaddr=::
-+;  d) Listen on the IPv6 wildcard.            Example: bindaddr=::
- ; (You can choose independently for UDP, TCP, and TLS, by specifying different values for
- ; "udpbindaddr", "tcpbindaddr", and "tlsbindaddr".)
--; (Note that using bindaddr=:: will show only a single IPv6 socket in netstat.
--;  IPv4 is supported at the same time using IPv4-mapped IPv6 addresses.)
-+; (Note that on OpenBSD, using bindaddr=:: will only allow IPv6 connections.
-+;  OpenBSD does *not* permit IPv4-mapped IPv6 addresses.)
- ;
- ; You may optionally add a port number. (The default is port 5060 for UDP and TCP, 5061
- ; for TLS).
Index: patches/patch-configure_ac
===================================================================
RCS file: /cvs/ports/telephony/asterisk/patches/patch-configure_ac,v
retrieving revision 1.39
diff -u -p -r1.39 patch-configure_ac
--- patches/patch-configure_ac 10 Oct 2015 19:58:47 -0000 1.39
+++ patches/patch-configure_ac 11 Oct 2015 21:58:41 -0000
@@ -1,9 +1,9 @@
-$OpenBSD: patch-configure_ac,v 1.39 2015/10/10 19:58:47 sthen Exp $
+$OpenBSD: patch-configure_ac,v 1.37 2015/04/02 17:09:30 sthen Exp $
 
 c-client requires both kerbV libs *and* (separately) libssl.
 
---- configure.ac.orig Fri Oct  9 23:23:39 2015
-+++ configure.ac Sat Oct 10 14:18:22 2015
+--- configure.ac.orig Fri Oct  9 22:48:48 2015
++++ configure.ac Sun Oct 11 21:00:19 2015
 @@ -60,7 +60,7 @@ AC_SUBST([astvarrundir],      ['${localstatedir}/run/a
 
  case "${host_os}" in
@@ -13,7 +13,7 @@ c-client requires both kerbV libs *and*
          astvarlibdir='${prefix}/share/asterisk'
          astdbdir='${localstatedir}/db/asterisk'
       fi
-@@ -1740,7 +1740,7 @@ if test "${USE_IMAP_TK}" != "no"; then
+@@ -1814,7 +1814,7 @@ if test "${USE_IMAP_TK}" != "no"; then
  )
  else #looking in imap directory didn't work, try c-client
  imap_ldflags=""
@@ -22,7 +22,7 @@ c-client requires both kerbV libs *and*
  imap_include="-DUSE_SYSTEM_CCLIENT"
  CPPFLAGS="${saved_cppflags}"
  LIBS="${saved_libs}"
-@@ -1926,7 +1926,7 @@ AST_EXT_TOOL_CHECK([NETSNMP], [net-snmp-config], , [--
+@@ -2000,7 +2000,7 @@ AST_EXT_TOOL_CHECK([NETSNMP], [net-snmp-config], , [--
 
  AST_EXT_LIB_CHECK([NEWT], [newt], [newtBell], [newt.h])
 
Index: patches/patch-contrib_scripts_safe_asterisk
===================================================================
RCS file: /cvs/ports/telephony/asterisk/patches/patch-contrib_scripts_safe_asterisk,v
retrieving revision 1.18
diff -u -p -r1.18 patch-contrib_scripts_safe_asterisk
--- patches/patch-contrib_scripts_safe_asterisk 10 Nov 2014 20:43:18 -0000 1.18
+++ patches/patch-contrib_scripts_safe_asterisk 11 Oct 2015 21:58:41 -0000
@@ -1,11 +1,7 @@
-$OpenBSD: patch-contrib_scripts_safe_asterisk,v 1.18 2014/11/10 20:43:18 sthen Exp $
-
-- more useful defaults
-- create /var/run/asterisk with sane ownership/perms
-
---- contrib/scripts/safe_asterisk.orig Thu Oct  9 09:06:26 2014
-+++ contrib/scripts/safe_asterisk Mon Nov 10 19:52:06 2014
-@@ -5,21 +5,22 @@ ASTVARRUNDIR="__ASTERISK_VARRUN_DIR__"
+$OpenBSD$
+--- contrib/scripts/safe_asterisk.orig Thu Oct  9 09:08:43 2014
++++ contrib/scripts/safe_asterisk Thu Feb 19 21:08:57 2015
+@@ -6,21 +6,22 @@ ASTVARRUNDIR="__ASTERISK_VARRUN_DIR__"
  ASTVARLOGDIR="__ASTERISK_LOG_DIR__"
 
  CLIARGS="$*" # Grab any args passed to safe_asterisk
@@ -33,7 +29,7 @@ $OpenBSD: patch-contrib_scripts_safe_ast
 
  # run asterisk with this priority
  PRIORITY=0
-@@ -47,6 +48,19 @@ message() {
+@@ -48,6 +49,19 @@ message() {
  fi
  }
 
@@ -53,7 +49,7 @@ $OpenBSD: patch-contrib_scripts_safe_ast
  # Check if Asterisk is already running.  If it is, then bug out, because
  # starting safe_asterisk when Asterisk is running is very bad.
  VERSION=`"${ASTSBINDIR}/asterisk" -nrx 'core show version' 2>/dev/null`
-@@ -80,7 +94,7 @@ else
+@@ -81,7 +95,7 @@ else
  fi
  fi
  SYSCTL_MAXFILES="fs.file-max"
@@ -62,7 +58,7 @@ $OpenBSD: patch-contrib_scripts_safe_ast
  SYSCTL_MAXFILES="kern.maxfiles"
  fi
 
-@@ -91,8 +105,10 @@ else
+@@ -92,8 +106,10 @@ else
  fi
  fi
 
Index: patches/patch-main_editline_configure
===================================================================
RCS file: /cvs/ports/telephony/asterisk/patches/patch-main_editline_configure,v
retrieving revision 1.1
diff -u -p -r1.1 patch-main_editline_configure
--- patches/patch-main_editline_configure 16 Sep 2011 12:49:21 -0000 1.1
+++ patches/patch-main_editline_configure 11 Oct 2015 21:58:41 -0000
@@ -1,6 +1,6 @@
-$OpenBSD: patch-main_editline_configure,v 1.1 2011/09/16 12:49:21 naddy Exp $
---- main/editline/configure.orig Thu Sep 15 18:37:10 2011
-+++ main/editline/configure Thu Sep 15 18:37:45 2011
+$OpenBSD$
+--- main/editline/configure.orig Wed Jul 25 13:21:54 2012
++++ main/editline/configure Thu Feb 19 21:08:57 2015
 @@ -1963,7 +1963,7 @@ if test "x$enable_debug" = "xyes" ; then
    CPPFLAGS="$CPPFLAGS -DDEBUG_TTY -DDEBUG_KEY -DDEBUG_READ -DDEBUG"
    CPPFLAGS="$CPPFLAGS -DDEBUG_REFRESH -DDEBUG_PASTE"
Index: patches/patch-main_features_c
===================================================================
RCS file: patches/patch-main_features_c
diff -N patches/patch-main_features_c
--- patches/patch-main_features_c 28 Mar 2013 20:24:53 -0000 1.7
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-main_features_c,v 1.7 2013/03/28 20:24:53 sthen Exp $
---- main/features.c.orig Tue Oct  2 02:27:19 2012
-+++ main/features.c Fri Oct 26 14:17:04 2012
-@@ -1199,7 +1199,9 @@ static void bridge_call_thread_launch(struct ast_bridg
- }
- pthread_attr_destroy(&attr);
- memset(&sched, 0, sizeof(sched));
-+#if defined(_POSIX_THREAD_PRIORITY_SCHEDULING) && (_POSIX_THREAD_PRIORITY_SCHEDULING > 0)
- pthread_setschedparam(thread, SCHED_RR, &sched);
-+#endif
- }
-
- /*!
Index: patches/patch-main_logger_c
===================================================================
RCS file: /cvs/ports/telephony/asterisk/patches/patch-main_logger_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-main_logger_c
--- patches/patch-main_logger_c 10 Oct 2015 19:58:47 -0000 1.1
+++ patches/patch-main_logger_c 11 Oct 2015 21:58:41 -0000
@@ -1,12 +1,12 @@
-$OpenBSD: patch-main_logger_c,v 1.1 2015/10/10 19:58:47 sthen Exp $
---- main/logger.c.orig Sat Oct 10 15:12:36 2015
-+++ main/logger.c Sat Oct 10 20:55:23 2015
-@@ -1036,7 +1036,7 @@ static void ast_log_vsyslog(struct logmsg *msg, int fa
+$OpenBSD$
+--- main/logger.c.orig Sun Oct 11 21:01:27 2015
++++ main/logger.c Sun Oct 11 21:01:38 2015
+@@ -1322,7 +1322,7 @@ static void ast_log_vsyslog(struct logmsg *msg, int fa
  return;
  }
 
 - syslog_level = LOG_MAKEPRI(facility, syslog_level);
-+ syslog_level = facility | syslog_level;
++ syslog_level = (facility | syslog_level);
 
  snprintf(buf, sizeof(buf), "%s[%d]%s: %s:%d in %s: %s",
  levels[msg->level], msg->lwp, call_identifier_str, msg->file, msg->line, msg->function, msg->message);
Index: patches/patch-main_utils_c
===================================================================
RCS file: patches/patch-main_utils_c
diff -N patches/patch-main_utils_c
--- patches/patch-main_utils_c 5 May 2015 12:47:02 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-main_utils_c,v 1.2 2015/05/05 12:47:02 sthen Exp $
-
-Store p_tid that can be tied through to gdb or kern_procinfo.
-
---- main/utils.c.orig Tue Mar 17 22:28:41 2015
-+++ main/utils.c Tue May  5 13:35:32 2015
-@@ -2441,6 +2441,8 @@ int ast_get_tid(void)
- long lwpid;
- thr_self(&lwpid); /* available since sys/thr.h creation 2003 */
- ret = lwpid;
-+#elif defined(__OpenBSD__)
-+ ret = getthrid();
- #endif
- return ret;
- }
Index: patches/patch-res_res_fax_c
===================================================================
RCS file: patches/patch-res_res_fax_c
diff -N patches/patch-res_res_fax_c
--- patches/patch-res_res_fax_c 8 Jun 2015 08:44:52 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,33 +0,0 @@
-$OpenBSD: patch-res_res_fax_c,v 1.5 2015/06/08 08:44:52 sthen Exp $
-
-https://issues.asterisk.org/jira/secure/attachment/46850/fax-deadlock-v2.patch-11.3.0
-
---- res/res_fax.c.orig Thu Jun  4 01:44:42 2015
-+++ res/res_fax.c Fri Jun  5 10:41:19 2015
-@@ -3398,10 +3398,13 @@ static struct ast_frame *fax_detect_framehook(struct a
- switch (result) {
- case 'f':
- case 't':
-+ if (!strcmp(ast_channel_exten(chan), "fax")) {
-+ ast_debug(1, "Already in a fax extension, not redirecting\n");
-+ break;
-+ }
- ast_channel_unlock(chan);
- if (ast_exists_extension(chan, target_context, "fax", 1,
-    S_COR(ast_channel_caller(chan)->id.number.valid, ast_channel_caller(chan)->id.number.str, NULL))) {
-- ast_channel_lock(chan);
- ast_verb(2, "Redirecting '%s' to fax extension due to %s detection\n",
- ast_channel_name(chan), (result == 'f') ? "CNG" : "T38");
- pbx_builtin_setvar_helper(chan, "FAXEXTEN", ast_channel_exten(chan));
-@@ -3411,10 +3414,10 @@ static struct ast_frame *fax_detect_framehook(struct a
- ast_frfree(f);
- f = &ast_null_frame;
- } else {
-- ast_channel_lock(chan);
- ast_log(LOG_NOTICE, "FAX %s detected but no fax extension in context (%s)\n",
- (result == 'f') ? "CNG" : "T38", target_context);
- }
-+ ast_channel_lock(chan);
- }
- ast_framehook_detach(chan, details->faxdetect_id);
- details->faxdetect_id = -1;
Index: patches/patch-sounds_sounds_xml
===================================================================
RCS file: /cvs/ports/telephony/asterisk/patches/patch-sounds_sounds_xml,v
retrieving revision 1.5
diff -u -p -r1.5 patch-sounds_sounds_xml
--- patches/patch-sounds_sounds_xml 8 Jun 2015 08:44:52 -0000 1.5
+++ patches/patch-sounds_sounds_xml 11 Oct 2015 21:58:41 -0000
@@ -1,6 +1,6 @@
-$OpenBSD: patch-sounds_sounds_xml,v 1.5 2015/06/08 08:44:52 sthen Exp $
---- sounds/sounds.xml.orig Thu Jun  4 01:44:42 2015
-+++ sounds/sounds.xml Fri Jun  5 10:41:19 2015
+$OpenBSD$
+--- sounds/sounds.xml.orig Fri Aug  7 20:14:21 2015
++++ sounds/sounds.xml Fri Oct  9 15:30:56 2015
 @@ -10,7 +10,6 @@
  </member>
  <member name="CORE-SOUNDS-EN-GSM" displayname="English, GSM format" >
Index: patches/patch-utils_Makefile
===================================================================
RCS file: patches/patch-utils_Makefile
diff -N patches/patch-utils_Makefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-utils_Makefile 11 Oct 2015 21:58:41 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- 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
+
+ extconf.o: extconf.c
+
++conf2ael: 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
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/telephony/asterisk/pkg/PLIST-main,v
retrieving revision 1.57
diff -u -p -r1.57 PLIST-main
--- pkg/PLIST-main 8 Jun 2015 08:44:52 -0000 1.57
+++ pkg/PLIST-main 11 Oct 2015 21:58:41 -0000
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-main,v 1.57 2015/06/08 08:44:52 sthen Exp $
+@comment $OpenBSD: PLIST-main,v 1.56 2014/09/20 20:37:44 sthen Exp $
 @conflict asterisk-sounds-<=1.2.1p2
 @conflict asterisk-curl-*
 @conflict asterisk-fax-*
@@ -26,6 +26,7 @@ include/asterisk/agi.h
 include/asterisk/alaw.h
 include/asterisk/aoc.h
 include/asterisk/app.h
+include/asterisk/ari.h
 include/asterisk/ast_expr.h
 include/asterisk/ast_version.h
 include/asterisk/astdb.h
@@ -36,9 +37,18 @@ include/asterisk/astosp.h
 include/asterisk/audiohook.h
 include/asterisk/autochan.h
 include/asterisk/autoconfig.h
-include/asterisk/bridging.h
-include/asterisk/bridging_features.h
-include/asterisk/bridging_technology.h
+include/asterisk/backtrace.h
+include/asterisk/beep.h
+include/asterisk/bridge.h
+include/asterisk/bridge_after.h
+include/asterisk/bridge_basic.h
+include/asterisk/bridge_channel.h
+include/asterisk/bridge_channel_internal.h
+include/asterisk/bridge_features.h
+include/asterisk/bridge_internal.h
+include/asterisk/bridge_roles.h
+include/asterisk/bridge_technology.h
+include/asterisk/bucket.h
 include/asterisk/build.h
 include/asterisk/buildinfo.h
 include/asterisk/buildopts.h
@@ -54,10 +64,13 @@ include/asterisk/channel_internal.h
 include/asterisk/channelstate.h
 include/asterisk/chanvars.h
 include/asterisk/cli.h
+include/asterisk/codec.h
 include/asterisk/compat.h
 include/asterisk/compiler.h
 include/asterisk/config.h
 include/asterisk/config_options.h
+include/asterisk/core_local.h
+include/asterisk/core_unreal.h
 include/asterisk/crypto.h
 include/asterisk/data.h
 include/asterisk/datastore.h
@@ -71,24 +84,25 @@ include/asterisk/doxygen/architecture.h
 include/asterisk/doxygen/asterisk-git-howto.h
 include/asterisk/doxygen/commits.h
 include/asterisk/doxygen/licensing.h
-include/asterisk/doxygen/mantisworkflow.h
 include/asterisk/doxygen/releases.h
 include/asterisk/doxygen/reviewboard.h
 include/asterisk/doxyref.h
 include/asterisk/dsp.h
 include/asterisk/dundi.h
 include/asterisk/endian.h
+include/asterisk/endpoints.h
 include/asterisk/enum.h
 include/asterisk/event.h
 include/asterisk/event_defs.h
 include/asterisk/extconf.h
 include/asterisk/features.h
+include/asterisk/features_config.h
 include/asterisk/file.h
 include/asterisk/format.h
+include/asterisk/format_cache.h
 include/asterisk/format_cap.h
-include/asterisk/format_pref.h
+include/asterisk/format_compatibility.h
 include/asterisk/frame.h
-include/asterisk/frame_defs.h
 include/asterisk/framehook.h
 include/asterisk/fskmodem.h
 include/asterisk/fskmodem_float.h
@@ -102,15 +116,17 @@ include/asterisk/image.h
 include/asterisk/indications.h
 include/asterisk/inline_api.h
 include/asterisk/io.h
-include/asterisk/jabber.h
-include/asterisk/jingle.h
+include/asterisk/json.h
 include/asterisk/linkedlists.h
 include/asterisk/localtime.h
 include/asterisk/lock.h
 include/asterisk/logger.h
 include/asterisk/manager.h
+include/asterisk/max_forwards.h
 include/asterisk/md5.h
+include/asterisk/media_index.h
 include/asterisk/message.h
+include/asterisk/mixmonitor.h
 include/asterisk/mod_format.h
 include/asterisk/module.h
 include/asterisk/monitor.h
@@ -120,8 +136,12 @@ include/asterisk/netsock2.h
 include/asterisk/network.h
 include/asterisk/optional_api.h
 include/asterisk/options.h
+include/asterisk/opus.h
+include/asterisk/parking.h
 include/asterisk/paths.h
 include/asterisk/pbx.h
+include/asterisk/phoneprov.h
+include/asterisk/pickup.h
 include/asterisk/pktccops.h
 include/asterisk/plc.h
 include/asterisk/poll-compat.h
@@ -129,21 +149,53 @@ include/asterisk/presencestate.h
 include/asterisk/privacy.h
 include/asterisk/pval.h
 include/asterisk/res_fax.h
+include/asterisk/res_hep.h
+include/asterisk/res_mwi_external.h
+include/asterisk/res_pjsip.h
+include/asterisk/res_pjsip_body_generator_types.h
+include/asterisk/res_pjsip_cli.h
+include/asterisk/res_pjsip_outbound_publish.h
+include/asterisk/res_pjsip_presence_xml.h
+include/asterisk/res_pjsip_pubsub.h
+include/asterisk/res_pjsip_session.h
 include/asterisk/res_srtp.h
 include/asterisk/rtp_engine.h
 include/asterisk/say.h
 include/asterisk/sched.h
+include/asterisk/sdp_srtp.h
 include/asterisk/security_events.h
 include/asterisk/security_events_defs.h
 include/asterisk/select.h
+include/asterisk/sem.h
 include/asterisk/sha1.h
 include/asterisk/silk.h
 include/asterisk/sip_api.h
 include/asterisk/slin.h
 include/asterisk/slinfactory.h
 include/asterisk/smdi.h
+include/asterisk/smoother.h
+include/asterisk/sorcery.h
+include/asterisk/sounds_index.h
 include/asterisk/speech.h
+include/asterisk/spinlock.h
 include/asterisk/srv.h
+include/asterisk/stasis.h
+include/asterisk/stasis_app.h
+include/asterisk/stasis_app_device_state.h
+include/asterisk/stasis_app_impl.h
+include/asterisk/stasis_app_mailbox.h
+include/asterisk/stasis_app_playback.h
+include/asterisk/stasis_app_recording.h
+include/asterisk/stasis_app_snoop.h
+include/asterisk/stasis_bridges.h
+include/asterisk/stasis_cache_pattern.h
+include/asterisk/stasis_channels.h
+include/asterisk/stasis_endpoints.h
+include/asterisk/stasis_internal.h
+include/asterisk/stasis_message_router.h
+include/asterisk/stasis_system.h
+include/asterisk/stasis_test.h
+include/asterisk/statsd.h
 include/asterisk/stringfields.h
 include/asterisk/strings.h
 include/asterisk/stun.h
@@ -153,6 +205,7 @@ include/asterisk/tcptls.h
 include/asterisk/tdd.h
 include/asterisk/term.h
 include/asterisk/test.h
+include/asterisk/threadpool.h
 include/asterisk/threadstorage.h
 include/asterisk/time.h
 include/asterisk/timing.h
@@ -161,7 +214,9 @@ include/asterisk/translate.h
 include/asterisk/udptl.h
 include/asterisk/ulaw.h
 include/asterisk/unaligned.h
+include/asterisk/uri.h
 include/asterisk/utils.h
+include/asterisk/uuid.h
 include/asterisk/vector.h
 include/asterisk/version.h
 include/asterisk/xml.h
@@ -170,9 +225,11 @@ include/asterisk/xmpp.h
 lib/asterisk/
 lib/asterisk/modules/
 lib/asterisk/modules/app_adsiprog.so
+lib/asterisk/modules/app_agent_pool.so
 lib/asterisk/modules/app_alarmreceiver.so
 lib/asterisk/modules/app_amd.so
 lib/asterisk/modules/app_authenticate.so
+lib/asterisk/modules/app_bridgewait.so
 lib/asterisk/modules/app_cdr.so
 lib/asterisk/modules/app_celgenuserevent.so
 lib/asterisk/modules/app_chanisavail.so
@@ -205,7 +262,6 @@ lib/asterisk/modules/app_mp3.so
 lib/asterisk/modules/app_nbscat.so
 lib/asterisk/modules/app_originate.so
 lib/asterisk/modules/app_page.so
-lib/asterisk/modules/app_parkandannounce.so
 lib/asterisk/modules/app_playback.so
 lib/asterisk/modules/app_playtones.so
 lib/asterisk/modules/app_privacy.so
@@ -220,6 +276,7 @@ lib/asterisk/modules/app_sms.so
 lib/asterisk/modules/app_softhangup.so
 lib/asterisk/modules/app_speech_utils.so
 lib/asterisk/modules/app_stack.so
+lib/asterisk/modules/app_stasis.so
 lib/asterisk/modules/app_system.so
 lib/asterisk/modules/app_talkdetect.so
 lib/asterisk/modules/app_test.so
@@ -234,7 +291,9 @@ lib/asterisk/modules/app_waituntil.so
 lib/asterisk/modules/app_while.so
 lib/asterisk/modules/app_zapateller.so
 lib/asterisk/modules/bridge_builtin_features.so
-lib/asterisk/modules/bridge_multiplexed.so
+lib/asterisk/modules/bridge_builtin_interval_features.so
+lib/asterisk/modules/bridge_holding.so
+lib/asterisk/modules/bridge_native_rtp.so
 lib/asterisk/modules/bridge_simple.so
 lib/asterisk/modules/bridge_softmix.so
 lib/asterisk/modules/cdr_csv.so
@@ -245,14 +304,13 @@ lib/asterisk/modules/cdr_syslog.so
 lib/asterisk/modules/cel_custom.so
 lib/asterisk/modules/cel_manager.so
 lib/asterisk/modules/cel_sqlite3_custom.so
-lib/asterisk/modules/chan_agent.so
-lib/asterisk/modules/chan_bridge.so
+lib/asterisk/modules/chan_bridge_media.so
 lib/asterisk/modules/chan_console.so
 lib/asterisk/modules/chan_iax2.so
-lib/asterisk/modules/chan_local.so
 lib/asterisk/modules/chan_mgcp.so
 lib/asterisk/modules/chan_motif.so
 lib/asterisk/modules/chan_multicast_rtp.so
+lib/asterisk/modules/chan_pjsip.so
 lib/asterisk/modules/chan_sip.so
 lib/asterisk/modules/chan_skinny.so
 lib/asterisk/modules/chan_unistim.so
@@ -312,16 +370,22 @@ lib/asterisk/modules/func_logic.so
 lib/asterisk/modules/func_math.so
 lib/asterisk/modules/func_md5.so
 lib/asterisk/modules/func_module.so
+lib/asterisk/modules/func_periodic_hook.so
 lib/asterisk/modules/func_pitchshift.so
+lib/asterisk/modules/func_pjsip_aor.so
+lib/asterisk/modules/func_pjsip_contact.so
+lib/asterisk/modules/func_pjsip_endpoint.so
 lib/asterisk/modules/func_presencestate.so
 lib/asterisk/modules/func_rand.so
 lib/asterisk/modules/func_realtime.so
 lib/asterisk/modules/func_sha1.so
 lib/asterisk/modules/func_shell.so
+lib/asterisk/modules/func_sorcery.so
 lib/asterisk/modules/func_sprintf.so
 lib/asterisk/modules/func_srv.so
 lib/asterisk/modules/func_strings.so
 lib/asterisk/modules/func_sysinfo.so
+lib/asterisk/modules/func_talkdetect.so
 lib/asterisk/modules/func_timeout.so
 lib/asterisk/modules/func_uri.so
 lib/asterisk/modules/func_version.so
@@ -336,6 +400,18 @@ lib/asterisk/modules/pbx_spool.so
 lib/asterisk/modules/res_adsi.so
 lib/asterisk/modules/res_ael_share.so
 lib/asterisk/modules/res_agi.so
+lib/asterisk/modules/res_ari.so
+lib/asterisk/modules/res_ari_applications.so
+lib/asterisk/modules/res_ari_asterisk.so
+lib/asterisk/modules/res_ari_bridges.so
+lib/asterisk/modules/res_ari_channels.so
+lib/asterisk/modules/res_ari_device_states.so
+lib/asterisk/modules/res_ari_endpoints.so
+lib/asterisk/modules/res_ari_events.so
+lib/asterisk/modules/res_ari_model.so
+lib/asterisk/modules/res_ari_playbacks.so
+lib/asterisk/modules/res_ari_recordings.so
+lib/asterisk/modules/res_ari_sounds.so
 lib/asterisk/modules/res_clialiases.so
 lib/asterisk/modules/res_clioriginate.so
 lib/asterisk/modules/res_config_curl.so
@@ -348,20 +424,84 @@ lib/asterisk/modules/res_fax_spandsp.so
 lib/asterisk/modules/res_format_attr_celt.so
 lib/asterisk/modules/res_format_attr_h263.so
 lib/asterisk/modules/res_format_attr_h264.so
+lib/asterisk/modules/res_format_attr_opus.so
 lib/asterisk/modules/res_format_attr_silk.so
+lib/asterisk/modules/res_hep.so
+lib/asterisk/modules/res_hep_pjsip.so
+lib/asterisk/modules/res_hep_rtcp.so
 lib/asterisk/modules/res_http_websocket.so
 lib/asterisk/modules/res_limit.so
+lib/asterisk/modules/res_manager_devicestate.so
+lib/asterisk/modules/res_manager_presencestate.so
 lib/asterisk/modules/res_monitor.so
 lib/asterisk/modules/res_musiconhold.so
 lib/asterisk/modules/res_mutestream.so
+lib/asterisk/modules/res_parking.so
 lib/asterisk/modules/res_phoneprov.so
+lib/asterisk/modules/res_pjsip.so
+lib/asterisk/modules/res_pjsip_acl.so
+lib/asterisk/modules/res_pjsip_authenticator_digest.so
+lib/asterisk/modules/res_pjsip_caller_id.so
+lib/asterisk/modules/res_pjsip_config_wizard.so
+lib/asterisk/modules/res_pjsip_dialog_info_body_generator.so
+lib/asterisk/modules/res_pjsip_diversion.so
+lib/asterisk/modules/res_pjsip_dlg_options.so
+lib/asterisk/modules/res_pjsip_dtmf_info.so
+lib/asterisk/modules/res_pjsip_endpoint_identifier_anonymous.so
+lib/asterisk/modules/res_pjsip_endpoint_identifier_ip.so
+lib/asterisk/modules/res_pjsip_endpoint_identifier_user.so
+lib/asterisk/modules/res_pjsip_exten_state.so
+lib/asterisk/modules/res_pjsip_header_funcs.so
+lib/asterisk/modules/res_pjsip_keepalive.so
+lib/asterisk/modules/res_pjsip_log_forwarder.so
+lib/asterisk/modules/res_pjsip_logger.so
+lib/asterisk/modules/res_pjsip_messaging.so
+lib/asterisk/modules/res_pjsip_multihomed.so
+lib/asterisk/modules/res_pjsip_mwi.so
+lib/asterisk/modules/res_pjsip_mwi_body_generator.so
+lib/asterisk/modules/res_pjsip_nat.so
+lib/asterisk/modules/res_pjsip_notify.so
+lib/asterisk/modules/res_pjsip_one_touch_record_info.so
+lib/asterisk/modules/res_pjsip_outbound_authenticator_digest.so
+lib/asterisk/modules/res_pjsip_outbound_publish.so
+lib/asterisk/modules/res_pjsip_outbound_registration.so
+lib/asterisk/modules/res_pjsip_path.so
+lib/asterisk/modules/res_pjsip_phoneprov_provider.so
+lib/asterisk/modules/res_pjsip_pidf_body_generator.so
+lib/asterisk/modules/res_pjsip_pidf_digium_body_supplement.so
+lib/asterisk/modules/res_pjsip_pidf_eyebeam_body_supplement.so
+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
+lib/asterisk/modules/res_pjsip_session.so
+lib/asterisk/modules/res_pjsip_sips_contact.so
+lib/asterisk/modules/res_pjsip_t38.so
+lib/asterisk/modules/res_pjsip_transport_websocket.so
+lib/asterisk/modules/res_pjsip_xpidf_body_generator.so
 lib/asterisk/modules/res_realtime.so
 lib/asterisk/modules/res_rtp_asterisk.so
 lib/asterisk/modules/res_rtp_multicast.so
 lib/asterisk/modules/res_security_log.so
 lib/asterisk/modules/res_smdi.so
+lib/asterisk/modules/res_sorcery_astdb.so
+lib/asterisk/modules/res_sorcery_config.so
+lib/asterisk/modules/res_sorcery_memory.so
+lib/asterisk/modules/res_sorcery_memory_cache.so
+lib/asterisk/modules/res_sorcery_realtime.so
 lib/asterisk/modules/res_speech.so
 lib/asterisk/modules/res_srtp.so
+lib/asterisk/modules/res_stasis.so
+lib/asterisk/modules/res_stasis_answer.so
+lib/asterisk/modules/res_stasis_device_state.so
+lib/asterisk/modules/res_stasis_playback.so
+lib/asterisk/modules/res_stasis_recording.so
+lib/asterisk/modules/res_stasis_snoop.so
+lib/asterisk/modules/res_statsd.so
 lib/asterisk/modules/res_stun_monitor.so
 @comment lib/asterisk/modules/res_timing_kqueue.so
 lib/asterisk/modules/res_timing_pthread.so
@@ -380,12 +520,14 @@ lib/pkgconfig/asterisk.pc
 @bin sbin/astdb2sqlite3
 @bin sbin/asterisk
 sbin/astgenkey
+sbin/astversion
 @comment sbin/autosupport
 sbin/rasterisk
 sbin/safe_asterisk
 share/asterisk/agi-bin/
 share/asterisk/documentation/
 share/asterisk/documentation/appdocsxml.dtd
+share/asterisk/documentation/appdocsxml.xslt
 share/asterisk/documentation/core-en_US.xml
 share/asterisk/documentation/thirdparty/
 share/asterisk/firmware/
@@ -401,15 +543,29 @@ share/asterisk/phoneprov/000000000000.cf
 share/asterisk/phoneprov/polycom.xml
 share/asterisk/phoneprov/polycom_line.xml
 share/asterisk/phoneprov/snom-mac.xml
+share/asterisk/rest-api/
+share/asterisk/rest-api/applications.json
+share/asterisk/rest-api/asterisk.json
+share/asterisk/rest-api/bridges.json
+share/asterisk/rest-api/channels.json
+share/asterisk/rest-api/deviceStates.json
+share/asterisk/rest-api/endpoints.json
+share/asterisk/rest-api/events.json
+share/asterisk/rest-api/mailboxes.json
+share/asterisk/rest-api/playbacks.json
+share/asterisk/rest-api/recordings.json
+share/asterisk/rest-api/resources.json
+share/asterisk/rest-api/sounds.json
 share/asterisk/static-http/
 share/asterisk/static-http/ajamdemo.html
+share/asterisk/static-http/appdocsxml.xslt
 share/asterisk/static-http/astman.css
 share/asterisk/static-http/astman.js
 share/asterisk/static-http/core-en_US.xml
 share/asterisk/static-http/mantest.html
 share/asterisk/static-http/prototype.js
 share/doc/asterisk/
-share/doc/asterisk/Asterisk-11-Reference.pdf
+share/doc/asterisk/Asterisk-13-Reference.pdf
 share/doc/asterisk/Asterisk-Admin-Guide.pdf
 share/doc/asterisk/BUGS
 share/doc/asterisk/CHANGES
@@ -428,6 +584,8 @@ share/doc/asterisk/UPGRADE-1.4.txt
 share/doc/asterisk/UPGRADE-1.6.txt
 share/doc/asterisk/UPGRADE-1.8.txt
 share/doc/asterisk/UPGRADE-10.txt
+share/doc/asterisk/UPGRADE-11.txt
+share/doc/asterisk/UPGRADE-12.txt
 share/doc/asterisk/UPGRADE.txt
 share/doc/asterisk/api-1.6.0-changes.odt
 share/doc/asterisk/api-1.6.2-changes.txt
@@ -447,6 +605,7 @@ share/examples/asterisk/default/alarmrec
 share/examples/asterisk/default/amd.conf
 @comment share/examples/asterisk/default/app_mysql.conf
 share/examples/asterisk/default/app_skel.conf
+share/examples/asterisk/default/ari.conf
 share/examples/asterisk/default/asterisk.adsi
 share/examples/asterisk/default/asterisk.conf
 @sample ${SYSCONFDIR}/asterisk/asterisk.conf
@@ -489,20 +648,12 @@ share/examples/asterisk/default/extensio
 share/examples/asterisk/default/features.conf
 share/examples/asterisk/default/festival.conf
 share/examples/asterisk/default/followme.conf
-share/examples/asterisk/default/gtalk.conf
-@comment share/examples/asterisk/default/h323.conf
+share/examples/asterisk/default/hep.conf
 share/examples/asterisk/default/http.conf
 share/examples/asterisk/default/iax.conf
 share/examples/asterisk/default/iaxprov.conf
 share/examples/asterisk/default/indications.conf
 @sample ${SYSCONFDIR}/asterisk/indications.conf
-share/examples/asterisk/default/jabber.conf
-@mode 640
-@group _asterisk
-@sample ${SYSCONFDIR}/asterisk/jabber.conf
-@mode
-@group
-share/examples/asterisk/default/jingle.conf
 share/examples/asterisk/default/logger.conf
 share/examples/asterisk/default/manager.conf
 @comment share/examples/asterisk/default/meetme.conf
@@ -518,6 +669,9 @@ share/examples/asterisk/default/osp.conf
 @comment share/examples/asterisk/default/oss.conf
 share/examples/asterisk/default/phone.conf
 share/examples/asterisk/default/phoneprov.conf
+share/examples/asterisk/default/pjsip.conf
+share/examples/asterisk/default/pjsip_notify.conf
+share/examples/asterisk/default/pjsip_wizard.conf
 share/examples/asterisk/default/queuerules.conf
 share/examples/asterisk/default/queues.conf
 @comment share/examples/asterisk/default/res_config_mysql.conf
@@ -526,6 +680,7 @@ share/examples/asterisk/default/res_conf
 share/examples/asterisk/default/res_corosync.conf
 share/examples/asterisk/default/res_curl.conf
 share/examples/asterisk/default/res_fax.conf
+share/examples/asterisk/default/res_parking.conf
 share/examples/asterisk/default/res_pktccops.conf
 share/examples/asterisk/default/res_stun_monitor.conf
 share/examples/asterisk/default/rtp.conf
@@ -535,7 +690,12 @@ share/examples/asterisk/default/sip_noti
 share/examples/asterisk/default/skinny.conf
 share/examples/asterisk/default/sla.conf
 share/examples/asterisk/default/smdi.conf
+share/examples/asterisk/default/sorcery.conf
+share/examples/asterisk/default/ss7.timers
+share/examples/asterisk/default/stasis.conf
+share/examples/asterisk/default/statsd.conf
 share/examples/asterisk/default/telcordia-1.adsi
+share/examples/asterisk/default/test_sorcery.conf
 share/examples/asterisk/default/udptl.conf
 share/examples/asterisk/default/unistim.conf
 share/examples/asterisk/default/users.conf