summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--comms/asterisk18/Makefile4
-rw-r--r--comms/asterisk18/distinfo16
-rw-r--r--comms/asterisk18/patches/patch-ax43
3 files changed, 36 insertions, 27 deletions
diff --git a/comms/asterisk18/Makefile b/comms/asterisk18/Makefile
index fa4d95b0dc8..f94cfd9e626 100644
--- a/comms/asterisk18/Makefile
+++ b/comms/asterisk18/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.84 2014/07/02 03:20:43 jnemeth Exp $
+# $NetBSD: Makefile,v 1.85 2014/07/26 07:03:26 jnemeth Exp $
#
# NOTE: when updating this package, there are two places that sound
# tarballs need to be checked
-DISTNAME= asterisk-1.8.28.2
+DISTNAME= asterisk-1.8.29.0
DIST_SUBDIR= ${PKGNAME_NOREV}
DISTFILES= ${DEFAULT_DISTFILES}
EXTRACT_ONLY= ${DISTNAME}.tar.gz
diff --git a/comms/asterisk18/distinfo b/comms/asterisk18/distinfo
index d9b444aeb5a..66ede0ed24a 100644
--- a/comms/asterisk18/distinfo
+++ b/comms/asterisk18/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.53 2014/07/02 03:20:43 jnemeth Exp $
+$NetBSD: distinfo,v 1.54 2014/07/26 07:03:26 jnemeth Exp $
-SHA1 (asterisk-1.8.28.2/asterisk-1.8.28.2.tar.gz) = 880230919996fa4168c1baa7246d71065642f92f
-RMD160 (asterisk-1.8.28.2/asterisk-1.8.28.2.tar.gz) = b3cabf829b21350b771bf029db85830749628e7c
-Size (asterisk-1.8.28.2/asterisk-1.8.28.2.tar.gz) = 29521616 bytes
-SHA1 (asterisk-1.8.28.2/asterisk-extra-sounds-en-gsm-1.4.14.tar.gz) = 14403cd023e812565085c8232210b8b439274ecf
-RMD160 (asterisk-1.8.28.2/asterisk-extra-sounds-en-gsm-1.4.14.tar.gz) = 675fc1f3cedd0e17b62a8285f9f0527783cfb1d3
-Size (asterisk-1.8.28.2/asterisk-extra-sounds-en-gsm-1.4.14.tar.gz) = 4386590 bytes
+SHA1 (asterisk-1.8.29.0/asterisk-1.8.29.0.tar.gz) = dd4450f42b801ac12b5502af93e7cc91d216cac6
+RMD160 (asterisk-1.8.29.0/asterisk-1.8.29.0.tar.gz) = 9f33fe41a03acbc4baa7ae2862b76afef55e2e7a
+Size (asterisk-1.8.29.0/asterisk-1.8.29.0.tar.gz) = 29538404 bytes
+SHA1 (asterisk-1.8.29.0/asterisk-extra-sounds-en-gsm-1.4.14.tar.gz) = 14403cd023e812565085c8232210b8b439274ecf
+RMD160 (asterisk-1.8.29.0/asterisk-extra-sounds-en-gsm-1.4.14.tar.gz) = 675fc1f3cedd0e17b62a8285f9f0527783cfb1d3
+Size (asterisk-1.8.29.0/asterisk-extra-sounds-en-gsm-1.4.14.tar.gz) = 4386590 bytes
SHA1 (patch-aa) = 832f1c043b15198e0a286094dd0cc1a251bcfed0
SHA1 (patch-af) = 19786616bb606c38f769ec85f2e4d118573659ab
SHA1 (patch-ai) = e92edab5c1ff323478f41d0b0783102ed527fe39
@@ -22,7 +22,7 @@ SHA1 (patch-at) = df318d7b492121ff6f766b0e6ea73415293e96f0
SHA1 (patch-au) = 773398e719dca34640dcdc190857872da1ad7b4f
SHA1 (patch-av) = 3424013b5bf22624aa664e972e2b495ab3296cbe
SHA1 (patch-aw) = 0534acd67ea5da1eee8cf282035ebf4c559278ab
-SHA1 (patch-ax) = aae5b9954f9ae672aa948f1daa88494f1b407e81
+SHA1 (patch-ax) = 78d61807c7cf97aff3fe6a395ed6b4975b63d8d0
SHA1 (patch-ay) = 746a609e4d01903ebdf525a7cf5c3925729e74b0
SHA1 (patch-az) = 64365b12cb47ec0fba358e4326eda172f96068cf
SHA1 (patch-ba) = ffb20f4788f2f253e822fb48c68fec04c31b0619
diff --git a/comms/asterisk18/patches/patch-ax b/comms/asterisk18/patches/patch-ax
index 735ab8141c1..6f500948637 100644
--- a/comms/asterisk18/patches/patch-ax
+++ b/comms/asterisk18/patches/patch-ax
@@ -1,8 +1,8 @@
-$NetBSD: patch-ax,v 1.4 2013/04/18 16:55:22 jnemeth Exp $
+$NetBSD: patch-ax,v 1.5 2014/07/26 07:03:26 jnemeth Exp $
---- apps/app_queue.c.orig 2013-01-08 20:22:16.000000000 +0000
+--- apps/app_queue.c.orig 2014-06-12 15:38:48.000000000 +0000
+++ apps/app_queue.c
-@@ -3533,8 +3533,8 @@ static void record_abandoned(struct queu
+@@ -3591,8 +3591,8 @@ static void record_abandoned(struct queu
"Uniqueid: %s\r\n"
"Position: %d\r\n"
"OriginalPosition: %d\r\n"
@@ -13,16 +13,16 @@ $NetBSD: patch-ax,v 1.4 2013/04/18 16:55:22 jnemeth Exp $
qe->parent->callsabandoned++;
ao2_unlock(qe->parent);
-@@ -4210,7 +4210,7 @@ static int wait_our_turn(struct queue_en
+@@ -4309,7 +4309,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))) {
+ 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, qe->chan->uniqueid, "NONE", "EXITEMPTY", "%d|%d|%ld", qe->pos, qe->opos, (long) time(NULL) - qe->start);
+ ast_queue_log(qe->parent->name, qe->chan->uniqueid, "NONE", "EXITEMPTY", "%d|%d|%jd", qe->pos, qe->opos, (intmax_t) time(NULL) - qe->start);
leave_queue(qe);
break;
}
-@@ -4417,12 +4417,12 @@ static void send_agent_complete(const st
+@@ -4516,12 +4516,12 @@ static void send_agent_complete(const st
"Channel: %s\r\n"
"Member: %s\r\n"
"MemberName: %s\r\n"
@@ -38,7 +38,7 @@ $NetBSD: patch-ax,v 1.4 2013/04/18 16:55:22 jnemeth Exp $
qe->parent->eventwhencalled == QUEUE_EVENT_VARIABLES ? vars2manager(qe->chan, vars, vars_len) : "");
}
-@@ -4465,9 +4465,9 @@ static void queue_transfer_fixup(void *d
+@@ -4564,9 +4564,9 @@ static void queue_transfer_fixup(void *d
int callcompletedinsl = qtds->callcompletedinsl;
struct ast_datastore *datastore;
@@ -51,7 +51,7 @@ $NetBSD: patch-ax,v 1.4 2013/04/18 16:55:22 jnemeth Exp $
update_queue(qe->parent, member, callcompletedinsl, (time(NULL) - callstart));
-@@ -4956,7 +4956,7 @@ static int try_calling(struct queue_ent
+@@ -5055,7 +5055,7 @@ static int try_calling(struct queue_ent
} else if (ast_check_hangup(qe->chan)) {
/* Caller must have hung up just before being connected */
ast_log(LOG_NOTICE, "Caller was about to talk to agent on %s but the caller hungup.\n", peer->name);
@@ -60,7 +60,7 @@ $NetBSD: patch-ax,v 1.4 2013/04/18 16:55:22 jnemeth Exp $
record_abandoned(qe);
ast_hangup(peer);
ao2_ref(member, -1);
-@@ -5002,8 +5002,8 @@ static int try_calling(struct queue_ent
+@@ -5101,8 +5101,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) {
@@ -71,7 +71,7 @@ $NetBSD: patch-ax,v 1.4 2013/04/18 16:55:22 jnemeth Exp $
pbx_builtin_setvar_multiple(qe->chan, interfacevar);
pbx_builtin_setvar_multiple(peer, interfacevar);
}
-@@ -5257,8 +5257,8 @@ static int try_calling(struct queue_ent
+@@ -5356,8 +5356,8 @@ static int try_calling(struct queue_ent
ast_log(LOG_WARNING, "Asked to execute an AGI on this channel, but could not find application (agi)!\n");
}
qe->handled++;
@@ -82,7 +82,7 @@ $NetBSD: patch-ax,v 1.4 2013/04/18 16:55:22 jnemeth Exp $
if (qe->chan->cdr) {
struct ast_cdr *cdr;
-@@ -5294,12 +5294,12 @@ static int try_calling(struct queue_ent
+@@ -5393,12 +5393,12 @@ static int try_calling(struct queue_ent
"Channel: %s\r\n"
"Member: %s\r\n"
"MemberName: %s\r\n"
@@ -98,7 +98,7 @@ $NetBSD: patch-ax,v 1.4 2013/04/18 16:55:22 jnemeth Exp $
qe->parent->eventwhencalled == QUEUE_EVENT_VARIABLES ? vars2manager(qe->chan, vars, sizeof(vars)) : "");
ast_copy_string(oldcontext, qe->chan->context, sizeof(oldcontext));
ast_copy_string(oldexten, qe->chan->exten, sizeof(oldexten));
-@@ -5331,17 +5331,17 @@ static int try_calling(struct queue_ent
+@@ -5430,17 +5430,17 @@ static int try_calling(struct queue_ent
/* detect a blind transfer */
if (!(qe->chan->_softhangup | peer->_softhangup) && (strcasecmp(oldcontext, qe->chan->context) || strcasecmp(oldexten, qe->chan->exten))) {
@@ -123,7 +123,7 @@ $NetBSD: patch-ax,v 1.4 2013/04/18 16:55:22 jnemeth Exp $
send_agent_complete(qe, queuename, peer, member, callstart, vars, sizeof(vars), AGENT);
}
if ((tds = ast_channel_datastore_find(qe->chan, &queue_transfer_info, NULL))) {
-@@ -6237,8 +6237,8 @@ check_turns:
+@@ -6336,8 +6336,8 @@ check_turns:
record_abandoned(&qe);
reason = QUEUE_TIMEOUT;
res = 0;
@@ -134,8 +134,8 @@ $NetBSD: patch-ax,v 1.4 2013/04/18 16:55:22 jnemeth Exp $
break;
}
-@@ -6280,7 +6280,7 @@ check_turns:
- if ((status = get_member_status(qe.parent, qe.max_penalty, qe.min_penalty, qe.parent->leavewhenempty))) {
+@@ -6379,7 +6379,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;
- ast_queue_log(args.queuename, chan->uniqueid, "NONE", "EXITEMPTY", "%d|%d|%ld", qe.pos, qe.opos, (long)(time(NULL) - qe.start));
@@ -143,7 +143,7 @@ $NetBSD: patch-ax,v 1.4 2013/04/18 16:55:22 jnemeth Exp $
res = 0;
break;
}
-@@ -6302,7 +6302,7 @@ check_turns:
+@@ -6401,7 +6401,7 @@ check_turns:
record_abandoned(&qe);
reason = QUEUE_TIMEOUT;
res = 0;
@@ -152,7 +152,7 @@ $NetBSD: patch-ax,v 1.4 2013/04/18 16:55:22 jnemeth Exp $
break;
}
-@@ -6329,8 +6329,8 @@ stop:
+@@ -6428,8 +6428,8 @@ stop:
if (!qe.handled) {
record_abandoned(&qe);
ast_queue_log(args.queuename, chan->uniqueid, "NONE", "ABANDON",
@@ -163,3 +163,12 @@ $NetBSD: patch-ax,v 1.4 2013/04/18 16:55:22 jnemeth Exp $
res = -1;
} else if (qcontinue) {
reason = QUEUE_CONTINUE;
+@@ -6437,7 +6437,7 @@ stop:
+ }
+ } else if (qe.valid_digits) {
+ ast_queue_log(args.queuename, chan->uniqueid, "NONE", "EXITWITHKEY",
+- "%s|%d|%d|%ld", qe.digits, qe.pos, qe.opos, (long) time(NULL) - qe.start);
++ "%s|%d|%d|%jd", qe.digits, qe.pos, qe.opos, (intmax_t) time(NULL) - qe.start);
+ }
+ }
+
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-03 17:54:31 +0000