diff options
author | jnemeth <jnemeth@pkgsrc.org> | 2009-09-14 08:44:51 +0000 |
---|---|---|
committer | jnemeth <jnemeth@pkgsrc.org> | 2009-09-14 08:44:51 +0000 |
commit | c7052c03268aaab22556950d87bf8d33690d48dc (patch) | |
tree | fedef91e7368de8cd7fb0060cd46c410241102fd /comms | |
parent | f0f2cc221dd300a8223c22a7ec3d47b407658fe1 (diff) | |
download | pkgsrc-c7052c03268aaab22556950d87bf8d33690d48dc.tar.gz |
Update to Asterisk 1.6.1.6
- 1.6.1.6 fixes AST-2009-006 which is an IAX2 DOS vulnerability
- 1.6.1.5 contains a variety of bug fixes:
Category: Applications/app_chanspy
#15660: ChanSpy "whisper" is broken in 1.4.26
Category: Applications/app_fax
#15606: app_fax.c is not compiling under OpenBSD
#15610: T.38 re-INVITE received after T.38 already negotiated fails
Category: Applications/app_milliwatt
#15386: [patch] Milliwatt() is off by -11dbm
Category: Applications/app_mixmonitor
#15699: [patch] using ast_free instead of mixmonitor_free
Category: Applications/app_queue
#14536: [patch] After a caller is processed by app_queue the queue_log
logs the hangup as TRANSFER
#15664: [patch] QUEUE_MEMBER_LIST() returns member names instead of
Category: Applications/app_stack
#15557: [patch] Gosub() dequotes once more than Macro()
#15617: [patch] crash in LOCAL() if Gosub stack is allocated but empty
Category: Applications/app_voicemail
#15717: MWI is not sent to a SIP phone upon registration, but is after the
mailbox is updated/checked
#15720: opendir() return code is not checked in last_message_index()
Category: Applications/app_voicemail/IMAP
#14496: [patch] IMAP crash multiple callers / callers hangup at beep
#14597: greetings can not be retrieved from IMAP
#14950: [patch] Greetings are stored as IMAP messages even when
imapgreetings=no
#15729: IMAP greetings not stored in dovecot
Category: CDR/General
#15751: [patch] Core dump in ast_bridge_call features.c line 2772
Category: Channels/chan_agent
#15668: AGENTACCEPTDTMF is incorrectly spelled as AGENTACCEPTDMTF in code
to recognize channel variables.
Category: Channels/chan_dahdi
#15655: [patch] Dialplan starts execution before call is accepted
#15727: [patch] Message Waiting Indication(MWI) is randomly generated when
FXO is set to DTMF Caller ID
Category: Channels/chan_misdn
#12113: [patch] asterisk crash at reload chan_misdn.so
Category: Channels/chan_sip/General
#12869: [patch] 'context' doesn't change when 'sip reload' issued when
driven from realtime
#15362: [patch] log message output is truncated
#15596: [patch] all codecs allowed, but textsupport=no crashes on T140RED
enabled call
Category: Channels/chan_sip/Registration
#14366: [patch] Registration expiry not compatible with some ITSP
#15539: [patch] Register request line contains wrong address when domain
and registrar host differ
Category: Channels/chan_sip/T.38
#15182: [patch] T.38 invite does not always comply with RFC 2327
Category: Channels/chan_sip/Video
#15121: [patch] Video support in SIP channel driver appears to be totally
broken
Category: Core/BuildSystem
#15697: most cleaner alaw don't compile
#15698: [patch] If enable DEBUG_FD_LEAKS - h323 can't start.
#15714: [patch] Asterisk won't build with curl unless curl_config is
present
Category: Core/General
#14730: [patch] Fix runlevels in Debian rc files
#15273: [patch] german time (20:01:00 oh clock) is announced wrong
#15649: T38 Faxing failing on 1.6.1 svn
#15667: LOGGER WARNING : error executing after rotate
Category: Core/ManagerInterface
#15397: [patch] segfault in action_coreshowchannels() at manager.c
#15730: [patch] manager keeps creating /tmp/ast-ami-XXXXXX files (without
deleting) when a single manager client remains logged in
Category: Core/PBX
#15242: [patch] log does not indicate which function is missing closing
parenthesis
Category: Documentation
#15755: Description in queues.conf on call recording is slightly
misleading
Category: Functions/func_iconv
#15169: When building with uClibc, configure script mistakenly assumes
iconv is always available
Category: General
#15571: [patch] 'received' typos in trunk, in 6 files
#15595: [patch] fix spelling for typos, mainly in comments.
Category: PBX/pbx_dundi
#15322: [patch] DUNDILOOKUP() does not accept comma as argument separator
Category: Resources/General
#15624: res_ais, communication ok, but wrong state send and receive.
Category: Resources/res_config_ldap
#13725: [patch] ERROR[7387]: res_config_ldap.c:1292 update_ldap: Couldn't
modify dn:cn=1001,dc=xxx,dc=xxx because Invalid syntax
#15710: Typo in LDAP schema files on line 598
Category: Resources/res_musiconhold
#15051: [patch] Moh class set in the dialplan is ignored with realtime moh
----------------------------------------------------------------------
Commits Not Associated with an Issue
[Back to Top]
This is a list of all changes that went into this release that did not
directly close an issue from the issue tracker. The commits may have been
marked as being related to an issue. If that is the case, the issue
numbers are listed here, as well.
+------------------------------------------------------------------------+
| Revision | Author | Summary | Issues |
| | | | Referenced |
|----------+------------+-----------------------------------+------------|
| | | Restore explicit export of | |
| 209058 | kpfleming | ASTCFLAGS/ASTLDFLAGS and | |
| | | underscore-variants to sub-makes. | |
|----------+------------+-----------------------------------+------------|
| 209237 | mmichelson | Gracefully handle malformed RTP | |
| | | text packets. | |
|----------+------------+-----------------------------------+------------|
| 209262 | kpfleming | Make T.38 switchover in | |
| | | ReceiveFAX synchronous. | |
|----------+------------+-----------------------------------+------------|
| 209281 | kpfleming | Cleanup T.38 negotiation changes. | |
|----------+------------+-----------------------------------+------------|
| 209327 | tilghman | Publish French extra sounds | |
|----------+------------+-----------------------------------+------------|
| | | Fix some places where | |
| 209714 | russell | ast_event_type was used instead | |
| | | of ast_event_ie_type. | |
|----------+------------+-----------------------------------+------------|
| 209781 | kpfleming | Minor changes inspired by testing | |
| | | with latest GCC. | |
|----------+------------+-----------------------------------+------------|
| 209900 | russell | Resolve a valgrind warning about | #15396 |
| | | a read from uninitialized memory. | |
|----------+------------+-----------------------------------+------------|
| 211115 | russell | Resolve a deadlock involving | |
| | | app_chanspy and masquerades. | |
|----------+------------+-----------------------------------+------------|
| 211277 | tilghman | Small oops. Clear the flags which | |
| | | have been checked. | |
|----------+------------+-----------------------------------+------------|
| 211569 | tilghman | AST-2009-005 | |
|----------+------------+-----------------------------------+------------|
| 211586 | tilghman | Conversion specifiers, not format | |
| | | specifiers | |
|----------+------------+-----------------------------------+------------|
| | | Check an actual populated | |
| 212069 | file | variable when seeing if we need | |
| | | to do video or not. | |
|----------+------------+-----------------------------------+------------|
| | | Ensure that T38FaxVersion is put | |
| 212115 | kpfleming | into outgoing SDP in the proper | |
| | | case. | |
|----------+------------+-----------------------------------+------------|
| 212386 | seanbright | Handle slin16 for extra sounds as | |
| | | well. | |
|----------+------------+-----------------------------------+------------|
| 212768 | rmudgett | Removed some deadwood and added | |
| | | some doxygen comments. | |
|----------+------------+-----------------------------------+------------|
| | | Make the default extconfig.conf | |
| 212862 | tilghman | match entries with the sample | |
| | | res_mysql.conf. | |
|----------+------------+-----------------------------------+------------|
| 212928 | kpfleming | Convert this branch to Opsound | |
| | | music-on-hold. | |
|----------+------------+-----------------------------------+------------|
| | | Remove some | |
| 212942 | kpfleming | accidentally-committed | |
| | | properties. | |
|----------+------------+-----------------------------------+------------|
| 213449 | twilson | Make LOAD_ORDER actually work | |
|----------+------------+-----------------------------------+------------|
| 213452 | twilson | Oops, committed this first. Make | |
| | | the merged property happy | |
|----------+------------+-----------------------------------+------------|
| | | Make autoheader descriptions | |
| 214365 | tilghman | render correctly in our | #14906 |
| | | autoconfig.h file. | |
|----------+------------+-----------------------------------+------------|
| | | One more build system change, to | |
| 214496 | tilghman | make the descriptions look | |
| | | better, if we have better | |
| | | information. | |
+------------------------------------------------------------------------+
Diffstat (limited to 'comms')
-rw-r--r-- | comms/asterisk16/Makefile | 9 | ||||
-rw-r--r-- | comms/asterisk16/PLIST | 11 | ||||
-rw-r--r-- | comms/asterisk16/distinfo | 26 | ||||
-rw-r--r-- | comms/asterisk16/patches/patch-aa | 37 | ||||
-rw-r--r-- | comms/asterisk16/patches/patch-aq | 12 | ||||
-rw-r--r-- | comms/asterisk16/patches/patch-ax | 44 |
6 files changed, 69 insertions, 70 deletions
diff --git a/comms/asterisk16/Makefile b/comms/asterisk16/Makefile index ab476d4dbc6..53b3fe1b70a 100644 --- a/comms/asterisk16/Makefile +++ b/comms/asterisk16/Makefile @@ -1,11 +1,8 @@ -# $NetBSD: Makefile,v 1.6 2009/08/21 08:30:51 jnemeth Exp $ +# $NetBSD: Makefile,v 1.7 2009/09/14 08:44:51 jnemeth Exp $ # -DISTNAME= asterisk-1.6.1.4 -PKGREVISION= 1 -# DIST_SUBDIR= ${PKGNAME_NOREV} -# delete this with next version, this is only to account for the moh change -DIST_SUBDIR= ${PKGNAME_NOREV}-newmoh +DISTNAME= asterisk-1.6.1.6 +DIST_SUBDIR= ${PKGNAME_NOREV} EXTRACT_ONLY= ${DISTNAME}.tar.gz CATEGORIES= comms net audio MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \ diff --git a/comms/asterisk16/PLIST b/comms/asterisk16/PLIST index 1257d3ccc44..6a92b894fc6 100644 --- a/comms/asterisk16/PLIST +++ b/comms/asterisk16/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2009/08/20 20:37:06 jnemeth Exp $ +@comment $NetBSD: PLIST,v 1.6 2009/09/14 08:44:51 jnemeth Exp $ include/asterisk.h include/asterisk/_private.h include/asterisk/abstract_jb.h @@ -272,9 +272,9 @@ libdata/asterisk/images/kpad2.jpg libdata/asterisk/keys/freeworlddialup.pub libdata/asterisk/keys/iaxtel.pub libdata/asterisk/moh/.asterisk-moh-opsound-wav -libdata/asterisk/moh/CHANGES-asterisk-moh-opsound-wav -libdata/asterisk/moh/CREDITS-asterisk-moh-opsound-wav -libdata/asterisk/moh/LICENSE-asterisk-moh-opsound-wav +libdata/asterisk/moh/CHANGES-asterisk-moh-opsound-2.01 +libdata/asterisk/moh/CREDITS-asterisk-moh-opsound-2.01 +libdata/asterisk/moh/LICENSE-asterisk-moh-opsound-2.01 libdata/asterisk/moh/macroform-cold_day.wav libdata/asterisk/moh/macroform-robot_dity.wav libdata/asterisk/moh/macroform-the_simplicity.wav @@ -943,6 +943,7 @@ libdata/asterisk/static-http/docs/node275.html libdata/asterisk/static-http/docs/node276.html libdata/asterisk/static-http/docs/node277.html libdata/asterisk/static-http/docs/node278.html +libdata/asterisk/static-http/docs/node279.html libdata/asterisk/static-http/docs/node28.html libdata/asterisk/static-http/docs/node29.html libdata/asterisk/static-http/docs/node3.html @@ -1122,3 +1123,5 @@ share/examples/asterisk/users.conf share/examples/asterisk/voicemail.conf share/examples/asterisk/vpb.conf share/examples/rc.d/asterisk +@pkgdir libdata/asterisk/sounds/fr +@pkgdir libdata/asterisk/sounds/es diff --git a/comms/asterisk16/distinfo b/comms/asterisk16/distinfo index 35a7b564b44..9bf5d2df29a 100644 --- a/comms/asterisk16/distinfo +++ b/comms/asterisk16/distinfo @@ -1,15 +1,15 @@ -$NetBSD: distinfo,v 1.6 2009/08/21 08:45:43 wiz Exp $ +$NetBSD: distinfo,v 1.7 2009/09/14 08:44:51 jnemeth Exp $ -SHA1 (asterisk-1.6.1.4-newmoh/asterisk-1.6.1.4.tar.gz) = 66cba9e555bc38cfb0995f7ecd538234b525532c -RMD160 (asterisk-1.6.1.4-newmoh/asterisk-1.6.1.4.tar.gz) = 571720c6b574df81de2322979864e17f298898e3 -Size (asterisk-1.6.1.4-newmoh/asterisk-1.6.1.4.tar.gz) = 22966500 bytes -SHA1 (asterisk-1.6.1.4-newmoh/extract-cfile.awk) = c4f08eee1ab83c041bde1ab91672a4a3c43c28b8 -RMD160 (asterisk-1.6.1.4-newmoh/extract-cfile.awk) = cd59f8e5807732023d5aec95187e2d5572f400a4 -Size (asterisk-1.6.1.4-newmoh/extract-cfile.awk) = 667 bytes -SHA1 (asterisk-1.6.1.4-newmoh/rfc3951.txt) = 1a6c769be750fb02456d60db2470909254496017 -RMD160 (asterisk-1.6.1.4-newmoh/rfc3951.txt) = 15f7ec61653ec9953172f8f2150e7d8f6f620926 -Size (asterisk-1.6.1.4-newmoh/rfc3951.txt) = 373442 bytes -SHA1 (patch-aa) = 67d3622abf2b66a16376a9033b02fb019b5a6e4d +SHA1 (asterisk-1.6.1.6/asterisk-1.6.1.6.tar.gz) = 79a9a3635fdf2e8422dadabd9f05da3329e60dc1 +RMD160 (asterisk-1.6.1.6/asterisk-1.6.1.6.tar.gz) = adbf359540099930c9694c5c6003c1ffbe424847 +Size (asterisk-1.6.1.6/asterisk-1.6.1.6.tar.gz) = 23420613 bytes +SHA1 (asterisk-1.6.1.6/extract-cfile.awk) = c4f08eee1ab83c041bde1ab91672a4a3c43c28b8 +RMD160 (asterisk-1.6.1.6/extract-cfile.awk) = cd59f8e5807732023d5aec95187e2d5572f400a4 +Size (asterisk-1.6.1.6/extract-cfile.awk) = 667 bytes +SHA1 (asterisk-1.6.1.6/rfc3951.txt) = 1a6c769be750fb02456d60db2470909254496017 +RMD160 (asterisk-1.6.1.6/rfc3951.txt) = 15f7ec61653ec9953172f8f2150e7d8f6f620926 +Size (asterisk-1.6.1.6/rfc3951.txt) = 373442 bytes +SHA1 (patch-aa) = 43843bb97a88a648040fc6288a74d79561e5edf5 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) = 9b1820ba112fba4ac27474cc6e2b090d2e095b94 +SHA1 (patch-aq) = 99845e226dbc359ab60f4e27af32011b65c9ef15 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) = f71d16a6a5e274c241280ba6808f42617678a680 +SHA1 (patch-ax) = fd3f67d5917fa0b226df47657d055194cc741999 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 0e4b2972b00..f14ab65cdfd 100644 --- a/comms/asterisk16/patches/patch-aa +++ b/comms/asterisk16/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.2 2009/07/07 08:14:43 jnemeth Exp $ +$NetBSD: patch-aa,v 1.3 2009/09/14 08:44:51 jnemeth Exp $ ---- Makefile.orig 2009-02-24 12:44:50.000000000 -0800 +--- Makefile.orig 2009-08-04 07:54:45.000000000 -0700 +++ Makefile -@@ -122,20 +122,6 @@ DEBUG=-g3 +@@ -116,20 +116,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.2 2009/07/07 08:14:43 jnemeth Exp $ ASTETCDIR=$(sysconfdir)/asterisk ASTLIBDIR=$(libdir)/asterisk ASTHEADERDIR=$(includedir)/asterisk -@@ -145,19 +131,12 @@ else +@@ -139,19 +125,12 @@ else ASTLOGDIR=$(localstatedir)/log/asterisk ASTVARRUNDIR=$(localstatedir)/run ASTMANDIR=$(mandir) @@ -44,28 +44,27 @@ $NetBSD: patch-aa,v 1.2 2009/07/07 08:14:43 jnemeth Exp $ # Asterisk.conf is located in ASTETCDIR or by using the -C flag # when starting Asterisk -@@ -243,11 +222,6 @@ ifeq ($(AST_DEVMODE),yes) - ASTCFLAGS+=-Wformat=2 +@@ -237,10 +216,6 @@ ifeq ($(AST_DEVMODE),yes) + _ASTCFLAGS+=-Wformat=2 endif -ifneq ($(findstring BSD,$(OSARCH)),) -- ASTCFLAGS+=-I/usr/local/include -- ASTLDFLAGS+=-L/usr/local/lib +- _ASTCFLAGS+=-isystem /usr/local/include -endif - - ifeq ($(findstring -march,$(ASTCFLAGS)),) + 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) -@@ -465,7 +439,7 @@ distclean: $(SUBDIRS_DIST_CLEAN) _clean + _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 rm -f build_tools/menuselect-deps datafiles: _all -- if [ x`$(ID) -un` = xroot ]; then CFLAGS="$(ASTCFLAGS)" sh build_tools/mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi -+ CFLAGS="$(ASTCFLAGS)" build_tools/mkpkgconfig $(DESTDIR)${PREFIX}/lib/pkgconfig +- if [ x`$(ID) -un` = xroot ]; then CFLAGS="$(_ASTCFLAGS) $(ASTCFLAGS)" bash 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. -@@ -507,9 +481,10 @@ NEWHEADERS=$(notdir $(wildcard include/a +@@ -498,9 +473,10 @@ NEWHEADERS=$(notdir $(wildcard include/a OLDHEADERS=$(filter-out $(NEWHEADERS),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h))) installdirs: @@ -77,7 +76,7 @@ $NetBSD: patch-aa,v 1.2 2009/07/07 08:14:43 jnemeth Exp $ mkdir -p $(DESTDIR)$(ASTBINDIR) mkdir -p $(DESTDIR)$(ASTVARRUNDIR) mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail -@@ -518,6 +493,7 @@ installdirs: +@@ -509,6 +485,7 @@ installdirs: mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/tmp mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/meetme mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/monitor @@ -85,7 +84,7 @@ $NetBSD: patch-aa,v 1.2 2009/07/07 08:14:43 jnemeth Exp $ bininstall: _all installdirs $(SUBDIRS_INSTALL) $(INSTALL) -m 755 main/asterisk $(DESTDIR)$(ASTSBINDIR)/ -@@ -613,22 +589,22 @@ upgrade: bininstall +@@ -604,22 +581,22 @@ upgrade: bininstall # XXX why *.adsi is installed first ? adsi: @echo Installing adsi config files... @@ -113,7 +112,7 @@ $NetBSD: patch-aa,v 1.2 2009/07/07 08:14:43 jnemeth Exp $ if [ -f $${dst} ]; then \ if [ "$(OVERWRITE)" = "y" ]; then \ if cmp -s $${dst} $$x ; then \ -@@ -644,10 +620,10 @@ samples: adsi +@@ -635,10 +612,10 @@ samples: adsi echo "Installing file $$x"; \ $(INSTALL) -m 644 $$x $${dst} ;\ done @@ -126,7 +125,7 @@ $NetBSD: patch-aa,v 1.2 2009/07/07 08:14:43 jnemeth Exp $ echo "astetcdir => $(ASTETCDIR)" ; \ echo "astmoddir => $(MODULES_DIR)" ; \ echo "astvarlibdir => $(ASTVARLIBDIR)" ; \ -@@ -700,7 +676,7 @@ samples: adsi +@@ -691,7 +668,7 @@ samples: adsi echo "pbx_realtime=1.6" ; \ echo "res_agi=1.6" ; \ echo "app_set=1.6" ; \ @@ -135,7 +134,7 @@ $NetBSD: patch-aa,v 1.2 2009/07/07 08:14:43 jnemeth Exp $ else \ echo "Skipping asterisk.conf creation"; \ fi -@@ -834,7 +810,7 @@ uninstall-all: _uninstall +@@ -825,7 +802,7 @@ uninstall-all: _uninstall rm -rf $(DESTDIR)$(ASTVARLIBDIR) rm -rf $(DESTDIR)$(ASTDATADIR) rm -rf $(DESTDIR)$(ASTSPOOLDIR) diff --git a/comms/asterisk16/patches/patch-aq b/comms/asterisk16/patches/patch-aq index ef91bcc35ea..d24b79a5ad2 100644 --- a/comms/asterisk16/patches/patch-aq +++ b/comms/asterisk16/patches/patch-aq @@ -1,8 +1,8 @@ -$NetBSD: patch-aq,v 1.2 2009/07/07 08:14:43 jnemeth Exp $ +$NetBSD: patch-aq,v 1.3 2009/09/14 08:44:51 jnemeth Exp $ ---- configure.orig 2009-03-19 11:14:55.000000000 -0700 +--- configure.orig 2009-06-16 12:28:00.000000000 -0700 +++ configure -@@ -18161,6 +18161,144 @@ _ACEOF +@@ -19395,6 +19395,144 @@ _ACEOF fi @@ -145,9 +145,9 @@ $NetBSD: patch-aq,v 1.2 2009/07/07 08:14:43 jnemeth Exp $ +fi + - { echo "$as_me:$LINENO: checking for int" >&5 - echo $ECHO_N "checking for int... $ECHO_C" >&6; } -@@ -31464,6 +31602,8 @@ _ACEOF + # 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 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 e6b18fb7842..b9f14c5c359 100644 --- a/comms/asterisk16/patches/patch-ax +++ b/comms/asterisk16/patches/patch-ax @@ -1,8 +1,8 @@ -$NetBSD: patch-ax,v 1.2 2009/07/07 08:14:43 jnemeth Exp $ +$NetBSD: patch-ax,v 1.3 2009/09/14 08:44:51 jnemeth Exp $ ---- apps/app_queue.c.orig 2009-04-14 16:29:04.000000000 -0700 +--- apps/app_queue.c.orig 2009-08-10 12:30:55.000000000 -0700 +++ apps/app_queue.c -@@ -2524,8 +2524,8 @@ static void record_abandoned(struct queu +@@ -2540,8 +2540,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 2009/07/07 08:14:43 jnemeth Exp $ qe->parent->callsabandoned++; ao2_unlock(qe->parent); -@@ -2944,7 +2944,7 @@ static int wait_our_turn(struct queue_en +@@ -2960,7 +2960,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.2 2009/07/07 08:14:43 jnemeth Exp $ leave_queue(qe); break; } -@@ -2952,13 +2952,13 @@ static int wait_our_turn(struct queue_en +@@ -2968,13 +2968,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.2 2009/07/07 08:14:43 jnemeth Exp $ leave_queue(qe); break; } -@@ -3145,12 +3145,12 @@ static void send_agent_complete(const st +@@ -3161,12 +3161,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.2 2009/07/07 08:14:43 jnemeth Exp $ qe->parent->eventwhencalled == QUEUE_EVENT_VARIABLES ? vars2manager(qe->chan, vars, vars_len) : ""); } -@@ -3193,9 +3193,9 @@ static void queue_transfer_fixup(void *d +@@ -3209,9 +3209,9 @@ static void queue_transfer_fixup(void *d int callcompletedinsl = qtds->callcompletedinsl; struct ast_datastore *datastore; @@ -67,16 +67,16 @@ $NetBSD: patch-ax,v 1.2 2009/07/07 08:14:43 jnemeth Exp $ update_queue(qe->parent, member, callcompletedinsl); -@@ -3651,7 +3651,7 @@ static int try_calling(struct queue_ent +@@ -3681,7 +3681,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); - 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_cdr_noanswer(qe->chan->cdr); ast_hangup(peer); - ao2_ref(member, -1); -@@ -3696,8 +3696,8 @@ static int try_calling(struct queue_ent +@@ -3728,8 +3728,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.2 2009/07/07 08:14:43 jnemeth Exp $ pbx_builtin_setvar_multiple(qe->chan, interfacevar); pbx_builtin_setvar_multiple(peer, interfacevar); } -@@ -3942,8 +3942,8 @@ static int try_calling(struct queue_ent +@@ -3976,8 +3976,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.2 2009/07/07 08:14:43 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) -@@ -3953,12 +3953,12 @@ static int try_calling(struct queue_ent +@@ -3987,12 +3987,12 @@ static int try_calling(struct queue_ent "Channel: %s\r\n" "Member: %s\r\n" "MemberName: %s\r\n" @@ -114,7 +114,7 @@ $NetBSD: patch-ax,v 1.2 2009/07/07 08:14:43 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)); -@@ -3987,17 +3987,17 @@ static int try_calling(struct queue_ent +@@ -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)) { @@ -139,8 +139,8 @@ $NetBSD: patch-ax,v 1.2 2009/07/07 08:14:43 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))) { -@@ -4874,8 +4874,8 @@ check_turns: - record_abandoned(&qe); +@@ -4909,8 +4909,8 @@ check_turns: + ast_cdr_noanswer(qe.chan->cdr); reason = QUEUE_TIMEOUT; res = 0; - ast_queue_log(args.queuename, chan->uniqueid,"NONE", "EXITWITHTIMEOUT", "%d|%d|%ld", @@ -150,16 +150,16 @@ $NetBSD: patch-ax,v 1.2 2009/07/07 08:14:43 jnemeth Exp $ break; } -@@ -4942,7 +4942,7 @@ check_turns: - if (qe.parent->leavewhenempty && (status == QUEUE_NO_MEMBERS)) { +@@ -4980,7 +4980,7 @@ check_turns: record_abandoned(&qe); + ast_cdr_noanswer(qe.chan->cdr); reason = QUEUE_LEAVEEMPTY; - ast_queue_log(args.queuename, chan->uniqueid, "NONE", "EXITEMPTY", "%d|%d|%ld", qe.pos, qe.opos, (long)(time(NULL) - qe.start)); + ast_queue_log(args.queuename, chan->uniqueid, "NONE", "EXITEMPTY", "%d|%d|%jd", qe.pos, qe.opos, (intmax_t)(time(NULL) - qe.start)); res = 0; break; } -@@ -4951,7 +4951,7 @@ check_turns: +@@ -4989,7 +4989,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.2 2009/07/07 08:14:43 jnemeth Exp $ res = 0; break; } -@@ -4967,7 +4967,7 @@ check_turns: +@@ -5005,7 +5005,7 @@ check_turns: record_abandoned(&qe); reason = QUEUE_TIMEOUT; res = 0; @@ -177,9 +177,9 @@ $NetBSD: patch-ax,v 1.2 2009/07/07 08:14:43 jnemeth Exp $ break; } -@@ -4994,8 +4994,8 @@ stop: - if (!qe.handled) { +@@ -5033,8 +5033,8 @@ stop: record_abandoned(&qe); + ast_cdr_noanswer(qe.chan->cdr); ast_queue_log(args.queuename, chan->uniqueid, "NONE", "ABANDON", - "%d|%d|%ld", qe.pos, qe.opos, - (long) time(NULL) - qe.start); @@ -188,7 +188,7 @@ $NetBSD: patch-ax,v 1.2 2009/07/07 08:14:43 jnemeth Exp $ res = -1; } else if (qcontinue) { reason = QUEUE_CONTINUE; -@@ -5765,8 +5765,8 @@ static char *__queues_show(struct manses +@@ -5807,8 +5807,8 @@ static char *__queues_show(struct manses mem->paused ? " (paused)" : "", devstate2str(mem->status)); if (mem->calls) |