svn commit: r464634 - in head/net: . asterisk15 asterisk15/files
Guido Falsi
madpilot at FreeBSD.org
Thu Mar 15 21:14:13 UTC 2018
Author: madpilot
Date: Thu Mar 15 21:14:11 2018
New Revision: 464634
URL: https://svnweb.freebsd.org/changeset/ports/464634
Log:
Add asterisk15 port, bringing branch 15 of the asterisk project.
Note that branch 15 is NOT a Long Term Support branch. Asterisk 15
will reach EOL before Asterisk 13.
Requested by: "Herbert J. Skuhra" <herbert at gojira.at> (thanks for
help testing)
Added:
head/net/asterisk15/
- copied from r464633, head/net/asterisk13/
Modified:
head/net/Makefile
head/net/asterisk15/Makefile
head/net/asterisk15/distinfo
head/net/asterisk15/files/patch-Makefile
head/net/asterisk15/files/patch-channels-chan_dahdi.c
head/net/asterisk15/files/patch-configure
head/net/asterisk15/files/patch-main__http.c
head/net/asterisk15/files/patch-main__lock.c
head/net/asterisk15/files/patch-res_res__pjsip_pjsip__cli.c
head/net/asterisk15/pkg-plist
Modified: head/net/Makefile
==============================================================================
--- head/net/Makefile Thu Mar 15 21:02:02 2018 (r464633)
+++ head/net/Makefile Thu Mar 15 21:14:11 2018 (r464634)
@@ -28,6 +28,7 @@
SUBDIR += asterisk-chan_sccp
SUBDIR += asterisk-g72x
SUBDIR += asterisk13
+ SUBDIR += asterisk15
SUBDIR += avahi
SUBDIR += avahi-app
SUBDIR += avahi-autoipd
Modified: head/net/asterisk15/Makefile
==============================================================================
--- head/net/asterisk13/Makefile Thu Mar 15 21:02:02 2018 (r464633)
+++ head/net/asterisk15/Makefile Thu Mar 15 21:14:11 2018 (r464634)
@@ -1,13 +1,13 @@
# $FreeBSD$
PORTNAME= asterisk
-PORTVERSION= 13.20.0
+PORTVERSION= 15.3.0
CATEGORIES= net
MASTER_SITES= https://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729
MASTER_SITE_SUBDIR= asterisk/ \
asterisk/old-releases/ \
sounds/releases/:g729
-PKGNAMESUFFIX= 13
+PKGNAMESUFFIX= 15
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= madpilot at FreeBSD.org
@@ -34,6 +34,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --datarootdir=${DATADIR} \
--with-ilbc=internal \
--with-crypto=${OPENSSLBASE} \
+ --with-pjproject-bundled=no \
--with-ssl=${OPENSSLBASE}
CPE_VENDOR= digium
@@ -60,7 +61,7 @@ OPTIONS_DEFINE= ASTVERSION BACKTRACE CURL EXCHANGE F
MP3PLAYER OOH323 OPTIMIZED_CFLAGS PJSIP PORTAUDIO RADIUS SNMP \
SPANDSP SRTP SYSINFO XMPP
OPTIONS_DEFAULT= CURL FREETDS GSM LUA MP3PLAYER NEWT ODBC MYSQL PGSQL PJSIP \
- PORTAUDIO RADIUS SNMP SPANDSP SPEEX SRTP SQLITE2 VORBIS
+ PORTAUDIO RADIUS SNMP SPANDSP SPEEX SQLITE2 SRTP VORBIS
OPTIONS_DEFINE_i386= DAHDI
OPTIONS_DEFINE_amd64= DAHDI
Modified: head/net/asterisk15/distinfo
==============================================================================
--- head/net/asterisk13/distinfo Thu Mar 15 21:02:02 2018 (r464633)
+++ head/net/asterisk15/distinfo Thu Mar 15 21:14:11 2018 (r464634)
@@ -1,6 +1,6 @@
-TIMESTAMP = 1521143571
-SHA256 (asterisk-13.20.0.tar.gz) = a3d6d953f844867ea11e0be22ee6225049cd4f5870df6ab23454623bcfbc94d5
-SIZE (asterisk-13.20.0.tar.gz) = 32986236
+TIMESTAMP = 1521144030
+SHA256 (asterisk-15.3.0.tar.gz) = f424f89f23b72f267ff9baab82d449bebbbf00c54e54fcd06b8fca13788b012c
+SIZE (asterisk-15.3.0.tar.gz) = 27584086
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
Modified: head/net/asterisk15/files/patch-Makefile
==============================================================================
--- head/net/asterisk13/files/patch-Makefile Thu Mar 15 21:02:02 2018 (r464633)
+++ head/net/asterisk15/files/patch-Makefile Thu Mar 15 21:14:11 2018 (r464634)
@@ -1,4 +1,4 @@
---- Makefile.orig 2017-10-13 17:46:56 UTC
+--- Makefile.orig 2017-12-20 20:39:39 UTC
+++ Makefile
@@ -138,7 +138,7 @@ ASTTOPDIR:=$(subst $(space),\$(space),$(CURDIR))
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
- # 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.
-@@ -219,7 +219,7 @@ endif
+ # 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
+@@ -220,7 +220,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)
endif
-@@ -445,8 +445,12 @@ datafiles: _all doc/core-en_US.xml
+@@ -456,8 +456,12 @@ endif
$(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 \
-@@ -541,7 +545,7 @@ INSTALLDIRS="$(ASTLIBDIR)" "$(ASTMODDIR)" "$(ASTSBINDI
+@@ -552,7 +556,7 @@ INSTALLDIRS="$(ASTLIBDIR)" "$(ASTMODDIR)" "$(ASTSBINDI
"$(ASTDATADIR)/firmware/iax" "$(ASTDATADIR)/images" "$(ASTDATADIR)/keys" \
"$(ASTDATADIR)/phoneprov" "$(ASTDATADIR)/rest-api" "$(ASTDATADIR)/static-http" \
"$(ASTDATADIR)/sounds" "$(ASTDATADIR)/moh" "$(ASTMANDIR)/man8" "$(AGI_DIR)" "$(ASTDBDIR)" \
@@ -50,7 +50,7 @@
installdirs:
@for i in $(INSTALLDIRS); do \
-@@ -578,10 +582,10 @@ bininstall: _all installdirs $(SUBDIRS_INSTALL) main-b
+@@ -591,10 +595,10 @@ endif
if [ -f contrib/firmware/iax/iaxy.bin ] ; then \
$(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin "$(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin"; \
fi
@@ -65,7 +65,7 @@
$(SUBDIRS_INSTALL):
+ at DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" ASTDATADIR="$(ASTDATADIR)" $(SUBMAKE) -C $(@:-install=) install
-@@ -689,7 +693,7 @@ ifneq ($(filter ~%,$(DESTDIR)),)
+@@ -702,7 +706,7 @@ ifneq ($(filter ~%,$(DESTDIR)),)
@exit 1
endif
@@ -74,7 +74,7 @@
@if [ -x /usr/sbin/asterisk-post-install ]; then \
/usr/sbin/asterisk-post-install "$(DESTDIR)" . ; \
fi
-@@ -734,23 +738,10 @@ upgrade: bininstall
+@@ -747,23 +751,10 @@ upgrade: bininstall
# (2) the extension to strip off
define INSTALL_CONFIGS
@for x in configs/$(1)/*$(2); do \
@@ -100,7 +100,7 @@
echo "Updating asterisk.conf" ; \
sed -e 's|^astetcdir.*$$|astetcdir => $(ASTETCDIR)|' \
-e 's|^astmoddir.*$$|astmoddir => $(ASTMODDIR)|' \
-@@ -763,8 +754,8 @@ define INSTALL_CONFIGS
+@@ -776,8 +767,8 @@ define INSTALL_CONFIGS
-e 's|^astrundir.*$$|astrundir => $(ASTVARRUNDIR)|' \
-e 's|^astlogdir.*$$|astlogdir => $(ASTLOGDIR)|' \
-e 's|^astsbindir.*$$|astsbindir => $(ASTSBINDIR)|' \
@@ -111,7 +111,7 @@
rm -f "$(DESTDIR)$(ASTCONFPATH).tmp" ; \
fi
endef
-@@ -780,7 +771,7 @@ adsi:
+@@ -793,7 +784,7 @@ adsi:
else \
echo "Installing $$x" ; \
fi ; \
Modified: head/net/asterisk15/files/patch-channels-chan_dahdi.c
==============================================================================
--- head/net/asterisk13/files/patch-channels-chan_dahdi.c Thu Mar 15 21:02:02 2018 (r464633)
+++ head/net/asterisk15/files/patch-channels-chan_dahdi.c Thu Mar 15 21:14:11 2018 (r464634)
@@ -1,6 +1,6 @@
---- channels/chan_dahdi.c.orig 2017-12-20 19:05:45 UTC
+--- channels/chan_dahdi.c.orig 2017-12-20 20:39:39 UTC
+++ channels/chan_dahdi.c
-@@ -4666,6 +4666,8 @@ void dahdi_ec_enable(struct dahdi_pvt *p)
+@@ -4589,6 +4589,8 @@ void dahdi_ec_enable(struct dahdi_pvt *p)
return;
}
if (p->echocancel.head.tap_length) {
@@ -9,17 +9,18 @@
#if defined(HAVE_PRI) || defined(HAVE_SS7)
switch (p->sig) {
#if defined(HAVE_PRI)
-@@ -4696,7 +4698,8 @@ void dahdi_ec_enable(struct dahdi_pvt *p)
+@@ -4619,7 +4621,9 @@ 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 +4733,9 @@ void dahdi_ec_disable(struct dahdi_pvt *p)
+@@ -4653,8 +4657,9 @@ void dahdi_ec_disable(struct dahdi_pvt *p)
if (p->echocanon) {
struct dahdi_echocanparams ecp = { .tap_length = 0 };
Modified: head/net/asterisk15/files/patch-configure
==============================================================================
--- head/net/asterisk13/files/patch-configure Thu Mar 15 21:02:02 2018 (r464633)
+++ head/net/asterisk15/files/patch-configure Thu Mar 15 21:14:11 2018 (r464634)
@@ -1,6 +1,6 @@
---- configure.orig 2017-12-20 19:05:45 UTC
+--- configure.orig 2017-12-20 20:39:39 UTC
+++ configure
-@@ -4782,9 +4782,9 @@ astheaderdir='${includedir}/asterisk'
+@@ -4818,9 +4818,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'
-@@ -4807,8 +4807,6 @@ esac
+@@ -4843,8 +4843,6 @@ esac
case "${host_os}" in
freebsd*)
ac_default_prefix=/usr/local
@@ -21,7 +21,7 @@
;;
openbsd*)
ac_default_prefix=/usr/local
-@@ -20266,6 +20264,8 @@ $as_echo_n "checking for getifaddrs() support... " >&6
+@@ -20495,11 +20493,13 @@ $as_echo_n "checking for getifaddrs() support... " >&6
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -30,14 +30,20 @@
#include <ifaddrs.h>
int
main ()
-@@ -29529,13 +29529,13 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no";
+ {
+- struct ifaddrs *p; getifaddrs(&p);
++ Struct ifaddrs *p; getifaddrs(&p);
+ ;
+ return 0;
+@@ -30097,13 +30097,13 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no";
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- { $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; }
++$as_echo_n "checking for luaL_newstate in -llua-5.2... " >&6; }
if ${ac_cv_lib_lua5_2_luaL_newstate+:} false; then :
$as_echo_n "(cached) " >&6
else
@@ -47,7 +53,7 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -29576,7 +29576,7 @@ fi
+@@ -30144,7 +30144,7 @@ fi
# now check for the header.
if test "${AST_LUA_FOUND}" = "yes"; then
@@ -56,7 +62,7 @@
# if --with-LUA=DIR has been specified, use it.
if test "x${LUA_DIR}" != "x"; then
LUA_INCLUDE="-I${LUA_DIR}/include"
-@@ -29586,7 +29586,7 @@ fi
+@@ -30154,7 +30154,7 @@ fi
# check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${LUA_INCLUDE}"
@@ -65,8 +71,20 @@
if test "x$ac_cv_header_lua5_2_lua_h" = xyes; then :
LUA_HEADER_FOUND=1
else
-@@ -29633,13 +29633,13 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no";
+@@ -30181,9 +30181,9 @@ fi
+ if test "x${PBX_LUA}" = "x1" ; then
+ if test x"${LUA_DIR}" = x; then
+- LUA_INCLUDE="${LUA_INCLUDE} -I/usr/include/lua5.2"
++ LUA_INCLUDE="${LUA_INCLUDE} -I/usr/include/lua-5.2"
+ else
+- LUA_INCLUDE="${LUA_INCLUDE} -I${LUA_DIR}/lua5.2"
++ LUA_INCLUDE="${LUA_INCLUDE} -I${LUA_DIR}/lua-5.2"
+ fi
+ fi
+
+@@ -30201,13 +30201,13 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no";
+
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua5.1" >&5
@@ -82,7 +100,7 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -29680,7 +29680,7 @@ fi
+@@ -30248,7 +30248,7 @@ fi
# now check for the header.
if test "${AST_LUA_FOUND}" = "yes"; then
@@ -91,7 +109,7 @@
# if --with-LUA=DIR has been specified, use it.
if test "x${LUA_DIR}" != "x"; then
LUA_INCLUDE="-I${LUA_DIR}/include"
-@@ -29690,7 +29690,7 @@ fi
+@@ -30258,7 +30258,7 @@ fi
# check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${LUA_INCLUDE}"
@@ -100,3 +118,15 @@
if test "x$ac_cv_header_lua5_1_lua_h" = xyes; then :
LUA_HEADER_FOUND=1
else
+@@ -30285,9 +30285,9 @@ fi
+
+ if test "x${PBX_LUA}" = "x1" ; then
+ if test x"${LUA_DIR}" = x; then
+- LUA_INCLUDE="${LUA_INCLUDE} -I/usr/include/lua5.1"
++ LUA_INCLUDE="${LUA_INCLUDE} -I/usr/include/lua-5.1"
+ else
+- LUA_INCLUDE="${LUA_INCLUDE} -I${LUA_DIR}/lua5.1"
++ LUA_INCLUDE="${LUA_INCLUDE} -I${LUA_DIR}/lua-5.1"
+ fi
+ fi
+
Modified: head/net/asterisk15/files/patch-main__http.c
==============================================================================
--- head/net/asterisk13/files/patch-main__http.c Thu Mar 15 21:02:02 2018 (r464633)
+++ head/net/asterisk15/files/patch-main__http.c Thu Mar 15 21:14:11 2018 (r464634)
@@ -1,6 +1,6 @@
---- main/http.c.orig 2017-10-13 17:46:56 UTC
+--- main/http.c.orig 2017-12-20 20:39:39 UTC
+++ main/http.c
-@@ -2098,7 +2098,7 @@ static int __ast_http_load(int reload)
+@@ -2044,7 +2044,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;
Modified: head/net/asterisk15/files/patch-main__lock.c
==============================================================================
--- head/net/asterisk13/files/patch-main__lock.c Thu Mar 15 21:02:02 2018 (r464633)
+++ head/net/asterisk15/files/patch-main__lock.c Thu Mar 15 21:14:11 2018 (r464634)
@@ -1,6 +1,6 @@
---- main/lock.c.orig 2017-10-13 17:46:56 UTC
+--- main/lock.c.orig 2017-12-20 20:39:39 UTC
+++ main/lock.c
-@@ -703,9 +703,6 @@ int __ast_rwlock_init(int tracking, const char *filena
+@@ -710,9 +710,6 @@ int __ast_rwlock_init(int tracking, const char *filena
#endif /* DEBUG_THREADS */
pthread_rwlockattr_init(&attr);
Modified: head/net/asterisk15/files/patch-res_res__pjsip_pjsip__cli.c
==============================================================================
--- head/net/asterisk13/files/patch-res_res__pjsip_pjsip__cli.c Thu Mar 15 21:02:02 2018 (r464633)
+++ head/net/asterisk15/files/patch-res_res__pjsip_pjsip__cli.c Thu Mar 15 21:14:11 2018 (r464634)
@@ -1,6 +1,6 @@
---- res/res_pjsip/pjsip_cli.c.orig 2017-10-13 17:46:56 UTC
+--- res/res_pjsip/pjsip_cli.c.orig 2017-12-20 20:39:39 UTC
+++ res/res_pjsip/pjsip_cli.c
-@@ -172,7 +172,7 @@ char *ast_sip_cli_traverse_objects(struct ast_cli_entr
+@@ -163,7 +163,7 @@ char *ast_sip_cli_traverse_objects(struct ast_cli_entr
}
regex = a->argv[4];
} else {
Modified: head/net/asterisk15/pkg-plist
==============================================================================
--- head/net/asterisk13/pkg-plist Thu Mar 15 21:02:02 2018 (r464633)
+++ head/net/asterisk15/pkg-plist Thu Mar 15 21:14:11 2018 (r464634)
@@ -90,6 +90,7 @@
@sample %%ETCDIR%%/res_pktccops.conf.sample
@sample %%ETCDIR%%/res_snmp.conf.sample
@sample %%ETCDIR%%/res_stun_monitor.conf.sample
+ at sample %%ETCDIR%%/resolver_unbound.conf.sample
@sample %%ETCDIR%%/rtp.conf.sample
@sample %%ETCDIR%%/say.conf.sample
@sample %%ETCDIR%%/sip.conf.sample
@@ -163,15 +164,24 @@ include/asterisk/compat.h
include/asterisk/compiler.h
include/asterisk/config.h
include/asterisk/config_options.h
+include/asterisk/conversions.h
include/asterisk/core_local.h
include/asterisk/core_unreal.h
include/asterisk/crypto.h
-include/asterisk/data.h
include/asterisk/datastore.h
include/asterisk/devicestate.h
include/asterisk/dial.h
include/asterisk/dlinkedlists.h
include/asterisk/dns.h
+include/asterisk/dns_core.h
+include/asterisk/dns_internal.h
+include/asterisk/dns_naptr.h
+include/asterisk/dns_query_set.h
+include/asterisk/dns_recurring.h
+include/asterisk/dns_resolver.h
+include/asterisk/dns_srv.h
+include/asterisk/dns_test.h
+include/asterisk/dns_tlsa.h
include/asterisk/dnsmgr.h
include/asterisk/doxygen/architecture.h
include/asterisk/doxygen/licensing.h
@@ -201,10 +211,12 @@ include/asterisk/hashtab.h
include/asterisk/heap.h
include/asterisk/http.h
include/asterisk/http_websocket.h
+include/asterisk/ilbc.h
include/asterisk/image.h
include/asterisk/indications.h
include/asterisk/inline_api.h
include/asterisk/io.h
+include/asterisk/iostream.h
include/asterisk/json.h
include/asterisk/linkedlists.h
include/asterisk/localtime.h
@@ -213,6 +225,7 @@ include/asterisk/logger.h
include/asterisk/manager.h
include/asterisk/max_forwards.h
include/asterisk/md5.h
+include/asterisk/media_cache.h
include/asterisk/media_index.h
include/asterisk/message.h
include/asterisk/mixmonitor.h
@@ -290,6 +303,7 @@ include/asterisk/stasis_message_router.h
include/asterisk/stasis_system.h
include/asterisk/stasis_test.h
include/asterisk/statsd.h
+include/asterisk/stream.h
include/asterisk/stringfields.h
include/asterisk/strings.h
include/asterisk/stun.h
More information about the svn-ports-head
mailing list