updated asterisk 11 diff (now to 11.2.1) following my recent commit.
Index: Makefile
===================================================================
RCS file: /cvs/ports/telephony/asterisk/Makefile,v
retrieving revision 1.169
diff -u -p -r1.169 Makefile
--- Makefile 22 Jan 2013 23:26:30 -0000 1.169
+++ Makefile 22 Jan 2013 23:37:04 -0000
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.169 2013/01/22 23:26:30 sthen Exp $
+# $OpenBSD: Makefile,v 1.162 2012/10/08 21:28:06 sthen Exp $
SHARED_ONLY= Yes
+
COMMENT-main= open source multi-protocol PBX and telephony toolkit
-VER= 10.12.1
+VER= 11.2.1
DISTNAME= asterisk-${VER:S/beta/-beta/:S/rc/-rc/}
PKGNAME-main= asterisk-${VER}
@@ -17,16 +18,19 @@ MAINTAINER= Stuart Henderson <sthen@ope
# Asterisk with OpenSSL and OpenH323 and distribute the resulting binary
# files." iLBC codec has BSD-like license terms, but also see patent
# notes in codecs/ilbc/LICENSE_ADDENDUM.
-PERMIT_PACKAGE_CDROM= patent licensing clauses in iLBC
+PERMIT_PACKAGE_CDROM= patent licensing clauses
PERMIT_PACKAGE_FTP= Yes
-PERMIT_DISTFILES_CDROM= patent licensing clauses in iLBC
+PERMIT_DISTFILES_CDROM= patent licensing clauses
PERMIT_DISTFILES_FTP= Yes
WANTLIB-main += c crypto curl execinfo gsm idn iksemel
WANTLIB-main += m ogg pthread spandsp sqlite3 ssl stdc++ termcap
WANTLIB-main += tiff vorbis vorbisenc vorbisfile xml2 z
+WANTLIB-main += avcodec avformat avutil opencore-amrnb swscale
WANTLIB-main += ${MODGETTEXT_WANTLIB}
+SHARED_LIBS= asteriskssl 0.0 # 1
+
MODULES= devel/gettext
MULTI_PACKAGES= -main -calendar -http_post -ldap -odbc \
@@ -37,7 +41,9 @@ PSEUDO_FLAVORS= no_calendar no_http_pos
LIB_DEPENDS-main= audio/gsm \
audio/libogg \
audio/libvorbis \
+ audio/opencore-amr \
devel/libexecinfo \
+ graphics/ffmpeg \
graphics/tiff \
net/curl \
telephony/spandsp \
@@ -47,8 +53,7 @@ LIB_DEPENDS-main= audio/gsm \
RUN_DEPENDS-main= ${MODGETTEXT_RUN_DEPENDS} \
telephony/asterisk-sounds/core-sounds/en,gsm \
telephony/asterisk-sounds/moh-opsound,wav
-BUILD_DEPENDS+= devel/libtool# for share/aclocal/lt~obsolete.m4
-BUILD_DEPENDS+= security/libsrtp>=1.4.4# statically linked
+BUILD_DEPENDS= security/libsrtp>=1.4.4 # statically linked
MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/releases/ \
http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/
@@ -71,9 +76,11 @@ LDFLAGS+= -L${X11BASE}/lib -L${LOCALBAS
CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" \
CFLAGS="${CFLAGS}" \
LDFLAGS="${LDFLAGS}" \
- LIBS="-pthread"
+ LIBS="-lpthread" \
+ ac_cv_path_LDCONFIG=:
MAKE_FLAGS+= ASTCFLAGS="${CFLAGS}" \
ASTLDFLAGS="${LDFLAGS}" \
+ ASTSSL_SO_VERSION="${LIBasteriskssl_VERSION}" \
NOISY_BUILD="Yes" \
OPTIMIZE=
Index: distinfo
===================================================================
RCS file: /cvs/ports/telephony/asterisk/distinfo,v
retrieving revision 1.107
diff -u -p -r1.107 distinfo
--- distinfo 22 Jan 2013 23:26:30 -0000 1.107
+++ distinfo 22 Jan 2013 23:37:04 -0000
@@ -1,2 +1,2 @@
-SHA256 (asterisk-10.12.1.tar.gz) = qKn29NbygXex/MvtlML0n9z6IV6VTf1ZS/av3qG21vI=
-SIZE (asterisk-10.12.1.tar.gz) = 25114264
+SHA256 (asterisk-11.2.1.tar.gz) = I59CA3+OtD1s1psoak3j2l2UkYBu8pIR4PB09jsTCCU=
+SIZE (asterisk-11.2.1.tar.gz) = 30465933
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/telephony/asterisk/patches/patch-Makefile,v
retrieving revision 1.33
diff -u -p -r1.33 patch-Makefile
--- patches/patch-Makefile 28 Sep 2012 00:03:57 -0000 1.33
+++ patches/patch-Makefile 22 Jan 2013 23:37:04 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile,v 1.33 2012/09/28 00:03:57 sthen Exp $
---- Makefile.orig Wed Jun 13 15:30:34 2012
-+++ Makefile Tue Sep 18 23:47:38 2012
-@@ -123,7 +123,7 @@ ASTTOPDIR:=$(subst $(space),\$(space),$(CURDIR))
+--- Makefile.orig Tue Sep 18 16:47:01 2012
++++ Makefile Fri Oct 26 14:17:03 2012
+@@ -131,7 +131,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.33 2012/09/
# Asterisk.conf is located in ASTETCDIR or by using the -C flag
# when starting Asterisk
-@@ -153,8 +153,10 @@ LINKER_SYMBOL_PREFIX=
+@@ -160,8 +160,10 @@ LINKER_SYMBOL_PREFIX=
# The file /etc/asterisk.makeopts will also be included but can be overridden
# by the file in your home directory.
@@ -21,7 +21,7 @@ $OpenBSD: patch-Makefile,v 1.33 2012/09/
MOD_SUBDIR_CFLAGS="-I$(ASTTOPDIR)/include"
OTHER_SUBDIR_CFLAGS="-I$(ASTTOPDIR)/include"
-@@ -164,7 +166,9 @@ OPTIONS=
+@@ -176,7 +178,9 @@ endif
ifeq ($(findstring -save-temps,$(_ASTCFLAGS) $(ASTCFLAGS)),)
ifeq ($(findstring -pipe,$(_ASTCFLAGS) $(ASTCFLAGS)),)
Index: patches/patch-configs_asterisk_conf_sample
===================================================================
RCS file:
/cvs/ports/telephony/asterisk/patches/patch-configs_asterisk_conf_sample,v
retrieving revision 1.3
diff -u -p -r1.3 patch-configs_asterisk_conf_sample
--- patches/patch-configs_asterisk_conf_sample 28 Sep 2012 00:03:57 -0000
1.3
+++ patches/patch-configs_asterisk_conf_sample 22 Jan 2013 23:37:04 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-configs_asterisk_conf_sample,v 1.3 2012/09/28 00:03:57 sthen
Exp $
---- configs/asterisk.conf.sample.orig Wed Dec 7 20:12:53 2011
-+++ configs/asterisk.conf.sample Thu Jan 5 19:41:24 2012
-@@ -58,8 +58,8 @@ astsbindir => /usr/sbin
+--- configs/asterisk.conf.sample.orig Wed Apr 25 10:32:21 2012
++++ configs/asterisk.conf.sample Fri Oct 26 14:17:03 2012
+@@ -61,8 +61,8 @@ astsbindir => /usr/sbin
; not otherwise require one.
;transcode_via_sln = yes ; Build transcode paths via SLINEAR, instead of
; directly.
@@ -12,8 +12,8 @@ $OpenBSD: patch-configs_asterisk_conf_sa
;lightbackground = yes ; If your terminal is set for a
light-colored
; background.
;forceblackbackground = yes ; Force the background of the terminal to be
-@@ -76,11 +76,11 @@ documentation_language = en_US ; Set the language you
- ; lock.
+@@ -85,11 +85,11 @@ documentation_language = en_US ; Set the language you
+ ; Default gosub.
; Changing the following lines may compromise your security.
-;[files]
Index: patches/patch-configs_res_odbc_conf_sample
===================================================================
RCS file:
/cvs/ports/telephony/asterisk/patches/patch-configs_res_odbc_conf_sample,v
retrieving revision 1.2
diff -u -p -r1.2 patch-configs_res_odbc_conf_sample
--- patches/patch-configs_res_odbc_conf_sample 8 Nov 2012 09:34:31 -0000
1.2
+++ patches/patch-configs_res_odbc_conf_sample 22 Jan 2013 23:37:04 -0000
@@ -1,6 +1,6 @@
-$OpenBSD: patch-configs_res_odbc_conf_sample,v 1.2 2012/11/08 09:34:31 sthen
Exp $
---- configs/res_odbc.conf.sample.orig Tue Sep 25 14:28:20 2012
-+++ configs/res_odbc.conf.sample Tue Nov 6 23:29:02 2012
+$OpenBSD: patch-configs_res_odbc_conf_sample,v 1.1 2012/09/28 00:03:57 sthen
Exp $
+--- configs/res_odbc.conf.sample.orig Tue Sep 25 14:29:02 2012
++++ configs/res_odbc.conf.sample Fri Oct 26 14:17:04 2012
@@ -19,8 +19,7 @@
; If not specified, it is assumed the section is enabled.
enabled => no
Index: patches/patch-configs_sip_conf_sample
===================================================================
RCS file: /cvs/ports/telephony/asterisk/patches/patch-configs_sip_conf_sample,v
retrieving revision 1.1
diff -u -p -r1.1 patch-configs_sip_conf_sample
--- patches/patch-configs_sip_conf_sample 28 Sep 2012 00:03:57 -0000
1.1
+++ patches/patch-configs_sip_conf_sample 22 Jan 2013 23:37:04 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-configs_sip_conf_sample,v 1.1 2012/09/28 00:03:57 sthen Exp $
---- configs/sip.conf.sample.orig Thu Sep 20 14:02:08 2012
-+++ configs/sip.conf.sample Thu Sep 20 14:03:03 2012
-@@ -148,11 +148,11 @@ allowoverlap=no ; Disable overlap dial
+--- 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
Index: patches/patch-configure_ac
===================================================================
RCS file: /cvs/ports/telephony/asterisk/patches/patch-configure_ac,v
retrieving revision 1.27
diff -u -p -r1.27 patch-configure_ac
--- patches/patch-configure_ac 11 Dec 2012 14:46:41 -0000 1.27
+++ patches/patch-configure_ac 22 Jan 2013 23:37:04 -0000
@@ -1,7 +1,7 @@
-$OpenBSD: patch-configure_ac,v 1.27 2012/12/11 14:46:41 sthen Exp $
---- configure.ac.orig Thu Oct 18 20:53:08 2012
-+++ configure.ac Tue Dec 11 10:56:24 2012
-@@ -59,7 +59,7 @@ AC_SUBST([astvarrundir], ['${localstatedir}/run/a
+$OpenBSD: patch-configure_ac,v 1.26 2012/09/28 00:03:57 sthen Exp $
+--- configure.ac.orig Thu Oct 18 21:02:02 2012
++++ configure.ac Tue Jan 22 22:36:09 2013
+@@ -60,7 +60,7 @@ AC_SUBST([astvarrundir], ['${localstatedir}/run/a
case "${host_os}" in
*bsd*)
@@ -10,7 +10,7 @@ $OpenBSD: patch-configure_ac,v 1.27 2012
astvarlibdir='${prefix}/share/asterisk'
astdbdir='${localstatedir}/db/asterisk'
fi
-@@ -1618,7 +1618,7 @@ if test "${USE_IMAP_TK}" != "no"; then
+@@ -1701,7 +1701,7 @@ if test "${USE_IMAP_TK}" != "no"; then
)
else #looking in imap directory didn't work, try c-client
imap_ldflags=""
@@ -19,12 +19,12 @@ $OpenBSD: patch-configure_ac,v 1.27 2012
imap_include="-DUSE_SYSTEM_CCLIENT"
CPPFLAGS="${saved_cppflags}"
LIBS="${saved_libs}"
-@@ -1804,7 +1804,7 @@ AST_EXT_TOOL_CHECK([NETSNMP], [net-snmp-config], , [--
+@@ -1887,7 +1887,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], [-pthread])
++AST_EXT_LIB_CHECK([UNIXODBC], [iodbc], [SQLConnect], [sql.h], [-lpthread])
AST_EXT_LIB_CHECK([OGG], [ogg], [ogg_sync_init], [])
Index: patches/patch-contrib_scripts_safe_asterisk
===================================================================
RCS file:
/cvs/ports/telephony/asterisk/patches/patch-contrib_scripts_safe_asterisk,v
retrieving revision 1.15
diff -u -p -r1.15 patch-contrib_scripts_safe_asterisk
--- patches/patch-contrib_scripts_safe_asterisk 22 Jan 2013 23:26:30 -0000
1.15
+++ patches/patch-contrib_scripts_safe_asterisk 22 Jan 2013 23:37:04 -0000
@@ -1,25 +1,28 @@
-$OpenBSD: patch-contrib_scripts_safe_asterisk,v 1.15 2013/01/22 23:26:30 sthen
Exp $
+$OpenBSD: patch-contrib_scripts_safe_asterisk,v 1.14 2012/09/28 00:03:57 sthen
Exp $
- more useful defaults
- create /var/run/asterisk with sane ownership/perms
---- contrib/scripts/safe_asterisk.orig Tue Jan 22 18:43:31 2013
-+++ contrib/scripts/safe_asterisk Tue Jan 22 22:33:33 2013
-@@ -6,9 +6,9 @@ ASTVARRUNDIR=__ASTERISK_VARRUN_DIR__
+--- contrib/scripts/safe_asterisk.orig Tue Jan 22 18:57:06 2013
++++ contrib/scripts/safe_asterisk Tue Jan 22 22:36:09 2013
+@@ -6,22 +6,23 @@ ASTVARRUNDIR=__ASTERISK_VARRUN_DIR__
ASTVARLOGDIR=__ASTERISK_LOG_DIR__
CLIARGS="$*" # Grab any args passed to
safe_asterisk
-TTY=9 # TTY (if you want one) for
Asterisk to run on
-CONSOLE=yes # Whether or not you want a
console
--#NOTIFY=root@localhost.localdomain # Who to notify about crashes
-+TTY= # TTY (if you want one)
for Asterisk to run on
-+CONSOLE=no # Whether or not you
want a console
-+NOTIFY=root # Who to notify about
crashes
++TTY= # TTY (if you want one) for
Asterisk to run on
++CONSOLE=no # Whether or not you want a
console
+ #NOTIFY=root@localhost.localdomain # Who to notify about crashes
+-NOTIFY=${NOTIFY:-} # Who to notify about crashes
++NOTIFY=${NOTIFY:-root} # Who to notify about crashes
#EXEC=/path/to/somescript # Run this command if Asterisk
crashes
#LOGFILE=${ASTVARLOGDIR}/safe_asterisk.log # Where to place the normal
logfile (disabled if blank)
- #SYSLOG=local0 # Which syslog facility
to use (disabled if blank)
-@@ -16,10 +16,11 @@ MACHINE=`hostname` # To specify
which machine has c
- DUMPDROP=/tmp
+-SYSLOG=${SYSLOG:-} # Which syslog facility to use
(disabled if blank)
++SYSLOG=${SYSLOG:-daemon} # Which syslog facility to use
(disabled if blank)
+ MACHINE=`hostname` # To specify which machine has
crashed when getting the mail
+ DUMPDROP=${DUMPDROP:-/tmp}
+ RUNDIR=${RUNDIR:-/tmp}
SLEEPSECS=4
ASTPIDFILE=${ASTVARRUNDIR}/asterisk.pid
+VARRUNOWNER="_asterisk:wheel" # chown __ASTERISK_VARRUN_DIR__ if it's
created.
@@ -32,7 +35,7 @@ $OpenBSD: patch-contrib_scripts_safe_ast
# run asterisk with this priority
PRIORITY=0
-@@ -45,6 +46,19 @@ message() {
+@@ -47,6 +48,19 @@ message() {
fi
}
@@ -52,7 +55,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`
-@@ -73,7 +87,7 @@ else
+@@ -75,7 +89,7 @@ else
fi
fi
SYSCTL_MAXFILES="fs.file-max"
@@ -61,7 +64,7 @@ $OpenBSD: patch-contrib_scripts_safe_ast
SYSCTL_MAXFILES="kern.maxfiles"
fi
-@@ -84,8 +98,10 @@ else
+@@ -86,8 +100,10 @@ else
fi
fi
Index: patches/patch-main_features_c
===================================================================
RCS file: /cvs/ports/telephony/asterisk/patches/patch-main_features_c,v
retrieving revision 1.6
diff -u -p -r1.6 patch-main_features_c
--- patches/patch-main_features_c 15 Sep 2012 12:43:49 -0000 1.6
+++ patches/patch-main_features_c 22 Jan 2013 23:37:04 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-main_features_c,v 1.6 2012/09/15 12:43:49 sthen Exp $
---- main/features.c.orig Tue Sep 11 17:15:05 2012
-+++ main/features.c Wed Sep 12 14:36:19 2012
-@@ -1045,7 +1045,9 @@ static void bridge_call_thread_launch(struct ast_bridg
+--- 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));
Index: patches/patch-pbx_pbx_spool_c
===================================================================
RCS file: /cvs/ports/telephony/asterisk/patches/patch-pbx_pbx_spool_c,v
retrieving revision 1.3
diff -u -p -r1.3 patch-pbx_pbx_spool_c
--- patches/patch-pbx_pbx_spool_c 11 Dec 2012 14:46:41 -0000 1.3
+++ patches/patch-pbx_pbx_spool_c 22 Jan 2013 23:37:04 -0000
@@ -3,9 +3,9 @@ $OpenBSD: patch-pbx_pbx_spool_c,v 1.3 20
Don't pass an invalid time limit to kevent() if the directory list is empty
(limit is 100M seconds; see itimerfix() in /sys/kern/kern_time.c).
---- pbx/pbx_spool.c.orig Mon Oct 8 22:11:41 2012
-+++ pbx/pbx_spool.c Tue Dec 11 14:34:03 2012
-@@ -742,7 +742,7 @@ static void *scan_thread(void *unused)
+--- pbx/pbx_spool.c.orig Wed Nov 14 19:53:23 2012
++++ pbx/pbx_spool.c Tue Jan 22 23:29:33 2013
+@@ -751,7 +751,7 @@ static void *scan_thread(void *unused)
queue_created_files();
#else
struct timespec ts2 = { next - now, 0 };
Index: patches/patch-res_pjproject_aconfigure
===================================================================
RCS file: patches/patch-res_pjproject_aconfigure
diff -N patches/patch-res_pjproject_aconfigure
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-res_pjproject_aconfigure 22 Jan 2013 23:37:04 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+--- res/pjproject/aconfigure.orig Mon Nov 5 23:50:57 2012
++++ res/pjproject/aconfigure Mon Nov 5 23:52:18 2012
+@@ -3468,10 +3468,6 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+-if test -z "$CROSS_COMPILE"; then
+- CROSS_COMPILE=`echo ${CC} | sed 's/gcc//'`
+-fi
+-
+ if test "$AR" = ""; then AR="${CROSS_COMPILE}ar rv"; fi
+
+ if test "$LD" = ""; then LD="$CC"; fi
Index: patches/patch-sounds_sounds_xml
===================================================================
RCS file: /cvs/ports/telephony/asterisk/patches/patch-sounds_sounds_xml,v
retrieving revision 1.1
diff -u -p -r1.1 patch-sounds_sounds_xml
--- patches/patch-sounds_sounds_xml 25 Sep 2012 21:58:46 -0000 1.1
+++ patches/patch-sounds_sounds_xml 22 Jan 2013 23:37:04 -0000
@@ -1,19 +1,19 @@
$OpenBSD: patch-sounds_sounds_xml,v 1.1 2012/09/25 21:58:46 sthen Exp $
---- sounds/sounds.xml.orig Wed Sep 19 17:22:34 2012
-+++ sounds/sounds.xml Wed Sep 19 17:29:12 2012
-@@ -6,7 +6,6 @@
- <member name="CORE-SOUNDS-EN-ALAW" displayname="English, a-Law
format">
+--- sounds/sounds.xml.orig Sat Aug 18 02:08:03 2012
++++ sounds/sounds.xml Fri Oct 26 14:18:43 2012
+@@ -10,7 +10,6 @@
</member>
<member name="CORE-SOUNDS-EN-GSM" displayname="English, GSM
format" >
+ <support_level>core</support_level>
- <defaultenabled>yes</defaultenabled>
</member>
<member name="CORE-SOUNDS-EN-G729" displayname="English, G.729
format">
- </member>
-@@ -93,7 +92,6 @@
+ <support_level>core</support_level>
+@@ -138,7 +137,6 @@
</category>
<category name="MENUSELECT_MOH" displayname="Music On Hold File
Packages" positive_output="yes">
<member name="MOH-OPSOUND-WAV" displayname="opsound.org Music
On Hold Files, WAV format" >
- <defaultenabled>yes</defaultenabled>
+ <support_level>core</support_level>
</member>
<member name="MOH-OPSOUND-ULAW" displayname="opsound.org Music
On Hold Files, mu-Law format" >
- </member>
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/telephony/asterisk/pkg/PLIST-main,v
retrieving revision 1.46
diff -u -p -r1.46 PLIST-main
--- pkg/PLIST-main 28 Sep 2012 00:03:57 -0000 1.46
+++ pkg/PLIST-main 22 Jan 2013 23:37:04 -0000
@@ -50,12 +50,14 @@ include/asterisk/cdr.h
include/asterisk/cel.h
include/asterisk/celt.h
include/asterisk/channel.h
+include/asterisk/channel_internal.h
include/asterisk/channelstate.h
include/asterisk/chanvars.h
include/asterisk/cli.h
include/asterisk/compat.h
include/asterisk/compiler.h
include/asterisk/config.h
+include/asterisk/config_options.h
include/asterisk/crypto.h
include/asterisk/data.h
include/asterisk/datastore.h
@@ -95,6 +97,7 @@ include/asterisk/global_datastores.h
include/asterisk/hashtab.h
include/asterisk/heap.h
include/asterisk/http.h
+include/asterisk/http_websocket.h
include/asterisk/image.h
include/asterisk/indications.h
include/asterisk/inline_api.h
@@ -122,6 +125,7 @@ include/asterisk/pbx.h
include/asterisk/pktccops.h
include/asterisk/plc.h
include/asterisk/poll-compat.h
+include/asterisk/presencestate.h
include/asterisk/privacy.h
include/asterisk/pval.h
include/asterisk/res_fax.h
@@ -134,6 +138,7 @@ include/asterisk/security_events_defs.h
include/asterisk/select.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
@@ -160,6 +165,7 @@ include/asterisk/utils.h
include/asterisk/version.h
include/asterisk/xml.h
include/asterisk/xmldoc.h
+include/asterisk/xmpp.h
lib/asterisk/
lib/asterisk/modules/
lib/asterisk/modules/app_adsiprog.so
@@ -197,6 +203,7 @@ lib/asterisk/modules/app_morsecode.so
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
@@ -239,10 +246,10 @@ 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_gtalk.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_sip.so
lib/asterisk/modules/chan_skinny.so
@@ -295,6 +302,7 @@ lib/asterisk/modules/func_extstate.so
lib/asterisk/modules/func_frame_trace.so
lib/asterisk/modules/func_global.so
lib/asterisk/modules/func_groupcount.so
+lib/asterisk/modules/func_hangupcause.so
lib/asterisk/modules/func_iconv.so
lib/asterisk/modules/func_jitterbuffer.so
lib/asterisk/modules/func_lock.so
@@ -303,6 +311,7 @@ lib/asterisk/modules/func_math.so
lib/asterisk/modules/func_md5.so
lib/asterisk/modules/func_module.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
@@ -328,14 +337,17 @@ lib/asterisk/modules/res_agi.so
lib/asterisk/modules/res_clialiases.so
lib/asterisk/modules/res_clioriginate.so
lib/asterisk/modules/res_config_curl.so
+lib/asterisk/modules/res_config_sqlite3.so
lib/asterisk/modules/res_convert.so
lib/asterisk/modules/res_crypto.so
lib/asterisk/modules/res_curl.so
lib/asterisk/modules/res_fax.so
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_silk.so
-lib/asterisk/modules/res_jabber.so
+lib/asterisk/modules/res_http_websocket.so
lib/asterisk/modules/res_limit.so
lib/asterisk/modules/res_monitor.so
lib/asterisk/modules/res_musiconhold.so
@@ -350,6 +362,9 @@ lib/asterisk/modules/res_speech.so
lib/asterisk/modules/res_srtp.so
lib/asterisk/modules/res_stun_monitor.so
lib/asterisk/modules/res_timing_pthread.so
+lib/asterisk/modules/res_xmpp.so
+@comment lib/libasteriskssl.so
+@lib lib/libasteriskssl.so.${LIBasteriskssl_VERSION}
@man man/man8/asterisk.8
@man man/man8/astgenkey.8
@man man/man8/autosupport.8
@@ -405,6 +420,7 @@ share/doc/asterisk/UPGRADE-1.2.txt
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.txt
share/doc/asterisk/api-1.6.0-changes.odt
share/doc/asterisk/api-1.6.2-changes.txt
@@ -416,13 +432,14 @@ share/examples/asterisk/
@mode
@group
share/examples/asterisk/default/
+share/examples/asterisk/default/acl.conf
share/examples/asterisk/default/adsi.conf
share/examples/asterisk/default/agents.conf
-share/examples/asterisk/default/ais.conf
share/examples/asterisk/default/alarmreceiver.conf
@comment share/examples/asterisk/default/alsa.conf
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/asterisk.adsi
share/examples/asterisk/default/asterisk.conf
@sample ${SYSCONFDIR}/asterisk/asterisk.conf
@@ -441,12 +458,12 @@ share/examples/asterisk/default/cel_sqli
@comment share/examples/asterisk/default/cel_tds.conf
@comment share/examples/asterisk/default/chan_dahdi.conf
@comment share/examples/asterisk/default/chan_mobile.conf
-@comment share/examples/asterisk/default/chan_ooh323.conf
share/examples/asterisk/default/cli.conf
share/examples/asterisk/default/cli_aliases.conf
share/examples/asterisk/default/cli_permissions.conf
share/examples/asterisk/default/codecs.conf
share/examples/asterisk/default/confbridge.conf
+share/examples/asterisk/default/config_test.conf
share/examples/asterisk/default/console.conf
share/examples/asterisk/default/dbsep.conf
share/examples/asterisk/default/dnsmgr.conf
@@ -483,8 +500,10 @@ share/examples/asterisk/default/mgcp.con
share/examples/asterisk/default/minivm.conf
@comment share/examples/asterisk/default/misdn.conf
share/examples/asterisk/default/modules.conf
+share/examples/asterisk/default/motif.conf
share/examples/asterisk/default/musiconhold.conf
share/examples/asterisk/default/muted.conf
+@comment share/examples/asterisk/default/ooh323.conf
share/examples/asterisk/default/osp.conf
@comment share/examples/asterisk/default/oss.conf
share/examples/asterisk/default/phone.conf
@@ -493,6 +512,8 @@ share/examples/asterisk/default/queuerul
share/examples/asterisk/default/queues.conf
@comment share/examples/asterisk/default/res_config_mysql.conf
share/examples/asterisk/default/res_config_sqlite.conf
+share/examples/asterisk/default/res_config_sqlite3.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_pktccops.conf
@@ -510,6 +531,7 @@ share/examples/asterisk/default/unistim.
share/examples/asterisk/default/users.conf
share/examples/asterisk/default/voicemail.conf
@comment share/examples/asterisk/default/vpb.conf
+share/examples/asterisk/default/xmpp.conf
share/examples/asterisk/openbsd/
share/examples/asterisk/openbsd/cdr.conf.sample
@sample ${SYSCONFDIR}/asterisk/cdr.conf
