upgrade to Asterisk 10.9.0: this is a bug fix release:

The Asterisk Development Team has announced the release of Asterisk 10.9.0.

The release of Asterisk 10.9.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 channel reference leak in ChanSpy.

* --- dsp.c: Fix multiple issues when no-interdigit delay is present,
      and fast DTMF 50ms/50ms

* --- Fix bug where final queue member would not be removed from
      memory.

* --- Fix memory leak when CEL is successfully written to PostgreSQL
      database

* --- Fix DUNDi message routing bug when neighboring peer is
      unreachable

For a full list of changes in this release, please see the ChangeLog:

http://downloads.asterisk.org/pub/telephony/asterisk/ChangeLog-10.9.0

Thank you for your continued support of Asterisk!

22 files changed, 130 insertions, 131 deletions

diff --git a/comms/asterisk10/Makefile b/comms/asterisk10/Makefile
index cf8d638288b..749daadf102 100644
--- a/comms/asterisk10/Makefile
+++ b/comms/asterisk10/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.33 2012/10/08 23:01:19 adam Exp $
+# $NetBSD: Makefile,v 1.34 2012/10/09 01:36:31 jnemeth Exp $
 #
 # NOTE: when updating this package, there are two places that sound
 #       tarballs need to be checked
 
-DISTNAME=	asterisk-10.8.0
+DISTNAME=	asterisk-10.9.0
 DIST_SUBDIR=	${PKGNAME_NOREV}
 DISTFILES=	${DEFAULT_DISTFILES}
 EXTRACT_ONLY=	${DISTNAME}.tar.gz
-PKGREVISION=	4
 CATEGORIES=	comms net audio
 MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/asterisk/ \
 		http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ \
diff --git a/comms/asterisk10/distinfo b/comms/asterisk10/distinfo
index 53320375073..50b5a934652 100644
--- a/comms/asterisk10/distinfo
+++ b/comms/asterisk10/distinfo
@@ -1,38 +1,38 @@
-$NetBSD: distinfo,v 1.20 2012/09/14 01:30:32 jnemeth Exp $
+$NetBSD: distinfo,v 1.21 2012/10/09 01:36:31 jnemeth Exp $
 
-SHA1 (asterisk-10.8.0/asterisk-10.8.0.tar.gz) = ee98721415e419a0b559aaf6ca2d408ae11f425a
-RMD160 (asterisk-10.8.0/asterisk-10.8.0.tar.gz) = 0513b1e68cf8c432d038af212f5e8fcd60a19d54
-Size (asterisk-10.8.0/asterisk-10.8.0.tar.gz) = 25007513 bytes
-SHA1 (asterisk-10.8.0/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 8692fa61423b4769dc8bfa78faf9ed5ef7a259b9
-RMD160 (asterisk-10.8.0/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 68170c769d739d6b5b35b00f999ad6bbf876f9f6
-Size (asterisk-10.8.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) = 3da85de105d0795e0e0c1fe2e6fc4f4ff77edc6f
-SHA1 (patch-apps_app__sms.c) = 8013727b495dc0ac038eb28b84e9d3839d0bc23d
+SHA1 (asterisk-10.9.0/asterisk-10.9.0.tar.gz) = 80cfb804067e557b95baf002cc91df618698a384
+RMD160 (asterisk-10.9.0/asterisk-10.9.0.tar.gz) = c61e176ad063ec12658519dff7d0571f32864b00
+Size (asterisk-10.9.0/asterisk-10.9.0.tar.gz) = 25060275 bytes
+SHA1 (asterisk-10.9.0/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 8692fa61423b4769dc8bfa78faf9ed5ef7a259b9
+RMD160 (asterisk-10.9.0/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 68170c769d739d6b5b35b00f999ad6bbf876f9f6
+Size (asterisk-10.9.0/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 3349898 bytes
+SHA1 (patch-Makefile) = ab740f84f9883980cb5d8e8d5ca301f172c76231
+SHA1 (patch-apps_app__dial.c) = e6c9f559310acdb6574d0e034dcb55df7c2ba31f
+SHA1 (patch-apps_app__followme.c) = cd34774a11b96269003d9f1b6fbdfddf5d9b9d4b
+SHA1 (patch-apps_app__queue.c) = 6fc4edbf9386e2ff39a63a1c3a3d9fe2ea27d187
+SHA1 (patch-apps_app__sms.c) = d89b27a9df04d4da98d562241c07d25d182baefc
 SHA1 (patch-build__tools_mkpkgconfig) = 2bd3c0e24bc6d721cc234feb19b64a57106fcbe4
-SHA1 (patch-channels_chan__oss.c) = 3a69c29f4106bfabe05f63118d73538e85478e88
-SHA1 (patch-configure) = c3611a024ed1c8ffb0a517289ca473f886179b08
-SHA1 (patch-configure.ac) = 6c8db1d178c2d21afff53f3db72e9c78c9e0a8a3
+SHA1 (patch-channels_chan__oss.c) = fccfa6fca010294ed2d3ab87fc31f436d67f49fa
+SHA1 (patch-configure) = e114b113b5b2733edfd138d48740d65dda6d639e
+SHA1 (patch-configure.ac) = fa39e67fe998d0fe7dfb5fb3988f2be712b3b29f
 SHA1 (patch-contrib_scripts_autosupport) = c6c1d917dd0544c4f54ae760f68cbcd1f35030f4
 SHA1 (patch-contrib_scripts_vmail.cgi) = 650b9bbf3e322d1ad351932cfe6f747baa8f35e4
-SHA1 (patch-include_asterisk_autoconfig.h.in) = 7d6e3443ce3f0741c72a5f2178895598e79e83c9
+SHA1 (patch-include_asterisk_autoconfig.h.in) = 1d658b1997b3664cf34d01f1903fa38c8c986ee2
 SHA1 (patch-include_asterisk_endian.h) = 41c1a9a9e02fe394bc9261f5559e931b1378ea28
 SHA1 (patch-include_asterisk_inline__api.h) = ff43d14e2608dd08d7d03799dfe9847f9f7f5666
 SHA1 (patch-include_asterisk_lock.h) = fc7b4934e5f53a09066802daa054300895cf7bcf
-SHA1 (patch-main_Makefile) = 4b80898802c75937510acf5252c5e82d379f578e
-SHA1 (patch-main_acl.c) = 85cea968f3c3a2651a687661bba2d8131c342d5a
-SHA1 (patch-main_asterisk.c) = 9670f68f5496a74ee359ba45c85757fa894775b6
-SHA1 (patch-main_features.c) = 4624d0349e138da2782779f9a7d7a9b404bd1662
-SHA1 (patch-main_manager.c) = 305204b2602b5775d97e72852859ce793a96df0a
-SHA1 (patch-main_netsock.c) = 68721f0b1e8ed6744d467a39a82473c5d4946f0f
-SHA1 (patch-main_sched.c) = fac7764ef00c05057730b24fcdf833fe77d23ade
-SHA1 (patch-main_utils.c) = c79c65a6f81cb8e15edcb680d478c4085233d427
-SHA1 (patch-pbx_pbx__dundi.c) = 190aaa60584cd81eea9b3bba3b5686668564d772
-SHA1 (patch-sounds_Makefile) = 960aa87eb38abf92f4f681456c2a32db40180361
+SHA1 (patch-main_Makefile) = cc8ab49ca045aff935125d1905f311ea557130eb
+SHA1 (patch-main_acl.c) = 1eac532a15127c25981d2db9462a8ccce2c58620
+SHA1 (patch-main_asterisk.c) = df7bcdaeb2fc90f9fdc1b16388fbb5cf7eba141c
+SHA1 (patch-main_features.c) = 1932f46e435f38b0f03b25ce98767fccd4f83ec7
+SHA1 (patch-main_manager.c) = 05e65a5d3d06a674c55a5b2d5779fd62aff26b7d
+SHA1 (patch-main_netsock.c) = 92542984c6f35fab53d1d107880a51743e3419c6
+SHA1 (patch-main_sched.c) = 3a1ef5a384a7fa7329abf2babdacf3dd1d57a041
+SHA1 (patch-main_utils.c) = 6d0fd44963149b0561ae179771b7e9fd80fa00b9
+SHA1 (patch-pbx_pbx__dundi.c) = 0645ee88c18f94b90ed051cfe100414300f2763f
+SHA1 (patch-sounds_Makefile) = 579c38e483bb0631fa1c4ea67fca24462caac41e
 SHA1 (patch-tests_test__locale.c) = 37ba5fbf7cd3b0c4db4bf1872eb098aef440eeb9
 SHA1 (patch-utils_Makefile) = 0d8c38b1a9450f4f0e364fc0213b9a8e56afce55
 SHA1 (patch-utils_db1-ast_include_db.h) = 94ec413fe6a6154d65c43bdde2b26644d8bb5dac
-SHA1 (patch-utils_extconf.c) = 11ace2372a1aa1e5130c41a41704acab10c18624
+SHA1 (patch-utils_extconf.c) = 9df5ebd9ad1dd669d9a2db5d7da455e8caae3811
 SHA1 (patch-utils_streamplayer.c) = fd83c3063f19405fdac3fb4640e42d62f55c7593
diff --git a/comms/asterisk10/patches/patch-Makefile b/comms/asterisk10/patches/patch-Makefile
index ddf3a65807b..d66221847e3 100644
--- a/comms/asterisk10/patches/patch-Makefile
+++ b/comms/asterisk10/patches/patch-Makefile
@@ -1,6 +1,6 @@
-$NetBSD: patch-Makefile,v 1.3 2012/08/03 08:52:32 jnemeth Exp $
+$NetBSD: patch-Makefile,v 1.4 2012/10/09 01:36:32 jnemeth Exp $
 
---- Makefile.orig	2012-06-13 14:30:34.000000000 +0000
+--- Makefile.orig	2012-09-11 17:14:06.000000000 +0000
 +++ Makefile
 @@ -127,7 +127,7 @@ DEBUG=-g3
  
@@ -83,10 +83,10 @@ $NetBSD: patch-Makefile,v 1.3 2012/08/03 08:52:32 jnemeth Exp $
  		if [ -f "$${dst}" ]; then \
  			if [ "$(OVERWRITE)" = "y" ]; then \
  				if cmp -s "$${dst}" "$$x" ; then \
-@@ -628,9 +623,9 @@ samples: adsi
- 			-e 's|^astspooldir.*$$|astspooldir => $(ASTSPOOLDIR)|' \
+@@ -629,9 +624,9 @@ samples: adsi
  			-e 's|^astrundir.*$$|astrundir => $(ASTVARRUNDIR)|' \
  			-e 's|^astlogdir.*$$|astlogdir => $(ASTLOGDIR)|' \
+ 			-e 's|^astsbindir.*$$|astsbindir => $(ASTSBINDIR)|' \
 -			"$(DESTDIR)$(ASTCONFPATH)" > "$(DESTDIR)$(ASTCONFPATH).tmp" ; \
 -		$(INSTALL) -m 644 "$(DESTDIR)$(ASTCONFPATH).tmp" "$(DESTDIR)$(ASTCONFPATH)" ; \
 -		rm -f "$(DESTDIR)$(ASTCONFPATH).tmp" ; \
@@ -96,7 +96,7 @@ $NetBSD: patch-Makefile,v 1.3 2012/08/03 08:52:32 jnemeth Exp $
  	fi ; \
  	$(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX"
  	build_tools/make_sample_voicemail "$(DESTDIR)/$(ASTDATADIR)" "$(DESTDIR)/$(ASTSPOOLDIR)"
-@@ -656,7 +651,7 @@ samples: adsi
+@@ -657,7 +652,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.3 2012/08/03 08:52:32 jnemeth Exp $
  	$(INSTALL) -d "$(DESTDIR)$(HTTP_DOCSDIR)/_asterisk"
  	for x in images/*.gif; do \
  		$(INSTALL) -m 644 $$x "$(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/"; \
-@@ -810,7 +805,7 @@ uninstall-all: _uninstall
+@@ -811,7 +806,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.3 2012/08/03 08:52:32 jnemeth Exp $
  	rm -rf "$(DESTDIR)$(ASTLOGDIR)"
  
  menuconfig: menuselect
-@@ -879,6 +874,7 @@ menuselect-tree: $(foreach dir,$(filter-
+@@ -880,6 +875,7 @@ menuselect-tree: $(foreach dir,$(filter-
  	@echo "</menu>" >> $@
  
  .PHONY: menuselect
diff --git a/comms/asterisk10/patches/patch-apps_app__dial.c b/comms/asterisk10/patches/patch-apps_app__dial.c
index 3eb5c0c3f5e..707005c53ff 100644
--- a/comms/asterisk10/patches/patch-apps_app__dial.c
+++ b/comms/asterisk10/patches/patch-apps_app__dial.c
@@ -1,8 +1,8 @@
-$NetBSD: patch-apps_app__dial.c,v 1.1.1.1 2012/01/15 18:36:21 jnemeth Exp $
+$NetBSD: patch-apps_app__dial.c,v 1.2 2012/10/09 01:36:32 jnemeth Exp $
 
---- apps/app_dial.c.orig	2011-10-05 17:01:46.000000000 +0000
+--- apps/app_dial.c.orig	2012-08-29 18:24:54.000000000 +0000
 +++ apps/app_dial.c
-@@ -1816,12 +1816,12 @@ static void end_bridge_callback(void *da
+@@ -1935,12 +1935,12 @@ static void end_bridge_callback(void *da
  
  	ast_channel_lock(chan);
  	if (chan->cdr->answer.tv_sec) {
diff --git a/comms/asterisk10/patches/patch-apps_app__followme.c b/comms/asterisk10/patches/patch-apps_app__followme.c
index c6f9cc7da49..2d97aeea02a 100644
--- a/comms/asterisk10/patches/patch-apps_app__followme.c
+++ b/comms/asterisk10/patches/patch-apps_app__followme.c
@@ -1,8 +1,8 @@
-$NetBSD: patch-apps_app__followme.c,v 1.1.1.1 2012/01/15 18:36:21 jnemeth Exp $
+$NetBSD: patch-apps_app__followme.c,v 1.2 2012/10/09 01:36:32 jnemeth Exp $
 
---- apps/app_followme.c.orig	2011-09-20 22:49:36.000000000 +0000
+--- apps/app_followme.c.orig	2012-09-06 00:56:47.000000000 +0000
 +++ apps/app_followme.c
-@@ -1011,12 +1011,12 @@ static void end_bridge_callback(void *da
+@@ -1127,12 +1127,12 @@ static void end_bridge_callback(void *da
  
  	ast_channel_lock(chan);
  	if (chan->cdr->answer.tv_sec) {
diff --git a/comms/asterisk10/patches/patch-apps_app__queue.c b/comms/asterisk10/patches/patch-apps_app__queue.c
index 7e8c7f4bd19..12af1c511ab 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.2 2012/08/03 08:52:32 jnemeth Exp $
+$NetBSD: patch-apps_app__queue.c,v 1.3 2012/10/09 01:36:32 jnemeth Exp $
 
---- apps/app_queue.c.orig	2012-06-22 22:09:29.000000000 +0000
+--- apps/app_queue.c.orig	2012-09-07 21:49:16.000000000 +0000
 +++ apps/app_queue.c
-@@ -3429,8 +3429,8 @@ static void record_abandoned(struct queu
+@@ -3449,8 +3449,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.2 2012/08/03 08:52:32 jnemeth Exp $
  
  	qe->parent->callsabandoned++;
  	ao2_unlock(qe->parent);
-@@ -4089,7 +4089,7 @@ static int wait_our_turn(struct queue_en
+@@ -4109,7 +4109,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.2 2012/08/03 08:52:32 jnemeth Exp $
  				leave_queue(qe);
  				break;
  			}
-@@ -4295,12 +4295,12 @@ static void send_agent_complete(const st
+@@ -4315,12 +4315,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.2 2012/08/03 08:52:32 jnemeth Exp $
  		qe->parent->eventwhencalled == QUEUE_EVENT_VARIABLES ? vars2manager(qe->chan, vars, vars_len) : "");
  }
  
-@@ -4343,9 +4343,9 @@ static void queue_transfer_fixup(void *d
+@@ -4363,9 +4363,9 @@ static void queue_transfer_fixup(void *d
  	int callcompletedinsl = qtds->callcompletedinsl;
  	struct ast_datastore *datastore;
  
@@ -51,7 +51,7 @@ $NetBSD: patch-apps_app__queue.c,v 1.2 2012/08/03 08:52:32 jnemeth Exp $
  
  	update_queue(qe->parent, member, callcompletedinsl, (time(NULL) - callstart));
  	
-@@ -4834,7 +4834,7 @@ static int try_calling(struct queue_ent 
+@@ -4854,7 +4854,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-apps_app__queue.c,v 1.2 2012/08/03 08:52:32 jnemeth Exp $
  				record_abandoned(qe);
  				ast_hangup(peer);
  				ao2_ref(member, -1);
-@@ -4881,8 +4881,8 @@ static int try_calling(struct queue_ent 
+@@ -4901,8 +4901,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.2 2012/08/03 08:52:32 jnemeth Exp $
  			pbx_builtin_setvar_multiple(qe->chan, interfacevar);
  			pbx_builtin_setvar_multiple(peer, interfacevar);
  		}
-@@ -5140,8 +5140,8 @@ static int try_calling(struct queue_ent 
+@@ -5158,8 +5158,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.2 2012/08/03 08:52:32 jnemeth Exp $
  
  		if (qe->chan->cdr) {
  			struct ast_cdr *cdr;
-@@ -5177,12 +5177,12 @@ static int try_calling(struct queue_ent 
+@@ -5195,12 +5195,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.2 2012/08/03 08:52:32 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));
-@@ -5214,17 +5214,17 @@ static int try_calling(struct queue_ent 
+@@ -5232,17 +5232,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.2 2012/08/03 08:52:32 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))) {	
-@@ -6166,8 +6166,8 @@ check_turns:
+@@ -6183,8 +6183,8 @@ check_turns:
  			record_abandoned(&qe);
  			reason = QUEUE_TIMEOUT;
  			res = 0;
@@ -134,7 +134,7 @@ $NetBSD: patch-apps_app__queue.c,v 1.2 2012/08/03 08:52:32 jnemeth Exp $
  			break;
  		}
  
-@@ -6209,7 +6209,7 @@ check_turns:
+@@ -6226,7 +6226,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.2 2012/08/03 08:52:32 jnemeth Exp $
  				res = 0;
  				break;
  			}
-@@ -6231,7 +6231,7 @@ check_turns:
+@@ -6248,7 +6248,7 @@ check_turns:
  			record_abandoned(&qe);
  			reason = QUEUE_TIMEOUT;
  			res = 0;
@@ -152,7 +152,7 @@ $NetBSD: patch-apps_app__queue.c,v 1.2 2012/08/03 08:52:32 jnemeth Exp $
  			break;
  		}
  
-@@ -6258,8 +6258,8 @@ stop:
+@@ -6275,8 +6275,8 @@ stop:
  			if (!qe.handled) {
  				record_abandoned(&qe);
  				ast_queue_log(args.queuename, chan->uniqueid, "NONE", "ABANDON",
diff --git a/comms/asterisk10/patches/patch-apps_app__sms.c b/comms/asterisk10/patches/patch-apps_app__sms.c
index c321628cd84..7bd0b3134da 100644
--- a/comms/asterisk10/patches/patch-apps_app__sms.c
+++ b/comms/asterisk10/patches/patch-apps_app__sms.c
@@ -1,6 +1,6 @@
-$NetBSD: patch-apps_app__sms.c,v 1.1.1.1 2012/01/15 18:36:21 jnemeth Exp $
+$NetBSD: patch-apps_app__sms.c,v 1.2 2012/10/09 01:36:32 jnemeth Exp $
 
---- apps/app_sms.c.orig	2011-07-14 20:25:31.000000000 +0000
+--- apps/app_sms.c.orig	2012-07-31 19:57:09.000000000 +0000
 +++ apps/app_sms.c
 @@ -553,7 +553,7 @@ static void packdate(unsigned char *o, t
  	int z;
diff --git a/comms/asterisk10/patches/patch-channels_chan__oss.c b/comms/asterisk10/patches/patch-channels_chan__oss.c
index e9008a61004..b0b2c7bd428 100644
--- a/comms/asterisk10/patches/patch-channels_chan__oss.c
+++ b/comms/asterisk10/patches/patch-channels_chan__oss.c
@@ -1,6 +1,6 @@
-$NetBSD: patch-channels_chan__oss.c,v 1.2 2012/03/25 02:17:47 jnemeth Exp $
+$NetBSD: patch-channels_chan__oss.c,v 1.3 2012/10/09 01:36:32 jnemeth Exp $
 
---- channels/chan_oss.c.orig	2011-09-09 16:27:01.000000000 +0000
+--- channels/chan_oss.c.orig	2012-08-21 20:40:18.000000000 +0000
 +++ channels/chan_oss.c
 @@ -48,7 +48,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi
  
diff --git a/comms/asterisk10/patches/patch-configure b/comms/asterisk10/patches/patch-configure
index 50fa93d06d0..d7c00e9fc8b 100644
--- a/comms/asterisk10/patches/patch-configure
+++ b/comms/asterisk10/patches/patch-configure
@@ -1,17 +1,17 @@
-$NetBSD: patch-configure,v 1.5 2012/06/05 01:39:45 jnemeth Exp $
+$NetBSD: patch-configure,v 1.6 2012/10/09 01:36:32 jnemeth Exp $
 
---- configure.orig	2012-04-12 15:01:13.000000000 +0000
+--- configure.orig	2012-08-09 19:11:01.000000000 +0000
 +++ configure
-@@ -15988,7 +15988,7 @@ $as_echo "user CFLAGS present" >&6; }
+@@ -23605,7 +23605,7 @@ $as_echo "user CFLAGS present" >&6; }
  else
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ 	{ $as_echo "$as_me:$LINENO: result: no" >&5
  $as_echo "no" >&6; }
 -	AST_NATIVE_ARCH=
 +	AST_NATIVE_ARCH=0
  fi
  
  
-@@ -16448,6 +16448,148 @@ fi
+@@ -24494,6 +24494,148 @@ fi
  
  
  
@@ -160,18 +160,18 @@ $NetBSD: patch-configure,v 1.5 2012/06/05 01:39:45 jnemeth Exp $
  # The cast to long int works around a bug in the HP C Compiler
  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-@@ -17562,6 +17704,8 @@ $as_echo_n "checking if \"struct ifaddrs
- 
- 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -29069,6 +29211,8 @@ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
-+ #include <sys/types.h>
-+ #include <sys/socket.h>
-  #include <ifaddrs.h>
++#include <sys/types.h>
++#include <sys/socket.h>
+ #include <ifaddrs.h>
  int
  main ()
-@@ -28872,10 +29016,10 @@ if test "x$ac_cv_file__sbin_launchd" = x
- 
- $as_echo "#define HAVE_SBIN_LAUNCHD 1" >>confdefs.h
+@@ -55829,10 +55973,10 @@ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_SBIN_LAUNCHD 1
+ _ACEOF
  
 -fi
  
diff --git a/comms/asterisk10/patches/patch-configure.ac b/comms/asterisk10/patches/patch-configure.ac
index 9ecdce5aac4..486128613f2 100644
--- a/comms/asterisk10/patches/patch-configure.ac
+++ b/comms/asterisk10/patches/patch-configure.ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-configure.ac,v 1.2 2012/06/05 01:39:45 jnemeth Exp $
+$NetBSD: patch-configure.ac,v 1.3 2012/10/09 01:36:32 jnemeth Exp $
 
---- configure.ac.orig	2012-04-12 15:01:13.000000000 +0000
+--- configure.ac.orig	2012-08-09 19:11:01.000000000 +0000
 +++ configure.ac
 @@ -1004,7 +1004,7 @@ if $(${CC} -march=native -S -o /dev/null
  	fi
diff --git a/comms/asterisk10/patches/patch-include_asterisk_autoconfig.h.in b/comms/asterisk10/patches/patch-include_asterisk_autoconfig.h.in
index 12c822ceba0..7785d1044aa 100644
--- a/comms/asterisk10/patches/patch-include_asterisk_autoconfig.h.in
+++ b/comms/asterisk10/patches/patch-include_asterisk_autoconfig.h.in
@@ -1,8 +1,8 @@
-$NetBSD: patch-include_asterisk_autoconfig.h.in,v 1.1.1.1 2012/01/15 18:36:21 jnemeth Exp $
+$NetBSD: patch-include_asterisk_autoconfig.h.in,v 1.2 2012/10/09 01:36:32 jnemeth Exp $
 
---- include/asterisk/autoconfig.h.in.orig	2011-10-06 22:58:40.000000000 +0000
+--- include/asterisk/autoconfig.h.in.orig	2012-08-09 19:11:01.000000000 +0000
 +++ include/asterisk/autoconfig.h.in
-@@ -896,6 +896,9 @@
+@@ -899,6 +899,9 @@
  /* Define to 1 if you have the <syslog.h> header file. */
  #undef HAVE_SYSLOG_H
  
diff --git a/comms/asterisk10/patches/patch-main_Makefile b/comms/asterisk10/patches/patch-main_Makefile
index 715055683c4..f95670f7f5e 100644
--- a/comms/asterisk10/patches/patch-main_Makefile
+++ b/comms/asterisk10/patches/patch-main_Makefile
@@ -1,8 +1,8 @@
-$NetBSD: patch-main_Makefile,v 1.1.1.1 2012/01/15 18:36:21 jnemeth Exp $
+$NetBSD: patch-main_Makefile,v 1.2 2012/10/09 01:36:32 jnemeth Exp $
 
---- main/Makefile.orig	2011-09-19 20:29:40.000000000 +0000
+--- main/Makefile.orig	2012-09-08 05:21:41.000000000 +0000
 +++ main/Makefile
-@@ -88,6 +88,10 @@ ifeq ($(OSARCH),OpenBSD)
+@@ -85,6 +85,10 @@ ifeq ($(OSARCH),OpenBSD)
    AST_LIBS+=-lcrypto -lpthread -lm $(EDITLINE_LIB)
  endif
  
diff --git a/comms/asterisk10/patches/patch-main_acl.c b/comms/asterisk10/patches/patch-main_acl.c
index 346d4607323..9f32dbf53b8 100644
--- a/comms/asterisk10/patches/patch-main_acl.c
+++ b/comms/asterisk10/patches/patch-main_acl.c
@@ -1,8 +1,8 @@
-$NetBSD: patch-main_acl.c,v 1.1.1.1 2012/01/15 18:36:21 jnemeth Exp $
+$NetBSD: patch-main_acl.c,v 1.2 2012/10/09 01:36:32 jnemeth Exp $
 
---- main/acl.c.orig	2011-11-08 18:01:11.000000000 +0000
+--- main/acl.c.orig	2012-06-15 16:07:08.000000000 +0000
 +++ main/acl.c
-@@ -123,7 +123,7 @@ static int get_local_address(struct ast_
+@@ -127,7 +127,7 @@ static int get_local_address(struct ast_
  	char *buf = NULL;
  	int bufsz, x;
  #endif /* SOLARIS */
@@ -11,7 +11,7 @@ $NetBSD: patch-main_acl.c,v 1.1.1.1 2012/01/15 18:36:21 jnemeth Exp $
  	struct ifaddrs *ifap, *ifaphead;
  	int rtnerr;
  	const struct sockaddr_in *sin;
-@@ -132,7 +132,7 @@ static int get_local_address(struct ast_
+@@ -136,7 +136,7 @@ static int get_local_address(struct ast_
  	int best_score = -100;
  	memset(&best_addr, 0, sizeof(best_addr));
  
@@ -20,7 +20,7 @@ $NetBSD: patch-main_acl.c,v 1.1.1.1 2012/01/15 18:36:21 jnemeth Exp $
  	rtnerr = getifaddrs(&ifaphead);
  	if (rtnerr) {
  		perror(NULL);
-@@ -143,7 +143,7 @@ static int get_local_address(struct ast_
+@@ -147,7 +147,7 @@ static int get_local_address(struct ast_
  	s = socket(AF_INET, SOCK_STREAM, 0);
  
  	if (s > 0) {
@@ -29,7 +29,7 @@ $NetBSD: patch-main_acl.c,v 1.1.1.1 2012/01/15 18:36:21 jnemeth Exp $
  		for (ifap = ifaphead; ifap; ifap = ifap->ifa_next) {
  
  			if (ifap->ifa_addr && ifap->ifa_addr->sa_family == AF_INET) {
-@@ -202,7 +202,7 @@ static int get_local_address(struct ast_
+@@ -206,7 +206,7 @@ static int get_local_address(struct ast_
  
  		close(s);
  	}
diff --git a/comms/asterisk10/patches/patch-main_asterisk.c b/comms/asterisk10/patches/patch-main_asterisk.c
index e5c961e9578..c899ba23e44 100644
--- a/comms/asterisk10/patches/patch-main_asterisk.c
+++ b/comms/asterisk10/patches/patch-main_asterisk.c
@@ -1,8 +1,8 @@
-$NetBSD: patch-main_asterisk.c,v 1.1.1.1 2012/01/15 18:36:21 jnemeth Exp $
+$NetBSD: patch-main_asterisk.c,v 1.2 2012/10/09 01:36:32 jnemeth Exp $
 
---- main/asterisk.c.orig	2011-12-08 23:20:44.000000000 +0000
+--- main/asterisk.c.orig	2012-09-11 21:04:36.000000000 +0000
 +++ main/asterisk.c
-@@ -85,7 +85,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi
+@@ -89,7 +89,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi
  #include <sys/sysctl.h>
  #if !defined(__OpenBSD__)
  #include <sys/vmmeter.h>
diff --git a/comms/asterisk10/patches/patch-main_features.c b/comms/asterisk10/patches/patch-main_features.c
index 957471403e9..1bbda6d6f57 100644
--- a/comms/asterisk10/patches/patch-main_features.c
+++ b/comms/asterisk10/patches/patch-main_features.c
@@ -1,8 +1,8 @@
-$NetBSD: patch-main_features.c,v 1.3 2012/07/15 07:51:02 jnemeth Exp $
+$NetBSD: patch-main_features.c,v 1.4 2012/10/09 01:36:32 jnemeth Exp $
 
---- main/features.c.orig	2012-07-05 23:05:44.000000000 +0000
+--- main/features.c.orig	2012-09-11 15:30:37.000000000 +0000
 +++ main/features.c
-@@ -1547,14 +1547,14 @@ static int park_call_full(struct ast_cha
+@@ -1578,14 +1578,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-main_features.c,v 1.3 2012/07/15 07:51:02 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>"),
-@@ -2113,7 +2113,7 @@ static int builtin_automonitor(struct as
+@@ -2144,7 +2144,7 @@ static int builtin_automonitor(struct as
  		len = strlen(touch_monitor) + 50;
- 		args = alloca(len);
- 		touch_filename = alloca(len);
+ 		args = ast_alloca(len);
+ 		touch_filename = ast_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
+@@ -2154,7 +2154,7 @@ static int builtin_automonitor(struct as
  		len = strlen(caller_chan_id) + strlen(callee_chan_id) + 50;
- 		args = alloca(len);
- 		touch_filename = alloca(len);
+ 		args = ast_alloca(len);
+ 		touch_filename = ast_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);
  	}
  
-@@ -2225,7 +2225,7 @@ static int builtin_automixmonitor(struct
+@@ -2256,7 +2256,7 @@ static int builtin_automixmonitor(struct
  		len = strlen(touch_monitor) + 50;
- 		args = alloca(len);
- 		touch_filename = alloca(len);
+ 		args = ast_alloca(len);
+ 		touch_filename = ast_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
+@@ -2266,7 +2266,7 @@ static int builtin_automixmonitor(struct
  		len = strlen(caller_chan_id) + strlen(callee_chan_id) + 50;
- 		args = alloca(len);
- 		touch_filename = alloca(len);
+ 		args = ast_alloca(len);
+ 		touch_filename = ast_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"));
  	}
  
-@@ -7010,10 +7010,10 @@ static char *handle_parkedcalls(struct a
+@@ -7067,10 +7067,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-main_features.c,v 1.3 2012/07/15 07:51:02 jnemeth Exp $
  			++lotparked;
  		}
  		AST_LIST_UNLOCK(&curlot->parkings);
-@@ -7069,7 +7069,7 @@ static int manager_parking_status(struct
+@@ -7126,7 +7126,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-main_features.c,v 1.3 2012/07/15 07:51:02 jnemeth Exp $
  				"CallerIDNum: %s\r\n"
  				"CallerIDName: %s\r\n"
  				"ConnectedLineNum: %s\r\n"
-@@ -7078,7 +7078,7 @@ static int manager_parking_status(struct
+@@ -7135,7 +7135,7 @@ static int manager_parking_status(struct
  				"\r\n",
  				curlot->name,
  				cur->parkingnum, cur->chan->name, cur->peername,
diff --git a/comms/asterisk10/patches/patch-main_manager.c b/comms/asterisk10/patches/patch-main_manager.c
index f5a64a66d22..8e01082b693 100644
--- a/comms/asterisk10/patches/patch-main_manager.c
+++ b/comms/asterisk10/patches/patch-main_manager.c
@@ -1,8 +1,8 @@
-$NetBSD: patch-main_manager.c,v 1.1.1.1 2012/01/15 18:36:21 jnemeth Exp $
+$NetBSD: patch-main_manager.c,v 1.2 2012/10/09 01:36:32 jnemeth Exp $
 
---- main/manager.c.orig	2011-10-11 18:53:34.000000000 +0000
+--- main/manager.c.orig	2012-09-05 19:22:08.000000000 +0000
 +++ main/manager.c
-@@ -1690,7 +1690,7 @@ static char *handle_showmanconn(struct a
+@@ -1717,7 +1717,7 @@ static char *handle_showmanconn(struct a
  	struct mansession_session *session;
  	time_t now = time(NULL);
  #define HSMCONN_FORMAT1 "  %-15.15s  %-15.15s  %-10.10s  %-10.10s  %-8.8s  %-8.8s  %-5.5s  %-5.5s\n"
@@ -11,7 +11,7 @@ $NetBSD: patch-main_manager.c,v 1.1.1.1 2012/01/15 18:36:21 jnemeth Exp $
  	int count = 0;
  	struct ao2_iterator i;
  
-@@ -1711,7 +1711,7 @@ static char *handle_showmanconn(struct a
+@@ -1738,7 +1738,7 @@ static char *handle_showmanconn(struct a
  	i = ao2_iterator_init(sessions, 0);
  	while ((session = ao2_iterator_next(&i))) {
  		ao2_lock(session);
diff --git a/comms/asterisk10/patches/patch-main_netsock.c b/comms/asterisk10/patches/patch-main_netsock.c
index 19570270439..03236835e4b 100644
--- a/comms/asterisk10/patches/patch-main_netsock.c
+++ b/comms/asterisk10/patches/patch-main_netsock.c
@@ -1,8 +1,8 @@
-$NetBSD: patch-main_netsock.c,v 1.1.1.1 2012/01/15 18:36:21 jnemeth Exp $
+$NetBSD: patch-main_netsock.c,v 1.2 2012/10/09 01:36:32 jnemeth Exp $
 
---- main/netsock.c.orig	2010-12-10 16:28:14.000000000 +0000
+--- main/netsock.c.orig	2012-06-15 16:07:08.000000000 +0000
 +++ main/netsock.c
-@@ -31,5 +31,5 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi
+@@ -35,5 +35,5 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi
  
  #ifndef __linux__ 
 -#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__Darwin__) || defined(__GLIBC__)
diff --git a/comms/asterisk10/patches/patch-main_sched.c b/comms/asterisk10/patches/patch-main_sched.c
index d215f015be9..c936a7260cf 100644
--- a/comms/asterisk10/patches/patch-main_sched.c
+++ b/comms/asterisk10/patches/patch-main_sched.c
@@ -1,8 +1,8 @@
-$NetBSD: patch-main_sched.c,v 1.1.1.1 2012/01/15 18:36:21 jnemeth Exp $
+$NetBSD: patch-main_sched.c,v 1.2 2012/10/09 01:36:32 jnemeth Exp $
 
---- main/sched.c.orig	2010-12-20 17:15:54.000000000 +0000
+--- main/sched.c.orig	2012-06-15 16:07:08.000000000 +0000
 +++ main/sched.c
-@@ -553,12 +553,12 @@ void ast_sched_dump(struct ast_sched_con
+@@ -557,12 +557,12 @@ void ast_sched_dump(struct ast_sched_con
  		struct timeval delta;
  		q = ast_heap_peek(con->sched_heap, x);
  		delta = ast_tvsub(q->when, when);
diff --git a/comms/asterisk10/patches/patch-main_utils.c b/comms/asterisk10/patches/patch-main_utils.c
index 673c457c49c..8662afe0a05 100644
--- a/comms/asterisk10/patches/patch-main_utils.c
+++ b/comms/asterisk10/patches/patch-main_utils.c
@@ -1,8 +1,8 @@
-$NetBSD: patch-main_utils.c,v 1.1.1.1 2012/01/15 18:36:21 jnemeth Exp $
+$NetBSD: patch-main_utils.c,v 1.2 2012/10/09 01:36:32 jnemeth Exp $
 
---- main/utils.c.orig	2011-11-02 21:37:11.000000000 +0000
+--- main/utils.c.orig	2012-08-27 13:57:10.000000000 +0000
 +++ main/utils.c
-@@ -484,7 +484,7 @@ const char *ast_inet_ntoa(struct in_addr
+@@ -488,7 +488,7 @@ const char *ast_inet_ntoa(struct in_addr
  static int dev_urandom_fd;
  #endif
  
@@ -11,7 +11,7 @@ $NetBSD: patch-main_utils.c,v 1.1.1.1 2012/01/15 18:36:21 jnemeth Exp $
  #undef pthread_create /* For ast_pthread_create function only */
  #endif /* !__linux__ */
  
-@@ -1392,13 +1392,13 @@ int ast_false(const char *s)
+@@ -1399,13 +1399,13 @@ int ast_false(const char *s)
  static struct timeval tvfix(struct timeval a)
  {
  	if (a.tv_usec >= ONE_MILLION) {
diff --git a/comms/asterisk10/patches/patch-pbx_pbx__dundi.c b/comms/asterisk10/patches/patch-pbx_pbx__dundi.c
index af2d9b6379c..1322a285fbe 100644
--- a/comms/asterisk10/patches/patch-pbx_pbx__dundi.c
+++ b/comms/asterisk10/patches/patch-pbx_pbx__dundi.c
@@ -1,6 +1,6 @@
-$NetBSD: patch-pbx_pbx__dundi.c,v 1.1.1.1 2012/01/15 18:36:21 jnemeth Exp $
+$NetBSD: patch-pbx_pbx__dundi.c,v 1.2 2012/10/09 01:36:32 jnemeth Exp $
 
---- pbx/pbx_dundi.c.orig	2011-07-14 20:25:31.000000000 +0000
+--- pbx/pbx_dundi.c.orig	2012-09-06 02:49:41.000000000 +0000
 +++ pbx/pbx_dundi.c
 @@ -38,7 +38,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi
  #include <pthread.h>
diff --git a/comms/asterisk10/patches/patch-sounds_Makefile b/comms/asterisk10/patches/patch-sounds_Makefile
index 643ad066bfb..83b93ef17de 100644
--- a/comms/asterisk10/patches/patch-sounds_Makefile
+++ b/comms/asterisk10/patches/patch-sounds_Makefile
@@ -1,6 +1,6 @@
-$NetBSD: patch-sounds_Makefile,v 1.1.1.1 2012/01/15 18:36:21 jnemeth Exp $
+$NetBSD: patch-sounds_Makefile,v 1.2 2012/10/09 01:36:32 jnemeth Exp $
 
---- sounds/Makefile.orig	2011-08-25 15:29:56.000000000 +0000
+--- sounds/Makefile.orig	2012-01-24 20:35:38.000000000 +0000
 +++ sounds/Makefile
 @@ -119,20 +119,6 @@ endef # sound_format_lang_rule
  all: $(CORE_SOUNDS) $(EXTRA_SOUNDS) $(MOH)
diff --git a/comms/asterisk10/patches/patch-utils_extconf.c b/comms/asterisk10/patches/patch-utils_extconf.c
index e5ce2cb3f20..89f1401c7da 100644
--- a/comms/asterisk10/patches/patch-utils_extconf.c
+++ b/comms/asterisk10/patches/patch-utils_extconf.c
@@ -1,6 +1,6 @@
-$NetBSD: patch-utils_extconf.c,v 1.1.1.1 2012/01/15 18:36:21 jnemeth Exp $
+$NetBSD: patch-utils_extconf.c,v 1.2 2012/10/09 01:36:32 jnemeth Exp $
 
---- utils/extconf.c.orig	2011-07-14 20:25:31.000000000 +0000
+--- utils/extconf.c.orig	2012-08-01 02:26:09.000000000 +0000
 +++ utils/extconf.c
 @@ -795,6 +795,10 @@ static void  __attribute__((destructor))
  #include "libkern/OSAtomic.h"