summaryrefslogtreecommitdiff
path: root/net/asterisk13
diff options
context:
space:
mode:
Diffstat (limited to 'net/asterisk13')
-rw-r--r--net/asterisk13/Makefile150
-rw-r--r--net/asterisk13/distinfo4
-rw-r--r--net/asterisk13/files/patch-Makefile20
-rw-r--r--net/asterisk13/files/patch-channels-chan_dahdi.c8
-rw-r--r--net/asterisk13/files/patch-configure18
-rw-r--r--net/asterisk13/files/patch-include-asterisk-config.h4
-rw-r--r--net/asterisk13/files/patch-main__http.c4
-rw-r--r--net/asterisk13/files/patch-main__utils.c4
-rw-r--r--net/asterisk13/pkg-plist3
9 files changed, 123 insertions, 92 deletions
diff --git a/net/asterisk13/Makefile b/net/asterisk13/Makefile
index 768ef90241a4..c9836f07e4f5 100644
--- a/net/asterisk13/Makefile
+++ b/net/asterisk13/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= asterisk
-PORTVERSION= 13.4.0
+PORTVERSION= 13.5.0
CATEGORIES= net
MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \
http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/
@@ -19,110 +19,140 @@ RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123
ONLY_FOR_ARCHS= i386 amd64 powerpc sparc64
GNU_CONFIGURE= yes
-LDFLAGS+= -L${LOCALBASE}/lib
-CPPFLAGS+= -I${LOCALBASE}/include
-CFLAGS+= -I${LOCALBASE}/include
USE_CSTD= gnu89
USE_GNOME= libxml2
USE_LDCONFIG= yes
-USES= bison cpe gmake iconv
+USE_OPENSSL= yes
+USES= bison cpe gmake iconv localbase ncurses shebangfix
CPE_VENDOR= digium
USE_RC_SUBR= asterisk
MAKE_ENV= PTHREAD_LIBS="-lpthread" \
MKDIR="${MKDIR}" \
PWLIBDIR=${LOCALBASE}/share/pwlib \
- OPENH323DIR=${LOCALBASE}/share/openh323 \
OSVERSION=${OSVERSION} \
- NOISY_BUILD=YES \
DOCSDIR=${DOCSDIR} \
ASTCFLAGS="${CFLAGS}"
-CONFIGURE_ARGS+= --datarootdir=${DATADIR}
+MAKE_ARGS+= NOISY_BUILD=YES
+CONFIGURE_ARGS+= --datarootdir=${DATADIR} \
+ --with-crypto=${OPENSSLBASE} \
+ --with-ssl=${OPENSSLBASE}
+
+SHEBANG_FILES= agi/agi-test.agi \
+ agi/jukebox.agi
CONFLICTS= ossp-uuid-[0-9]*
CONFLICTS_BUILD= linuxthreads-*
CONFLICTS_INSTALL= asterisk*-1.8* asterisk*-11*
-OPTIONS_DEFINE= VORBIS PGSQL MYSQL ODBC RADIUS SNMP FREETDS XMPP SQLITE GSM \
- CURL SPANDSP EXCHANGE NEWG711 SRTP LUA LDAP OOH323 PJSIP SPEEX \
- SYSINFO PORTAUDIO
-OPTIONS_SINGLE= COMPILER
-OPTIONS_SINGLE_COMPILER= GCC BASE
-OPTIONS_DEFAULT= VORBIS ODBC PGSQL RADIUS SNMP FREETDS \
- XMPP GSM SQLITE3 CURL LUA PJSIP SPEEX PORTAUDIO GCC
+OPTIONS_DEFINE= CURL EXCHANGE FREETDS GSM LDAP LUA MYSQL \
+ NEWG711 ODBC OOH323 PGSQL PJSIP PORTAUDIO \
+ RADIUS SNMP SPANDSP SPEEX SQLITE2 SRTP \
+ SYSINFO VORBIS XMPP
+
+OPTIONS_SINGLE= COMPILER
+OPTIONS_SINGLE_COMPILER= BASE GCC
+OPTIONS_DEFAULT= CURL FREETDS GCC GSM LUA ODBC PGSQL PJSIP \
+ PORTAUDIO RADIUS SNMP SPEEX SQLITE2 VORBIS \
+ XMPP
-OPTIONS_DEFINE_i386= DAHDI
-OPTIONS_DEFINE_amd64= DAHDI
-OPTIONS_DEFINE_sparc64= DAHDI
+OPTIONS_DEFINE_i386= DAHDI
+OPTIONS_DEFINE_amd64= DAHDI
+OPTIONS_DEFINE_sparc64= DAHDI
-OPTIONS_DEFAULT_i386= DAHDI
-OPTIONS_DEFAULT_amd64= DAHDI
+OPTIONS_DEFAULT_i386= DAHDI
+OPTIONS_DEFAULT_amd64= DAHDI
OPTIONS_DEFAULT_sparc64= DAHDI
+BASE_DESC= Use base compiler (experimental)
+DAHDI_DESC?= DAHDI support
EXCHANGE_DESC?= Exchange calendar support
+GCC_DESC= Use gcc from ports
NEWG711_DESC?= New G711 Codec
-SRTP_DESC?= SecureRTP support
OOH323_DESC?= ooh323 support
-DAHDI_DESC?= DAHDI support
-XMPP_DESC?= XMPP/GTALK support
PJSIP_DESC?= Build the PJSIP based SIP channel
+SRTP_DESC?= SecureRTP support
SYSINFO_DESC?= Use devel/libsysinfo to get system information
-GCC_DESC= Use gcc from ports
-BASE_DESC= Use base compiler (experimental)
+XMPP_DESC?= XMPP/GTALK support
+
+OPTIONS_SUB= yes
+
+CURL_CONFIGURE_ON= --with-libcurl
+CURL_CONFIGURE_OFF= --with-libcurl=no
+CURL_LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl
-OPTIONS_SUB= yes
-OOH323_LIB_DEPENDS= libpt_r.so:${PORTSDIR}/devel/pwlib \
- libh323_r.so:${PORTSDIR}/net/openh323
DAHDI_CONFIGURE_ON= --with-dahdi --with-openr2
DAHDI_CONFIGURE_OFF= --without-dahdi --without-openr2
DAHDI_BUILD_DEPENDS= libpri>=1.4.10:${PORTSDIR}/misc/libpri \
${LOCALBASE}/include/dahdi/user.h:${PORTSDIR}/misc/dahdi
DAHDI_LIB_DEPENDS= libpri.so:${PORTSDIR}/misc/libpri \
libopenr2.so:${PORTSDIR}/misc/openr2
-ODBC_CONFIGURE_WITH= unixodbc
-ODBC_CONFIGURE_ON= --with-ltdl
-ODBC_LIB_DEPENDS= libodbc.so:${PORTSDIR}/databases/unixODBC \
- libltdl.so:${PORTSDIR}/devel/libltdl
+
+EXCHANGE_CONFIGURE_OFF= --without-neon --without-neon29
+EXCHANGE_LIB_DEPENDS= libneon.so:${PORTSDIR}/www/neon
+
FREETDS_CONFIGURE_ON= --with-tds=${LOCALBASE}
FREETDS_CONFIGURE_OFF= --without-tds
FREETDS_LIB_DEPENDS= libsybdb.so:${PORTSDIR}/databases/freetds
-PGSQL_CONFIGURE_WITH= postgres
-PGSQL_USES= pgsql
-MYSQL_CONFIGURE_WITH= mysqlclient
-MYSQL_USE= MYSQL=yes
-VORBIS_CONFIGURE_WITH= ogg
-VORBIS_LIB_DEPENDS= libvorbis.so:${PORTSDIR}/audio/libvorbis
-RADIUS_CONFIGURE_WITH= radius
-RADIUS_LIB_DEPENDS= libradiusclient-ng.so:${PORTSDIR}/net/radiusclient
-SNMP_CONFIGURE_WITH= netsnmp
-SNMP_LIB_DEPENDS= libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
-XMPP_CONFIGURE_WITH= iksemel
-XMPP_LIB_DEPENDS= libiksemel.so:${PORTSDIR}/textproc/iksemel
-SQLITE_CONFIGURE_WITH= sqlite
-SQLITE_LIB_DEPENDS= libsqlite.so:${PORTSDIR}/databases/sqlite2
+
+GCC_USE= GCC=yes
+
GSM_CONFIGURE_WITH= gsm
GSM_LIB_DEPENDS= libgsm.so:${PORTSDIR}/audio/gsm
-CURL_CONFIGURE_ON= --with-libcurl
-CURL_CONFIGURE_OFF= --with-libcurl=no
-CURL_LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl
-SPANDSP_CONFIGURE_WITH= spandsp
-SPANDSP_LIB_DEPENDS= libspandsp.so:${PORTSDIR}/comms/spandsp
-EXCHANGE_CONFIGURE_OFF= --without-neon --without-neon29
-EXCHANGE_LIB_DEPENDS= libneon.so:${PORTSDIR}/www/neon
-SRTP_CONFIGURE_WITH= srtp
+
+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}
-LDAP_CONFIGURE_WITH= ldap
-LDAP_USE= OPENLDAP=yes
+
+MYSQL_CONFIGURE_WITH= mysqlclient
+MYSQL_USE= MYSQL=yes
+
+ODBC_CONFIGURE_WITH= unixodbc
+ODBC_CONFIGURE_ON= --with-ltdl
+ODBC_LIB_DEPENDS= libodbc.so:${PORTSDIR}/databases/unixODBC \
+ libltdl.so:${PORTSDIR}/devel/libltdl
+
+OOH323_CPPFLAGS= -I${LOCALBASE}/include/openh323
+OOH323_LIB_DEPENDS= libpt_r.so:${PORTSDIR}/devel/pwlib \
+ libh323_r.so:${PORTSDIR}/net/openh323
+OOH323_MAKE_ENV= OPENH323DIR=${LOCALBASE}/share/openh323
+
+PGSQL_CONFIGURE_WITH= postgres
+PGSQL_USES= pgsql
+
PJSIP_CONFIGURE_WITH= pjproject
PJSIP_USES= pkgconfig
+
PORTAUDIO_CONFIGURE_WITH= portaudio
PORTAUDIO_LIB_DEPENDS= libportaudio.so:${PORTSDIR}/audio/portaudio
+
+RADIUS_CONFIGURE_WITH= radius
+RADIUS_LIB_DEPENDS= libradiusclient-ng.so:${PORTSDIR}/net/radiusclient
+
+SNMP_CONFIGURE_WITH= netsnmp
+SNMP_LIB_DEPENDS= libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
+
+SPANDSP_CONFIGURE_WITH= spandsp
+SPANDSP_LIB_DEPENDS= libspandsp.so:${PORTSDIR}/comms/spandsp
+
SPEEX_LIB_DEPENDS= libspeex.so:${PORTSDIR}/audio/speex
SPEEX_CONFIGURE_WITH= speex
+
+SQLITE2_CONFIGURE_WITH= sqlite
+SQLITE2_LIB_DEPENDS= libsqlite.so:${PORTSDIR}/databases/sqlite2
+
+SRTP_CONFIGURE_WITH= srtp
+
SYSINFO_LIB_DEPENDS= libsysinfo.so:${PORTSDIR}/devel/libsysinfo
-GCC_USE= GCC=yes
+
+VORBIS_CONFIGURE_WITH= ogg
+VORBIS_LIB_DEPENDS= libvorbis.so:${PORTSDIR}/audio/libvorbis
+
+XMPP_CONFIGURE_WITH= iksemel
+XMPP_LIB_DEPENDS= libiksemel.so:${PORTSDIR}/textproc/iksemel
ASTERISK_USER?= asterisk
ASTERISK_GROUP?= asterisk
@@ -154,9 +184,9 @@ VARDIR=${PREFIX}/var
.endif
SUB_LIST+= ASTERISK_USER=${ASTERISK_USER}
-PLIST_SUB+= ASTERISK_USER=${ASTERISK_USER}
-PLIST_SUB+= ASTERISK_GROUP=${ASTERISK_GROUP}
-PLIST_SUB+= VARDIR=${VARDIR}
+PLIST_SUB+= ASTERISK_USER=${ASTERISK_USER} \
+ ASTERISK_GROUP=${ASTERISK_GROUP} \
+ VARDIR=${VARDIR}
post-extract:
@${FIND} ${WRKSRC} -name '*.d' -delete
diff --git a/net/asterisk13/distinfo b/net/asterisk13/distinfo
index 5e54a65c38db..6e6aca06acc5 100644
--- a/net/asterisk13/distinfo
+++ b/net/asterisk13/distinfo
@@ -1,2 +1,2 @@
-SHA256 (asterisk-13.4.0.tar.gz) = 2049012665e99d2967b18d1594ae752307db7e967235877f1e058e6fb5b4c045
-SIZE (asterisk-13.4.0.tar.gz) = 32009886
+SHA256 (asterisk-13.5.0.tar.gz) = e8b8d071f783edea82de510194dd272070ffbb7cdb2f5f6b020be5d15b67e8b9
+SIZE (asterisk-13.5.0.tar.gz) = 32107014
diff --git a/net/asterisk13/files/patch-Makefile b/net/asterisk13/files/patch-Makefile
index 16795b0adfe1..5497444fd954 100644
--- a/net/asterisk13/files/patch-Makefile
+++ b/net/asterisk13/files/patch-Makefile
@@ -1,4 +1,4 @@
---- Makefile.orig 2014-10-19 17:07:50 UTC
+--- Makefile.orig 2015-07-24 22:20:17 UTC
+++ Makefile
@@ -128,7 +128,7 @@ ASTTOPDIR:=$(subst $(space),\$(space),$(
OVERWRITE=y
@@ -16,9 +16,9 @@
-DAHDI_UDEV_HOOK_DIR = /usr/share/dahdi/span_config.d
+# DAHDI_UDEV_HOOK_DIR = /usr/share/dahdi/span_config.d
- # If the file .asterisk.makeopts is present in your home directory, you can
- # include all of your favorite menuselect options so that every time you download
-@@ -207,7 +207,7 @@ endif
+ # This Makefile previously contained a note about the ability to use .asterisk.makeopts
+ # from your home directory or /etc/asterisk.makeopts to set defaults for menuselect.
+@@ -214,7 +214,7 @@ endif
ifeq ($(OSARCH),FreeBSD)
# -V is understood by BSD Make, not by GNU make.
@@ -27,7 +27,7 @@
_ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi)
# flag to tell 'ldconfig' to only process specified directories
LDCONFIG_FLAGS=-m
-@@ -461,8 +461,12 @@ datafiles: _all doc/core-en_US.xml
+@@ -471,8 +471,12 @@ datafiles: _all doc/core-en_US.xml
$(INSTALL) -m 644 $$n "$(DESTDIR)$(ASTDATADIR)/static-http/docs" ; \
done \
fi
@@ -41,7 +41,7 @@
done
$(MAKE) -C sounds install
find rest-api -name "*.json" | while read x; do \
-@@ -556,7 +560,8 @@ INSTALLDIRS="$(ASTLIBDIR)" "$(ASTMODDIR)
+@@ -566,7 +570,8 @@ INSTALLDIRS="$(ASTLIBDIR)" "$(ASTMODDIR)
"$(ASTDATADIR)/documentation/thirdparty" "$(ASTDATADIR)/firmware" \
"$(ASTDATADIR)/firmware/iax" "$(ASTDATADIR)/images" "$(ASTDATADIR)/keys" \
"$(ASTDATADIR)/phoneprov" "$(ASTDATADIR)/rest-api" "$(ASTDATADIR)/static-http" \
@@ -51,7 +51,7 @@
installdirs:
@for i in $(INSTALLDIRS); do \
-@@ -592,10 +597,10 @@ bininstall: _all installdirs $(SUBDIRS_I
+@@ -602,10 +607,10 @@ bininstall: _all installdirs $(SUBDIRS_I
if [ -f contrib/firmware/iax/iaxy.bin ] ; then \
$(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin "$(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin"; \
fi
@@ -66,7 +66,7 @@
$(SUBDIRS_INSTALL):
+@DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" $(SUBMAKE) -C $(@:-install=) install
-@@ -628,7 +633,7 @@ ifneq ($(filter ~%,$(DESTDIR)),)
+@@ -638,7 +643,7 @@ ifneq ($(filter ~%,$(DESTDIR)),)
@exit 1
endif
@@ -75,7 +75,7 @@
@if [ -x /usr/sbin/asterisk-post-install ]; then \
/usr/sbin/asterisk-post-install "$(DESTDIR)" . ; \
fi
-@@ -670,29 +675,16 @@ adsi:
+@@ -680,29 +685,16 @@ adsi:
else \
echo "Installing $$x" ; \
fi ; \
@@ -108,7 +108,7 @@
echo "Updating asterisk.conf" ; \
sed -e 's|^astetcdir.*$$|astetcdir => $(ASTETCDIR)|' \
-e 's|^astmoddir.*$$|astmoddir => $(ASTMODDIR)|' \
-@@ -705,15 +697,15 @@ samples: adsi
+@@ -715,15 +707,15 @@ samples: adsi
-e 's|^astrundir.*$$|astrundir => $(ASTVARRUNDIR)|' \
-e 's|^astlogdir.*$$|astlogdir => $(ASTLOGDIR)|' \
-e 's|^astsbindir.*$$|astsbindir => $(ASTSBINDIR)|' \
diff --git a/net/asterisk13/files/patch-channels-chan_dahdi.c b/net/asterisk13/files/patch-channels-chan_dahdi.c
index 92ff4e0c1954..0d8b1feadb79 100644
--- a/net/asterisk13/files/patch-channels-chan_dahdi.c
+++ b/net/asterisk13/files/patch-channels-chan_dahdi.c
@@ -1,6 +1,6 @@
---- channels/chan_dahdi.c.orig 2014-07-25 16:47:17 UTC
+--- channels/chan_dahdi.c.orig 2015-07-24 22:20:17 UTC
+++ channels/chan_dahdi.c
-@@ -4596,6 +4596,8 @@ void dahdi_ec_enable(struct dahdi_pvt *p
+@@ -4598,6 +4598,8 @@ void dahdi_ec_enable(struct dahdi_pvt *p
return;
}
if (p->echocancel.head.tap_length) {
@@ -9,7 +9,7 @@
#if defined(HAVE_PRI) || defined(HAVE_SS7)
switch (p->sig) {
#if defined(HAVE_PRI)
-@@ -4626,7 +4628,9 @@ void dahdi_ec_enable(struct dahdi_pvt *p
+@@ -4628,7 +4630,9 @@ void dahdi_ec_enable(struct dahdi_pvt *p
break;
}
#endif /* defined(HAVE_PRI) || defined(HAVE_SS7) */
@@ -20,7 +20,7 @@
if (res) {
ast_log(LOG_WARNING, "Unable to enable echo cancellation on channel %d (%s)\n", p->channel, strerror(errno));
} else {
-@@ -4660,8 +4664,9 @@ void dahdi_ec_disable(struct dahdi_pvt *
+@@ -4662,8 +4666,9 @@ void dahdi_ec_disable(struct dahdi_pvt *
if (p->echocanon) {
struct dahdi_echocanparams ecp = { .tap_length = 0 };
diff --git a/net/asterisk13/files/patch-configure b/net/asterisk13/files/patch-configure
index f120219bbf6a..430a56aa814c 100644
--- a/net/asterisk13/files/patch-configure
+++ b/net/asterisk13/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig 2014-10-19 17:07:50 UTC
+--- configure.orig 2015-07-24 22:20:17 UTC
+++ configure
-@@ -4667,9 +4667,9 @@ astheaderdir='${includedir}/asterisk'
+@@ -4684,9 +4684,9 @@ astheaderdir='${includedir}/asterisk'
astlibdir='${libdir}'
astmoddir='${libdir}/asterisk/modules'
astmandir='${mandir}'
@@ -12,7 +12,7 @@
astkeydir='${astvarlibdir}'
astspooldir='${localstatedir}/spool/asterisk'
astlogdir='${localstatedir}/log/asterisk'
-@@ -4692,8 +4692,6 @@ esac
+@@ -4709,8 +4709,6 @@ esac
case "${host_os}" in
freebsd*)
ac_default_prefix=/usr/local
@@ -21,7 +21,7 @@
;;
openbsd*)
ac_default_prefix=/usr/local
-@@ -19052,6 +19050,8 @@ $as_echo_n "checking if \"struct ifaddrs
+@@ -19297,6 +19295,8 @@ $as_echo_n "checking if \"struct ifaddrs
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -30,7 +30,7 @@
#include <ifaddrs.h>
int
main ()
-@@ -27599,7 +27599,7 @@ $as_echo "${OPENH323_BUILD}" >&6; }
+@@ -28158,7 +28158,7 @@ $as_echo "${OPENH323_BUILD}" >&6; }
fi
@@ -39,7 +39,7 @@
if test "${HAS_OPENH323:-unset}" != "unset"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking OpenH323 installation validity" >&5
-@@ -27697,13 +27697,13 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_
+@@ -28256,13 +28256,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`
@@ -56,7 +56,7 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -27745,18 +27745,18 @@ fi
+@@ -28304,18 +28304,18 @@ fi
# now check for the header.
if test "${AST_LUA_FOUND}" = "yes"; then
@@ -78,7 +78,7 @@
if test "x$ac_cv_header_lua5_2_lua_h" = xyes; then :
LUA_HEADER_FOUND=1
else
-@@ -27809,13 +27809,13 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_
+@@ -28368,13 +28368,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`
@@ -95,7 +95,7 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -27857,18 +27857,18 @@ fi
+@@ -28416,18 +28416,18 @@ fi
# now check for the header.
if test "${AST_LUA_FOUND}" = "yes"; then
diff --git a/net/asterisk13/files/patch-include-asterisk-config.h b/net/asterisk13/files/patch-include-asterisk-config.h
index 09f86867546d..3c4cd7bb8ab8 100644
--- a/net/asterisk13/files/patch-include-asterisk-config.h
+++ b/net/asterisk13/files/patch-include-asterisk-config.h
@@ -1,6 +1,6 @@
---- include/asterisk/config.h.orig 2014-10-16 17:30:39 UTC
+--- include/asterisk/config.h.orig 2015-07-24 22:20:17 UTC
+++ include/asterisk/config.h
-@@ -674,6 +674,8 @@ struct ast_variable *ast_variables_rever
+@@ -714,6 +714,8 @@ struct ast_variable *ast_variables_rever
* This function frees a list of variables.
*/
void ast_variables_destroy(struct ast_variable *var);
diff --git a/net/asterisk13/files/patch-main__http.c b/net/asterisk13/files/patch-main__http.c
index f92375ac7355..3fd45c39807c 100644
--- a/net/asterisk13/files/patch-main__http.c
+++ b/net/asterisk13/files/patch-main__http.c
@@ -1,6 +1,6 @@
---- main/http.c.orig 2014-07-07 01:10:55 UTC
+--- main/http.c.orig 2015-07-24 22:20:17 UTC
+++ main/http.c
-@@ -2032,7 +2032,7 @@ static int __ast_http_load(int reload)
+@@ -2080,7 +2080,7 @@ static int __ast_http_load(int reload)
struct http_uri_redirect *redirect;
struct ast_flags config_flags = { reload ? CONFIG_FLAG_FILEUNCHANGED : 0 };
uint32_t bindport = DEFAULT_PORT;
diff --git a/net/asterisk13/files/patch-main__utils.c b/net/asterisk13/files/patch-main__utils.c
index 34e490223c4c..3f1a6492e75d 100644
--- a/net/asterisk13/files/patch-main__utils.c
+++ b/net/asterisk13/files/patch-main__utils.c
@@ -1,6 +1,6 @@
---- main/utils.c.orig 2014-09-18 19:22:39 UTC
+--- main/utils.c.orig 2015-07-24 22:20:17 UTC
+++ main/utils.c
-@@ -1220,8 +1220,8 @@ int ast_pthread_create_stack(pthread_t *
+@@ -1256,8 +1256,8 @@ int ast_pthread_create_stack(pthread_t *
pthread_attr_init(attr);
}
diff --git a/net/asterisk13/pkg-plist b/net/asterisk13/pkg-plist
index c49b2a1d06ec..52b0d794b3df 100644
--- a/net/asterisk13/pkg-plist
+++ b/net/asterisk13/pkg-plist
@@ -390,7 +390,7 @@ lib/asterisk/modules/res_clialiases.so
%%CURL%%lib/asterisk/modules/res_curl.so
%%CURL%%lib/asterisk/modules/res_config_curl.so
%%LDAP%%lib/asterisk/modules/res_config_ldap.so
-%%SQLITE%%lib/asterisk/modules/res_config_sqlite.so
+%%SQLITE2%%lib/asterisk/modules/res_config_sqlite.so
lib/asterisk/modules/res_config_sqlite3.so
lib/asterisk/modules/res_format_attr_celt.so
lib/asterisk/modules/res_format_attr_h263.so
@@ -453,6 +453,7 @@ lib/asterisk/modules/res_realtime.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
%%SRTP%%lib/asterisk/modules/res_srtp.so
lib/asterisk/modules/res_stasis.so