diff options
author | jnemeth <jnemeth@pkgsrc.org> | 2012-08-03 08:52:31 +0000 |
---|---|---|
committer | jnemeth <jnemeth@pkgsrc.org> | 2012-08-03 08:52:31 +0000 |
commit | 4b1949ad8ed0bc028162f3a578ff600b67ba54e2 (patch) | |
tree | 762719ffcfed1663c249a2bf205dc21fd8bf60c8 | |
parent | a077546d36774ef0d225ef6224c97b4342fd3011 (diff) | |
download | pkgsrc-4b1949ad8ed0bc028162f3a578ff600b67ba54e2.tar.gz |
Update to Asterisk 10.7.0; this is a bug fix release:
The release of Asterisk 10.7.0 resolves several issues reported by the
community and would have not been possible without your participation.
Thank you!
The following is a sample of the issues resolved in this release:
* --- Fix deadlock potential with ast_set_hangupsource() calls.
* --- Fix request routing issue when outboundproxy is used.
* --- Set the Caller ID "tag" on peers even if remote party
information is present.
* --- Fix NULL pointer segfault in ast_sockaddr_parse()
* --- Do not perform install on existing directories
For a full list of changes in this release, please see the ChangeLog:
http://downloads.asterisk.org/pub/telephony/asterisk/ChangeLog-10.7.0
Thank you for your continued support of Asterisk!
-rw-r--r-- | comms/asterisk10/Makefile | 4 | ||||
-rw-r--r-- | comms/asterisk10/distinfo | 18 | ||||
-rw-r--r-- | comms/asterisk10/patches/patch-Makefile | 38 | ||||
-rw-r--r-- | comms/asterisk10/patches/patch-apps_app__queue.c | 34 |
4 files changed, 47 insertions, 47 deletions
diff --git a/comms/asterisk10/Makefile b/comms/asterisk10/Makefile index 0adc35282c1..299c886ff51 100644 --- a/comms/asterisk10/Makefile +++ b/comms/asterisk10/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.23 2012/07/17 02:04:04 jnemeth Exp $ +# $NetBSD: Makefile,v 1.24 2012/08/03 08:52:31 jnemeth Exp $ # # NOTE: when updating this package, there are two places that sound # tarballs need to be checked -DISTNAME= asterisk-10.6.1 +DISTNAME= asterisk-10.7.0 DIST_SUBDIR= ${PKGNAME_NOREV} DISTFILES= ${DEFAULT_DISTFILES} EXTRACT_ONLY= ${DISTNAME}.tar.gz diff --git a/comms/asterisk10/distinfo b/comms/asterisk10/distinfo index 646c4cea3ea..cd9e71ffb60 100644 --- a/comms/asterisk10/distinfo +++ b/comms/asterisk10/distinfo @@ -1,15 +1,15 @@ -$NetBSD: distinfo,v 1.17 2012/07/17 02:04:04 jnemeth Exp $ +$NetBSD: distinfo,v 1.18 2012/08/03 08:52:31 jnemeth Exp $ -SHA1 (asterisk-10.6.1/asterisk-10.6.1.tar.gz) = ba6cb7d0a07ca55d10e38b008c664734a17f1e53 -RMD160 (asterisk-10.6.1/asterisk-10.6.1.tar.gz) = effd8239f99115355396284aeb934a6cb5aae452 -Size (asterisk-10.6.1/asterisk-10.6.1.tar.gz) = 24989457 bytes -SHA1 (asterisk-10.6.1/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 8692fa61423b4769dc8bfa78faf9ed5ef7a259b9 -RMD160 (asterisk-10.6.1/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 68170c769d739d6b5b35b00f999ad6bbf876f9f6 -Size (asterisk-10.6.1/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 3349898 bytes -SHA1 (patch-Makefile) = 1f351f6b3de49ee32be69cd8b8f88571b7ae9e03 +SHA1 (asterisk-10.7.0/asterisk-10.7.0.tar.gz) = 8aa8112c86ea283554acb2aa4de98e826fbe44c2 +RMD160 (asterisk-10.7.0/asterisk-10.7.0.tar.gz) = d26978f92ef5696da00c55ca227a12336a655d1b +Size (asterisk-10.7.0/asterisk-10.7.0.tar.gz) = 25006763 bytes +SHA1 (asterisk-10.7.0/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 8692fa61423b4769dc8bfa78faf9ed5ef7a259b9 +RMD160 (asterisk-10.7.0/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 68170c769d739d6b5b35b00f999ad6bbf876f9f6 +Size (asterisk-10.7.0/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 3349898 bytes +SHA1 (patch-Makefile) = b8093ebafab8794a29c986e141aa692b04594de4 SHA1 (patch-apps_app__dial.c) = 2109ed50406dedc90a300981a3a7500b1397ff3a SHA1 (patch-apps_app__followme.c) = a0a507986ec9722337d46fdaaac0a79d23a634e4 -SHA1 (patch-apps_app__queue.c) = e035995563eb5533d5261568fdb43e8adcf2fe35 +SHA1 (patch-apps_app__queue.c) = 3da85de105d0795e0e0c1fe2e6fc4f4ff77edc6f SHA1 (patch-apps_app__sms.c) = 8013727b495dc0ac038eb28b84e9d3839d0bc23d SHA1 (patch-build__tools_mkpkgconfig) = 2bd3c0e24bc6d721cc234feb19b64a57106fcbe4 SHA1 (patch-channels_chan__oss.c) = 3a69c29f4106bfabe05f63118d73538e85478e88 diff --git a/comms/asterisk10/patches/patch-Makefile b/comms/asterisk10/patches/patch-Makefile index e0c89f42951..ddf3a65807b 100644 --- a/comms/asterisk10/patches/patch-Makefile +++ b/comms/asterisk10/patches/patch-Makefile @@ -1,6 +1,6 @@ -$NetBSD: patch-Makefile,v 1.2 2012/06/05 01:39:45 jnemeth Exp $ +$NetBSD: patch-Makefile,v 1.3 2012/08/03 08:52:32 jnemeth Exp $ ---- Makefile.orig 2012-04-12 15:01:13.000000000 +0000 +--- Makefile.orig 2012-06-13 14:30:34.000000000 +0000 +++ Makefile @@ -127,7 +127,7 @@ DEBUG=-g3 @@ -39,25 +39,25 @@ $NetBSD: patch-Makefile,v 1.2 2012/06/05 01:39:45 jnemeth Exp $ CFLAGS="$(_ASTCFLAGS) $(ASTCFLAGS)" build_tools/mkpkgconfig "$(DESTDIR)$(libdir)/pkgconfig"; # Should static HTTP be installed during make samples or even with its own target ala # webvoicemail? There are portions here that *could* be customized but might also be -@@ -480,7 +475,7 @@ OLDHEADERS=$(filter-out $(NEWHEADERS) $( - installdirs: - $(INSTALL) -d "$(DESTDIR)$(MODULES_DIR)" - $(INSTALL) -d "$(DESTDIR)$(ASTSBINDIR)" -- $(INSTALL) -d "$(DESTDIR)$(ASTETCDIR)" -+ $(INSTALL) -d "$(DESTDIR)$(ASTEXAMPLEDIR)" - $(INSTALL) -d "$(DESTDIR)$(ASTVARRUNDIR)" - $(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)" - $(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/dictate" -@@ -510,7 +505,7 @@ installdirs: - $(INSTALL) -d "$(DESTDIR)$(AGI_DIR)" - $(INSTALL) -d "$(DESTDIR)$(ASTDBDIR)" +@@ -476,7 +471,7 @@ update: + + NEWHEADERS=$(notdir $(wildcard include/asterisk/*.h)) + OLDHEADERS=$(filter-out $(NEWHEADERS) $(notdir $(DESTDIR)$(ASTHEADERDIR)),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h))) +-INSTALLDIRS="$(ASTLIBDIR)" "$(MODULES_DIR)" "$(ASTSBINDIR)" "$(ASTETCDIR)" "$(ASTVARRUNDIR)" \ ++INSTALLDIRS="$(ASTLIBDIR)" "$(MODULES_DIR)" "$(ASTSBINDIR)" "$(ASTEXAMPLEDIR)" "$(ASTVARRUNDIR)" \ + "$(ASTSPOOLDIR)" "$(ASTSPOOLDIR)/dictate" "$(ASTSPOOLDIR)/meetme" \ + "$(ASTSPOOLDIR)/monitor" "$(ASTSPOOLDIR)/system" "$(ASTSPOOLDIR)/tmp" \ + "$(ASTSPOOLDIR)/voicemail" "$(ASTHEADERDIR)" "$(ASTHEADERDIR)/doxygen" \ +@@ -494,7 +489,7 @@ installdirs: + fi; \ + done -bininstall: _all installdirs $(SUBDIRS_INSTALL) +bininstall: installdirs $(SUBDIRS_INSTALL) $(INSTALL) -m 755 main/asterisk "$(DESTDIR)$(ASTSBINDIR)/" $(LN) -sf asterisk "$(DESTDIR)$(ASTSBINDIR)/rasterisk" $(INSTALL) -m 755 contrib/scripts/astgenkey "$(DESTDIR)$(ASTSBINDIR)/" -@@ -602,21 +597,21 @@ upgrade: bininstall +@@ -586,21 +581,21 @@ upgrade: bininstall # XXX why *.adsi is installed first ? adsi: @echo Installing adsi config files... @@ -83,7 +83,7 @@ $NetBSD: patch-Makefile,v 1.2 2012/06/05 01:39:45 jnemeth Exp $ if [ -f "$${dst}" ]; then \ if [ "$(OVERWRITE)" = "y" ]; then \ if cmp -s "$${dst}" "$$x" ; then \ -@@ -644,9 +639,9 @@ samples: adsi +@@ -628,9 +623,9 @@ samples: adsi -e 's|^astspooldir.*$$|astspooldir => $(ASTSPOOLDIR)|' \ -e 's|^astrundir.*$$|astrundir => $(ASTVARRUNDIR)|' \ -e 's|^astlogdir.*$$|astlogdir => $(ASTLOGDIR)|' \ @@ -96,7 +96,7 @@ $NetBSD: patch-Makefile,v 1.2 2012/06/05 01:39:45 jnemeth Exp $ fi ; \ $(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX" build_tools/make_sample_voicemail "$(DESTDIR)/$(ASTDATADIR)" "$(DESTDIR)/$(ASTSPOOLDIR)" -@@ -672,7 +667,7 @@ samples: adsi +@@ -656,7 +651,7 @@ samples: adsi 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 ) @@ -105,7 +105,7 @@ $NetBSD: patch-Makefile,v 1.2 2012/06/05 01:39:45 jnemeth Exp $ $(INSTALL) -d "$(DESTDIR)$(HTTP_DOCSDIR)/_asterisk" for x in images/*.gif; do \ $(INSTALL) -m 644 $$x "$(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/"; \ -@@ -826,7 +821,7 @@ uninstall-all: _uninstall +@@ -810,7 +805,7 @@ uninstall-all: _uninstall rm -rf "$(DESTDIR)$(ASTVARLIBDIR)" rm -rf "$(DESTDIR)$(ASTDATADIR)" rm -rf "$(DESTDIR)$(ASTSPOOLDIR)" @@ -114,7 +114,7 @@ $NetBSD: patch-Makefile,v 1.2 2012/06/05 01:39:45 jnemeth Exp $ rm -rf "$(DESTDIR)$(ASTLOGDIR)" menuconfig: menuselect -@@ -895,6 +890,7 @@ menuselect-tree: $(foreach dir,$(filter- +@@ -879,6 +874,7 @@ menuselect-tree: $(foreach dir,$(filter- @echo "</menu>" >> $@ .PHONY: menuselect diff --git a/comms/asterisk10/patches/patch-apps_app__queue.c b/comms/asterisk10/patches/patch-apps_app__queue.c index 1912cc485c2..7e8c7f4bd19 100644 --- a/comms/asterisk10/patches/patch-apps_app__queue.c +++ b/comms/asterisk10/patches/patch-apps_app__queue.c @@ -1,8 +1,8 @@ -$NetBSD: patch-apps_app__queue.c,v 1.1.1.1 2012/01/15 18:36:21 jnemeth Exp $ +$NetBSD: patch-apps_app__queue.c,v 1.2 2012/08/03 08:52:32 jnemeth Exp $ ---- apps/app_queue.c.orig 2011-10-25 21:10:02.000000000 +0000 +--- apps/app_queue.c.orig 2012-06-22 22:09:29.000000000 +0000 +++ apps/app_queue.c -@@ -3406,8 +3406,8 @@ static void record_abandoned(struct queu +@@ -3429,8 +3429,8 @@ static void record_abandoned(struct queu "Uniqueid: %s\r\n" "Position: %d\r\n" "OriginalPosition: %d\r\n" @@ -13,7 +13,7 @@ $NetBSD: patch-apps_app__queue.c,v 1.1.1.1 2012/01/15 18:36:21 jnemeth Exp $ qe->parent->callsabandoned++; ao2_unlock(qe->parent); -@@ -4010,7 +4010,7 @@ static int wait_our_turn(struct queue_en +@@ -4089,7 +4089,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))) { *reason = QUEUE_LEAVEEMPTY; @@ -22,7 +22,7 @@ $NetBSD: patch-apps_app__queue.c,v 1.1.1.1 2012/01/15 18:36:21 jnemeth Exp $ leave_queue(qe); break; } -@@ -4216,12 +4216,12 @@ static void send_agent_complete(const st +@@ -4295,12 +4295,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-apps_app__queue.c,v 1.1.1.1 2012/01/15 18:36:21 jnemeth Exp $ qe->parent->eventwhencalled == QUEUE_EVENT_VARIABLES ? vars2manager(qe->chan, vars, vars_len) : ""); } -@@ -4264,9 +4264,9 @@ static void queue_transfer_fixup(void *d +@@ -4343,9 +4343,9 @@ static void queue_transfer_fixup(void *d int callcompletedinsl = qtds->callcompletedinsl; struct ast_datastore *datastore; @@ -51,16 +51,16 @@ $NetBSD: patch-apps_app__queue.c,v 1.1.1.1 2012/01/15 18:36:21 jnemeth Exp $ update_queue(qe->parent, member, callcompletedinsl, (time(NULL) - callstart)); -@@ -4744,7 +4744,7 @@ static int try_calling(struct queue_ent - } else if (res2) { - /* Caller must have hung up just before being connected*/ +@@ -4834,7 +4834,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); - ast_queue_log(queuename, qe->chan->uniqueid, member->membername, "ABANDON", "%d|%d|%ld", qe->pos, qe->opos, (long) time(NULL) - qe->start); + ast_queue_log(queuename, qe->chan->uniqueid, member->membername, "ABANDON", "%d|%d|%jd", qe->pos, qe->opos, (intmax_t) time(NULL) - qe->start); record_abandoned(qe); ast_hangup(peer); ao2_ref(member, -1); -@@ -4791,8 +4791,8 @@ static int try_calling(struct queue_ent +@@ -4881,8 +4881,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-apps_app__queue.c,v 1.1.1.1 2012/01/15 18:36:21 jnemeth Exp $ pbx_builtin_setvar_multiple(qe->chan, interfacevar); pbx_builtin_setvar_multiple(peer, interfacevar); } -@@ -5050,8 +5050,8 @@ static int try_calling(struct queue_ent +@@ -5140,8 +5140,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-apps_app__queue.c,v 1.1.1.1 2012/01/15 18:36:21 jnemeth Exp $ if (qe->chan->cdr) { struct ast_cdr *cdr; -@@ -5087,12 +5087,12 @@ static int try_calling(struct queue_ent +@@ -5177,12 +5177,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-apps_app__queue.c,v 1.1.1.1 2012/01/15 18:36:21 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)); -@@ -5124,17 +5124,17 @@ static int try_calling(struct queue_ent +@@ -5214,17 +5214,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-apps_app__queue.c,v 1.1.1.1 2012/01/15 18:36:21 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))) { -@@ -6025,8 +6025,8 @@ check_turns: +@@ -6166,8 +6166,8 @@ check_turns: record_abandoned(&qe); reason = QUEUE_TIMEOUT; res = 0; @@ -134,7 +134,7 @@ $NetBSD: patch-apps_app__queue.c,v 1.1.1.1 2012/01/15 18:36:21 jnemeth Exp $ break; } -@@ -6068,7 +6068,7 @@ check_turns: +@@ -6209,7 +6209,7 @@ check_turns: if ((status = get_member_status(qe.parent, qe.max_penalty, qe.min_penalty, qe.parent->leavewhenempty))) { record_abandoned(&qe); reason = QUEUE_LEAVEEMPTY; @@ -143,7 +143,7 @@ $NetBSD: patch-apps_app__queue.c,v 1.1.1.1 2012/01/15 18:36:21 jnemeth Exp $ res = 0; break; } -@@ -6090,7 +6090,7 @@ check_turns: +@@ -6231,7 +6231,7 @@ check_turns: record_abandoned(&qe); reason = QUEUE_TIMEOUT; res = 0; @@ -152,7 +152,7 @@ $NetBSD: patch-apps_app__queue.c,v 1.1.1.1 2012/01/15 18:36:21 jnemeth Exp $ break; } -@@ -6117,8 +6117,8 @@ stop: +@@ -6258,8 +6258,8 @@ stop: if (!qe.handled) { record_abandoned(&qe); ast_queue_log(args.queuename, chan->uniqueid, "NONE", "ABANDON", |