mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-07 06:40:06 +00:00
Code Issues Releases Activity

Update asterisk13 to 13.18.0

Browse Source
This commit is contained in:
Guido Falsi 2017-10-30 22:58:18 +00:00
parent 71cc8f7ffb
commit a6d6400dc9
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=453213
10 changed files with 52 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
net/asterisk13/Makefile
View File

@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= asterisk
PORTVERSION= 13.17.2
PORTREVISION= 1
PORTVERSION= 13.18.0
CATEGORIES= net
MASTER_SITES= http://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729
MASTER_SITE_SUBDIR= asterisk/ \

6
net/asterisk13/distinfo
View File

@ -1,6 +1,6 @@
TIMESTAMP = 1505852333
SHA256 (asterisk-13.17.2.tar.gz) = 19ae0565687b85bde382b2cc274dd5a27ac33dc57a4eb3b663cb5ad9b238f1ac
SIZE (asterisk-13.17.2.tar.gz) = 32899368
TIMESTAMP = 1509395177
SHA256 (asterisk-13.18.0.tar.gz) = 36efd526f749e58867b861e7b6234c47b89ac7c9b4f34d294623a5c99bed7b69
SIZE (asterisk-13.18.0.tar.gz) = 32996878
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

26
net/asterisk13/files/patch-Makefile
View File

@ -1,6 +1,6 @@
--- Makefile.orig 2016-03-22 18:32:00 UTC
--- Makefile.orig 2017-10-13 17:46:56 UTC
+++ Makefile
@@ -131,7 +131,7 @@ ASTTOPDIR:=$(subst $(space),\$(space),$(
@@ -138,7 +138,7 @@ ASTTOPDIR:=$(subst $(space),\$(space),$(CURDIR))
OVERWRITE=y
# Include debug and macro symbols in the executables (-g) and profiling info (-pg)
@ -9,7 +9,7 @@
# Asterisk.conf is located in ASTETCDIR or by using the -C flag
# when starting Asterisk
@@ -155,7 +155,7 @@ LINKER_SYMBOL_PREFIX=
@@ -162,7 +162,7 @@ LINKER_SYMBOL_PREFIX=
#_ASTCFLAGS+=-DOLD_DSP_ROUTINES
# Default install directory for DAHDI hooks.
@ -18,16 +18,16 @@
# 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.
@@ -217,7 +217,7 @@ endif
@@ -219,7 +219,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)
# flag to tell 'ldconfig' to only process specified directories
LDCONFIG_FLAGS=-m
@@ -476,8 +476,12 @@ datafiles: _all doc/core-en_US.xml
endif
@@ -445,8 +445,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 \
@@ -572,7 +576,7 @@ INSTALLDIRS="$(ASTLIBDIR)" "$(ASTMODDIR)
@@ -541,7 +545,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 \
@@ -609,10 +613,10 @@ bininstall: _all installdirs $(SUBDIRS_I
@@ -578,10 +582,10 @@ bininstall: _all installdirs $(SUBDIRS_INSTALL) main-b
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):
+@DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" ASTDATADIR="$(ASTDATADIR)" $(SUBMAKE) -C $(@:-install=) install
@@ -645,7 +649,7 @@ ifneq ($(filter ~%,$(DESTDIR)),)
@@ -689,7 +693,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
@@ -688,23 +692,10 @@ upgrade: bininstall
@@ -734,23 +738,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)|' \
@@ -717,8 +708,8 @@ define INSTALL_CONFIGS
@@ -763,8 +754,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
@@ -734,7 +725,7 @@ adsi:
@@ -780,7 +771,7 @@ adsi:
else \
echo "Installing $$x" ; \
fi ; \

20
net/asterisk13/files/patch-channels-chan_dahdi.c
View File

@ -1,6 +1,18 @@
--- channels/chan_dahdi.c.orig 2015-07-24 22:20:17 UTC
--- channels/chan_dahdi.c.orig 2017-10-13 17:46:56 UTC
+++ channels/chan_dahdi.c
@@ -4598,6 +4598,8 @@ void dahdi_ec_enable(struct dahdi_pvt *p
@@ -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;
}
if (p->echocancel.head.tap_length) {
@ -9,7 +21,7 @@
#if defined(HAVE_PRI) || defined(HAVE_SS7)
switch (p->sig) {
#if defined(HAVE_PRI)
@@ -4628,7 +4630,9 @@ void dahdi_ec_enable(struct dahdi_pvt *p
@@ -4696,7 +4698,9 @@ void dahdi_ec_enable(struct dahdi_pvt *p)
break;
}
#endif /* defined(HAVE_PRI) || defined(HAVE_SS7) */
@ -20,7 +32,7 @@
if (res) {
ast_log(LOG_WARNING, "Unable to enable echo cancellation on channel %d (%s)\n", p->channel, strerror(errno));
} else {
@@ -4662,8 +4666,9 @@ void dahdi_ec_disable(struct dahdi_pvt *
@@ -4730,8 +4734,9 @@ void dahdi_ec_disable(struct dahdi_pvt *p)
if (p->echocanon) {
struct dahdi_echocanparams ecp = { .tap_length = 0 };

18
net/asterisk13/files/patch-configure
View File

@ -1,6 +1,6 @@
--- configure.orig 2015-07-24 22:20:17 UTC
--- configure.orig 2017-10-13 17:46:56 UTC
+++ configure
@@ -4684,9 +4684,9 @@ astheaderdir='${includedir}/asterisk'
@@ -4780,9 +4780,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'
@@ -4709,8 +4709,6 @@ esac
@@ -4805,8 +4805,6 @@ esac
case "${host_os}" in
freebsd*)
ac_default_prefix=/usr/local
@ -21,7 +21,7 @@
;;
openbsd*)
ac_default_prefix=/usr/local
@@ -19297,6 +19295,8 @@ $as_echo_n "checking if \"struct ifaddrs
@@ -20706,6 +20704,8 @@ $as_echo_n "checking if \"struct ifaddrs *p; getifaddr
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@ -30,7 +30,7 @@
#include <ifaddrs.h>
int
main ()
@@ -28158,7 +28158,7 @@ $as_echo "${OPENH323_BUILD}" >&6; }
@@ -30490,7 +30490,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
@@ -28256,13 +28256,13 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_
@@ -30588,13 +30588,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`
@ -56,7 +56,7 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -28304,18 +28304,18 @@ fi
@@ -30636,18 +30636,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
@@ -28368,13 +28368,13 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_
@@ -30700,13 +30700,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`
@ -95,7 +95,7 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -28416,18 +28416,18 @@ fi
@@ -30748,18 +30748,18 @@ fi
# now check for the header.
if test "${AST_LUA_FOUND}" = "yes"; then

4
net/asterisk13/files/patch-main__Makefile
View File

@ -1,6 +1,6 @@
--- main/Makefile.orig 2017-03-24 08:40:58 UTC
--- main/Makefile.orig 2017-10-13 17:46:56 UTC
+++ main/Makefile
@@ -81,9 +81,12 @@ endif
@@ -75,9 +75,12 @@ endif
ifeq ($(OSARCH),FreeBSD)
# -V is understood by BSD Make, not by GNU make.

4
net/asterisk13/files/patch-main__asterisk.exports.in
View File

@ -1,6 +1,6 @@
--- main/asterisk.exports.in.orig 2013-08-22 08:26:55 UTC
--- main/asterisk.exports.in.orig 2017-10-13 17:46:56 UTC
+++ main/asterisk.exports.in
@@ -68,6 +68,8 @@
@@ -70,6 +70,8 @@
*/
LINKER_SYMBOL_PREFIX_IO_stdin_used;

4
net/asterisk13/files/patch-main__http.c
View File

@ -1,6 +1,6 @@
--- main/http.c.orig 2015-07-24 22:20:17 UTC
--- main/http.c.orig 2017-10-13 17:46:56 UTC
+++ main/http.c
@@ -2080,7 +2080,7 @@ static int __ast_http_load(int reload)
@@ -2098,7 +2098,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;

4
net/asterisk13/files/patch-main__lock.c
View File

@ -1,6 +1,6 @@
--- main/lock.c.orig 2014-12-12 23:40:50 UTC
--- main/lock.c.orig 2017-10-13 17:46:56 UTC
+++ main/lock.c
@@ -701,9 +701,6 @@ int __ast_rwlock_init(int tracking, cons
@@ -703,9 +703,6 @@ int __ast_rwlock_init(int tracking, const char *filena
#endif /* DEBUG_THREADS */
pthread_rwlockattr_init(&attr);

4
net/asterisk13/files/patch-res_res__pjsip_pjsip__cli.c
View File

@ -1,6 +1,6 @@
--- res/res_pjsip/pjsip_cli.c.orig 2016-05-13 17:41:41 UTC
--- res/res_pjsip/pjsip_cli.c.orig 2017-10-13 17:46:56 UTC
+++ res/res_pjsip/pjsip_cli.c
@@ -172,7 +172,7 @@ char *ast_sip_cli_traverse_objects(struc
@@ -172,7 +172,7 @@ char *ast_sip_cli_traverse_objects(struct ast_cli_entr
}
regex = a->argv[4];
} else {