diff options
author | jnemeth <jnemeth> | 2009-12-30 04:11:02 +0000 |
---|---|---|
committer | jnemeth <jnemeth> | 2009-12-30 04:11:02 +0000 |
commit | f6df31a444de692dfa04f097b43c26c9e3d8800d (patch) | |
tree | bdf306bc2dccb36b0a828b7a69eb5e3642d88302 | |
parent | e0f7692e869c05149616968cfca68ec67d412506 (diff) | |
download | pkgsrc-f6df31a444de692dfa04f097b43c26c9e3d8800d.tar.gz |
Update to 1.6.1.12. 1.6.1.10 and 1.6.1.12 are general bug
fix releases. For more information see:
http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/asterisk-1.6.1.10-summary.html or http://tinyurl.com/yzyr9tt and
http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/asterisk-1.6.1.12-summary.html or http://tinyurl.com/yfxlyjp .
1.6.1.11 fixes AST-2009-010 which allows people to remotely crash the
server. The description of the issue is:
An attacker sending a valid RTP comfort noise payload containing
a data length of 24 bytes or greater can remotely crash Asterisk.
Commit during freeze approved by wiz@.
-rw-r--r-- | comms/asterisk16/Makefile | 5 | ||||
-rw-r--r-- | comms/asterisk16/PLIST | 13 | ||||
-rw-r--r-- | comms/asterisk16/distinfo | 26 | ||||
-rw-r--r-- | comms/asterisk16/patches/patch-aa | 36 | ||||
-rw-r--r-- | comms/asterisk16/patches/patch-aq | 18 | ||||
-rw-r--r-- | comms/asterisk16/patches/patch-ax | 42 |
6 files changed, 76 insertions, 64 deletions
diff --git a/comms/asterisk16/Makefile b/comms/asterisk16/Makefile index 1d5536c7543..90dd070aee0 100644 --- a/comms/asterisk16/Makefile +++ b/comms/asterisk16/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.9 2009/12/15 21:32:37 joerg Exp $ +# $NetBSD: Makefile,v 1.10 2009/12/30 04:11:02 jnemeth Exp $ # -DISTNAME= asterisk-1.6.1.9 -PKGREVISION= 1 +DISTNAME= asterisk-1.6.1.12 DIST_SUBDIR= ${PKGNAME_NOREV} EXTRACT_ONLY= ${DISTNAME}.tar.gz CATEGORIES= comms net audio diff --git a/comms/asterisk16/PLIST b/comms/asterisk16/PLIST index 09672bdfd14..56eae81c537 100644 --- a/comms/asterisk16/PLIST +++ b/comms/asterisk16/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2009/11/20 04:30:08 jnemeth Exp $ +@comment $NetBSD: PLIST,v 1.8 2009/12/30 04:11:02 jnemeth Exp $ include/asterisk.h include/asterisk/_private.h include/asterisk/abstract_jb.h @@ -266,7 +266,6 @@ lib/asterisk/modules/res_smdi.so lib/asterisk/modules/res_speech.so lib/asterisk/modules/res_timing_pthread.so lib/pkgconfig/asterisk.pc -libdata/asterisk/firmware/iax/iaxy.bin libdata/asterisk/images/asterisk-intro.jpg libdata/asterisk/images/kpad2.jpg libdata/asterisk/keys/freeworlddialup.pub @@ -285,10 +284,10 @@ libdata/asterisk/phoneprov/000000000000-phone.cfg libdata/asterisk/phoneprov/000000000000.cfg libdata/asterisk/phoneprov/polycom.xml libdata/asterisk/phoneprov/polycom_line.xml -libdata/asterisk/sounds/.asterisk-core-sounds-en-gsm-1.4.15 -libdata/asterisk/sounds/en/CHANGES-asterisk-core-en-1.4.15 -libdata/asterisk/sounds/en/CREDITS-asterisk-core-en-1.4.15 -libdata/asterisk/sounds/en/LICENSE-asterisk-core-en-1.4.15 +libdata/asterisk/sounds/.asterisk-core-sounds-en-gsm-1.4.16 +libdata/asterisk/sounds/en/CHANGES-asterisk-core-en-1.4.16 +libdata/asterisk/sounds/en/CREDITS-asterisk-core-en-1.4.16 +libdata/asterisk/sounds/en/LICENSE-asterisk-core-en-1.4.16 libdata/asterisk/sounds/en/agent-alreadyon.gsm libdata/asterisk/sounds/en/agent-incorrect.gsm libdata/asterisk/sounds/en/agent-loggedoff.gsm @@ -676,6 +675,7 @@ libdata/asterisk/sounds/en/vm-opts-full.gsm libdata/asterisk/sounds/en/vm-opts.gsm libdata/asterisk/sounds/en/vm-passchanged.gsm libdata/asterisk/sounds/en/vm-password.gsm +libdata/asterisk/sounds/en/vm-pls-try-again.gsm libdata/asterisk/sounds/en/vm-press.gsm libdata/asterisk/sounds/en/vm-prev.gsm libdata/asterisk/sounds/en/vm-reachoper.gsm @@ -1125,3 +1125,4 @@ share/examples/asterisk/vpb.conf share/examples/rc.d/asterisk @pkgdir libdata/asterisk/sounds/fr @pkgdir libdata/asterisk/sounds/es +@pkgdir libdata/asterisk/firmware/iax diff --git a/comms/asterisk16/distinfo b/comms/asterisk16/distinfo index b11503c9545..0349ed4869b 100644 --- a/comms/asterisk16/distinfo +++ b/comms/asterisk16/distinfo @@ -1,15 +1,15 @@ -$NetBSD: distinfo,v 1.8 2009/11/20 04:30:08 jnemeth Exp $ +$NetBSD: distinfo,v 1.9 2009/12/30 04:11:02 jnemeth Exp $ -SHA1 (asterisk-1.6.1.9/asterisk-1.6.1.9.tar.gz) = 411da99cac652f5fedae0780a4bfc1aed51bdb29 -RMD160 (asterisk-1.6.1.9/asterisk-1.6.1.9.tar.gz) = f7c0b4e50fa76a9ee8a954be7cafa234279532c4 -Size (asterisk-1.6.1.9/asterisk-1.6.1.9.tar.gz) = 23427875 bytes -SHA1 (asterisk-1.6.1.9/extract-cfile.awk) = c4f08eee1ab83c041bde1ab91672a4a3c43c28b8 -RMD160 (asterisk-1.6.1.9/extract-cfile.awk) = cd59f8e5807732023d5aec95187e2d5572f400a4 -Size (asterisk-1.6.1.9/extract-cfile.awk) = 667 bytes -SHA1 (asterisk-1.6.1.9/rfc3951.txt) = 1a6c769be750fb02456d60db2470909254496017 -RMD160 (asterisk-1.6.1.9/rfc3951.txt) = 15f7ec61653ec9953172f8f2150e7d8f6f620926 -Size (asterisk-1.6.1.9/rfc3951.txt) = 373442 bytes -SHA1 (patch-aa) = 43843bb97a88a648040fc6288a74d79561e5edf5 +SHA1 (asterisk-1.6.1.12/asterisk-1.6.1.12.tar.gz) = b7c9cdfd6b7401be2eabac537f6f6cebee10b48c +RMD160 (asterisk-1.6.1.12/asterisk-1.6.1.12.tar.gz) = fa2440974605ea3098cd99d697bab2bea534b827 +Size (asterisk-1.6.1.12/asterisk-1.6.1.12.tar.gz) = 23438391 bytes +SHA1 (asterisk-1.6.1.12/extract-cfile.awk) = c4f08eee1ab83c041bde1ab91672a4a3c43c28b8 +RMD160 (asterisk-1.6.1.12/extract-cfile.awk) = cd59f8e5807732023d5aec95187e2d5572f400a4 +Size (asterisk-1.6.1.12/extract-cfile.awk) = 667 bytes +SHA1 (asterisk-1.6.1.12/rfc3951.txt) = 1a6c769be750fb02456d60db2470909254496017 +RMD160 (asterisk-1.6.1.12/rfc3951.txt) = 15f7ec61653ec9953172f8f2150e7d8f6f620926 +Size (asterisk-1.6.1.12/rfc3951.txt) = 373442 bytes +SHA1 (patch-aa) = 71e819ec12324c6f4bb7de7142bdaac33958ab84 SHA1 (patch-af) = 09860d714281cb4c65d1a087cf5b16647a16e2fa SHA1 (patch-ag) = c71c61350cefbbe53eefa99245ca7712753f22d5 SHA1 (patch-ai) = e92edab5c1ff323478f41d0b0783102ed527fe39 @@ -19,14 +19,14 @@ SHA1 (patch-am) = 98aa4648b867d193ec05d8da14434205f369c17b SHA1 (patch-an) = 93a5df66fd6459fb76e9191dc3bf37b9ee5483b5 SHA1 (patch-ao) = 0663a698469550b22bb97ee1b18980bc2bc67495 SHA1 (patch-ap) = d60274a44e10dc4e70235ac97b7ae21f37ce713e -SHA1 (patch-aq) = 99845e226dbc359ab60f4e27af32011b65c9ef15 +SHA1 (patch-aq) = 53937dc2033dc8c50c623e06efa7fa974a61ff8e SHA1 (patch-ar) = 44e46336c0b228ab291e025b8bb5ee505f75345a SHA1 (patch-as) = a887d37f0829c22d115ff08721893da49e4bfda4 SHA1 (patch-at) = 7f366ea0075b16c81bb81ba78becc029b3265151 SHA1 (patch-au) = 47330b597a484b5d29aeca466243369a121b2b3c SHA1 (patch-av) = d90ae8aac1d85471cbf22f3cb62315ebbd22a94a SHA1 (patch-aw) = 310153eed541d1a6a0c7859f6c032478cd2ff67a -SHA1 (patch-ax) = fd3f67d5917fa0b226df47657d055194cc741999 +SHA1 (patch-ax) = 865376102295e1afc316cc12e87965211449b306 SHA1 (patch-ay) = 39a2ae198ff2989c501dd4374e1ea57a3d52dda9 SHA1 (patch-az) = 917cc8868708ce9c022a0268debd90f51f88bdad SHA1 (patch-ba) = 2ea96529e0187a23d0b640c7cae69904d587c269 diff --git a/comms/asterisk16/patches/patch-aa b/comms/asterisk16/patches/patch-aa index f14ab65cdfd..4384a35afe4 100644 --- a/comms/asterisk16/patches/patch-aa +++ b/comms/asterisk16/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.3 2009/09/14 08:44:51 jnemeth Exp $ +$NetBSD: patch-aa,v 1.4 2009/12/30 04:11:02 jnemeth Exp $ ---- Makefile.orig 2009-08-04 07:54:45.000000000 -0700 +--- Makefile.orig 2009-11-03 20:01:04.000000000 +0000 +++ Makefile -@@ -116,20 +116,6 @@ DEBUG=-g3 +@@ -123,20 +123,6 @@ DEBUG=-g3 # Define standard directories for various platforms # These apply if they are not redefined in asterisk.conf @@ -23,7 +23,7 @@ $NetBSD: patch-aa,v 1.3 2009/09/14 08:44:51 jnemeth Exp $ ASTETCDIR=$(sysconfdir)/asterisk ASTLIBDIR=$(libdir)/asterisk ASTHEADERDIR=$(includedir)/asterisk -@@ -139,19 +125,12 @@ else +@@ -146,19 +132,12 @@ else ASTLOGDIR=$(localstatedir)/log/asterisk ASTVARRUNDIR=$(localstatedir)/run ASTMANDIR=$(mandir) @@ -44,7 +44,7 @@ $NetBSD: patch-aa,v 1.3 2009/09/14 08:44:51 jnemeth Exp $ # Asterisk.conf is located in ASTETCDIR or by using the -C flag # when starting Asterisk -@@ -237,10 +216,6 @@ ifeq ($(AST_DEVMODE),yes) +@@ -244,10 +223,6 @@ ifeq ($(AST_DEVMODE),yes) _ASTCFLAGS+=-Wformat=2 endif @@ -55,16 +55,18 @@ $NetBSD: patch-aa,v 1.3 2009/09/14 08:44:51 jnemeth Exp $ ifeq ($(findstring -march,$(_ASTCFLAGS) $(ASTCFLAGS)),) ifneq ($(PROC),ultrasparc) _ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi) -@@ -456,7 +431,7 @@ distclean: $(SUBDIRS_DIST_CLEAN) _clean +@@ -463,9 +438,7 @@ distclean: $(SUBDIRS_DIST_CLEAN) _clean rm -f build_tools/menuselect-deps datafiles: _all -- if [ x`$(ID) -un` = xroot ]; then CFLAGS="$(_ASTCFLAGS) $(ASTCFLAGS)" bash build_tools/mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi +- if [ `$(ID) -u` = 0 ]; then \ +- CFLAGS="$(_ASTCFLAGS) $(ASTCFLAGS)" build_tools/mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; \ +- fi + CFLAGS="$(_ASTCFLAGS) $(ASTCFLAGS)" build_tools/mkpkgconfig $(DESTDIR)${PREFIX}/lib/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 # improved a lot. I'll put it here for now. -@@ -498,9 +473,10 @@ NEWHEADERS=$(notdir $(wildcard include/a +@@ -507,9 +480,10 @@ NEWHEADERS=$(notdir $(wildcard include/a OLDHEADERS=$(filter-out $(NEWHEADERS),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h))) installdirs: @@ -76,7 +78,7 @@ $NetBSD: patch-aa,v 1.3 2009/09/14 08:44:51 jnemeth Exp $ mkdir -p $(DESTDIR)$(ASTBINDIR) mkdir -p $(DESTDIR)$(ASTVARRUNDIR) mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail -@@ -509,6 +485,7 @@ installdirs: +@@ -518,6 +492,7 @@ installdirs: mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/tmp mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/meetme mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/monitor @@ -84,7 +86,7 @@ $NetBSD: patch-aa,v 1.3 2009/09/14 08:44:51 jnemeth Exp $ bininstall: _all installdirs $(SUBDIRS_INSTALL) $(INSTALL) -m 755 main/asterisk $(DESTDIR)$(ASTSBINDIR)/ -@@ -604,22 +581,22 @@ upgrade: bininstall +@@ -613,22 +588,22 @@ upgrade: bininstall # XXX why *.adsi is installed first ? adsi: @echo Installing adsi config files... @@ -112,7 +114,7 @@ $NetBSD: patch-aa,v 1.3 2009/09/14 08:44:51 jnemeth Exp $ if [ -f $${dst} ]; then \ if [ "$(OVERWRITE)" = "y" ]; then \ if cmp -s $${dst} $$x ; then \ -@@ -635,10 +612,10 @@ samples: adsi +@@ -644,10 +619,10 @@ samples: adsi echo "Installing file $$x"; \ $(INSTALL) -m 644 $$x $${dst} ;\ done @@ -125,7 +127,7 @@ $NetBSD: patch-aa,v 1.3 2009/09/14 08:44:51 jnemeth Exp $ echo "astetcdir => $(ASTETCDIR)" ; \ echo "astmoddir => $(MODULES_DIR)" ; \ echo "astvarlibdir => $(ASTVARLIBDIR)" ; \ -@@ -691,7 +668,7 @@ samples: adsi +@@ -700,7 +675,7 @@ samples: adsi echo "pbx_realtime=1.6" ; \ echo "res_agi=1.6" ; \ echo "app_set=1.6" ; \ @@ -134,7 +136,7 @@ $NetBSD: patch-aa,v 1.3 2009/09/14 08:44:51 jnemeth Exp $ else \ echo "Skipping asterisk.conf creation"; \ fi -@@ -825,7 +802,7 @@ uninstall-all: _uninstall +@@ -834,7 +809,7 @@ uninstall-all: _uninstall rm -rf $(DESTDIR)$(ASTVARLIBDIR) rm -rf $(DESTDIR)$(ASTDATADIR) rm -rf $(DESTDIR)$(ASTSPOOLDIR) @@ -143,3 +145,11 @@ $NetBSD: patch-aa,v 1.3 2009/09/14 08:44:51 jnemeth Exp $ rm -rf $(DESTDIR)$(ASTLOGDIR) menuconfig: menuselect +@@ -905,6 +880,7 @@ asterisk.pdf: + $(MAKE) -C doc/tex asterisk.pdf + + .PHONY: menuselect ++.PHONY: menuselect.makeopts + .PHONY: main + .PHONY: sounds + .PHONY: clean diff --git a/comms/asterisk16/patches/patch-aq b/comms/asterisk16/patches/patch-aq index d24b79a5ad2..c58baf454be 100644 --- a/comms/asterisk16/patches/patch-aq +++ b/comms/asterisk16/patches/patch-aq @@ -1,9 +1,9 @@ -$NetBSD: patch-aq,v 1.3 2009/09/14 08:44:51 jnemeth Exp $ +$NetBSD: patch-aq,v 1.4 2009/12/30 04:11:02 jnemeth Exp $ ---- configure.orig 2009-06-16 12:28:00.000000000 -0700 +--- configure.orig 2009-10-26 23:48:25.000000000 +0000 +++ configure -@@ -19395,6 +19395,144 @@ _ACEOF - fi +@@ -19294,6 +19294,146 @@ fi + +if test "${ac_cv_header_sys_atomic_h+set}" = set; then @@ -144,10 +144,12 @@ $NetBSD: patch-aq,v 1.3 2009/09/14 08:44:51 jnemeth Exp $ + +fi + - - # 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 -@@ -33094,6 +33232,8 @@ _ACEOF ++ ++ + { echo "$as_me:$LINENO: checking for int" >&5 + echo $ECHO_N "checking for int... $ECHO_C" >&6; } + if test "${ac_cv_type_int+set}" = set; then +@@ -20567,6 +20707,8 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ diff --git a/comms/asterisk16/patches/patch-ax b/comms/asterisk16/patches/patch-ax index b9f14c5c359..ea43a25b3a4 100644 --- a/comms/asterisk16/patches/patch-ax +++ b/comms/asterisk16/patches/patch-ax @@ -1,8 +1,8 @@ -$NetBSD: patch-ax,v 1.3 2009/09/14 08:44:51 jnemeth Exp $ +$NetBSD: patch-ax,v 1.4 2009/12/30 04:11:02 jnemeth Exp $ ---- apps/app_queue.c.orig 2009-08-10 12:30:55.000000000 -0700 +--- apps/app_queue.c.orig 2009-11-30 20:58:33.000000000 +0000 +++ apps/app_queue.c -@@ -2540,8 +2540,8 @@ static void record_abandoned(struct queu +@@ -2571,8 +2571,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.3 2009/09/14 08:44:51 jnemeth Exp $ qe->parent->callsabandoned++; ao2_unlock(qe->parent); -@@ -2960,7 +2960,7 @@ static int wait_our_turn(struct queue_en +@@ -3007,7 +3007,7 @@ static int wait_our_turn(struct queue_en if (qe->parent->leavewhenempty && (status == QUEUE_NO_MEMBERS)) { *reason = QUEUE_LEAVEEMPTY; @@ -22,7 +22,7 @@ $NetBSD: patch-ax,v 1.3 2009/09/14 08:44:51 jnemeth Exp $ leave_queue(qe); break; } -@@ -2968,13 +2968,13 @@ static int wait_our_turn(struct queue_en +@@ -3015,13 +3015,13 @@ static int wait_our_turn(struct queue_en /* leave the queue if no reachable agents, if enabled */ if ((qe->parent->leavewhenempty == QUEUE_EMPTY_STRICT) && (status == QUEUE_NO_REACHABLE_MEMBERS || status == QUEUE_NO_UNPAUSED_REACHABLE_MEMBERS)) { *reason = QUEUE_LEAVEUNAVAIL; @@ -38,7 +38,7 @@ $NetBSD: patch-ax,v 1.3 2009/09/14 08:44:51 jnemeth Exp $ leave_queue(qe); break; } -@@ -3161,12 +3161,12 @@ static void send_agent_complete(const st +@@ -3209,12 +3209,12 @@ static void send_agent_complete(const st "Channel: %s\r\n" "Member: %s\r\n" "MemberName: %s\r\n" @@ -54,7 +54,7 @@ $NetBSD: patch-ax,v 1.3 2009/09/14 08:44:51 jnemeth Exp $ qe->parent->eventwhencalled == QUEUE_EVENT_VARIABLES ? vars2manager(qe->chan, vars, vars_len) : ""); } -@@ -3209,9 +3209,9 @@ static void queue_transfer_fixup(void *d +@@ -3257,9 +3257,9 @@ static void queue_transfer_fixup(void *d int callcompletedinsl = qtds->callcompletedinsl; struct ast_datastore *datastore; @@ -67,7 +67,7 @@ $NetBSD: patch-ax,v 1.3 2009/09/14 08:44:51 jnemeth Exp $ update_queue(qe->parent, member, callcompletedinsl); -@@ -3681,7 +3681,7 @@ static int try_calling(struct queue_ent +@@ -3734,7 +3734,7 @@ static int try_calling(struct queue_ent } else if (res2) { /* 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); @@ -76,7 +76,7 @@ $NetBSD: patch-ax,v 1.3 2009/09/14 08:44:51 jnemeth Exp $ record_abandoned(qe); ast_cdr_noanswer(qe->chan->cdr); ast_hangup(peer); -@@ -3728,8 +3728,8 @@ static int try_calling(struct queue_ent +@@ -3781,8 +3781,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) { @@ -87,7 +87,7 @@ $NetBSD: patch-ax,v 1.3 2009/09/14 08:44:51 jnemeth Exp $ pbx_builtin_setvar_multiple(qe->chan, interfacevar); pbx_builtin_setvar_multiple(peer, interfacevar); } -@@ -3976,8 +3976,8 @@ static int try_calling(struct queue_ent +@@ -4029,8 +4029,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++; @@ -98,7 +98,7 @@ $NetBSD: patch-ax,v 1.3 2009/09/14 08:44:51 jnemeth Exp $ if (update_cdr && qe->chan->cdr) ast_copy_string(qe->chan->cdr->dstchannel, member->membername, sizeof(qe->chan->cdr->dstchannel)); if (qe->parent->eventwhencalled) -@@ -3987,12 +3987,12 @@ static int try_calling(struct queue_ent +@@ -4040,12 +4040,12 @@ static int try_calling(struct queue_ent "Channel: %s\r\n" "Member: %s\r\n" "MemberName: %s\r\n" @@ -114,10 +114,10 @@ $NetBSD: patch-ax,v 1.3 2009/09/14 08:44:51 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)); -@@ -4021,17 +4021,17 @@ static int try_calling(struct queue_ent - if (!attended_transfer_occurred(qe->chan)) { - struct ast_datastore *tds; - if (strcasecmp(oldcontext, qe->chan->context) || strcasecmp(oldexten, qe->chan->exten)) { +@@ -4076,17 +4076,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))) { - ast_queue_log(queuename, qe->chan->uniqueid, member->membername, "TRANSFER", "%s|%s|%ld|%ld|%d", - qe->chan->exten, qe->chan->context, (long) (callstart - qe->start), - (long) (time(NULL) - callstart), qe->opos); @@ -139,7 +139,7 @@ $NetBSD: patch-ax,v 1.3 2009/09/14 08:44:51 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))) { -@@ -4909,8 +4909,8 @@ check_turns: +@@ -4970,8 +4970,8 @@ check_turns: ast_cdr_noanswer(qe.chan->cdr); reason = QUEUE_TIMEOUT; res = 0; @@ -150,7 +150,7 @@ $NetBSD: patch-ax,v 1.3 2009/09/14 08:44:51 jnemeth Exp $ break; } -@@ -4980,7 +4980,7 @@ check_turns: +@@ -5041,7 +5041,7 @@ check_turns: record_abandoned(&qe); ast_cdr_noanswer(qe.chan->cdr); reason = QUEUE_LEAVEEMPTY; @@ -159,7 +159,7 @@ $NetBSD: patch-ax,v 1.3 2009/09/14 08:44:51 jnemeth Exp $ res = 0; break; } -@@ -4989,7 +4989,7 @@ check_turns: +@@ -5050,7 +5050,7 @@ check_turns: if ((qe.parent->leavewhenempty == QUEUE_EMPTY_STRICT) && (status == QUEUE_NO_REACHABLE_MEMBERS || status == QUEUE_NO_UNPAUSED_REACHABLE_MEMBERS)) { record_abandoned(&qe); reason = QUEUE_LEAVEUNAVAIL; @@ -168,7 +168,7 @@ $NetBSD: patch-ax,v 1.3 2009/09/14 08:44:51 jnemeth Exp $ res = 0; break; } -@@ -5005,7 +5005,7 @@ check_turns: +@@ -5066,7 +5066,7 @@ check_turns: record_abandoned(&qe); reason = QUEUE_TIMEOUT; res = 0; @@ -177,7 +177,7 @@ $NetBSD: patch-ax,v 1.3 2009/09/14 08:44:51 jnemeth Exp $ break; } -@@ -5033,8 +5033,8 @@ stop: +@@ -5094,8 +5094,8 @@ stop: record_abandoned(&qe); ast_cdr_noanswer(qe.chan->cdr); ast_queue_log(args.queuename, chan->uniqueid, "NONE", "ABANDON", @@ -188,7 +188,7 @@ $NetBSD: patch-ax,v 1.3 2009/09/14 08:44:51 jnemeth Exp $ res = -1; } else if (qcontinue) { reason = QUEUE_CONTINUE; -@@ -5807,8 +5807,8 @@ static char *__queues_show(struct manses +@@ -5879,8 +5879,8 @@ static char *__queues_show(struct manses mem->paused ? " (paused)" : "", devstate2str(mem->status)); if (mem->calls) |