diff options
-rw-r--r-- | comms/asterisk18/Makefile | 4 | ||||
-rw-r--r-- | comms/asterisk18/distinfo | 16 | ||||
-rw-r--r-- | comms/asterisk18/patches/patch-ay | 80 |
3 files changed, 50 insertions, 50 deletions
diff --git a/comms/asterisk18/Makefile b/comms/asterisk18/Makefile index c799f394cf2..895a6706868 100644 --- a/comms/asterisk18/Makefile +++ b/comms/asterisk18/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.38 2012/07/06 19:51:58 jnemeth Exp $ +# $NetBSD: Makefile,v 1.39 2012/07/15 07:49:27 jnemeth Exp $ # # NOTE: when updating this package, there are two places that sound # tarballs need to be checked -DISTNAME= asterisk-1.8.13.1 +DISTNAME= asterisk-1.8.14.0 DIST_SUBDIR= ${PKGNAME_NOREV} DISTFILES= ${DEFAULT_DISTFILES} EXTRACT_ONLY= ${DISTNAME}.tar.gz diff --git a/comms/asterisk18/distinfo b/comms/asterisk18/distinfo index 4c9e85445d3..53f5c57d249 100644 --- a/comms/asterisk18/distinfo +++ b/comms/asterisk18/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.33 2012/07/06 19:51:58 jnemeth Exp $ +$NetBSD: distinfo,v 1.34 2012/07/15 07:49:27 jnemeth Exp $ -SHA1 (asterisk-1.8.13.1/asterisk-1.8.13.1.tar.gz) = 0985f4e3ed0dc4e9834edf351f04493f27a078e5 -RMD160 (asterisk-1.8.13.1/asterisk-1.8.13.1.tar.gz) = 3523bce4398ca8f3ab8d4f07a52c7a97a2ddd6d8 -Size (asterisk-1.8.13.1/asterisk-1.8.13.1.tar.gz) = 25049076 bytes -SHA1 (asterisk-1.8.13.1/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 8692fa61423b4769dc8bfa78faf9ed5ef7a259b9 -RMD160 (asterisk-1.8.13.1/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 68170c769d739d6b5b35b00f999ad6bbf876f9f6 -Size (asterisk-1.8.13.1/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 3349898 bytes +SHA1 (asterisk-1.8.14.0/asterisk-1.8.14.0.tar.gz) = 9e082bd0912cc263b57fd199d346b485239aadda +RMD160 (asterisk-1.8.14.0/asterisk-1.8.14.0.tar.gz) = 3525af9ebd42ff122ca8a8e46edf7cc8e9f24fb2 +Size (asterisk-1.8.14.0/asterisk-1.8.14.0.tar.gz) = 25076590 bytes +SHA1 (asterisk-1.8.14.0/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 8692fa61423b4769dc8bfa78faf9ed5ef7a259b9 +RMD160 (asterisk-1.8.14.0/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 68170c769d739d6b5b35b00f999ad6bbf876f9f6 +Size (asterisk-1.8.14.0/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 3349898 bytes SHA1 (patch-aa) = d8a67b0fd3781bb2d38b08563c69e490ab42a3e8 SHA1 (patch-af) = 19786616bb606c38f769ec85f2e4d118573659ab SHA1 (patch-ai) = e92edab5c1ff323478f41d0b0783102ed527fe39 @@ -23,7 +23,7 @@ SHA1 (patch-au) = 773398e719dca34640dcdc190857872da1ad7b4f SHA1 (patch-av) = 3424013b5bf22624aa664e972e2b495ab3296cbe SHA1 (patch-aw) = 0534acd67ea5da1eee8cf282035ebf4c559278ab SHA1 (patch-ax) = 0136483807024ac10f2abb9a9c0e3679b0043add -SHA1 (patch-ay) = b2e2203037c0d5434f22de8a808f002b61ef8886 +SHA1 (patch-ay) = 777fb4515c2d9f4bc38f3fd32fa5d6b3871e92b6 SHA1 (patch-az) = 64365b12cb47ec0fba358e4326eda172f96068cf SHA1 (patch-ba) = ffb20f4788f2f253e822fb48c68fec04c31b0619 SHA1 (patch-bb) = bf1a2bb2ba1eb2ba44a9b26fa9ae0468510a1575 diff --git a/comms/asterisk18/patches/patch-ay b/comms/asterisk18/patches/patch-ay index 5ecdbcfaee4..a45da45968d 100644 --- a/comms/asterisk18/patches/patch-ay +++ b/comms/asterisk18/patches/patch-ay @@ -1,8 +1,8 @@ -$NetBSD: patch-ay,v 1.4 2012/04/07 20:10:45 jnemeth Exp $ +$NetBSD: patch-ay,v 1.5 2012/07/15 07:49:27 jnemeth Exp $ ---- main/features.c.orig 2012-02-27 16:03:04.000000000 +0000 +--- main/features.c.orig 2012-07-05 23:07:27.000000000 +0000 +++ main/features.c -@@ -1493,14 +1493,14 @@ static int park_call_full(struct ast_cha +@@ -1547,14 +1547,14 @@ static int park_call_full(struct ast_cha "Channel: %s\r\n" "Parkinglot: %s\r\n" "From: %s\r\n" @@ -19,43 +19,43 @@ $NetBSD: patch-ay,v 1.4 2012/04/07 20:10:45 jnemeth Exp $ S_COR(chan->caller.id.number.valid, chan->caller.id.number.str, "<unknown>"), S_COR(chan->caller.id.name.valid, chan->caller.id.name.str, "<unknown>"), S_COR(chan->connected.id.number.valid, chan->connected.id.number.str, "<unknown>"), -@@ -2057,7 +2057,7 @@ static int builtin_automonitor(struct as - len = strlen(touch_monitor) + 50; - args = alloca(len); - touch_filename = alloca(len); -- snprintf(touch_filename, len, "%s-%ld-%s", S_OR(touch_monitor_prefix, "auto"), (long)time(NULL), touch_monitor); -+ snprintf(touch_filename, len, "%s-%jd-%s", S_OR(touch_monitor_prefix, "auto"), (intmax_t)time(NULL), touch_monitor); - snprintf(args, len, "%s,%s,m", S_OR(touch_format, "wav"), touch_filename); - } else { - caller_chan_id = ast_strdupa(S_COR(caller_chan->caller.id.number.valid, -@@ -2067,7 +2067,7 @@ static int builtin_automonitor(struct as - len = strlen(caller_chan_id) + strlen(callee_chan_id) + 50; - args = alloca(len); - touch_filename = alloca(len); -- snprintf(touch_filename, len, "%s-%ld-%s-%s", S_OR(touch_monitor_prefix, "auto"), (long)time(NULL), caller_chan_id, callee_chan_id); -+ snprintf(touch_filename, len, "%s-%jd-%s-%s", S_OR(touch_monitor_prefix, "auto"), (intmax_t)time(NULL), caller_chan_id, callee_chan_id); - snprintf(args, len, "%s,%s,m", S_OR(touch_format, "wav"), touch_filename); - } +@@ -2113,7 +2113,7 @@ static int builtin_automonitor(struct as + len = strlen(touch_monitor) + 50; + args = alloca(len); + touch_filename = alloca(len); +- snprintf(touch_filename, len, "%s-%ld-%s", S_OR(touch_monitor_prefix, "auto"), (long)time(NULL), touch_monitor); ++ snprintf(touch_filename, len, "%s-%jd-%s", S_OR(touch_monitor_prefix, "auto"), (intmax_t)time(NULL), touch_monitor); + snprintf(args, len, "%s,%s,m", S_OR(touch_format, "wav"), touch_filename); + } else { + caller_chan_id = ast_strdupa(S_COR(caller_chan->caller.id.number.valid, +@@ -2123,7 +2123,7 @@ static int builtin_automonitor(struct as + len = strlen(caller_chan_id) + strlen(callee_chan_id) + 50; + args = alloca(len); + touch_filename = alloca(len); +- snprintf(touch_filename, len, "%s-%ld-%s-%s", S_OR(touch_monitor_prefix, "auto"), (long)time(NULL), caller_chan_id, callee_chan_id); ++ snprintf(touch_filename, len, "%s-%jd-%s-%s", S_OR(touch_monitor_prefix, "auto"), (intmax_t)time(NULL), caller_chan_id, callee_chan_id); + snprintf(args, len, "%s,%s,m", S_OR(touch_format, "wav"), touch_filename); + } -@@ -2173,7 +2173,7 @@ static int builtin_automixmonitor(struct - len = strlen(touch_monitor) + 50; - args = alloca(len); - touch_filename = alloca(len); -- snprintf(touch_filename, len, "auto-%ld-%s", (long)time(NULL), touch_monitor); -+ snprintf(touch_filename, len, "auto-%jd-%s", (intmax_t)time(NULL), touch_monitor); - snprintf(args, len, "%s.%s,b", touch_filename, (touch_format) ? touch_format : "wav"); - } else { - caller_chan_id = ast_strdupa(S_COR(caller_chan->caller.id.number.valid, -@@ -2183,7 +2183,7 @@ static int builtin_automixmonitor(struct - len = strlen(caller_chan_id) + strlen(callee_chan_id) + 50; - args = alloca(len); - touch_filename = alloca(len); -- snprintf(touch_filename, len, "auto-%ld-%s-%s", (long)time(NULL), caller_chan_id, callee_chan_id); -+ snprintf(touch_filename, len, "auto-%jd-%s-%s", (intmax_t)time(NULL), caller_chan_id, callee_chan_id); - snprintf(args, len, "%s.%s,b", touch_filename, S_OR(touch_format, "wav")); - } +@@ -2225,7 +2225,7 @@ static int builtin_automixmonitor(struct + len = strlen(touch_monitor) + 50; + args = alloca(len); + touch_filename = alloca(len); +- snprintf(touch_filename, len, "auto-%ld-%s", (long)time(NULL), touch_monitor); ++ snprintf(touch_filename, len, "auto-%jd-%s", (intmax_t)time(NULL), touch_monitor); + snprintf(args, len, "%s.%s,b", touch_filename, (touch_format) ? touch_format : "wav"); + } else { + caller_chan_id = ast_strdupa(S_COR(caller_chan->caller.id.number.valid, +@@ -2235,7 +2235,7 @@ static int builtin_automixmonitor(struct + len = strlen(caller_chan_id) + strlen(callee_chan_id) + 50; + args = alloca(len); + touch_filename = alloca(len); +- snprintf(touch_filename, len, "auto-%ld-%s-%s", (long)time(NULL), caller_chan_id, callee_chan_id); ++ snprintf(touch_filename, len, "auto-%jd-%s-%s", (intmax_t)time(NULL), caller_chan_id, callee_chan_id); + snprintf(args, len, "%s.%s,b", touch_filename, S_OR(touch_format, "wav")); + } -@@ -6958,10 +6958,10 @@ static char *handle_parkedcalls(struct a +@@ -6995,10 +6995,10 @@ static char *handle_parkedcalls(struct a AST_LIST_LOCK(&curlot->parkings); AST_LIST_TRAVERSE(&curlot->parkings, cur, list) { @@ -68,7 +68,7 @@ $NetBSD: patch-ay,v 1.4 2012/04/07 20:10:45 jnemeth Exp $ ++lotparked; } AST_LIST_UNLOCK(&curlot->parkings); -@@ -7017,7 +7017,7 @@ static int manager_parking_status(struct +@@ -7054,7 +7054,7 @@ static int manager_parking_status(struct "Exten: %d\r\n" "Channel: %s\r\n" "From: %s\r\n" @@ -77,7 +77,7 @@ $NetBSD: patch-ay,v 1.4 2012/04/07 20:10:45 jnemeth Exp $ "CallerIDNum: %s\r\n" "CallerIDName: %s\r\n" "ConnectedLineNum: %s\r\n" -@@ -7026,7 +7026,7 @@ static int manager_parking_status(struct +@@ -7063,7 +7063,7 @@ static int manager_parking_status(struct "\r\n", curlot->name, cur->parkingnum, cur->chan->name, cur->peername, |