MFH: r458800 r461819

- Update net/asterisk13 to 13.19.0
- Move MASTER_SITES and WWW to https
- Add missing dependencies reported by stage-qa

Update asterisk13 to 13.19.1

Fixes a memory leak in the CDR functionality.

Approved by:	ports-secteam (riggs)
This commit is contained in:
Guido Falsi 2018-02-15 22:31:49 +00:00
parent eaf07c13dc
commit bafc79cfbf
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/branches/2018Q1/; revision=461955
6 changed files with 37 additions and 60 deletions

View File

@ -1,10 +1,9 @@
# $FreeBSD$
PORTNAME= asterisk
PORTVERSION= 13.18.5
PORTREVISION= 1
PORTVERSION= 13.19.1
CATEGORIES= net
MASTER_SITES= http://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729
MASTER_SITES= https://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729
MASTER_SITE_SUBDIR= asterisk/ \
asterisk/old-releases/ \
sounds/releases/:g729
@ -130,7 +129,9 @@ DAHDI_LIB_DEPENDS= libpri.so:misc/libpri \
libtonezone.so:misc/dahdi
EXCHANGE_CONFIGURE_OFF= --without-neon --without-neon29
EXCHANGE_LIB_DEPENDS= libneon.so:www/neon
EXCHANGE_LIB_DEPENDS= libneon.so:www/neon \
libexpat.so:textproc/expat2
EXCHANGE_USES= gettext-runtime
FREETDS_CONFIGURE_ON= --with-tds=${LOCALBASE}
FREETDS_CONFIGURE_OFF= --without-tds
@ -192,6 +193,7 @@ SQLITE2_CONFIGURE_WITH= sqlite
SQLITE2_LIB_DEPENDS= libsqlite.so:databases/sqlite2
SRTP_CONFIGURE_WITH= srtp
SRTP_LIB_DEPENDS= libsrtp.so:net/libsrtp
SYSINFO_LIB_DEPENDS= libsysinfo.so:devel/libsysinfo

View File

@ -1,6 +1,6 @@
TIMESTAMP = 1514023097
SHA256 (asterisk-13.18.5.tar.gz) = 23706560ae2d83af44b521040b2db1155b3e873b0e1fbcbe27ae4b7895f3b74f
SIZE (asterisk-13.18.5.tar.gz) = 32973835
TIMESTAMP = 1518560936
SHA256 (asterisk-13.19.1.tar.gz) = ff64118f9b9e5b3c84d09105a24751af573976718ce4bfd641075eb01b56dc63
SIZE (asterisk-13.19.1.tar.gz) = 32989891
SHA256 (asterisk-core-sounds-en-g729-1.5.tar.gz) = 8b28a59cfa53b59c76e0a191704f0708e3d83acffab8c5e6f25dfc599f0123f9
SIZE (asterisk-core-sounds-en-g729-1.5.tar.gz) = 1551123
SHA256 (asterisk-moh-opsound-g729-2.03.tar.gz) = 0147ca9a97f0c550227aacb7793499057c4d2c64e021c95f93722f27d5549585

View File

@ -1,17 +1,5 @@
--- channels/chan_dahdi.c.orig 2017-10-13 17:46:56 UTC
--- channels/chan_dahdi.c.orig 2017-12-20 19:05:45 UTC
+++ channels/chan_dahdi.c
@@ -61,10 +61,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include <signal.h>
#else
#include <sys/signal.h>
+#include <sys/sysmacros.h>
#endif
#include <sys/stat.h>
#include <math.h>
-#include <sys/sysmacros.h>
#include "sig_analog.h"
/* Analog signaling is currently still present in chan_dahdi for use with
@@ -4666,6 +4666,8 @@ void dahdi_ec_enable(struct dahdi_pvt *p)
return;
}
@ -21,18 +9,17 @@
#if defined(HAVE_PRI) || defined(HAVE_SS7)
switch (p->sig) {
#if defined(HAVE_PRI)
@@ -4696,7 +4698,9 @@ void dahdi_ec_enable(struct dahdi_pvt *p)
@@ -4696,7 +4698,8 @@ void dahdi_ec_enable(struct dahdi_pvt *p)
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 {
@@ -4730,8 +4734,9 @@ void dahdi_ec_disable(struct dahdi_pvt *p)
@@ -4730,8 +4733,9 @@ void dahdi_ec_disable(struct dahdi_pvt *p)
if (p->echocanon) {
struct dahdi_echocanparams ecp = { .tap_length = 0 };

View File

@ -1,6 +1,6 @@
--- configure.orig 2017-10-13 17:46:56 UTC
--- configure.orig 2017-12-20 19:05:45 UTC
+++ configure
@@ -4780,9 +4780,9 @@ astheaderdir='${includedir}/asterisk'
@@ -4782,9 +4782,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'
@@ -4805,8 +4805,6 @@ esac
@@ -4807,8 +4807,6 @@ esac
case "${host_os}" in
freebsd*)
ac_default_prefix=/usr/local
@ -21,7 +21,7 @@
;;
openbsd*)
ac_default_prefix=/usr/local
@@ -20706,6 +20704,8 @@ $as_echo_n "checking if \"struct ifaddrs *p; getifaddr
@@ -20266,6 +20264,8 @@ $as_echo_n "checking for getifaddrs() support... " >&6
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@ -30,15 +30,15 @@
#include <ifaddrs.h>
int
main ()
@@ -30588,13 +30588,13 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no";
@@ -29529,13 +29529,13 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no";
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 "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua5.2" >&5
-$as_echo_n "checking for luaL_newstate in -llua5.2... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua-5.2" >&5
+$as_echo_n "checking for luaL_newstate in -lluai-5.2... " >&6; }
if ${ac_cv_lib_lua5_2_luaL_newstate+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@ -47,7 +47,7 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -30636,18 +30636,18 @@ fi
@@ -29576,7 +29576,7 @@ fi
# now check for the header.
if test "${AST_LUA_FOUND}" = "yes"; then
@ -56,12 +56,8 @@
# 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
@@ -29586,7 +29586,7 @@ fi
# 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"
@ -69,15 +65,15 @@
if test "x$ac_cv_header_lua5_2_lua_h" = xyes; then :
LUA_HEADER_FOUND=1
else
@@ -30700,13 +30700,13 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no";
@@ -29633,13 +29633,13 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no";
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 "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua5.1" >&5
-$as_echo_n "checking for luaL_newstate in -llua5.1... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua-5.1" >&5
+$as_echo_n "checking for luaL_newstate in -llua-5.1... " >&6; }
if ${ac_cv_lib_lua5_1_luaL_newstate+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@ -86,7 +82,7 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -30748,18 +30748,18 @@ fi
@@ -29680,7 +29680,7 @@ fi
# now check for the header.
if test "${AST_LUA_FOUND}" = "yes"; then
@ -95,12 +91,8 @@
# 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
@@ -29690,7 +29690,7 @@ fi
# 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"

View File

@ -2,4 +2,4 @@ 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.asterisk.org
WWW: https://www.asterisk.org

View File

@ -174,11 +174,7 @@ include/asterisk/dlinkedlists.h
include/asterisk/dns.h
include/asterisk/dnsmgr.h
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/releases.h
include/asterisk/doxygen/reviewboard.h
include/asterisk/doxyref.h
include/asterisk/dsp.h
include/asterisk/dundi.h