summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--comms/asterisk13/Makefile4
-rw-r--r--comms/asterisk13/PLIST3
-rw-r--r--comms/asterisk13/distinfo24
-rw-r--r--comms/asterisk13/patches/patch-Makefile32
-rw-r--r--comms/asterisk13/patches/patch-apps_app__queue.c32
-rw-r--r--comms/asterisk13/patches/patch-include_asterisk_strings.h14
6 files changed, 55 insertions, 54 deletions
diff --git a/comms/asterisk13/Makefile b/comms/asterisk13/Makefile
index 14b905384e6..f1f020d369b 100644
--- a/comms/asterisk13/Makefile
+++ b/comms/asterisk13/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.27 2017/05/29 20:52:37 jnemeth Exp $
+# $NetBSD: Makefile,v 1.28 2017/06/04 07:51:27 jnemeth Exp $
#
# NOTE: when updating this package, there are two places that sound
# tarballs need to be checked; look in ${WRKSRC}/sounds/Makefile
# to find out the current sound file versions
-DISTNAME= asterisk-13.15.1
+DISTNAME= asterisk-13.16.0
#PKGREVISION= 4
CATEGORIES= comms net audio
MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/
diff --git a/comms/asterisk13/PLIST b/comms/asterisk13/PLIST
index d18033452b5..6adf2b02086 100644
--- a/comms/asterisk13/PLIST
+++ b/comms/asterisk13/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2017/05/13 22:39:13 jnemeth Exp $
+@comment $NetBSD: PLIST,v 1.10 2017/06/04 07:51:27 jnemeth Exp $
include/asterisk.h
include/asterisk/_private.h
include/asterisk/abstract_jb.h
@@ -7,6 +7,7 @@ include/asterisk/adsi.h
include/asterisk/ael_structs.h
include/asterisk/agi.h
include/asterisk/alaw.h
+include/asterisk/alertpipe.h
include/asterisk/aoc.h
include/asterisk/app.h
include/asterisk/ari.h
diff --git a/comms/asterisk13/distinfo b/comms/asterisk13/distinfo
index d9b5d19f5f0..c0c2340d2a3 100644
--- a/comms/asterisk13/distinfo
+++ b/comms/asterisk13/distinfo
@@ -1,18 +1,18 @@
-$NetBSD: distinfo,v 1.13 2017/05/29 20:52:37 jnemeth Exp $
+$NetBSD: distinfo,v 1.14 2017/06/04 07:51:27 jnemeth Exp $
-SHA1 (asterisk-13.15.1/asterisk-13.15.1.tar.gz) = f7d32a31e5a45624a38f9604ac8e434c6b0ecd7c
-RMD160 (asterisk-13.15.1/asterisk-13.15.1.tar.gz) = c89f27ab4362ee64cad4376e96eb4ede630a2de1
-SHA512 (asterisk-13.15.1/asterisk-13.15.1.tar.gz) = 2ee19853431b890c988b69e03604b0d39b9764a93074c22a9975bde7d6f432582a00c2e841be6c6fd5f86fab338b9e717d4a7912e4fbac5034cb7a0dcf3b2337
-Size (asterisk-13.15.1/asterisk-13.15.1.tar.gz) = 32828857 bytes
-SHA1 (asterisk-13.15.1/asterisk-extra-sounds-en-gsm-1.5.tar.gz) = 831ae6442e23cbef1e7d1c84798778ad0b0524d1
-RMD160 (asterisk-13.15.1/asterisk-extra-sounds-en-gsm-1.5.tar.gz) = d52df795201c53fc4cd7d99ed41516e312f6f0f3
-SHA512 (asterisk-13.15.1/asterisk-extra-sounds-en-gsm-1.5.tar.gz) = c7d3c3fd2c854e6776801312d34bf69bbed78a443c16121637f508c5275f18b1d415cbb6e4f6f8c5aa3769cbbfa1a11485b9972053777f3ac39256c2c81729f1
-Size (asterisk-13.15.1/asterisk-extra-sounds-en-gsm-1.5.tar.gz) = 4256538 bytes
-SHA1 (patch-Makefile) = 1373ea4cfab46f701cef0f5c61a6a1604e710bf5
+SHA1 (asterisk-13.16.0/asterisk-13.16.0.tar.gz) = ab0db5bd3779ebbe5b37aaa6c00e72c702b6d55a
+RMD160 (asterisk-13.16.0/asterisk-13.16.0.tar.gz) = beebb78e85dd6735c8943f00f416efe0eed42afc
+SHA512 (asterisk-13.16.0/asterisk-13.16.0.tar.gz) = 287a89bf00685287efcdb0a8142e6369e9752548688626a5e01b23f4ed4585dbca8cf12b0344b20ce9a8b5e903b63895cc596a52ec39c3a88719b6029f63221d
+Size (asterisk-13.16.0/asterisk-13.16.0.tar.gz) = 32886977 bytes
+SHA1 (asterisk-13.16.0/asterisk-extra-sounds-en-gsm-1.5.tar.gz) = 831ae6442e23cbef1e7d1c84798778ad0b0524d1
+RMD160 (asterisk-13.16.0/asterisk-extra-sounds-en-gsm-1.5.tar.gz) = d52df795201c53fc4cd7d99ed41516e312f6f0f3
+SHA512 (asterisk-13.16.0/asterisk-extra-sounds-en-gsm-1.5.tar.gz) = c7d3c3fd2c854e6776801312d34bf69bbed78a443c16121637f508c5275f18b1d415cbb6e4f6f8c5aa3769cbbfa1a11485b9972053777f3ac39256c2c81729f1
+Size (asterisk-13.16.0/asterisk-extra-sounds-en-gsm-1.5.tar.gz) = 4256538 bytes
+SHA1 (patch-Makefile) = 4e8452e810533624464ab24e65ef3969e896ebd3
SHA1 (patch-addons_chan__ooh323.c) = 9cba619ced6a4449604faebeac33d91a23519c48
SHA1 (patch-apps_app__dumpchan.c) = 127ac02bdc180ad2334cd095aa6e646feb6fba10
SHA1 (patch-apps_app__followme.c) = c6a5790b5e9b34d07dbfdd66a58e2854c8c72695
-SHA1 (patch-apps_app__queue.c) = c90dcacf1b18dba977b6a18505b9c1401a6c8e82
+SHA1 (patch-apps_app__queue.c) = 6dbcbdf0a23b1e7b57a82203375f16e872612c9d
SHA1 (patch-apps_app__sms.c) = ae81daf6ccf8c8fdf2251dba305e137bb9ab6b05
SHA1 (patch-apps_app__voicemail.c) = ee46ffd64a15ef79fc568edd3d5eb68cd86865f7
SHA1 (patch-build__tools_mkpkgconfig) = 7fab8fcf46d9f8a3b98455674fec6307ec472b23
@@ -28,7 +28,7 @@ SHA1 (patch-include_asterisk_autoconfig.h.in) = a5df61da7f5cdc53f4b41ccb6ea4631e
SHA1 (patch-include_asterisk_endian.h) = 1fc20d750da7d0a0407c1e1694b8bb21753acdcd
SHA1 (patch-include_asterisk_lock.h) = ce636ef6102a2a95600cfc8215305507e08fe8f9
SHA1 (patch-include_asterisk_sha1.h) = 9b233ef82b50b8d94177616e1382991656ce1ebf
-SHA1 (patch-include_asterisk_strings.h) = d204488d681e39af6fadf9f054c9e402f4cb8657
+SHA1 (patch-include_asterisk_strings.h) = ea1dbcd709e9f44cbbe70c9e5b86e10ea551be19
SHA1 (patch-main_Makefile) = 28642be69a1b911939b134ca4d0bba2f12d0e3bf
SHA1 (patch-main_acl.c) = 06a9d247b19d648e9ff54ac2a234dc8ac8c023bb
SHA1 (patch-main_asterisk.c) = 93ae4e31b4ae279e42b5c3661bb5fdb76d9ea161
diff --git a/comms/asterisk13/patches/patch-Makefile b/comms/asterisk13/patches/patch-Makefile
index a752ff77b2e..344917edd1c 100644
--- a/comms/asterisk13/patches/patch-Makefile
+++ b/comms/asterisk13/patches/patch-Makefile
@@ -1,8 +1,8 @@
-$NetBSD: patch-Makefile,v 1.3 2016/05/06 07:41:06 jnemeth Exp $
+$NetBSD: patch-Makefile,v 1.4 2017/06/04 07:51:27 jnemeth Exp $
---- Makefile.orig 2016-04-20 10:46:18.000000000 +0000
+--- Makefile.orig 2017-05-30 17:44:16.000000000 +0000
+++ Makefile
-@@ -135,7 +135,7 @@ DEBUG=-g3
+@@ -139,7 +139,7 @@ DEBUG=-g3
# Asterisk.conf is located in ASTETCDIR or by using the -C flag
# when starting Asterisk
@@ -11,7 +11,7 @@ $NetBSD: patch-Makefile,v 1.3 2016/05/06 07:41:06 jnemeth Exp $
AGI_DIR=$(ASTDATADIR)/agi-bin
# If you use Apache, you may determine by a grep 'DocumentRoot' of your httpd.conf file
-@@ -172,6 +172,9 @@ DAHDI_UDEV_HOOK_DIR = /usr/share/dahdi/s
+@@ -176,6 +176,9 @@ DAHDI_UDEV_HOOK_DIR = /usr/share/dahdi/s
# supported run:
# menuselect/menuselect --help
@@ -21,7 +21,7 @@ $NetBSD: patch-Makefile,v 1.3 2016/05/06 07:41:06 jnemeth Exp $
MOD_SUBDIR_CFLAGS="-I$(ASTTOPDIR)/include"
OTHER_SUBDIR_CFLAGS="-I$(ASTTOPDIR)/include"
-@@ -211,10 +214,6 @@ ifeq ($(AST_DEVMODE),yes)
+@@ -210,10 +213,6 @@ ifeq ($(AST_DEVMODE),yes)
ADDL_TARGETS+=validate-docs
endif
@@ -32,7 +32,7 @@ $NetBSD: patch-Makefile,v 1.3 2016/05/06 07:41:06 jnemeth Exp $
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)
-@@ -342,10 +341,10 @@ makeopts: configure
+@@ -336,10 +335,10 @@ makeopts: configure
@echo "****"
@exit 1
@@ -44,16 +44,16 @@ $NetBSD: patch-Makefile,v 1.3 2016/05/06 07:41:06 jnemeth Exp $
+ menuselect/menuselect --check-deps $@ $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS)
endif
- $(MOD_SUBDIRS_EMBED_LDSCRIPT):
-@@ -445,7 +444,6 @@ dist-clean: distclean
+ $(MOD_SUBDIRS_MENUSELECT_TREE):
+@@ -412,7 +411,6 @@ dist-clean: distclean
distclean: $(SUBDIRS_DIST_CLEAN) _clean
@$(MAKE) -C menuselect dist-clean
- @$(MAKE) -C sounds dist-clean
rm -f menuselect.makeopts makeopts menuselect-tree menuselect.makedeps
- rm -f makeopts.embed_rules
rm -f config.log config.status config.cache
-@@ -561,7 +559,7 @@ update:
+ rm -rf autom4te.cache
+@@ -527,7 +525,7 @@ update:
NEWHEADERS=$(notdir $(wildcard include/asterisk/*.h))
OLDHEADERS=$(filter-out $(NEWHEADERS) $(notdir $(DESTDIR)$(ASTHEADERDIR)),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h)))
@@ -62,7 +62,7 @@ $NetBSD: patch-Makefile,v 1.3 2016/05/06 07:41:06 jnemeth Exp $
"$(ASTSPOOLDIR)" "$(ASTSPOOLDIR)/dictate" "$(ASTSPOOLDIR)/meetme" \
"$(ASTSPOOLDIR)/monitor" "$(ASTSPOOLDIR)/system" "$(ASTSPOOLDIR)/tmp" \
"$(ASTSPOOLDIR)/voicemail" "$(ASTSPOOLDIR)/recording" \
-@@ -688,7 +686,7 @@ upgrade: bininstall
+@@ -731,7 +729,7 @@ upgrade: bininstall
# (2) the extension to strip off
define INSTALL_CONFIGS
@for x in configs/$(1)/*$(2); do \
@@ -71,7 +71,7 @@ $NetBSD: patch-Makefile,v 1.3 2016/05/06 07:41:06 jnemeth Exp $
if [ -f "$${dst}" ]; then \
if [ "$(OVERWRITE)" = "y" ]; then \
if cmp -s "$${dst}" "$$x" ; then \
-@@ -717,24 +715,24 @@ define INSTALL_CONFIGS
+@@ -760,24 +758,24 @@ define INSTALL_CONFIGS
-e 's|^astrundir.*$$|astrundir => $(ASTVARRUNDIR)|' \
-e 's|^astlogdir.*$$|astlogdir => $(ASTLOGDIR)|' \
-e 's|^astsbindir.*$$|astsbindir => $(ASTSBINDIR)|' \
@@ -102,7 +102,7 @@ $NetBSD: patch-Makefile,v 1.3 2016/05/06 07:41:06 jnemeth Exp $
done
samples: adsi
-@@ -767,7 +765,7 @@ basic-pbx:
+@@ -810,7 +808,7 @@ basic-pbx:
webvmail:
@[ -d "$(DESTDIR)$(HTTP_DOCSDIR)/" ] || ( printf "http docs directory not found.\nUpdate assignment of variable HTTP_DOCSDIR in Makefile!\n" && exit 1 )
@[ -d "$(DESTDIR)$(HTTP_CGIDIR)" ] || ( printf "cgi-bin directory not found.\nUpdate assignment of variable HTTP_CGIDIR in Makefile!\n" && exit 1 )
@@ -111,7 +111,7 @@ $NetBSD: patch-Makefile,v 1.3 2016/05/06 07:41:06 jnemeth Exp $
$(INSTALL) -d "$(DESTDIR)$(HTTP_DOCSDIR)/_asterisk"
for x in images/*.gif; do \
$(INSTALL) -m 644 $$x "$(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/"; \
-@@ -817,11 +815,11 @@ endif
+@@ -860,11 +858,11 @@ endif
endif
install-logrotate:
@@ -126,7 +126,7 @@ $NetBSD: patch-Makefile,v 1.3 2016/05/06 07:41:06 jnemeth Exp $
rm -f contrib/scripts/asterisk.logrotate.tmp
config:
-@@ -932,7 +930,7 @@ uninstall-all: _uninstall
+@@ -976,7 +974,7 @@ uninstall-all: _uninstall
rm -rf "$(DESTDIR)$(ASTVARLIBDIR)"
rm -rf "$(DESTDIR)$(ASTDATADIR)"
rm -rf "$(DESTDIR)$(ASTSPOOLDIR)"
@@ -135,7 +135,7 @@ $NetBSD: patch-Makefile,v 1.3 2016/05/06 07:41:06 jnemeth Exp $
rm -rf "$(DESTDIR)$(ASTLOGDIR)"
menuconfig: menuselect
-@@ -1021,6 +1019,7 @@ check-alembic: makeopts
+@@ -1064,6 +1062,7 @@ check-alembic: makeopts
@ALEMBIC=$(ALEMBIC) build_tools/make_check_alembic config cdr voicemail >&2
.PHONY: menuselect
diff --git a/comms/asterisk13/patches/patch-apps_app__queue.c b/comms/asterisk13/patches/patch-apps_app__queue.c
index 211919a5f89..218b86cd65a 100644
--- a/comms/asterisk13/patches/patch-apps_app__queue.c
+++ b/comms/asterisk13/patches/patch-apps_app__queue.c
@@ -1,17 +1,17 @@
-$NetBSD: patch-apps_app__queue.c,v 1.1.1.1 2015/12/05 23:29:09 jnemeth Exp $
+$NetBSD: patch-apps_app__queue.c,v 1.2 2017/06/04 07:51:27 jnemeth Exp $
---- apps/app_queue.c.orig 2015-10-09 21:48:48.000000000 +0000
+--- apps/app_queue.c.orig 2017-05-30 17:44:16.000000000 +0000
+++ apps/app_queue.c
-@@ -5286,7 +5286,7 @@ static int wait_our_turn(struct queue_en
+@@ -5418,7 +5418,7 @@ static int wait_our_turn(struct queue_en
if ((status = get_member_status(qe->parent, qe->max_penalty, qe->min_penalty, qe->parent->leavewhenempty, 0))) {
*reason = QUEUE_LEAVEEMPTY;
- ast_queue_log(qe->parent->name, ast_channel_uniqueid(qe->chan), "NONE", "EXITEMPTY", "%d|%d|%ld", qe->pos, qe->opos, (long) (time(NULL) - qe->start));
-+ ast_queue_log(qe->parent->name, ast_channel_uniqueid(qe->chan), "NONE", "EXITEMPTY", "%d|%d|%jd", qe->pos, qe->opos, (intmax_t) (time(NULL) - qe->start));
- leave_queue(qe);
++ ast_queue_log(qe->parent->name, ast_channel_uniqueid(qe->chan), "NONE", "EXITEMPTY", "%d|%d|%ld", qe->pos, qe->opos, (intmax_t) (time(NULL) - qe->start));
+ res = -1;
+ qe->handled = -1;
break;
- }
-@@ -6638,8 +6638,8 @@ static int try_calling(struct queue_ent
+@@ -6795,8 +6795,8 @@ static int try_calling(struct queue_ent
/* if setinterfacevar is defined, make member variables available to the channel */
/* use pbx_builtin_setvar to set a load of variables with one call */
if (qe->parent->setinterfacevar) {
@@ -22,7 +22,7 @@ $NetBSD: patch-apps_app__queue.c,v 1.1.1.1 2015/12/05 23:29:09 jnemeth Exp $
pbx_builtin_setvar_multiple(qe->chan, interfacevar);
pbx_builtin_setvar_multiple(peer, interfacevar);
}
-@@ -6647,8 +6647,8 @@ static int try_calling(struct queue_ent
+@@ -6804,8 +6804,8 @@ static int try_calling(struct queue_ent
/* if setqueueentryvar is defined, make queue entry (i.e. the caller) variables available to the channel */
/* use pbx_builtin_setvar to set a load of variables with one call */
if (qe->parent->setqueueentryvar) {
@@ -33,7 +33,7 @@ $NetBSD: patch-apps_app__queue.c,v 1.1.1.1 2015/12/05 23:29:09 jnemeth Exp $
pbx_builtin_setvar_multiple(qe->chan, interfacevar);
pbx_builtin_setvar_multiple(peer, interfacevar);
}
-@@ -7838,8 +7838,8 @@ static int queue_exec(struct ast_channel
+@@ -8024,8 +8024,8 @@ static int queue_exec(struct ast_channel
}
}
@@ -44,7 +44,7 @@ $NetBSD: patch-apps_app__queue.c,v 1.1.1.1 2015/12/05 23:29:09 jnemeth Exp $
qe.chan = chan;
qe.prio = prio;
-@@ -7889,8 +7889,8 @@ check_turns:
+@@ -8075,8 +8075,8 @@ check_turns:
record_abandoned(&qe);
reason = QUEUE_TIMEOUT;
res = 0;
@@ -55,7 +55,7 @@ $NetBSD: patch-apps_app__queue.c,v 1.1.1.1 2015/12/05 23:29:09 jnemeth Exp $
break;
}
-@@ -7935,7 +7935,7 @@ check_turns:
+@@ -8121,7 +8121,7 @@ check_turns:
if ((status = get_member_status(qe.parent, qe.max_penalty, qe.min_penalty, qe.parent->leavewhenempty, 0))) {
record_abandoned(&qe);
reason = QUEUE_LEAVEEMPTY;
@@ -64,7 +64,7 @@ $NetBSD: patch-apps_app__queue.c,v 1.1.1.1 2015/12/05 23:29:09 jnemeth Exp $
res = 0;
break;
}
-@@ -7958,7 +7958,7 @@ check_turns:
+@@ -8144,7 +8144,7 @@ check_turns:
record_abandoned(&qe);
reason = QUEUE_TIMEOUT;
res = 0;
@@ -73,7 +73,7 @@ $NetBSD: patch-apps_app__queue.c,v 1.1.1.1 2015/12/05 23:29:09 jnemeth Exp $
break;
}
-@@ -7986,8 +7986,8 @@ stop:
+@@ -8172,8 +8172,8 @@ stop:
if (!qe.handled) {
record_abandoned(&qe);
ast_queue_log(args.queuename, ast_channel_uniqueid(chan), "NONE", "ABANDON",
@@ -84,7 +84,7 @@ $NetBSD: patch-apps_app__queue.c,v 1.1.1.1 2015/12/05 23:29:09 jnemeth Exp $
res = -1;
} else if (qcontinue) {
reason = QUEUE_CONTINUE;
-@@ -7995,7 +7995,7 @@ stop:
+@@ -8181,7 +8181,7 @@ stop:
}
} else if (qe.valid_digits) {
ast_queue_log(args.queuename, ast_channel_uniqueid(chan), "NONE", "EXITWITHKEY",
@@ -93,7 +93,7 @@ $NetBSD: patch-apps_app__queue.c,v 1.1.1.1 2015/12/05 23:29:09 jnemeth Exp $
}
}
-@@ -9163,9 +9163,9 @@ static char *__queues_show(struct manses
+@@ -9332,9 +9332,9 @@ static char *__queues_show(struct manses
do_print(s, fd, " Callers: ");
for (qe = q->head; qe; qe = qe->next) {
@@ -106,7 +106,7 @@ $NetBSD: patch-apps_app__queue.c,v 1.1.1.1 2015/12/05 23:29:09 jnemeth Exp $
do_print(s, fd, ast_str_buffer(out));
}
}
-@@ -9531,7 +9531,7 @@ static int manager_queues_status(struct
+@@ -9703,7 +9703,7 @@ static int manager_queues_status(struct
"CallerIDName: %s\r\n"
"ConnectedLineNum: %s\r\n"
"ConnectedLineName: %s\r\n"
diff --git a/comms/asterisk13/patches/patch-include_asterisk_strings.h b/comms/asterisk13/patches/patch-include_asterisk_strings.h
index b1381da9e3e..0c084bd60a5 100644
--- a/comms/asterisk13/patches/patch-include_asterisk_strings.h
+++ b/comms/asterisk13/patches/patch-include_asterisk_strings.h
@@ -1,8 +1,8 @@
-$NetBSD: patch-include_asterisk_strings.h,v 1.1.1.1 2015/12/05 23:29:10 jnemeth Exp $
+$NetBSD: patch-include_asterisk_strings.h,v 1.2 2017/06/04 07:51:27 jnemeth Exp $
---- include/asterisk/strings.h.orig 2015-10-09 21:48:48.000000000 +0000
+--- include/asterisk/strings.h.orig 2017-05-30 17:44:16.000000000 +0000
+++ include/asterisk/strings.h
-@@ -1159,7 +1159,7 @@ char *ast_tech_to_upper(char *dev_str),
+@@ -1168,7 +1168,7 @@ char *ast_tech_to_upper(char *dev_str),
}
for (pos = dev_str; *pos && *pos != '/'; pos++) {
@@ -11,12 +11,12 @@ $NetBSD: patch-include_asterisk_strings.h,v 1.1.1.1 2015/12/05 23:29:10 jnemeth
}
return dev_str;
}
-@@ -1218,7 +1218,7 @@ static force_inline int attribute_pure a
- int hash = 5381;
+@@ -1244,7 +1244,7 @@ static force_inline int attribute_pure a
+ unsigned int hash = 5381;
while (*str) {
-- hash = hash * 33 ^ tolower(*str++);
+- hash = hash * 33 ^ (unsigned char) tolower(*str++);
+ hash = hash * 33 ^ tolower((unsigned char)*str++);
}
- return abs(hash);
+ return ast_str_hash_restrict(hash);
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-23 18:38:08 +0000