summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--MOVED1
-rw-r--r--net/Makefile1
-rw-r--r--net/asterisk/Makefile263
-rw-r--r--net/asterisk/distinfo6
-rw-r--r--net/asterisk/files/asterisk.in65
-rw-r--r--net/asterisk/files/patch-AST-2016-001153
-rw-r--r--net/asterisk/files/patch-AST-2016-00218
-rw-r--r--net/asterisk/files/patch-AST-2016-00328
-rw-r--r--net/asterisk/files/patch-Makefile97
-rw-r--r--net/asterisk/files/patch-agi__Makefile13
-rw-r--r--net/asterisk/files/patch-channels-chan_dahdi.c33
-rw-r--r--net/asterisk/files/patch-channels__Makefile29
-rw-r--r--net/asterisk/files/patch-channels__sip__include__sip.h11
-rw-r--r--net/asterisk/files/patch-channels_h323_Makefile.in11
-rw-r--r--net/asterisk/files/patch-configure231
-rw-r--r--net/asterisk/files/patch-main__Makefile38
-rw-r--r--net/asterisk/files/patch-main__asterisk.exports.in11
-rw-r--r--net/asterisk/files/patch-main__db.c18
-rw-r--r--net/asterisk/files/patch-main__lock.c13
-rw-r--r--net/asterisk/files/patch-main__utils.c13
-rw-r--r--net/asterisk/files/patch-main_tcptls.c17
-rw-r--r--net/asterisk/pkg-descr5
-rw-r--r--net/asterisk/pkg-message36
-rw-r--r--net/asterisk/pkg-plist284
24 files changed, 1 insertions, 1394 deletions
diff --git a/MOVED b/MOVED
index 1e72eebc2d57..b4149c54357e 100644
--- a/MOVED
+++ b/MOVED
@@ -8622,3 +8622,4 @@ emulators/kqemu-kmod||2016-08-26|Not supported in any qemu version anymore
emulators/kqemu-kmod-devel||2016-08-26|Not supported in any qemu version anymore
www/varnish-libvmod-saintmode|www/varnish-modules|2016-09-01|Upstream moved this module into the varnish-modules collection
security/letskencrypt|security/acme-client|2016-09-02|Upstream renamed the project
+net/asterisk||2016-09-12|Has expired: Asterisk 1.8 reached EOL on 2015-10-21
diff --git a/net/Makefile b/net/Makefile
index 6ed068952c16..3d37011f2574 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -26,7 +26,6 @@
SUBDIR += arprelease
SUBDIR += asio
SUBDIR += aslookup
- SUBDIR += asterisk
SUBDIR += asterisk-chan_sccp
SUBDIR += asterisk-g72x
SUBDIR += asterisk11
diff --git a/net/asterisk/Makefile b/net/asterisk/Makefile
deleted file mode 100644
index e8c4bc73fa5a..000000000000
--- a/net/asterisk/Makefile
+++ /dev/null
@@ -1,263 +0,0 @@
-# Created by: Maxim Sobolev <sobomax@portaone.com>
-# $FreeBSD$
-
-PORTNAME= asterisk
-PORTVERSION= 1.8.32.3
-PORTREVISION= 8
-CATEGORIES= net
-MASTER_SITES= http://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729
-MASTER_SITE_SUBDIR= asterisk/ \
- asterisk/old-releases/ \
- sounds/releases/:g729
-PKGNAMESUFFIX= 18
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
-
-MAINTAINER= madpilot@FreeBSD.org
-COMMENT= Open Source PBX and telephony toolkit
-
-LICENSE= GPLv2
-LICENSE_FILE= ${WRKSRC}/LICENSE
-
-EXTRACT_ONLY:= ${DISTNAME}${EXTRACT_SUFX}
-
-DEPRECATED= Asterisk 1.8 reached EOL on 2015-10-21
-EXPIRATION_DATE= 2016-04-30
-
-ONLY_FOR_ARCHS= i386 amd64 powerpc sparc64
-
-USES= alias bison cpe gmake shebangfix ssl
-USE_CSTD= gnu89
-USE_GCC= yes
-USE_GNOME= libxml2
-USE_RC_SUBR= asterisk
-
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-crypto=${OPENSSLBASE} \
- --with-ssl=${OPENSSLBASE}
-
-CPE_VENDOR= digium
-
-SHEBANG_FILES= agi/agi-test.agi \
- agi/jukebox.agi
-STRIP=
-
-MAKE_ENV= PTHREAD_LIBS="-lpthread" \
- MKDIR="${MKDIR}" \
- PWLIBDIR=${LOCALBASE}/share/pwlib \
- OSVERSION=${OSVERSION} \
- DOCSDIR=${DOCSDIR} \
- ASTCFLAGS="${CFLAGS}" \
- ASTLDFLAGS="${LDFLAGS}"
-MAKE_ARGS+= NOISY_BUILD=yes \
- ASTDATADIR=${DATADIR}
-
-CONFLICTS_BUILD= linuxthreads-*
-CONFLICTS_INSTALL= asterisk*-11* asterisk*-13*
-
-OPTIONS_DEFINE= BACKTRACE CURL EXCHANGE FREETDS H323 JABBER LUA LDAP \
- MP3PLAYER OOH323 RADIUS SNMP SPANDSP SRTP SYSINFO
-OPTIONS_DEFAULT= BACKTRACE CURL FREETDS GSM H323 JABBER LUA NEWT MYSQL ODBC \
- PGSQL RADIUS SNMP SPANDSP SPEEX SQLITE VORBIS
-
-OPTIONS_DEFINE_i386= DAHDI
-OPTIONS_DEFINE_amd64= DAHDI
-OPTIONS_DEFINE_sparc64= DAHDI
-
-OPTIONS_DEFAULT_i386= DAHDI
-OPTIONS_DEFAULT_amd64= DAHDI
-OPTIONS_DEFAULT_sparc64= DAHDI
-
-OPTIONS_GROUP= CODECS
-OPTIONS_GROUP_CODECS= GSM NEWG711 SPEEX VORBIS
-CODECS_DESC= Encoder/Decoder (Codec) Support
-
-OPTIONS_GROUP+= DATABASE
-OPTIONS_GROUP_DATABASE= MYSQL ODBC PGSQL SQLITE
-DATABASE_DESC= Database Support
-
-OPTIONS_MULTI= MENU
-OPTIONS_MULTI_MENU= NCURSES NEWT
-MENU_DESC= Menuselect Interface Backend
-NEWT_DESC= Newt User Interface
-
-OPTIONS_GROUP+= SOUNDS
-OPTIONS_GROUP_SOUNDS= G729
-SOUNDS_DESC= Core and Music-on-Hold (MoH) Sound Files
-ASTERISK_CORE_G729_SOUNDS= asterisk-core-sounds-en-g729-1.4.26.tar.gz
-ASTERISK_MOH_G729_SOUNDS= asterisk-moh-opsound-g729-2.03.tar.gz
-
-G729_DESC= Install G.729 format sounds
-G729_DISTFILES= ${ASTERISK_CORE_G729_SOUNDS}:g729 \
- ${ASTERISK_MOH_G729_SOUNDS}:g729
-
-OPTIONS_SUB= yes
-
-BACKTRACE_DESC= Stack backtrace support via (lib)execinfo
-DAHDI_DESC= Digium Asterisk Hardware Device Interface (DAHDI) support
-EXCHANGE_DESC= Exchange calendar support
-MP3PLAYER_DESC= Install MP3 Player for Music-On-Hold (mpg123)
-NEWG711_DESC= Use the NEW G.711 (ulaw/alaw) codecs (slower, but cleaner)
-
-OOH323_DESC= ooh323 support
-SRTP_DESC= Secure Real-time Transport Protocol (SRTP RFC3711) support
-SYSINFO_DESC= Use devel/libsysinfo to get system information
-
-BACKTRACE_CONFIGURE_WITH= execinfo
-BACKTRACE_USES= execinfo
-
-CURL_CONFIGURE_ON= --with-libcurl
-CURL_CONFIGURE_OFF= --with-libcurl=no
-CURL_LIB_DEPENDS= libcurl.so:ftp/curl
-
-DAHDI_CONFIGURE_ON= --with-dahdi --with-openr2
-DAHDI_CONFIGURE_OFF= --without-dahdi --without-openr2
-DAHDI_LIB_DEPENDS= libpri.so:misc/libpri \
- libopenr2.so:misc/openr2 \
- libtonezone.so:misc/dahdi
-
-EXCHANGE_CONFIGURE_OFF= --without-neon --without-neon29
-EXCHANGE_LIB_DEPENDS= libneon.so:www/neon
-
-FREETDS_CONFIGURE_ON= --with-tds=${LOCALBASE}
-FREETDS_CONFIGURE_OFF= --without-tds
-FREETDS_LIB_DEPENDS= libsybdb.so:databases/freetds
-
-GSM_CONFIGURE_WITH= gsm
-GSM_LIB_DEPENDS= libgsm.so:audio/gsm
-
-H323_CONFIGURE_WITH= h323
-H323_CPPFLAGS= -I${LOCALBASE}/include/openh323
-H323_LIB_DEPENDS= libpt_r.so:devel/pwlib \
- libh323_r.so:net/openh323
-H323_MAKE_ENV= OPENH323DIR=${LOCALBASE}/share/openh323
-
-ICONV_CONFIGURE_OFF= --with-iconv=/dev/null --with-iconv=no
-ICONV_CONFIGURE_WITH= iconv
-ICONV_USES= iconv
-
-JABBER_CONFIGURE_WITH= iksemel
-JABBER_LIB_DEPENDS= libiksemel.so:textproc/iksemel
-
-ODBC_CONFIGURE_WITH= unixodbc
-ODBC_CONFIGURE_ON= --with-ltdl
-ODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC \
- libltdl.so:devel/libltdl
-
-LDAP_CONFIGURE_WITH= ldap
-LDAP_USE= OPENLDAP=yes
-
-LUA_CONFIGURE_WITH= lua
-LUA_USES= lua:51
-LUA_CFLAGS= -I${LUA_INCDIR}
-LUA_LDFLAGS= -L${LUA_LIBDIR}
-
-MP3PLAYER_RUN_DEPENDS= mpg123:audio/mpg123
-
-MYSQL_CONFIGURE_WITH= mysqlclient
-MYSQL_USES= mysql
-
-NCURSES_USES= ncurses
-
-NEWT_LIB_DEPENDS= libnewt.so:devel/newt
-
-PGSQL_CONFIGURE_WITH= postgres
-PGSQL_USES= pgsql
-
-RADIUS_CONFIGURE_WITH= radius
-RADIUS_LIB_DEPENDS= libradiusclient-ng.so:net/radiusclient
-
-SNMP_CONFIGURE_WITH= netsnmp
-SNMP_LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp
-
-SPEEX_LIB_DEPENDS= libspeex.so:audio/speex
-
-SQLITE_CONFIGURE_WITH= sqlite
-SQLITE_CONFIGURE_OFF= --with-sqlite3=no
-SQLITE_LIB_DEPENDS= libsqlite.so:databases/sqlite2 \
- libsqlite3.so:databases/sqlite3
-
-VORBIS_CONFIGURE_WITH= ogg
-VORBIS_LIB_DEPENDS= libvorbis.so:audio/libvorbis
-
-SPANDSP_CONFIGURE_WITH= spandsp
-SPANDSP_LIB_DEPENDS= libspandsp.so:comms/spandsp
-
-SRTP_CONFIGURE_WITH= srtp
-SRTP_BUILD_DEPENDS= libsrtp>=1.4.4:net/libsrtp
-
-SYSINFO_LIB_DEPENDS= libsysinfo.so:devel/libsysinfo
-
-PORTSCOUT= limit:^1\.8\.
-
-ASTERISK_USER?= asterisk
-ASTERISK_GROUP?= asterisk
-
-USERS= ${ASTERISK_USER}
-GROUPS= ${ASTERISK_GROUP} dahdi
-
-.include <bsd.port.pre.mk>
-
-.if ${PREFIX} == ${LOCALBASE}
-VARDIR=/var
-.else
-VARDIR=${PREFIX}/var
-.endif
-
-SUB_LIST+= ASTERISK_USER=${ASTERISK_USER}
-PLIST_SUB+= ASTERISK_USER=${ASTERISK_USER} \
- ASTERISK_GROUP=${ASTERISK_GROUP} \
- VARDIR=${VARDIR}
-
-post-extract:
- @${FIND} ${WRKSRC} -name '*.d' -delete
-
-.if ${PORT_OPTIONS:MG729}
- ${CP} ${DISTDIR}/${ASTERISK_CORE_G729_SOUNDS} ${WRKSRC}/sounds
- ${CP} ${DISTDIR}/${ASTERISK_MOH_G729_SOUNDS} ${WRKSRC}/sounds
-.endif
-
-post-patch:
- @${REINPLACE_CMD} -e 's|/var/lib|${PREFIX}/share|g' ${WRKSRC}/configs/musiconhold.conf.sample
-.if ${PORT_OPTIONS:MSYSINFO}
- @${REINPLACE_CMD} -e 's/%%LIBSYSINFO%%/-lsysinfo/' ${WRKSRC}/main/Makefile
-.else
- @${REINPLACE_CMD} -e '/#define HAVE_SYSINFO 1/d' ${WRKSRC}/configure
- @${REINPLACE_CMD} -e '/%%LIBSYSINFO%%/d' ${WRKSRC}/main/Makefile
-.endif
-
-.if exists(${FILESDIR}/.asterisk.makeopts)
-USER_MAKEOPTS_FILE=${FILESDIR}/.asterisk.makeopts
-.else
-USER_MAKEOPTS_FILE=
-.endif
-
-post-configure:
- @cd ${WRKSRC} && ${MAKE_CMD} menuselect.makeopts USER_MAKEOPTS="${USER_MAKEOPTS_FILE}"
- @cd ${WRKSRC} && ./menuselect/menuselect --disable res_timing_kqueue menuselect.makeopts
-.if ${PORT_OPTIONS:MMYSQL}
- @cd ${WRKSRC} && ./menuselect/menuselect --enable res_config_mysql menuselect.makeopts
- @cd ${WRKSRC} && ./menuselect/menuselect --enable app_mysql menuselect.makeopts
- @cd ${WRKSRC} && ./menuselect/menuselect --enable cdr_mysql menuselect.makeopts
-.endif
-.if ${PORT_OPTIONS:MOOH323}
- @cd ${WRKSRC} && ./menuselect/menuselect --enable chan_ooh323 menuselect.makeopts
-.endif
-.if ${PORT_OPTIONS:MNEWG711}
- @cd ${WRKSRC} && ./menuselect/menuselect --enable G711_NEW_ALGORITHM menuselect.makeopts
-.endif
-
-post-install:
- @${RM} ${STAGEDIR}${ETCDIR}/*.conf ${STAGEDIR}${ETCDIR}/extensions.ael ${STAGEDIR}${ETCDIR}/extensions.lua
- ${FIND} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/modules -type f -name '*.so' | ${SED} "s,^${STAGEDIR}${PREFIX}/,," >> ${TMPPLIST}
- ${FIND} ${STAGEDIR}${DATADIR}/sounds -type f | ${SED} "s,^${STAGEDIR}${DATADIR},${DATADIR}," >> ${TMPPLIST}
- ${FIND} ${STAGEDIR}${DATADIR}/moh -type f | ${SED} "s,^${STAGEDIR}${DATADIR},${DATADIR}," >> ${TMPPLIST}
-
- (cd ${STAGEDIR} && \
- ${ECHO} "@owner ${ASTERISK_USER}" >> ${TMPPLIST} && \
- ${ECHO} "@group ${ASTERISK_GROUP}" >> ${TMPPLIST} && \
- ${FIND} var/spool/${PORTNAME}/voicemail/default -type f | ${SED} "s,^,/," >> ${TMPPLIST} && \
- ${FIND} var/spool/${PORTNAME}/voicemail/ -type d | ${SED} "s,^,@dir /," >> ${TMPPLIST} && \
- ${ECHO} "@owner" >> ${TMPPLIST} && \
- ${ECHO} "@group" >> ${TMPPLIST});
-
-.include <bsd.port.post.mk>
diff --git a/net/asterisk/distinfo b/net/asterisk/distinfo
deleted file mode 100644
index dd77db499d45..000000000000
--- a/net/asterisk/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-SHA256 (asterisk-1.8.32.3.tar.gz) = 3c12ddbb86e2b901af449bd5a3ac7bbc55a28664159d0c4fb70f89d761d8bf9e
-SIZE (asterisk-1.8.32.3.tar.gz) = 29637478
-SHA256 (asterisk-core-sounds-en-g729-1.4.26.tar.gz) = 0e81f61b22650bd350c17fd5eaad746fb1f184386773b792a5a1106f22d27df4
-SIZE (asterisk-core-sounds-en-g729-1.4.26.tar.gz) = 1381942
-SHA256 (asterisk-moh-opsound-g729-2.03.tar.gz) = 0147ca9a97f0c550227aacb7793499057c4d2c64e021c95f93722f27d5549585
-SIZE (asterisk-moh-opsound-g729-2.03.tar.gz) = 1103000
diff --git a/net/asterisk/files/asterisk.in b/net/asterisk/files/asterisk.in
deleted file mode 100644
index e2d997ecc201..000000000000
--- a/net/asterisk/files/asterisk.in
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: asterisk
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-#
-# Add the following lines to /etc/rc.conf to enable asterisk:
-#
-# asterisk_enable (bool): Set it to "YES" to enable asterisk
-# Default is "NO"
-# asterisk_user (string): User asterisk runs as
-# Default is %%ASTERISK_USER%%
-# asterisk_args (string): Extra argumeents to pass to asterisk at startup
-# Default is "-n"
-# asterisk_pidfile (string): Location of the asterisk pid file
-# Default is /var/run/asterisk/asterisk.pid
-#
-
-. /etc/rc.subr
-
-name=asterisk
-rcvar=asterisk_enable
-desc="Asterisk PBX server"
-
-load_rc_config $name
-
-: ${asterisk_enable:=NO}
-: ${asterisk_user:=%%ASTERISK_USER%%}
-: ${asterisk_args=-n}
-: ${asterisk_pidfile:=/var/run/asterisk/asterisk.pid}
-
-extra_commands=reload
-
-start_precmd=asterisk_precmd
-stop_cmd=asterisk_stop
-reload_cmd=asterisk_reload
-
-command="%%PREFIX%%/sbin/asterisk"
-command_args="${asterisk_args} -F -U ${asterisk_user}"
-pidfile=${asterisk_pidfile}
-
-asterisk_precmd()
-{
- local rundir=${asterisk_pidfile%/*}
- if [ ! -d $rundir ] ; then
- install -d -m 0755 -o asterisk -g asterisk $rundir
- fi
-}
-
-asterisk_stop()
-{
- echo 'Stopping asterisk'
- $command -nqrx 'core stop now'
-}
-
-asterisk_reload()
-{
- echo 'Reloading asterisk'
- $command -nqrx 'reload'
-}
-
-run_rc_command "$1"
diff --git a/net/asterisk/files/patch-AST-2016-001 b/net/asterisk/files/patch-AST-2016-001
deleted file mode 100644
index 8888a9214f7a..000000000000
--- a/net/asterisk/files/patch-AST-2016-001
+++ /dev/null
@@ -1,153 +0,0 @@
---- configs/http.conf.sample.orig 2014-06-12 16:05:50 UTC
-+++ configs/http.conf.sample
-@@ -67,10 +67,31 @@ bindaddr=127.0.0.1
- ; If no path is given for tlscertfile or tlsprivatekey, default is to look in current
- ; directory. If no tlsprivatekey is given, default is to search tlscertfile for private key.
- ;
-+;
- ; To produce a certificate you can e.g. use openssl. This places both the cert and
- ; private in same .pem file.
- ; openssl req -new -x509 -days 365 -nodes -out /tmp/foo.pem -keyout /tmp/foo.pem
- ;
-+; tlscipher= ; The list of allowed ciphers
-+; ; if none are specified the following cipher
-+; ; list will be used instead:
-+; ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:
-+; ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:
-+; kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:
-+; ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:
-+; ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:
-+; DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:
-+; AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:
-+; AES:CAMELLIA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:
-+; !EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA
-+;
-+; tlsdisablev1=yes ; Disable TLSv1 support - if not set this defaults to "yes"
-+; tlsdisablev11=yes ; Disable TLSv1.1 support - if not set this defaults to "no"
-+; tlsdisablev12=yes ; Disable TLSv1.2 support - if not set this defaults to "no"
-+;
-+; tlsservercipherorder=yes ; Use the server preference order instead of the client order
-+; ; Defaults to "yes"
-+;
- ; The post_mappings section maps URLs to real paths on the filesystem. If a
- ; POST is done from within an authenticated manager session to one of the
- ; configured POST mappings, then any files in the POST will be placed in the
---- include/asterisk/tcptls.h.orig 2014-06-13 04:58:51 UTC
-+++ include/asterisk/tcptls.h
-@@ -79,7 +79,15 @@ enum ast_ssl_flags {
- /*! Use SSLv3 for outgoing client connections */
- AST_SSL_SSLV3_CLIENT = (1 << 4),
- /*! Use TLSv1 for outgoing client connections */
-- AST_SSL_TLSV1_CLIENT = (1 << 5)
-+ AST_SSL_TLSV1_CLIENT = (1 << 5),
-+ /*! Use server cipher order instead of the client order */
-+ AST_SSL_SERVER_CIPHER_ORDER = (1 << 6),
-+ /*! Disable TLSv1 support */
-+ AST_SSL_DISABLE_TLSV1 = (1 << 7),
-+ /*! Disable TLSv1.1 support */
-+ AST_SSL_DISABLE_TLSV11 = (1 << 8),
-+ /*! Disable TLSv1.2 support */
-+ AST_SSL_DISABLE_TLSV12 = (1 << 9),
- };
-
- struct ast_tls_config {
---- main/http.c.orig 2014-06-13 04:58:51 UTC
-+++ main/http.c
-@@ -1118,10 +1118,13 @@ static int __ast_http_load(int reload)
- }
- http_tls_cfg.pvtfile = ast_strdup("");
-
-+ /* Apply modern intermediate settings according to the Mozilla OpSec team as of July 30th, 2015 but disable TLSv1 */
-+ ast_set_flag(&http_tls_cfg.flags, AST_SSL_DISABLE_TLSV1 | AST_SSL_SERVER_CIPHER_ORDER);
-+
- if (http_tls_cfg.cipher) {
- ast_free(http_tls_cfg.cipher);
- }
-- http_tls_cfg.cipher = ast_strdup("");
-+ http_tls_cfg.cipher = ast_strdup("ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:AES:CAMELLIA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:!EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA");
-
- AST_RWLIST_WRLOCK(&uri_redirects);
- while ((redirect = AST_RWLIST_REMOVE_HEAD(&uri_redirects, entry))) {
-@@ -1146,8 +1149,6 @@ static int __ast_http_load(int reload)
- && strcasecmp(v->name, "tlsdontverifyserver")
- && strcasecmp(v->name, "tlsclientmethod")
- && strcasecmp(v->name, "sslclientmethod")
-- && strcasecmp(v->name, "tlscipher")
-- && strcasecmp(v->name, "sslcipher")
- && !ast_tls_read_conf(&http_tls_cfg, &https_desc, v->name, v->value)) {
- continue;
- }
---- main/tcptls.c.orig 2015-04-08 16:53:07 UTC
-+++ main/tcptls.c
-@@ -749,6 +749,7 @@ static int __ssl_setup(struct ast_tls_co
- return 0;
- #else
- int disable_ssl = 0;
-+ long ssl_opts = 0;
-
- if (!cfg->enabled)
- return 0;
-@@ -793,12 +794,30 @@ static int __ssl_setup(struct ast_tls_co
- * them. SSLv23_*_method supports TLSv1+.
- */
- if (disable_ssl) {
-- long ssl_opts;
-+ ssl_opts |= SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3;
-+ }
-
-- ssl_opts = SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3;
-- SSL_CTX_set_options(cfg->ssl_ctx, ssl_opts);
-+ if (ast_test_flag(&cfg->flags, AST_SSL_SERVER_CIPHER_ORDER)) {
-+ ssl_opts |= SSL_OP_CIPHER_SERVER_PREFERENCE;
- }
-
-+ if (ast_test_flag(&cfg->flags, AST_SSL_DISABLE_TLSV1)) {
-+ ssl_opts |= SSL_OP_NO_TLSv1;
-+ }
-+#if defined(HAVE_SSL_OP_NO_TLSV1_1) && defined(HAVE_SSL_OP_NO_TLSV1_2)
-+ if (ast_test_flag(&cfg->flags, AST_SSL_DISABLE_TLSV11)) {
-+ ssl_opts |= SSL_OP_NO_TLSv1_1;
-+ }
-+ if (ast_test_flag(&cfg->flags, AST_SSL_DISABLE_TLSV12)) {
-+ ssl_opts |= SSL_OP_NO_TLSv1_2;
-+ }
-+#else
-+ ast_log(LOG_WARNING, "Your version of OpenSSL leaves you potentially vulnerable "
-+ "to the SSL BEAST attack. Please upgrade to OpenSSL 1.0.1 or later\n");
-+#endif
-+
-+ SSL_CTX_set_options(cfg->ssl_ctx, ssl_opts);
-+
- SSL_CTX_set_verify(cfg->ssl_ctx,
- ast_test_flag(&cfg->flags, AST_SSL_VERIFY_CLIENT) ? SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT : SSL_VERIFY_NONE,
- NULL);
-@@ -1109,6 +1128,14 @@ int ast_tls_read_conf(struct ast_tls_con
- ast_clear_flag(&tls_cfg->flags, AST_SSL_TLSV1_CLIENT);
- ast_clear_flag(&tls_cfg->flags, AST_SSL_SSLV3_CLIENT);
- }
-+ } else if (!strcasecmp(varname, "tlsservercipherorder")) {
-+ ast_set2_flag(&tls_cfg->flags, ast_true(value), AST_SSL_SERVER_CIPHER_ORDER);
-+ } else if (!strcasecmp(varname, "tlsdisablev1")) {
-+ ast_set2_flag(&tls_cfg->flags, ast_true(value), AST_SSL_DISABLE_TLSV1);
-+ } else if (!strcasecmp(varname, "tlsdisablev11")) {
-+ ast_set2_flag(&tls_cfg->flags, ast_true(value), AST_SSL_DISABLE_TLSV11);
-+ } else if (!strcasecmp(varname, "tlsdisablev12")) {
-+ ast_set2_flag(&tls_cfg->flags, ast_true(value), AST_SSL_DISABLE_TLSV12);
- } else {
- return -1;
- }
---- include/asterisk/autoconfig.h.in.orig 2014-06-20 23:12:25 UTC
-+++ include/asterisk/autoconfig.h.in
-@@ -752,6 +752,12 @@
- /* Define to 1 if you have the ISDN SS7 library. */
- #undef HAVE_SS7
-
-+/* Define if your system has the SSL_OP_NO_TLSV1_1 headers. */
-+#undef HAVE_SSL_OP_NO_TLSV1_1
-+
-+/* Define if your system has the SSL_OP_NO_TLSV1_2 headers. */
-+#undef HAVE_SSL_OP_NO_TLSV1_2
-+
- /* Define to 1 if `stat' has the bug that it succeeds when given the
- zero-length file name argument. */
- #undef HAVE_STAT_EMPTY_STRING_BUG
diff --git a/net/asterisk/files/patch-AST-2016-002 b/net/asterisk/files/patch-AST-2016-002
deleted file mode 100644
index 75ca85aeacf8..000000000000
--- a/net/asterisk/files/patch-AST-2016-002
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/channels/chan_sip.c b/channels/chan_sip.c
-index 5de304a..277eec7 100644
---- channels/chan_sip.c
-+++ channels/chan_sip.c
-@@ -3771,6 +3771,13 @@ static int retrans_pkt(const void *data)
- }
-
- /* For non-invites, a maximum of 4 secs */
-+ if (INT_MAX / pkt->timer_a < pkt->timer_t1) {
-+ /*
-+ * Uh Oh, we will have an integer overflow.
-+ * Recalculate previous timeout time instead.
-+ */
-+ pkt->timer_a = pkt->timer_a / 2;
-+ }
- siptimer_a = pkt->timer_t1 * pkt->timer_a; /* Double each time */
- if (pkt->method != SIP_INVITE && siptimer_a > 4000) {
- siptimer_a = 4000;
diff --git a/net/asterisk/files/patch-AST-2016-003 b/net/asterisk/files/patch-AST-2016-003
deleted file mode 100644
index 537e5055ac98..000000000000
--- a/net/asterisk/files/patch-AST-2016-003
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/main/udptl.c b/main/udptl.c
-index a8244e8..6960487 100644
---- main/udptl.c
-+++ main/udptl.c
-@@ -231,16 +231,15 @@ static int decode_open_type(uint8_t *buf, unsigned int limit, unsigned int *len,
- if (decode_length(buf, limit, len, &octet_cnt) != 0)
- return -1;
-
-- if (octet_cnt > 0) {
-- /* Make sure the buffer contains at least the number of bits requested */
-- if ((*len + octet_cnt) > limit)
-- return -1;
--
-- *p_num_octets = octet_cnt;
-- *p_object = &buf[*len];
-- *len += octet_cnt;
-+ /* Make sure the buffer contains at least the number of bits requested */
-+ if ((*len + octet_cnt) > limit) {
-+ return -1;
- }
-
-+ *p_num_octets = octet_cnt;
-+ *p_object = &buf[*len];
-+ *len += octet_cnt;
-+
- return 0;
- }
- /*- End of function --------------------------------------------------------*/
diff --git a/net/asterisk/files/patch-Makefile b/net/asterisk/files/patch-Makefile
deleted file mode 100644
index 996f729331ca..000000000000
--- a/net/asterisk/files/patch-Makefile
+++ /dev/null
@@ -1,97 +0,0 @@
---- Makefile.orig 2014-10-31 16:37:55 UTC
-+++ Makefile
-@@ -121,7 +121,7 @@ ASTTOPDIR:=$(subst $(space),\$(space),$(
- OVERWRITE=y
-
- # Include debug and macro symbols in the executables (-g) and profiling info (-pg)
--DEBUG=-g3
-+#DEBUG=-g3
-
- # Asterisk.conf is located in ASTETCDIR or by using the -C flag
- # when starting Asterisk
-@@ -187,7 +187,7 @@ endif
-
- ifeq ($(OSARCH),FreeBSD)
- # -V is understood by BSD Make, not by GNU make.
-- BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk)
-+ BSDVERSION=$(OSVERSION)
- _ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi)
- endif
-
-@@ -418,8 +418,13 @@ datafiles: _all doc/core-en_US.xml
- $(INSTALL) -m 644 $$x "$(DESTDIR)$(ASTDATADIR)/static-http" ; \
- done
- $(INSTALL) -m 644 doc/core-en_US.xml "$(DESTDIR)$(ASTDATADIR)/static-http";
-+
-+ if [ ! -d $(DESTDIR)$(DOCSDIR)/images ]; then \
-+ $(MKDIR) $(DESTDIR)$(DOCSDIR)/images; \
-+ fi
-+
- for x in images/*.jpg; do \
-- $(INSTALL) -m 644 $$x "$(DESTDIR)$(ASTDATADIR)/images" ; \
-+ $(INSTALL) -m 644 $$x $(DESTDIR)$(DOCSDIR)/images ; \
- done
- $(MAKE) -C sounds install
-
-@@ -478,7 +483,7 @@ INSTALLDIRS="$(ASTLIBDIR)" "$(MODULES_DI
- "$(ASTDATADIR)/documentation/thirdparty" "$(ASTDATADIR)/firmware" \
- "$(ASTDATADIR)/firmware/iax" "$(ASTDATADIR)/images" "$(ASTDATADIR)/keys" \
- "$(ASTDATADIR)/phoneprov" "$(ASTDATADIR)/static-http" "$(ASTDATADIR)/sounds" \
-- "$(ASTDATADIR)/moh" "$(ASTMANDIR)/man8" "$(AGI_DIR)" "$(ASTDBDIR)"
-+ "$(ASTDATADIR)/moh" "$(ASTMANDIR)/man8" "$(AGI_DIR)" "$(ASTDBDIR)" "$(ASTSPOOLDIR)/outgoing"
-
- installdirs:
- @for i in $(INSTALLDIRS); do \
-@@ -545,7 +550,7 @@ ifneq ($(filter ~%,$(DESTDIR)),)
- @exit 1
- endif
-
--install: badshell bininstall datafiles
-+install: badshell bininstall datafiles samples
- @if [ -x /usr/sbin/asterisk-post-install ]; then \
- /usr/sbin/asterisk-post-install "$(DESTDIR)" . ; \
- fi
-@@ -587,29 +592,18 @@ adsi:
- else \
- echo "Installing $$x" ; \
- fi ; \
-- $(INSTALL) -m 644 "$$x" "$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`" ; \
-+ $(INSTALL) -m 644 "$$x" "$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`-dist" ; \
- done
-
- samples: adsi
- @echo Installing other config files...
- @for x in configs/*.sample; do \
-- dst="$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`" ; \
-- if [ -f "$${dst}" ]; then \
-- if [ "$(OVERWRITE)" = "y" ]; then \
-- if cmp -s "$${dst}" "$$x" ; then \
-- echo "Config file $$x is unchanged"; \
-- continue; \
-- fi ; \
-- mv -f "$${dst}" "$${dst}.old" ; \
-- else \
-- echo "Skipping config file $$x"; \
-- continue; \
-- fi ;\
-- fi ; \
-- echo "Installing file $$x"; \
-- $(INSTALL) -m 644 "$$x" "$${dst}" ;\
-+ $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`-dist ; \
-+ if [ ! -f $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` ]; then \
-+ $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`; \
-+ fi ; \
- done
-- if [ "$(OVERWRITE)" = "y" ]; then \
-+ @if true; then \
- echo "Updating asterisk.conf" ; \
- sed -e 's|^astetcdir.*$$|astetcdir => $(ASTETCDIR)|' \
- -e 's|^astmoddir.*$$|astmoddir => $(MODULES_DIR)|' \
-@@ -623,6 +617,7 @@ samples: adsi
- -e 's|^astlogdir.*$$|astlogdir => $(ASTLOGDIR)|' \
- "$(DESTDIR)$(ASTCONFPATH)" > "$(DESTDIR)$(ASTCONFPATH).tmp" ; \
- $(INSTALL) -m 644 "$(DESTDIR)$(ASTCONFPATH).tmp" "$(DESTDIR)$(ASTCONFPATH)" ; \
-+ $(INSTALL) -m 644 "$(DESTDIR)$(ASTCONFPATH).tmp" "$(DESTDIR)$(ASTCONFPATH)-dist" ; \
- rm -f "$(DESTDIR)$(ASTCONFPATH).tmp" ; \
- fi ; \
- $(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX"
diff --git a/net/asterisk/files/patch-agi__Makefile b/net/asterisk/files/patch-agi__Makefile
deleted file mode 100644
index 44823e82e7a7..000000000000
--- a/net/asterisk/files/patch-agi__Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
---- agi/Makefile.orig 2011-08-17 19:21:36 UTC
-+++ agi/Makefile
-@@ -16,7 +16,9 @@ ASTTOPDIR?=..
-
- .PHONY: clean all uninstall
-
--AGIS=$(MENUSELECT_AGIS)
-+AGIS_BIN=eagi-test eagi-sphinx-test
-+AGIS_SCR=agi-test.agi jukebox.agi
-+AGIS=$(AGIS_SCR) $(AGIS_BIN)
-
- ifeq ($(OSARCH),SunOS)
- LIBS+=-lsocket -lnsl
diff --git a/net/asterisk/files/patch-channels-chan_dahdi.c b/net/asterisk/files/patch-channels-chan_dahdi.c
deleted file mode 100644
index fbaa0e9d71bf..000000000000
--- a/net/asterisk/files/patch-channels-chan_dahdi.c
+++ /dev/null
@@ -1,33 +0,0 @@
---- channels/chan_dahdi.c.orig 2014-07-03 21:38:30 UTC
-+++ channels/chan_dahdi.c
-@@ -4907,6 +4907,8 @@ static void dahdi_enable_ec(struct dahdi
- return;
- }
- if (p->echocancel.head.tap_length) {
-+ struct dahdi_echocanparams *pecp;
-+
- #if defined(HAVE_PRI) || defined(HAVE_SS7)
- switch (p->sig) {
- #if defined(HAVE_PRI)
-@@ -4937,7 +4939,9 @@ static void dahdi_enable_ec(struct dahdi
- break;
- }
- #endif /* defined(HAVE_PRI) || defined(HAVE_SS7) */
-- res = ioctl(p->subs[SUB_REAL].dfd, DAHDI_ECHOCANCEL_PARAMS, &p->echocancel);
-+
-+ pecp = &p->echocancel.head;
-+ res = ioctl(p->subs[SUB_REAL].dfd, DAHDI_ECHOCANCEL_PARAMS, &pecp);
- if (res) {
- ast_log(LOG_WARNING, "Unable to enable echo cancellation on channel %d (%s)\n", p->channel, strerror(errno));
- } else {
-@@ -4971,8 +4975,9 @@ static void dahdi_disable_ec(struct dahd
-
- if (p->echocanon) {
- struct dahdi_echocanparams ecp = { .tap_length = 0 };
-+ struct dahdi_echocanparams *pecp = &ecp;
-
-- res = ioctl(p->subs[SUB_REAL].dfd, DAHDI_ECHOCANCEL_PARAMS, &ecp);
-+ res = ioctl(p->subs[SUB_REAL].dfd, DAHDI_ECHOCANCEL_PARAMS, &pecp);
-
- if (res)
- ast_log(LOG_WARNING, "Unable to disable echo cancellation on channel %d: %s\n", p->channel, strerror(errno));
diff --git a/net/asterisk/files/patch-channels__Makefile b/net/asterisk/files/patch-channels__Makefile
deleted file mode 100644
index 64fb37b41421..000000000000
--- a/net/asterisk/files/patch-channels__Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
---- channels/Makefile.orig 2010-06-07 20:04:42 UTC
-+++ channels/Makefile
-@@ -27,9 +27,10 @@ ifeq ($(OSARCH),linux-gnu)
- endif
-
- ifeq ($(OSARCH),FreeBSD)
-- PTLIB=-lpt_FreeBSD_x86_r
-- H323LIB=-lh323_FreeBSD_x86_r
-+ PTLIB=-lpt_r
-+ H323LIB=-lh323_r
- CHANH323LIB=-pthread
-+ H323LDLIBS=$(PTLIB) $(H323LIB) $(CHANH323LIB)
- endif
-
- ifeq ($(OSARCH),NetBSD)
-@@ -86,9 +87,13 @@ chan_h323.so: chan_h323.o h323/libchanh3
- else
- chan_h323.so: chan_h323.o h323/libchanh323.a
- $(ECHO_PREFIX) echo " [LD] $^ -> $@"
-+ifeq ($(OSARCH),FreeBSD)
-+ $(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) -L$(LOCALBASE)/lib $(H323LDFLAGS) -o $@ $< h323/libchanh323.a $(H323LDLIBS) $(CHANH323LIB)
-+else
- $(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(_ASTLDFLAGS) $(ASTLDFLAGS) $(SOLINK) -o $@ $< h323/libchanh323.a $(CHANH323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -L$(OPENH323DIR)/lib $(H323LIB) -L/usr/lib -lcrypto -lssl -lexpat
- endif
- endif
-+endif
-
- chan_misdn.o: _ASTCFLAGS+=-Imisdn
-
diff --git a/net/asterisk/files/patch-channels__sip__include__sip.h b/net/asterisk/files/patch-channels__sip__include__sip.h
deleted file mode 100644
index a8bfefc4f9d2..000000000000
--- a/net/asterisk/files/patch-channels__sip__include__sip.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- channels/sip/include/sip.h.orig 2014-05-09 22:18:59 UTC
-+++ channels/sip/include/sip.h
-@@ -184,7 +184,7 @@
- #define DEFAULT_MOHINTERPRET "default" /*!< The default music class */
- #define DEFAULT_MOHSUGGEST ""
- #define DEFAULT_VMEXTEN "asterisk" /*!< Default voicemail extension */
--#define DEFAULT_CALLERID "asterisk" /*!< Default caller ID */
-+#define DEFAULT_CALLERID "Unknown" /*!< Default caller ID */
- #define DEFAULT_MWI_FROM ""
- #define DEFAULT_NOTIFYMIME "application/simple-message-summary"
- #define DEFAULT_ALLOWGUEST TRUE
diff --git a/net/asterisk/files/patch-channels_h323_Makefile.in b/net/asterisk/files/patch-channels_h323_Makefile.in
deleted file mode 100644
index b55a15f7ec5d..000000000000
--- a/net/asterisk/files/patch-channels_h323_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- channels/h323/Makefile.in.orig 2010-06-03 14:48:09 UTC
-+++ channels/h323/Makefile.in
-@@ -13,7 +13,7 @@ STDCCFLAGS = -DNDEBUG
- STDCCFLAGS += -I../../include -include ../../include/asterisk/autoconfig.h
- STDCCFLAGS += -fPIC
- #OPTCCFLAGS +=
--CFLAGS = -pipe
-+CFLAGS = -pipe @CXXFLAGS@
- TARGET = libchanh323.a
- TARGET += Makefile.ast
- SOURCES = ast_h323.cxx compat_h323.cxx cisco-h225.cxx caps_h323.cxx
diff --git a/net/asterisk/files/patch-configure b/net/asterisk/files/patch-configure
deleted file mode 100644
index f250130bf6c5..000000000000
--- a/net/asterisk/files/patch-configure
+++ /dev/null
@@ -1,231 +0,0 @@
---- configure.orig 2014-08-17 22:31:23 UTC
-+++ configure
-@@ -632,6 +632,8 @@ CONFIG_GMIME
- AIS_LIB
- AIS_INCLUDE
- PBX_AIS
-+PBX_SSL_OP_NO_TLSV1_2
-+PBX_SSL_OP_NO_TLSV1_1
- OPENH323_BUILD
- OPENH323_SUFFIX
- OPENH323_LIBDIR
-@@ -4698,9 +4700,9 @@ astetcdir='${sysconfdir}/asterisk'
- astheaderdir='${includedir}/asterisk'
- astlibdir='${libdir}/asterisk'
- astmandir='${mandir}'
--astvarlibdir='${localstatedir}/lib/asterisk'
-+astvarlibdir='${prefix}/share/asterisk'
- astdatadir='${astvarlibdir}'
--astdbdir='${astvarlibdir}'
-+astdbdir='${localstatedir}/db/asterisk'
- astkeydir='${astvarlibdir}'
- astspooldir='${localstatedir}/spool/asterisk'
- astlogdir='${localstatedir}/log/asterisk'
-@@ -4723,8 +4725,6 @@ esac
- case "${host_os}" in
- freebsd*)
- ac_default_prefix=/usr/local
-- CPPFLAGS=-I/usr/local/include
-- LDFLAGS=-L/usr/local/lib
- ;;
- openbsd*)
- ac_default_prefix=/usr/local
-@@ -18470,6 +18470,8 @@ $as_echo_n "checking if \"struct ifaddrs
-
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-+ #include <sys/types.h>
-+ #include <sys/socket.h>
- #include <ifaddrs.h>
- int
- main ()
-@@ -26245,7 +26247,7 @@ $as_echo "${OPENH323_BUILD}" >&6; }
-
- fi
-
-- PLATFORM_OPENH323="h323_${PWLIB_PLATFORM}_${OPENH323_SUFFIX}"
-+ PLATFORM_OPENH323="h323_${OPENH323_SUFFIX}"
-
- if test "${HAS_OPENH323:-unset}" != "unset"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking OpenH323 installation validity" >&5
-@@ -26343,13 +26345,13 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_
- ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
- CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_lua5.2_${pbxfuncname}" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -llua5.2" >&5
--$as_echo_n "checking for ${pbxfuncname} in -llua5.2... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -llua-5.2" >&5
-+$as_echo_n "checking for ${pbxfuncname} in -llua-5.2... " >&6; }
- if eval \${$as_ac_Lib+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-llua5.2 ${pbxlibdir} -lm $LIBS"
-+LIBS="-llua-5.2 ${pbxlibdir} -lm $LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
-@@ -26391,18 +26393,18 @@ fi
-
- # now check for the header.
- if test "${AST_LUA_FOUND}" = "yes"; then
-- LUA_LIB="${pbxlibdir} -llua5.2 -lm"
-+ LUA_LIB="${pbxlibdir} -llua-5.2 -lm"
- # if --with-LUA=DIR has been specified, use it.
- if test "x${LUA_DIR}" != "x"; then
- LUA_INCLUDE="-I${LUA_DIR}/include"
- fi
- LUA_INCLUDE="${LUA_INCLUDE} "
-- if test "xlua5.2/lua.h" = "x" ; then # no header, assume found
-+ if test "xlua52/lua.h" = "x" ; then # no header, assume found
- LUA_HEADER_FOUND="1"
- else # check for the header
- ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
- CPPFLAGS="${CPPFLAGS} ${LUA_INCLUDE}"
-- ac_fn_c_check_header_mongrel "$LINENO" "lua5.2/lua.h" "ac_cv_header_lua5_2_lua_h" "$ac_includes_default"
-+ ac_fn_c_check_header_mongrel "$LINENO" "lua52/lua.h" "ac_cv_header_lua5_2_lua_h" "$ac_includes_default"
- if test "x$ac_cv_header_lua5_2_lua_h" = xyes; then :
- LUA_HEADER_FOUND=1
- else
-@@ -26455,13 +26457,13 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_
- ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
- CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_lua5.1_${pbxfuncname}" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -llua5.1" >&5
--$as_echo_n "checking for ${pbxfuncname} in -llua5.1... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -llua-5.1" >&5
-+$as_echo_n "checking for ${pbxfuncname} in -llua-5.1... " >&6; }
- if eval \${$as_ac_Lib+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-llua5.1 ${pbxlibdir} -lm $LIBS"
-+LIBS="-llua-5.1 ${pbxlibdir} -lm $LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
-@@ -26503,18 +26505,18 @@ fi
-
- # now check for the header.
- if test "${AST_LUA_FOUND}" = "yes"; then
-- LUA_LIB="${pbxlibdir} -llua5.1 -lm"
-+ LUA_LIB="${pbxlibdir} -llua-5.1 -lm"
- # if --with-LUA=DIR has been specified, use it.
- if test "x${LUA_DIR}" != "x"; then
- LUA_INCLUDE="-I${LUA_DIR}/include"
- fi
- LUA_INCLUDE="${LUA_INCLUDE} "
-- if test "xlua5.1/lua.h" = "x" ; then # no header, assume found
-+ if test "xlua51/lua.h" = "x" ; then # no header, assume found
- LUA_HEADER_FOUND="1"
- else # check for the header
- ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
- CPPFLAGS="${CPPFLAGS} ${LUA_INCLUDE}"
-- ac_fn_c_check_header_mongrel "$LINENO" "lua5.1/lua.h" "ac_cv_header_lua5_1_lua_h" "$ac_includes_default"
-+ ac_fn_c_check_header_mongrel "$LINENO" "lua51/lua.h" "ac_cv_header_lua5_1_lua_h" "$ac_includes_default"
- if test "x$ac_cv_header_lua5_1_lua_h" = xyes; then :
- LUA_HEADER_FOUND=1
- else
-@@ -27879,6 +27881,102 @@ $as_echo "no" >&6; }
-
- fi
-
-+if test "$PBX_OPENSSL" = "1";
-+then
-+
-+ if test "x${PBX_SSL_OP_NO_TLSV1_1}" != "x1"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_OP_NO_TLSv1_1 in openssl/ssl.h" >&5
-+$as_echo_n "checking for SSL_OP_NO_TLSv1_1 in openssl/ssl.h... " >&6; }
-+ saved_cppflags="${CPPFLAGS}"
-+ if test "x${SSL_OP_NO_TLSV1_1_DIR}" != "x"; then
-+ SSL_OP_NO_TLSV1_1_INCLUDE="-I${SSL_OP_NO_TLSV1_1_DIR}/include"
-+ fi
-+ CPPFLAGS="${CPPFLAGS} ${SSL_OP_NO_TLSV1_1_INCLUDE}"
-+
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+ #include <openssl/ssl.h>
-+int
-+main ()
-+{
-+#if defined(SSL_OP_NO_TLSv1_1)
-+ int foo = 0;
-+ #else
-+ int foo = bar;
-+ #endif
-+ 0
-+
-+ ;
-+ return 0;
-+
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+ PBX_SSL_OP_NO_TLSV1_1=1
-+
-+$as_echo "#define HAVE_SSL_OP_NO_TLSV1_1 1" >>confdefs.h
-+
-+
-+
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ CPPFLAGS="${saved_cppflags}"
-+ fi
-+
-+
-+
-+ if test "x${PBX_SSL_OP_NO_TLSV1_2}" != "x1"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_OP_NO_TLSv1_2 in openssl/ssl.h" >&5
-+$as_echo_n "checking for SSL_OP_NO_TLSv1_2 in openssl/ssl.h... " >&6; }
-+ saved_cppflags="${CPPFLAGS}"
-+ if test "x${SSL_OP_NO_TLSV1_2_DIR}" != "x"; then
-+ SSL_OP_NO_TLSV1_2_INCLUDE="-I${SSL_OP_NO_TLSV1_2_DIR}/include"
-+ fi
-+ CPPFLAGS="${CPPFLAGS} ${SSL_OP_NO_TLSV1_2_INCLUDE}"
-+
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+ #include <openssl/ssl.h>
-+int
-+main ()
-+{
-+if defined(SSL_OP_NO_TLSv1_2)
-+ int foo = 0;
-+ #else
-+ int foo = bar;
-+ #endif
-+ 0
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+ PBX_SSL_OP_NO_TLSV1_2=1
-+
-+$as_echo "#define HAVE_SSL_OP_NO_TLSV1_2 1" >>confdefs.h
-+
-+
-+
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ CPPFLAGS="${saved_cppflags}"
-+ fi
-+
-+
-+fi
-+
-
- if test "x${PBX_SRTP}" != "x1" -a "${USE_SRTP}" != "no"; then
- pbxlibdir=""
diff --git a/net/asterisk/files/patch-main__Makefile b/net/asterisk/files/patch-main__Makefile
deleted file mode 100644
index b4f5435ef217..000000000000
--- a/net/asterisk/files/patch-main__Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
---- main/Makefile.orig 2013-02-26 19:06:51 UTC
-+++ main/Makefile
-@@ -70,6 +70,7 @@ ifeq ($(OSARCH),FreeBSD)
- BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk)
- AST_LIBS+=$(shell if test $(BSDVERSION) -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi)
- AST_LIBS+=-lcrypto
-+ AST_LIBS+=%%LIBSYSINFO%%
- endif
-
- ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)
-@@ -109,8 +110,8 @@ editline/libedit.a: CHECK_SUBDIR
- cd editline && test -f config.h || CFLAGS="$(PTHREAD_CFLAGS) $(subst $(ASTTOPDIR),../../,$(_ASTCFLAGS:-Werror=) $(ASTCFLAGS))" LDFLAGS="$(_ASTLDFLAGS) $(ASTLDFLAGS)" ./configure --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --with-ncurses=$(NCURSES_DIR) --with-curses=$(CURSES_DIR) --with-termcap=$(TERMCAP_DIR) --with-tinfo=$(TINFO_DIR)
- $(MAKE) -C editline libedit.a
-
--db1-ast/libdb1.a: CHECK_SUBDIR
-- _ASTCFLAGS="$(_ASTCFLAGS) -Wno-strict-aliasing" ASTCFLAGS="$(ASTCFLAGS)" $(MAKE) -C db1-ast libdb1.a
-+#db1-ast/libdb1.a: CHECK_SUBDIR
-+# _ASTCFLAGS="$(_ASTCFLAGS) -Wno-strict-aliasing" ASTCFLAGS="$(ASTCFLAGS)" $(MAKE) -C db1-ast libdb1.a
-
- ifneq ($(findstring REBUILD_PARSERS,$(MENUSELECT_CFLAGS)),)
- ast_expr2.c ast_expr2.h: ast_expr2.y
-@@ -179,13 +180,13 @@ ssl.o: _ASTCFLAGS+=$(OPENSSL_INCLUDE)
-
- tcptls.o: _ASTCFLAGS+=$(OPENSSL_INCLUDE)
-
--$(MAIN_TGT): $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS)
-+$(MAIN_TGT): $(OBJS) editline/libedit.a $(AST_EMBED_LDSCRIPTS)
- @$(CC) -c -o buildinfo.o $(_ASTCFLAGS) buildinfo.c $(ASTCFLAGS)
- $(ECHO_PREFIX) echo " [LD] $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) -> $@"
- ifneq ($(findstring chan_h323,$(MENUSELECT_CHANNELS)),)
-- $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(ASTLDFLAGS) $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS)
-+ $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(LDFLAGS) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(OBJS) editline/libedit.a $(AST_EMBED_LDSCRIPTS) buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS)
- else
-- $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS)
-+ $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(LDFLAGS) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $(OBJS) editline/libedit.a $(AST_EMBED_LDSCRIPTS) buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS)
- endif
-
- ifeq ($(GNU_LD),1)
diff --git a/net/asterisk/files/patch-main__asterisk.exports.in b/net/asterisk/files/patch-main__asterisk.exports.in
deleted file mode 100644
index b57bf7cbdd62..000000000000
--- a/net/asterisk/files/patch-main__asterisk.exports.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- main/asterisk.exports.in.orig 2013-08-22 08:19:02 UTC
-+++ main/asterisk.exports.in
-@@ -63,6 +63,8 @@
-
- */
- LINKER_SYMBOL_PREFIX_IO_stdin_used;
-+ LINKER_SYMBOL_PREFIX__progname;
-+ LINKER_SYMBOL_PREFIXenviron;
- local:
- *;
- };
diff --git a/net/asterisk/files/patch-main__db.c b/net/asterisk/files/patch-main__db.c
deleted file mode 100644
index 32c3c58c02ed..000000000000
--- a/net/asterisk/files/patch-main__db.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- main/db.c.orig 2012-12-10 23:13:48 UTC
-+++ main/db.c
-@@ -40,6 +40,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi
- #include <sys/time.h>
- #include <signal.h>
- #include <dirent.h>
-+#include <db.h>
-
- #include "asterisk/channel.h"
- #include "asterisk/file.h"
-@@ -50,7 +51,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi
- #include "asterisk/utils.h"
- #include "asterisk/lock.h"
- #include "asterisk/manager.h"
--#include "db1-ast/include/db.h"
-
- /*** DOCUMENTATION
- <manager name="DBGet" language="en_US">
diff --git a/net/asterisk/files/patch-main__lock.c b/net/asterisk/files/patch-main__lock.c
deleted file mode 100644
index 7d5fe43b9eff..000000000000
--- a/net/asterisk/files/patch-main__lock.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- main/lock.c.orig 2013-09-09 19:56:02 UTC
-+++ main/lock.c
-@@ -691,10 +691,6 @@ int __ast_rwlock_init(int tracking, cons
-
- pthread_rwlockattr_init(&attr);
-
--#ifdef HAVE_PTHREAD_RWLOCK_PREFER_WRITER_NP
-- pthread_rwlockattr_setkind_np(&attr, PTHREAD_RWLOCK_PREFER_WRITER_NP);
--#endif
--
- res = pthread_rwlock_init(&t->lock, &attr);
- pthread_rwlockattr_destroy(&attr);
- return res;
diff --git a/net/asterisk/files/patch-main__utils.c b/net/asterisk/files/patch-main__utils.c
deleted file mode 100644
index 2d2f7e2ecfea..000000000000
--- a/net/asterisk/files/patch-main__utils.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- main/utils.c.orig 2014-11-07 20:16:06 UTC
-+++ main/utils.c
-@@ -1192,8 +1192,8 @@ int ast_pthread_create_stack(pthread_t *
- pthread_attr_init(attr);
- }
-
--#ifdef __linux__
-- /* On Linux, pthread_attr_init() defaults to PTHREAD_EXPLICIT_SCHED,
-+#if defined(__linux__) || defined(__FreeBSD__)
-+ /* On Linux and FreeBSD, pthread_attr_init() defaults to PTHREAD_EXPLICIT_SCHED,
- which is kind of useless. Change this here to
- PTHREAD_INHERIT_SCHED; that way the -p option to set realtime
- priority will propagate down to new threads by default.
diff --git a/net/asterisk/files/patch-main_tcptls.c b/net/asterisk/files/patch-main_tcptls.c
deleted file mode 100644
index d013da94b7f4..000000000000
--- a/net/asterisk/files/patch-main_tcptls.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- main/tcptls.c.orig 2015-04-08 18:53:07.000000000 +0200
-+++ main/tcptls.c 2015-09-23 21:30:28.092457300 +0200
-@@ -768,10 +768,13 @@ static int __ssl_setup(struct ast_tls_co
- cfg->ssl_ctx = SSL_CTX_new(SSLv2_client_method());
- } else
- #endif
-+#ifndef OPENSSL_NO_SSL3
- if (ast_test_flag(&cfg->flags, AST_SSL_SSLV3_CLIENT)) {
- ast_log(LOG_WARNING, "Usage of SSLv3 is discouraged due to known vulnerabilities. Please use 'tlsv1' or leave the TLS method unspecified!\n");
- cfg->ssl_ctx = SSL_CTX_new(SSLv3_client_method());
-- } else if (ast_test_flag(&cfg->flags, AST_SSL_TLSV1_CLIENT)) {
-+ } else
-+#endif
-+ if (ast_test_flag(&cfg->flags, AST_SSL_TLSV1_CLIENT)) {
- cfg->ssl_ctx = SSL_CTX_new(TLSv1_client_method());
- } else {
- disable_ssl = 1;
diff --git a/net/asterisk/pkg-descr b/net/asterisk/pkg-descr
deleted file mode 100644
index 28b7a1deb011..000000000000
--- a/net/asterisk/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-Asterisk is an Open Source PBX and telephony toolkit. It is, in a
-sense, middleware between Internet and telephony channels on the bottom,
-and Internet and telephony applications at the top.
-
-WWW: http://www.asteriskpbx.com
diff --git a/net/asterisk/pkg-message b/net/asterisk/pkg-message
deleted file mode 100644
index 08d8de995d68..000000000000
--- a/net/asterisk/pkg-message
+++ /dev/null
@@ -1,36 +0,0 @@
-###########################################################################
-
- This port supports custom Asterisk configurations using a *user-supplied*
- menuselect.makeopt file.
-
- This feature is of most value for users that want to disable or override
- default functionality that they dont want or need, particular in space
- and/or resource constrained, or embedded environments.
-
- If a file named ".asterisk.makeopts" is found in the ports files/
- directory, its contents will be used to configure Asterisk at the
- post-configure stage.
-
- If the file is *not* found, the port will default to a 'normal' Asterisk
- menuselect configuration, and only execute menuselect commands according
- to what port OPTIONS the user has selected.
-
- The format of this file is the same as the output of a standard
- `make menuselect` command, as per standard build instructions for
- Asterisk.
-
- NOTE: The contents of this file *MUST* be syntactically and semantically
- valid, as the port does *NOT* perform validation of this file.
-
- In particular, ensure that all Asterisk options have their
- dependencies met, using the corresponding port OPTIONS dependencies.
-
- The `menuselect --check-deps` command can be used to verify the
- configuration
-
- The following related documentation resources are also available:
-
- * https://wiki.asterisk.org/wiki/display/AST/Using+Menuselect+to+Select+Asterisk+Options
- * http://www.asteriskdocs.org/en/3rd_Edition/asterisk-book-html-chunk/installing_base_configuration.html#Installing_id293213
-
-################################################################################
diff --git a/net/asterisk/pkg-plist b/net/asterisk/pkg-plist
deleted file mode 100644
index f28ba581b71d..000000000000
--- a/net/asterisk/pkg-plist
+++ /dev/null
@@ -1,284 +0,0 @@
-@sample %%ETCDIR%%/ais.conf-dist %%ETCDIR%%/ais.conf
-@sample %%ETCDIR%%/cdr_adaptive_odbc.conf-dist %%ETCDIR%%/cdr_adaptive_odbc.conf
-@sample %%ETCDIR%%/cdr_sqlite3_custom.conf-dist %%ETCDIR%%/cdr_sqlite3_custom.conf
-@sample %%ETCDIR%%/cdr_syslog.conf-dist %%ETCDIR%%/cdr_syslog.conf
-@sample %%ETCDIR%%/cli.conf-dist %%ETCDIR%%/cli.conf
-@sample %%ETCDIR%%/cli_aliases.conf-dist %%ETCDIR%%/cli_aliases.conf
-@sample %%ETCDIR%%/cli_permissions.conf-dist %%ETCDIR%%/cli_permissions.conf
-@sample %%ETCDIR%%/console.conf-dist %%ETCDIR%%/console.conf
-@sample %%ETCDIR%%/dbsep.conf-dist %%ETCDIR%%/dbsep.conf
-@sample %%ETCDIR%%/dsp.conf-dist %%ETCDIR%%/dsp.conf
-@sample %%ETCDIR%%/extensions.lua-dist %%ETCDIR%%/extensions.lua
-@sample %%ETCDIR%%/extensions_minivm.conf-dist %%ETCDIR%%/extensions_minivm.conf
-@sample %%ETCDIR%%/jingle.conf-dist %%ETCDIR%%/jingle.conf
-@sample %%ETCDIR%%/minivm.conf-dist %%ETCDIR%%/minivm.conf
-@sample %%ETCDIR%%/phoneprov.conf-dist %%ETCDIR%%/phoneprov.conf
-@sample %%ETCDIR%%/queuerules.conf-dist %%ETCDIR%%/queuerules.conf
-@sample %%ETCDIR%%/res_ldap.conf-dist %%ETCDIR%%/res_ldap.conf
-@sample %%ETCDIR%%/unistim.conf-dist %%ETCDIR%%/unistim.conf
-@sample %%ETCDIR%%/adsi.conf-dist %%ETCDIR%%/adsi.conf
-@sample %%ETCDIR%%/agents.conf-dist %%ETCDIR%%/agents.conf
-@sample %%ETCDIR%%/alarmreceiver.conf-dist %%ETCDIR%%/alarmreceiver.conf
-@sample %%ETCDIR%%/alsa.conf-dist %%ETCDIR%%/alsa.conf
-@sample %%ETCDIR%%/asterisk.adsi-dist %%ETCDIR%%/asterisk.adsi
-@sample %%ETCDIR%%/asterisk.conf-dist %%ETCDIR%%/asterisk.conf
-@sample %%ETCDIR%%/calendar.conf-dist %%ETCDIR%%/calendar.conf
-@sample %%ETCDIR%%/ccss.conf-dist %%ETCDIR%%/ccss.conf
-@sample %%ETCDIR%%/cdr.conf-dist %%ETCDIR%%/cdr.conf
-@sample %%ETCDIR%%/cdr_custom.conf-dist %%ETCDIR%%/cdr_custom.conf
-@sample %%ETCDIR%%/cdr_manager.conf-dist %%ETCDIR%%/cdr_manager.conf
-@sample %%ETCDIR%%/cdr_mysql.conf-dist %%ETCDIR%%/cdr_mysql.conf
-@sample %%ETCDIR%%/cdr_odbc.conf-dist %%ETCDIR%%/cdr_odbc.conf
-@sample %%ETCDIR%%/cdr_pgsql.conf-dist %%ETCDIR%%/cdr_pgsql.conf
-@sample %%ETCDIR%%/cdr_tds.conf-dist %%ETCDIR%%/cdr_tds.conf
-@sample %%ETCDIR%%/cel.conf-dist %%ETCDIR%%/cel.conf
-@sample %%ETCDIR%%/cel_custom.conf-dist %%ETCDIR%%/cel_custom.conf
-@sample %%ETCDIR%%/cel_odbc.conf-dist %%ETCDIR%%/cel_odbc.conf
-@sample %%ETCDIR%%/cel_pgsql.conf-dist %%ETCDIR%%/cel_pgsql.conf
-@sample %%ETCDIR%%/cel_sqlite3_custom.conf-dist %%ETCDIR%%/cel_sqlite3_custom.conf
-@sample %%ETCDIR%%/cel_tds.conf-dist %%ETCDIR%%/cel_tds.conf
-@sample %%ETCDIR%%/codecs.conf-dist %%ETCDIR%%/codecs.conf
-@sample %%ETCDIR%%/dnsmgr.conf-dist %%ETCDIR%%/dnsmgr.conf
-@sample %%ETCDIR%%/dundi.conf-dist %%ETCDIR%%/dundi.conf
-@sample %%ETCDIR%%/enum.conf-dist %%ETCDIR%%/enum.conf
-@sample %%ETCDIR%%/extconfig.conf-dist %%ETCDIR%%/extconfig.conf
-@sample %%ETCDIR%%/extensions.ael-dist %%ETCDIR%%/extensions.ael
-@sample %%ETCDIR%%/extensions.conf-dist %%ETCDIR%%/extensions.conf
-@sample %%ETCDIR%%/features.conf-dist %%ETCDIR%%/features.conf
-@sample %%ETCDIR%%/festival.conf-dist %%ETCDIR%%/festival.conf
-@sample %%ETCDIR%%/iax.conf-dist %%ETCDIR%%/iax.conf
-@sample %%ETCDIR%%/iaxprov.conf-dist %%ETCDIR%%/iaxprov.conf
-@sample %%ETCDIR%%/indications.conf-dist %%ETCDIR%%/indications.conf
-@sample %%ETCDIR%%/logger.conf-dist %%ETCDIR%%/logger.conf
-@sample %%ETCDIR%%/manager.conf-dist %%ETCDIR%%/manager.conf
-@sample %%ETCDIR%%/meetme.conf-dist %%ETCDIR%%/meetme.conf
-@sample %%ETCDIR%%/mgcp.conf-dist %%ETCDIR%%/mgcp.conf
-@sample %%ETCDIR%%/misdn.conf-dist %%ETCDIR%%/misdn.conf
-@sample %%ETCDIR%%/modules.conf-dist %%ETCDIR%%/modules.conf
-@sample %%ETCDIR%%/musiconhold.conf-dist %%ETCDIR%%/musiconhold.conf
-@sample %%ETCDIR%%/osp.conf-dist %%ETCDIR%%/osp.conf
-@sample %%ETCDIR%%/oss.conf-dist %%ETCDIR%%/oss.conf
-@sample %%ETCDIR%%/phone.conf-dist %%ETCDIR%%/phone.conf
-@sample %%ETCDIR%%/queues.conf-dist %%ETCDIR%%/queues.conf
-@sample %%ETCDIR%%/res_config_mysql.conf-dist %%ETCDIR%%/res_config_mysql.conf
-@sample %%ETCDIR%%/res_pgsql.conf-dist %%ETCDIR%%/res_pgsql.conf
-@sample %%ETCDIR%%/res_pktccops.conf-dist %%ETCDIR%%/res_pktccops.conf
-@sample %%ETCDIR%%/res_odbc.conf-dist %%ETCDIR%%/res_odbc.conf
-@sample %%ETCDIR%%/rtp.conf-dist %%ETCDIR%%/rtp.conf
-@sample %%ETCDIR%%/sip.conf-dist %%ETCDIR%%/sip.conf
-@sample %%ETCDIR%%/sip_notify.conf-dist %%ETCDIR%%/sip_notify.conf
-@sample %%ETCDIR%%/skinny.conf-dist %%ETCDIR%%/skinny.conf
-@sample %%ETCDIR%%/telcordia-1.adsi-dist %%ETCDIR%%/telcordia-1.adsi
-@sample %%ETCDIR%%/voicemail.conf-dist %%ETCDIR%%/voicemail.conf
-@sample %%ETCDIR%%/vpb.conf-dist %%ETCDIR%%/vpb.conf
-@sample %%ETCDIR%%/chan_dahdi.conf-dist %%ETCDIR%%/chan_dahdi.conf
-@sample %%ETCDIR%%/chan_mobile.conf-dist %%ETCDIR%%/chan_mobile.conf
-@sample %%ETCDIR%%/chan_ooh323.conf-dist %%ETCDIR%%/chan_ooh323.conf
-@sample %%ETCDIR%%/udptl.conf-dist %%ETCDIR%%/udptl.conf
-@sample %%ETCDIR%%/users.conf-dist %%ETCDIR%%/users.conf
-@sample %%ETCDIR%%/smdi.conf-dist %%ETCDIR%%/smdi.conf
-@sample %%ETCDIR%%/sla.conf-dist %%ETCDIR%%/sla.conf
-@sample %%ETCDIR%%/say.conf-dist %%ETCDIR%%/say.conf
-@sample %%ETCDIR%%/res_snmp.conf-dist %%ETCDIR%%/res_snmp.conf
-@sample %%ETCDIR%%/res_stun_monitor.conf-dist %%ETCDIR%%/res_stun_monitor.conf
-@sample %%ETCDIR%%/muted.conf-dist %%ETCDIR%%/muted.conf
-@sample %%ETCDIR%%/jabber.conf-dist %%ETCDIR%%/jabber.conf
-@sample %%ETCDIR%%/http.conf-dist %%ETCDIR%%/http.conf
-@sample %%ETCDIR%%/h323.conf-dist %%ETCDIR%%/h323.conf
-@sample %%ETCDIR%%/gtalk.conf-dist %%ETCDIR%%/gtalk.conf
-@sample %%ETCDIR%%/func_odbc.conf-dist %%ETCDIR%%/func_odbc.conf
-@sample %%ETCDIR%%/followme.conf-dist %%ETCDIR%%/followme.conf
-@sample %%ETCDIR%%/amd.conf-dist %%ETCDIR%%/amd.conf
-@sample %%ETCDIR%%/app_mysql.conf-dist %%ETCDIR%%/app_mysql.conf
-@sample %%ETCDIR%%/res_config_sqlite.conf-dist %%ETCDIR%%/res_config_sqlite.conf
-@sample %%ETCDIR%%/res_curl.conf-dist %%ETCDIR%%/res_curl.conf
-@sample %%ETCDIR%%/res_fax.conf-dist %%ETCDIR%%/res_fax.conf
-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/_private.h
-include/asterisk/aoc.h
-include/asterisk/ast_version.h
-include/asterisk/autochan.h
-include/asterisk/calendar.h
-include/asterisk/ccss.h
-include/asterisk/cel.h
-include/asterisk/channelstate.h
-include/asterisk/data.h
-include/asterisk/event.h
-include/asterisk/event_defs.h
-include/asterisk/extconf.h
-include/asterisk/frame_defs.h
-include/asterisk/framehook.h
-include/asterisk/fskmodem_float.h
-include/asterisk/fskmodem_int.h
-include/asterisk/hashtab.h
-include/asterisk/mod_format.h
-include/asterisk/netsock2.h
-include/asterisk/network.h
-include/asterisk/optional_api.h
-include/asterisk/pktccops.h
-include/asterisk/pval.h
-include/asterisk/res_fax.h
-include/asterisk/res_srtp.h
-include/asterisk/rtp_engine.h
-include/asterisk/select.h
-include/asterisk/security_events.h
-include/asterisk/security_events_defs.h
-include/asterisk/stun.h
-include/asterisk/syslog.h
-include/asterisk/tcptls.h
-include/asterisk.h
-include/asterisk/abstract_jb.h
-include/asterisk/acl.h
-include/asterisk/adsi.h
-include/asterisk/ael_structs.h
-include/asterisk/agi.h
-include/asterisk/alaw.h
-include/asterisk/app.h
-include/asterisk/ast_expr.h
-include/asterisk/astdb.h
-include/asterisk/astmm.h
-include/asterisk/astobj.h
-include/asterisk/astobj2.h
-include/asterisk/astosp.h
-include/asterisk/audiohook.h
-include/asterisk/autoconfig.h
-include/asterisk/bridging.h
-include/asterisk/bridging_features.h
-include/asterisk/bridging_technology.h
-include/asterisk/build.h
-include/asterisk/buildinfo.h
-include/asterisk/buildopts.h
-include/asterisk/callerid.h
-include/asterisk/causes.h
-include/asterisk/cdr.h
-include/asterisk/channel.h
-include/asterisk/chanvars.h
-include/asterisk/cli.h
-include/asterisk/compat.h
-include/asterisk/compiler.h
-include/asterisk/config.h
-include/asterisk/crypto.h
-include/asterisk/datastore.h
-include/asterisk/devicestate.h
-include/asterisk/dial.h
-include/asterisk/dlinkedlists.h
-include/asterisk/dns.h
-include/asterisk/dnsmgr.h
-include/asterisk/doxyref.h
-include/asterisk/dsp.h
-include/asterisk/dundi.h
-include/asterisk/endian.h
-include/asterisk/enum.h
-include/asterisk/features.h
-include/asterisk/file.h
-include/asterisk/frame.h
-include/asterisk/fskmodem.h
-include/asterisk/global_datastores.h
-include/asterisk/heap.h
-include/asterisk/http.h
-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/linkedlists.h
-include/asterisk/localtime.h
-include/asterisk/lock.h
-include/asterisk/logger.h
-include/asterisk/manager.h
-include/asterisk/md5.h
-include/asterisk/module.h
-include/asterisk/monitor.h
-include/asterisk/musiconhold.h
-include/asterisk/netsock.h
-include/asterisk/options.h
-include/asterisk/paths.h
-include/asterisk/pbx.h
-include/asterisk/plc.h
-include/asterisk/poll-compat.h
-include/asterisk/privacy.h
-include/asterisk/res_odbc.h
-include/asterisk/say.h
-include/asterisk/sched.h
-include/asterisk/sha1.h
-include/asterisk/slin.h
-include/asterisk/slinfactory.h
-include/asterisk/smdi.h
-include/asterisk/speech.h
-include/asterisk/srv.h
-include/asterisk/stringfields.h
-include/asterisk/strings.h
-include/asterisk/taskprocessor.h
-include/asterisk/tdd.h
-include/asterisk/term.h
-include/asterisk/test.h
-include/asterisk/threadstorage.h
-include/asterisk/time.h
-include/asterisk/timing.h
-include/asterisk/transcap.h
-include/asterisk/translate.h
-include/asterisk/udptl.h
-include/asterisk/ulaw.h
-include/asterisk/unaligned.h
-include/asterisk/utils.h
-include/asterisk/version.h
-include/asterisk/xml.h
-include/asterisk/xmldoc.h
-man/man8/asterisk.8.gz
-man/man8/astgenkey.8.gz
-man/man8/autosupport.8.gz
-man/man8/safe_asterisk.8.gz
-sbin/astcanary
-sbin/asterisk
-sbin/astgenkey
-sbin/autosupport
-sbin/rasterisk
-sbin/safe_asterisk
-%%DATADIR%%/agi-bin/agi-test.agi
-%%DATADIR%%/agi-bin/eagi-sphinx-test
-%%DATADIR%%/agi-bin/eagi-test
-%%DATADIR%%/agi-bin/jukebox.agi
-%%DATADIR%%/documentation/appdocsxml.dtd
-%%DATADIR%%/documentation/core-en_US.xml
-%%DATADIR%%/phoneprov/000000000000-directory.xml
-%%DATADIR%%/phoneprov/000000000000-phone.cfg
-%%DATADIR%%/phoneprov/000000000000.cfg
-%%DATADIR%%/phoneprov/polycom.xml
-%%DATADIR%%/phoneprov/polycom_line.xml
-%%DATADIR%%/phoneprov/snom-mac.xml
-%%DATADIR%%/static-http/ajamdemo.html
-%%DATADIR%%/static-http/astman.css
-%%DATADIR%%/static-http/astman.js
-%%DATADIR%%/static-http/core-en_US.xml
-%%DATADIR%%/static-http/prototype.js
-%%DATADIR%%/static-http/mantest.html
-%%DOCSDIR%%/images/asterisk-intro.jpg
-%%DOCSDIR%%/images/kpad2.jpg
-@dir %%DATADIR%%/keys
-@dir %%DATADIR%%/images
-@dir %%DATADIR%%/firmware/iax
-@dir %%DATADIR%%/documentation/thirdparty
-@owner %%ASTERISK_USER%%
-@group %%ASTERISK_GROUP%%
-@dir %%VARDIR%%/log/asterisk/cdr-csv
-@dir %%VARDIR%%/log/asterisk/cdr-custom
-@dir %%VARDIR%%/log/asterisk/cel-custom
-@dir %%VARDIR%%/log/asterisk
-@dir %%VARDIR%%/spool/asterisk/dictate
-@dir %%VARDIR%%/spool/asterisk/meetme
-@dir %%VARDIR%%/spool/asterisk/monitor
-@dir %%VARDIR%%/spool/asterisk/outgoing
-@dir %%VARDIR%%/spool/asterisk
-@dir %%VARDIR%%/spool/asterisk/system
-@dir %%VARDIR%%/spool/asterisk/tmp
-@dir %%VARDIR%%/db/asterisk
-@dir %%VARDIR%%/run/asterisk
-@owner
-@group