Update to Asterisk 1.8.15.0; this is a general bug fix release:

The release of Asterisk 1.8.15.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.

* --- Make the address family filter specific to the transport.

* --- 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-1.8.15.0

Thank you for your continued support of Asterisk!

4 files changed, 47 insertions, 47 deletions

diff --git a/comms/asterisk18/Makefile b/comms/asterisk18/Makefile
index 5afe0fff304..bc522210f18 100644
--- a/comms/asterisk18/Makefile
+++ b/comms/asterisk18/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.41 2012/07/17 00:29:33 jnemeth Exp $
+# $NetBSD: Makefile,v 1.42 2012/08/03 08:22:53 jnemeth Exp $
 #
 # NOTE: when updating this package, there are two places that sound
 #       tarballs need to be checked
 
-DISTNAME=	asterisk-1.8.14.1
+DISTNAME=	asterisk-1.8.15.0
 DIST_SUBDIR=	${PKGNAME_NOREV}
 DISTFILES=	${DEFAULT_DISTFILES}
 EXTRACT_ONLY=	${DISTNAME}.tar.gz
diff --git a/comms/asterisk18/distinfo b/comms/asterisk18/distinfo
index 8ba4475d780..988d3c9a716 100644
--- a/comms/asterisk18/distinfo
+++ b/comms/asterisk18/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.35 2012/07/17 00:29:33 jnemeth Exp $
+$NetBSD: distinfo,v 1.36 2012/08/03 08:22:53 jnemeth Exp $
 
-SHA1 (asterisk-1.8.14.1/asterisk-1.8.14.1.tar.gz) = 2ce12a7f0d414a0048e9d8529746add79e7163bf
-RMD160 (asterisk-1.8.14.1/asterisk-1.8.14.1.tar.gz) = 6fa678c338cf787fda9c02e4c8e644baee6eecad
-Size (asterisk-1.8.14.1/asterisk-1.8.14.1.tar.gz) = 25068289 bytes
-SHA1 (asterisk-1.8.14.1/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 8692fa61423b4769dc8bfa78faf9ed5ef7a259b9
-RMD160 (asterisk-1.8.14.1/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 68170c769d739d6b5b35b00f999ad6bbf876f9f6
-Size (asterisk-1.8.14.1/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 3349898 bytes
-SHA1 (patch-aa) = d8a67b0fd3781bb2d38b08563c69e490ab42a3e8
+SHA1 (asterisk-1.8.15.0/asterisk-1.8.15.0.tar.gz) = 416b611b560cfcf6cab3e8769180493149f67960
+RMD160 (asterisk-1.8.15.0/asterisk-1.8.15.0.tar.gz) = c4409ffc68cbe5d27da0774cb5fa0e68bc29c2d3
+Size (asterisk-1.8.15.0/asterisk-1.8.15.0.tar.gz) = 25083527 bytes
+SHA1 (asterisk-1.8.15.0/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 8692fa61423b4769dc8bfa78faf9ed5ef7a259b9
+RMD160 (asterisk-1.8.15.0/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 68170c769d739d6b5b35b00f999ad6bbf876f9f6
+Size (asterisk-1.8.15.0/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 3349898 bytes
+SHA1 (patch-aa) = 832f1c043b15198e0a286094dd0cc1a251bcfed0
 SHA1 (patch-af) = 19786616bb606c38f769ec85f2e4d118573659ab
 SHA1 (patch-ai) = e92edab5c1ff323478f41d0b0783102ed527fe39
 SHA1 (patch-ak) = f8d5de733807bc6c0701886a3095901d6815a8bd
@@ -22,7 +22,7 @@ SHA1 (patch-at) = df318d7b492121ff6f766b0e6ea73415293e96f0
 SHA1 (patch-au) = 773398e719dca34640dcdc190857872da1ad7b4f
 SHA1 (patch-av) = 3424013b5bf22624aa664e972e2b495ab3296cbe
 SHA1 (patch-aw) = 0534acd67ea5da1eee8cf282035ebf4c559278ab
-SHA1 (patch-ax) = 0136483807024ac10f2abb9a9c0e3679b0043add
+SHA1 (patch-ax) = a4f4b0a46e74d74b780d8b96cdecb7e44d9b99f7
 SHA1 (patch-ay) = 777fb4515c2d9f4bc38f3fd32fa5d6b3871e92b6
 SHA1 (patch-az) = 64365b12cb47ec0fba358e4326eda172f96068cf
 SHA1 (patch-ba) = ffb20f4788f2f253e822fb48c68fec04c31b0619
diff --git a/comms/asterisk18/patches/patch-aa b/comms/asterisk18/patches/patch-aa
index ad89b11dc41..37cca862b90 100644
--- a/comms/asterisk18/patches/patch-aa
+++ b/comms/asterisk18/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.5 2012/06/05 00:15:35 jnemeth Exp $
+$NetBSD: patch-aa,v 1.6 2012/08/03 08:22:53 jnemeth Exp $
 
---- Makefile.orig	2012-04-12 14:26:06.000000000 +0000
+--- Makefile.orig	2012-06-13 14:27:57.000000000 +0000
 +++ Makefile
 @@ -125,7 +125,7 @@ DEBUG=-g3
  
@@ -39,25 +39,25 @@ $NetBSD: patch-aa,v 1.5 2012/06/05 00:15:35 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
-@@ -470,7 +465,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"
-@@ -500,7 +495,7 @@ installdirs:
- 	$(INSTALL) -d "$(DESTDIR)$(AGI_DIR)"
- 	$(INSTALL) -d "$(DESTDIR)$(ASTDBDIR)"
+@@ -466,7 +461,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" \
+@@ -484,7 +479,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)/"
-@@ -592,21 +587,21 @@ upgrade: bininstall
+@@ -576,21 +571,21 @@ upgrade: bininstall
  # XXX why *.adsi is installed first ?
  adsi:
  	@echo Installing adsi config files...
@@ -83,7 +83,7 @@ $NetBSD: patch-aa,v 1.5 2012/06/05 00:15:35 jnemeth Exp $
  		if [ -f "$${dst}" ]; then \
  			if [ "$(OVERWRITE)" = "y" ]; then \
  				if cmp -s "$${dst}" "$$x" ; then \
-@@ -634,9 +629,9 @@ samples: adsi
+@@ -618,9 +613,9 @@ samples: adsi
  			-e 's|^astspooldir.*$$|astspooldir => $(ASTSPOOLDIR)|' \
  			-e 's|^astrundir.*$$|astrundir => $(ASTVARRUNDIR)|' \
  			-e 's|^astlogdir.*$$|astlogdir => $(ASTLOGDIR)|' \
@@ -96,7 +96,7 @@ $NetBSD: patch-aa,v 1.5 2012/06/05 00:15:35 jnemeth Exp $
  	fi ; \
  	$(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX"
  	build_tools/make_sample_voicemail "$(DESTDIR)/$(ASTDATADIR)" "$(DESTDIR)/$(ASTSPOOLDIR)"
-@@ -662,7 +657,7 @@ samples: adsi
+@@ -646,7 +641,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-aa,v 1.5 2012/06/05 00:15:35 jnemeth Exp $
  	$(INSTALL) -d "$(DESTDIR)$(HTTP_DOCSDIR)/_asterisk"
  	for x in images/*.gif; do \
  		$(INSTALL) -m 644 $$x "$(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/"; \
-@@ -815,7 +810,7 @@ uninstall-all: _uninstall
+@@ -799,7 +794,7 @@ uninstall-all: _uninstall
  	rm -rf "$(DESTDIR)$(ASTVARLIBDIR)"
  	rm -rf "$(DESTDIR)$(ASTDATADIR)"
  	rm -rf "$(DESTDIR)$(ASTSPOOLDIR)"
@@ -114,7 +114,7 @@ $NetBSD: patch-aa,v 1.5 2012/06/05 00:15:35 jnemeth Exp $
  	rm -rf "$(DESTDIR)$(ASTLOGDIR)"
  
  menuconfig: menuselect
-@@ -884,6 +879,7 @@ menuselect-tree: $(foreach dir,$(filter-
+@@ -868,6 +863,7 @@ menuselect-tree: $(foreach dir,$(filter-
  	@echo "</menu>" >> $@
  
  .PHONY: menuselect
diff --git a/comms/asterisk18/patches/patch-ax b/comms/asterisk18/patches/patch-ax
index 2017127de53..f400e793f2c 100644
--- a/comms/asterisk18/patches/patch-ax
+++ b/comms/asterisk18/patches/patch-ax
@@ -1,8 +1,8 @@
-$NetBSD: patch-ax,v 1.2 2012/01/15 03:32:48 jnemeth Exp $
+$NetBSD: patch-ax,v 1.3 2012/08/03 08:22:53 jnemeth Exp $
 
---- apps/app_queue.c.orig	2011-09-23 08:34:03.000000000 +0000
+--- apps/app_queue.c.orig	2012-06-22 22:07:35.000000000 +0000
 +++ apps/app_queue.c
-@@ -3358,8 +3358,8 @@ static void record_abandoned(struct queu
+@@ -3357,8 +3357,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-ax,v 1.2 2012/01/15 03:32:48 jnemeth Exp $
  
  	qe->parent->callsabandoned++;
  	ao2_unlock(qe->parent);
-@@ -3948,7 +3948,7 @@ static int wait_our_turn(struct queue_en
+@@ -4003,7 +4003,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-ax,v 1.2 2012/01/15 03:32:48 jnemeth Exp $
  				leave_queue(qe);
  				break;
  			}
-@@ -4153,12 +4153,12 @@ static void send_agent_complete(const st
+@@ -4209,12 +4209,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.2 2012/01/15 03:32:48 jnemeth Exp $
  		qe->parent->eventwhencalled == QUEUE_EVENT_VARIABLES ? vars2manager(qe->chan, vars, vars_len) : "");
  }
  
-@@ -4201,9 +4201,9 @@ static void queue_transfer_fixup(void *d
+@@ -4257,9 +4257,9 @@ static void queue_transfer_fixup(void *d
  	int callcompletedinsl = qtds->callcompletedinsl;
  	struct ast_datastore *datastore;
  
@@ -51,16 +51,16 @@ $NetBSD: patch-ax,v 1.2 2012/01/15 03:32:48 jnemeth Exp $
  
  	update_queue(qe->parent, member, callcompletedinsl, (time(NULL) - callstart));
  	
-@@ -4681,7 +4681,7 @@ static int try_calling(struct queue_ent 
- 			} else if (res2) {
- 				/* Caller must have hung up just before being connected*/
+@@ -4748,7 +4748,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);
-@@ -4727,8 +4727,8 @@ static int try_calling(struct queue_ent 
+@@ -4794,8 +4794,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.2 2012/01/15 03:32:48 jnemeth Exp $
  			pbx_builtin_setvar_multiple(qe->chan, interfacevar);
  			pbx_builtin_setvar_multiple(peer, interfacevar);
  		}
-@@ -4984,8 +4984,8 @@ static int try_calling(struct queue_ent 
+@@ -5051,8 +5051,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.2 2012/01/15 03:32:48 jnemeth Exp $
  
  		if (qe->chan->cdr) {
  			struct ast_cdr *cdr;
-@@ -5021,12 +5021,12 @@ static int try_calling(struct queue_ent 
+@@ -5088,12 +5088,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.2 2012/01/15 03:32:48 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));
-@@ -5058,17 +5058,17 @@ static int try_calling(struct queue_ent 
+@@ -5125,17 +5125,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.2 2012/01/15 03:32:48 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))) {	
-@@ -5959,8 +5959,8 @@ check_turns:
+@@ -6026,8 +6026,8 @@ check_turns:
  			record_abandoned(&qe);
  			reason = QUEUE_TIMEOUT;
  			res = 0;
@@ -134,7 +134,7 @@ $NetBSD: patch-ax,v 1.2 2012/01/15 03:32:48 jnemeth Exp $
  			break;
  		}
  
-@@ -6002,7 +6002,7 @@ check_turns:
+@@ -6069,7 +6069,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-ax,v 1.2 2012/01/15 03:32:48 jnemeth Exp $
  				res = 0;
  				break;
  			}
-@@ -6024,7 +6024,7 @@ check_turns:
+@@ -6091,7 +6091,7 @@ check_turns:
  			record_abandoned(&qe);
  			reason = QUEUE_TIMEOUT;
  			res = 0;
@@ -152,7 +152,7 @@ $NetBSD: patch-ax,v 1.2 2012/01/15 03:32:48 jnemeth Exp $
  			break;
  		}
  
-@@ -6051,8 +6051,8 @@ stop:
+@@ -6118,8 +6118,8 @@ stop:
  			if (!qe.handled) {
  				record_abandoned(&qe);
  				ast_queue_log(args.queuename, chan->uniqueid, "NONE", "ABANDON",