Update to Asterisk 1.6.1.1

------------------------------------------------------------------------------
--- Functionality changes from Asterisk 1.6.0 to Asterisk 1.6.1  -------------
------------------------------------------------------------------------------

Device State Handling
---------------------
 * The event infrastructure in Asterisk got another big update to help support
    distributed events.  It currently supports distributed device state and
    distributed Voicemail MWI (Message Waiting Indication).  A new module has
    been merged, res_ais, which facilitates communicating events between servers.
    It uses the SAForum AIS (Service Availability Forum Application Interface
    Specification) CLM (Cluster Management) and EVT (Event) services to maintain
    a cluster of Asterisk servers, and to share events between them.  For more
    information on setting this up, see doc/distributed_devstate.txt.

Dialplan Functions
------------------
 * Added a new dialplan function, AST_CONFIG(), which allows you to access
   variables from an Asterisk configuration file.
 * The JACK_HOOK function now has a c() option to supply a custom client name.
 * Added two new dialplan functions from libspeex for audio gain control and
   denoise, AGC() and DENOISE(). Both functions can be applied to the tx and
   rx directions of a channel from the dialplan.
 * The SMDI_MSG_RETRIEVE function now has the ability to search for SMDI messages
   based on other parameters.  The default is still to search based on the
   forwarding station ID.  However, there are new options that allow you to search
   based on the message desk terminal ID, or the message desk number.
 * TIMEOUT() has been modified to be accurate down to the millisecond.
 * ENUM*() functions now include the following new options:
     - 'u' returns the full URI and does not strip off the URI-scheme.
     - 's' triggers ISN specific rewriting
     - 'i' looks for branches into an Infrastructure ENUM tree
     - 'd' for a direct DNS lookup without any flipping of digits.
 * TXCIDNAME() has a new zone-suffix parameter (which defaults to 'e164.arpa')
 * CHANNEL() now has options for the maximum, minimum, and standard or normal
   deviation of jitter, rtt, and loss for a call using chan_sip.

DAHDI channel driver (chan_dahdi) Changes
----------------------------------------
 * Channels can now be configured using named sections in chan_dahdi.conf, just
   like other channel drivers, including the use of templates.
 * The default for pridialplan has changed from 'national' to 'unknown'.

PBX Changes
-----------
 * It is now possible to specify a pattern match as a hint. Once a phone subscribes
   to something that matches the pattern a hint will be created using the contents
   and variables evaluated.
 * Dialplan matching has been extended to allow an extension to return to the
   PBX core to wait for more digits.  This is done by using the new dialplan
   application called "Incomplete".  This will permit a whole new level of
   extension control, by giving the administrator more control over early
   matches employing one of the short-circuit pattern match operators.  Note
   that custom applications can trigger this same behavior by returning the
   special value AST_PBX_INCOMPLETE.

The dial() application
----------------------
 * Dial has a new option: F(context^extension^pri), which permits a callee to
   continue in the dialplan, at the specified label, if the caller hangs up.
 * The Dial() application no longer copies the language used by the caller to the callee's
   channel. If you desire for the caller's channel's language to be used for file playback
   to the callee, then the file specified may be prepended with "${CHANNEL(language)}/" .

The chanspy() application
-------------------------
 * ChanSpy and ExtenSpy have a new option, 's' which suppresses speaking the
   technology name (e.g. SIP, IAX, etc) of the channel being spied on.
 * Chanspy has a new option, 'B', which can be used to "barge" on a call. This is
   like the pre-existing whisper mode, except that the spy can also talk to the
   participant on the bridged channel as well.
 * Chanspy has a new option, 'n', which will allow for the spied-on party's name
   to be spoken instead of the channel name or number. For more information on the
   use of this option, issue the command "core show application ChanSpy" from the
   Asterisk CLI.
 * Chanspy has a new option, 'd', which allows the spy to use DTMF to swap between
   spy modes. Use of this feature overrides the typical use of numeric DTMF. In other
   words, if using the 'd' option, it is not possible to enter a number to append to
   the first argument to Chanspy(). Pressing 4 will change to spy mode, pressing 5 will
   change to whisper mode, and pressing 6 will change to barge mode.

Other Application Changes
-------------------------
 * Directory now permits both first and last names to be matched at the same
   time.  In addition, the number of digits to enter of the name can be set in
   the arguments to Directory; previously, you could enter only 3, regardless
   of how many names are in your company.  For large companies, this should be
   quite helpful.
 * Voicemail now permits a mailbox setting to wrap around from first to last
   messages, if the "messagewrap" option is set to a true value.
 * Voicemail now permits an external script to be run, for password validation.
   The script should output "VALID" or "INVALID" on stdout, depending upon the
   wish to validate or invalidate the password given.  Arguments are:
   "mailbox" "context" "oldpass" "newpass".  See the sample voicemail.conf for
   more details
 * The voicemail externnotify script now accepts an additional (last) parameter
   containing the number of urgent messages in the INBOX.
 * The Jack application now has a c() option to supply a custom client name.
 * ExternalIVR now takes several options that affect the way it performs, as
   well as having several new commands.  Please see doc/externalivr.txt for the
   complete documentation.
 * Added ability to communicate over a TCP socket instead of forking a child process for the
   ExternalIVR application.
 * ChanIsAvail has a new option, 'a', which will return all available channels instead
   of just the first one if you give the function more then one channel to check.
 * PrivacyManager now takes an option where you can specify a context where the
   given number will be matched. This way you have more control over who is allowed
   and it stops the people who blindly enter 10 digits.
 * ForkCDR has new options: 'a' updates the answer time on the new CDR; 'A' locks
   answer times, disposition, on orig CDR against updates; 'D' Copies the disposition
   from the orig CDR to the new CDR after reset; 'e' sets the 'end' time on the
   original CDR; 'R' prevents the new CDR from being reset; 's(var=val)' adds/changes
   the 'var' variable on the original CDR; 'T' forces ast_cdr_end(), ast_cdr_answer(),
   obey the LOCKED flag on cdr's in the chain, and also the ast_cdr_setvar() func.
 * SendImage() no longer hangs up the channel on error; instead, it sets the
   status variable SENDIMAGESTATUS to one of 'SUCCESS', 'FAILURE', or
   'UNSUPPORTED'.  This change makes SendImage() more consistent with other
   applications.
 * Park has a new option, 's', which silences the announcement of the parking space number.
 * A non-numeric, zero, or negative timeout specified to Dial() will now be interpreted as
   invalid input and will be assumed to mean that no timeout is desired.

SIP Changes
-----------
 * Added DNS manager support to registrations for peers referencing peer entries.
   DNS manager runs in the background which allows DNS lookups to be run asynchronously
   as well as periodically updating the IP address. These properties allow for
   better performance as well as recovery in the event of an IP change.
 * Performance improvements via using hash tables (astobj2) and doubly-linked lists to improve
   load/reload of large numbers of peers/users by ~40x (for large lists of peers.
   Initially, we saw 4x improvement in call setup/destruction, but at the time
   of merging, this gain has disappeared; further research will be done to try
   and restore this performance improvement. Astobj2 refcounting is now used
   for users, peers, and dialogs.  Users are encouraged to assist in regression
   testing and problem reporting!
 * Added ability to specify registration expiry time on a per registration basis in
   the register line.
 * Added support for Realtime Text redundancy - T140 RED - in T.140 to
   prevent text loss due to lost packets.
 * Added t38pt_usertpsource option. See sip.conf.sample for details.
 * Added SIPnotify AMI command, for sending arbitrary SIP notify commands.
 * 'sip show peers' and 'sip show users' display their entries sorted in
   alphabetical order, as opposed to the order they were in, in the config
   file or database.
 * Videosupport now supports an additional option, "always", which always sets
   up video RTP ports, even on clients that don't support it.  This helps with
   callfiles and certain transfers to ensure that if two video phones are
   connected, they will always share video feeds.

IAX Changes
-----------
 * Existing DNS manager lookups extended to check for SRV records.
 * IAX2 encryption support has been improved to support periodic key rotation
   within a call for enhanced security.  The option "keyrotate" has been
   provided to disable this functionality to preserve backwards compatibility
   with older versions of IAX2 that do not support key rotation.

CLI Changes
-----------
  * New CLI command, "config reload <file.conf>" which reloads any module that
    references that particular configuration file.  Also added "config list"
    which shows which configuration files are in use.
  * New CLI commands, "pri show version" and "ss7 show version" that will
    display which version of libpri and libss7 are being used, respectively.
    A new API call was added so trunk will now have to be compiled against
    a versions of libpri and libss7 that have them or it will not know that
    these libraries exist.
  * The commands "core show globals", "core set global" and "core set chanvar" has
    been deprecated in favor of the more semanticly correct "dialplan show globals",
    "dialplan set chanvar" and "dialplan set global".
  * New CLI command "dialplan show chanvar" to list all variables associated
    with a given channel.

DNS manager changes
-------------------
  * Addresses managed by DNS manager now can check to see if there is a DNS
    SRV record for a given domain and will use that hostname/port if present.

AMI - The manager (TCP/TLS/HTTP)
--------------------------------
  * The Status action now takes an optional list of variables to display
    along with channel status.

ODBC Changes
------------
  * res_odbc no longer has a limit of 1023 total possible unshared connections,
    as some people were running into this limit.  This limit has been increased
    to 4.2 billion.

Queue changes
-------------
  * The TRANSFER queue log entry now includes the caller's original position in
    the transferred-from queue.
  * A new configuration option, "timeoutpriority" has been added. Please see the section
    labeled "QUEUE TIMING OPTIONS" in configs/queues.conf.sample for a detailed explanation
    of the option as well as an explanation about timeout options in general

Realtime changes
----------------
  * Several (ODBC, Postgres, MySQL, SQLite) realtime drivers have been given
    adaptive capabilities.  What this means in practical terms is that if your
    realtime table lacks critical fields, Asterisk will now emit warnings to
    that effect.  Also, some of the realtime drivers have the ability (if
    configured) to automatically add those columns to the table with the
    correct type and length.

Miscellaneous
-------------
  * The channel variable ATTENDED_TRANSFER_COMPLETE_SOUND can now be set using
    the 'setvar' option to cause a given audio file to be played upon completion
    of an attended transfer.  Currently it works for DAHDI, IAX2, SIP, and
    Skinny channels only.
  * You can now compile Asterisk against the Hoard Memory Allocator, see doc/hoard.txt
    for more information.
  * Config file variables may now be appended to, by using the '+=' append
    operator.  This is most helpful when working with long SQL queries in
    func_odbc.conf, as the queries no longer need to be specified on a single
    line.

11 files changed, 304 insertions, 96 deletions

diff --git a/comms/asterisk16/Makefile b/comms/asterisk16/Makefile
index a17e58af7e3..f43d2ed04dd 100644
--- a/comms/asterisk16/Makefile
+++ b/comms/asterisk16/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/06/12 09:04:55 jnemeth Exp $
+# $NetBSD: Makefile,v 1.2 2009/07/07 08:14:42 jnemeth Exp $
 #
 
-DISTNAME=	asterisk-1.6.0.10
+DISTNAME=	asterisk-1.6.1.1
 DIST_SUBDIR=	${PKGNAME_NOREV}
 EXTRACT_ONLY=	${DISTNAME}.tar.gz
 CATEGORIES=	comms net audio
diff --git a/comms/asterisk16/PLIST b/comms/asterisk16/PLIST
index dcf6b986073..ad46abf10d6 100644
--- a/comms/asterisk16/PLIST
+++ b/comms/asterisk16/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:31:59 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2009/07/07 08:14:42 jnemeth Exp $
 include/asterisk.h
 include/asterisk/_private.h
 include/asterisk/abstract_jb.h
@@ -31,8 +31,10 @@ include/asterisk/compat.h
 include/asterisk/compiler.h
 include/asterisk/config.h
 include/asterisk/crypto.h
+include/asterisk/datastore.h
 include/asterisk/devicestate.h
 include/asterisk/dial.h
+include/asterisk/dlinkedlists.h
 include/asterisk/dns.h
 include/asterisk/dnsmgr.h
 include/asterisk/doxyref.h
@@ -51,6 +53,7 @@ include/asterisk/fskmodem_float.h
 include/asterisk/fskmodem_int.h
 include/asterisk/global_datastores.h
 include/asterisk/hashtab.h
+include/asterisk/heap.h
 include/asterisk/http.h
 include/asterisk/image.h
 include/asterisk/indications.h
@@ -88,11 +91,13 @@ include/asterisk/speech.h
 include/asterisk/srv.h
 include/asterisk/stringfields.h
 include/asterisk/strings.h
+include/asterisk/taskprocessor.h
 include/asterisk/tcptls.h
 include/asterisk/tdd.h
 include/asterisk/term.h
 include/asterisk/threadstorage.h
 include/asterisk/time.h
+include/asterisk/timing.h
 include/asterisk/transcap.h
 include/asterisk/translate.h
 include/asterisk/udptl.h
@@ -133,7 +138,6 @@ lib/asterisk/modules/app_morsecode.so
 lib/asterisk/modules/app_mp3.so
 lib/asterisk/modules/app_nbscat.so
 lib/asterisk/modules/app_parkandannounce.so
-lib/asterisk/modules/app_pickupchan.so
 lib/asterisk/modules/app_playback.so
 lib/asterisk/modules/app_privacy.so
 lib/asterisk/modules/app_queue.so
@@ -204,6 +208,7 @@ lib/asterisk/modules/func_blacklist.so
 lib/asterisk/modules/func_callerid.so
 lib/asterisk/modules/func_cdr.so
 lib/asterisk/modules/func_channel.so
+lib/asterisk/modules/func_config.so
 lib/asterisk/modules/func_curl.so
 lib/asterisk/modules/func_cut.so
 lib/asterisk/modules/func_db.so
@@ -249,6 +254,7 @@ lib/asterisk/modules/res_config_ldap.so
 ${PLIST.unixodbc}lib/asterisk/modules/res_config_odbc.so
 lib/asterisk/modules/res_convert.so
 lib/asterisk/modules/res_crypto.so
+lib/asterisk/modules/res_curl.so
 lib/asterisk/modules/res_indications.so
 lib/asterisk/modules/res_limit.so
 lib/asterisk/modules/res_monitor.so
@@ -258,6 +264,7 @@ lib/asterisk/modules/res_phoneprov.so
 lib/asterisk/modules/res_realtime.so
 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
@@ -274,10 +281,11 @@ libdata/asterisk/phoneprov/000000000000-directory.xml
 libdata/asterisk/phoneprov/000000000000-phone.cfg
 libdata/asterisk/phoneprov/000000000000.cfg
 libdata/asterisk/phoneprov/polycom.xml
-libdata/asterisk/sounds/.asterisk-core-sounds-en-gsm-1.4.14
-libdata/asterisk/sounds/en/CHANGES-asterisk-core-en-1.4.14
-libdata/asterisk/sounds/en/CREDITS-asterisk-core-en-1.4.14
-libdata/asterisk/sounds/en/LICENSE-asterisk-core-en-1.4.14
+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/en/agent-alreadyon.gsm
 libdata/asterisk/sounds/en/agent-incorrect.gsm
 libdata/asterisk/sounds/en/agent-loggedoff.gsm
@@ -726,6 +734,10 @@ libdata/asterisk/static-http/docs/img2.png
 libdata/asterisk/static-http/docs/img3.png
 libdata/asterisk/static-http/docs/img4.png
 libdata/asterisk/static-http/docs/img5.png
+libdata/asterisk/static-http/docs/img6.png
+libdata/asterisk/static-http/docs/img7.png
+libdata/asterisk/static-http/docs/img8.png
+libdata/asterisk/static-http/docs/img9.png
 libdata/asterisk/static-http/docs/index.html
 libdata/asterisk/static-http/docs/internals.pl
 libdata/asterisk/static-http/docs/labels.pl
@@ -1025,12 +1037,14 @@ sbin/conf2ael
 sbin/hashtest
 sbin/hashtest2
 sbin/rasterisk
+sbin/refcounter
 sbin/safe_asterisk
 sbin/stereorize
 sbin/streamplayer
 share/examples/asterisk/adsi.conf
 share/examples/asterisk/adtranvofr.conf
 share/examples/asterisk/agents.conf
+share/examples/asterisk/ais.conf
 share/examples/asterisk/alarmreceiver.conf
 share/examples/asterisk/alsa.conf
 share/examples/asterisk/amd.conf
@@ -1048,7 +1062,9 @@ share/examples/asterisk/chan_dahdi.conf
 share/examples/asterisk/cli.conf
 share/examples/asterisk/codecs.conf
 share/examples/asterisk/console.conf
+share/examples/asterisk/dbsep.conf
 share/examples/asterisk/dnsmgr.conf
+share/examples/asterisk/dsp.conf
 share/examples/asterisk/dundi.conf
 share/examples/asterisk/enum.conf
 share/examples/asterisk/extconfig.conf
@@ -1103,3 +1119,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 fcc12dd8030..46d10708097 100644
--- a/comms/asterisk16/distinfo
+++ b/comms/asterisk16/distinfo
@@ -1,27 +1,27 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/06/12 09:04:56 jnemeth Exp $
+$NetBSD: distinfo,v 1.2 2009/07/07 08:14:42 jnemeth Exp $
 
-SHA1 (asterisk-1.6.0.10/asterisk-1.6.0.10.tar.gz) = b1e3a5940add2c3e9a3db3d5a976e91aed2060bd
-RMD160 (asterisk-1.6.0.10/asterisk-1.6.0.10.tar.gz) = 0bfeab2b21bcdb1f53e7c8ea75df2befd2efd303
-Size (asterisk-1.6.0.10/asterisk-1.6.0.10.tar.gz) = 13201068 bytes
-SHA1 (patch-aa) = 7b4d9274385b4f1343311f83048de9593cca4f38
+SHA1 (asterisk-1.6.1.1/asterisk-1.6.1.1.tar.gz) = db9462d1a829625da0149c4952abfa7eee99d0c2
+RMD160 (asterisk-1.6.1.1/asterisk-1.6.1.1.tar.gz) = 2eddf1f8b234480a84ce840323c66b204fea09e1
+Size (asterisk-1.6.1.1/asterisk-1.6.1.1.tar.gz) = 13630484 bytes
+SHA1 (patch-aa) = 67d3622abf2b66a16376a9033b02fb019b5a6e4d
 SHA1 (patch-af) = 09860d714281cb4c65d1a087cf5b16647a16e2fa
 SHA1 (patch-ag) = c71c61350cefbbe53eefa99245ca7712753f22d5
 SHA1 (patch-ai) = e92edab5c1ff323478f41d0b0783102ed527fe39
 SHA1 (patch-ak) = adee75b7716a8794de1b8cb054af7a5a8f0e5ffd
 SHA1 (patch-al) = 76a3132a0e81479c9519b1c976460f837b67f4a3
-SHA1 (patch-am) = 70488cd98c4349d330bfb510d0dfd7e0631c1d8b
+SHA1 (patch-am) = 98aa4648b867d193ec05d8da14434205f369c17b
 SHA1 (patch-an) = 93a5df66fd6459fb76e9191dc3bf37b9ee5483b5
 SHA1 (patch-ao) = 0663a698469550b22bb97ee1b18980bc2bc67495
 SHA1 (patch-ap) = d60274a44e10dc4e70235ac97b7ae21f37ce713e
-SHA1 (patch-aq) = 4be2a89a66578172f227c966833e666255cce14a
+SHA1 (patch-aq) = 9b1820ba112fba4ac27474cc6e2b090d2e095b94
 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) = 507f219a7edfb72ff30817b82442bac6dc97e762
-SHA1 (patch-ay) = a19031a9ef394bff517083e5fff13b5ed6312e0a
-SHA1 (patch-az) = aeaca48bcf19c1592361de0c302ce7d004307081
-SHA1 (patch-ba) = 6ee00f323a3109d7c554aa0bfac13679a63846e1
-SHA1 (patch-bb) = 44c00fd3e9e4c66b0df82381181ec538a1899929
+SHA1 (patch-ax) = f71d16a6a5e274c241280ba6808f42617678a680
+SHA1 (patch-ay) = 39a2ae198ff2989c501dd4374e1ea57a3d52dda9
+SHA1 (patch-az) = 917cc8868708ce9c022a0268debd90f51f88bdad
+SHA1 (patch-ba) = 2ea96529e0187a23d0b640c7cae69904d587c269
+SHA1 (patch-bb) = 3b78ed3c8233e2db38d09ca81f1768d018ffd2e2
diff --git a/comms/asterisk16/patches/patch-aa b/comms/asterisk16/patches/patch-aa
index c5b3d258efb..0e4b2972b00 100644
--- a/comms/asterisk16/patches/patch-aa
+++ b/comms/asterisk16/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.1.1.1 2009/06/12 09:04:56 jnemeth Exp $
+$NetBSD: patch-aa,v 1.2 2009/07/07 08:14:43 jnemeth Exp $
 
---- Makefile.orig	2008-11-29 10:37:55.000000000 -0800
+--- Makefile.orig	2009-02-24 12:44:50.000000000 -0800
 +++ Makefile
 @@ -122,20 +122,6 @@ DEBUG=-g3
  
@@ -44,7 +44,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2009/06/12 09:04:56 jnemeth Exp $
  
  # Asterisk.conf is located in ASTETCDIR or by using the -C flag
  # when starting Asterisk
-@@ -237,11 +216,6 @@ ifeq ($(AST_DEVMODE),yes)
+@@ -243,11 +222,6 @@ ifeq ($(AST_DEVMODE),yes)
    ASTCFLAGS+=-Wformat=2
  endif
  
@@ -53,10 +53,10 @@ $NetBSD: patch-aa,v 1.1.1.1 2009/06/12 09:04:56 jnemeth Exp $
 -  ASTLDFLAGS+=-L/usr/local/lib
 -endif
 -
- 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)
- endif
-@@ -457,7 +431,7 @@ distclean: $(SUBDIRS_DIST_CLEAN) _clean
+ ifeq ($(findstring -march,$(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
  	rm -f build_tools/menuselect-deps
  
  datafiles: _all
@@ -65,7 +65,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2009/06/12 09:04:56 jnemeth Exp $
  # 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.
-@@ -499,9 +473,10 @@ NEWHEADERS=$(notdir $(wildcard include/a
+@@ -507,9 +481,10 @@ NEWHEADERS=$(notdir $(wildcard include/a
  OLDHEADERS=$(filter-out $(NEWHEADERS),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h)))
  
  installdirs:
@@ -77,7 +77,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2009/06/12 09:04:56 jnemeth Exp $
  	mkdir -p $(DESTDIR)$(ASTBINDIR)
  	mkdir -p $(DESTDIR)$(ASTVARRUNDIR)
  	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail
-@@ -510,6 +485,7 @@ installdirs:
+@@ -518,6 +493,7 @@ installdirs:
  	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/tmp
  	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/meetme
  	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/monitor
@@ -85,7 +85,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2009/06/12 09:04:56 jnemeth Exp $
  
  bininstall: _all installdirs $(SUBDIRS_INSTALL)
  	$(INSTALL) -m 755 main/asterisk $(DESTDIR)$(ASTSBINDIR)/
-@@ -605,22 +581,22 @@ upgrade: bininstall
+@@ -613,22 +589,22 @@ upgrade: bininstall
  # XXX why *.adsi is installed first ?
  adsi:
  	@echo Installing adsi config files...
@@ -113,7 +113,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2009/06/12 09:04:56 jnemeth Exp $
  		if [ -f $${dst} ]; then \
  			if [ "$(OVERWRITE)" = "y" ]; then \
  				if cmp -s $${dst} $$x ; then \
-@@ -636,10 +612,10 @@ samples: adsi
+@@ -644,10 +620,10 @@ samples: adsi
  		echo "Installing file $$x"; \
  		$(INSTALL) -m 644 $$x $${dst} ;\
  	done
@@ -126,7 +126,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2009/06/12 09:04:56 jnemeth Exp $
  		echo "astetcdir => $(ASTETCDIR)" ; \
  		echo "astmoddir => $(MODULES_DIR)" ; \
  		echo "astvarlibdir => $(ASTVARLIBDIR)" ; \
-@@ -692,7 +668,7 @@ samples: adsi
+@@ -700,7 +676,7 @@ samples: adsi
  		echo "pbx_realtime=1.6" ; \
  		echo "res_agi=1.6" ; \
  		echo "app_set=1.6" ; \
@@ -135,7 +135,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2009/06/12 09:04:56 jnemeth Exp $
  	else \
  		echo "Skipping asterisk.conf creation"; \
  	fi
-@@ -826,7 +802,7 @@ uninstall-all: _uninstall
+@@ -834,7 +810,7 @@ uninstall-all: _uninstall
  	rm -rf $(DESTDIR)$(ASTVARLIBDIR)
  	rm -rf $(DESTDIR)$(ASTDATADIR)
  	rm -rf $(DESTDIR)$(ASTSPOOLDIR)
diff --git a/comms/asterisk16/patches/patch-am b/comms/asterisk16/patches/patch-am
index 696366a84dc..d470a28fcdb 100644
--- a/comms/asterisk16/patches/patch-am
+++ b/comms/asterisk16/patches/patch-am
@@ -1,11 +1,11 @@
-$NetBSD: patch-am,v 1.1.1.1 2009/06/12 09:04:56 jnemeth Exp $
+$NetBSD: patch-am,v 1.2 2009/07/07 08:14:43 jnemeth Exp $
 
---- apps/app_sms.c.orig	2008-11-02 16:39:04.000000000 -0800
+--- apps/app_sms.c.orig	2008-11-02 15:56:13.000000000 -0800
 +++ apps/app_sms.c
-@@ -510,7 +510,7 @@ static void packdate(unsigned char *o, t
+@@ -527,7 +527,7 @@ static void packdate(unsigned char *o, t
  	int z;
  
- 	ast_localtime(&tv, &t, NULL);
+ 	ast_localtime(&topack, &t, NULL);
 -#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined( __NetBSD__ ) || defined(__APPLE__) || defined(__CYGWIN__)
 +#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined( __NetBSD__ ) || defined(__APPLE__) || defined(__CYGWIN__) || defined(__DragonFly__)
  	z = -t.tm_gmtoff / 60 / 15;
diff --git a/comms/asterisk16/patches/patch-aq b/comms/asterisk16/patches/patch-aq
index 5418c8cb319..ef91bcc35ea 100644
--- a/comms/asterisk16/patches/patch-aq
+++ b/comms/asterisk16/patches/patch-aq
@@ -1,8 +1,8 @@
-$NetBSD: patch-aq,v 1.1.1.1 2009/06/12 09:04:57 jnemeth Exp $
+$NetBSD: patch-aq,v 1.2 2009/07/07 08:14:43 jnemeth Exp $
 
---- configure.orig	2009-01-29 15:47:00.000000000 -0800
+--- configure.orig	2009-03-19 11:14:55.000000000 -0700
 +++ configure
-@@ -17890,6 +17890,144 @@ _ACEOF
+@@ -18161,6 +18161,144 @@ _ACEOF
  fi
  
  
@@ -147,3 +147,12 @@ $NetBSD: patch-aq,v 1.1.1.1 2009/06/12 09:04:57 jnemeth Exp $
  
  { echo "$as_me:$LINENO: checking for int" >&5
  echo $ECHO_N "checking for int... $ECHO_C" >&6; }
+@@ -31464,6 +31602,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>
+ int
+ main ()
diff --git a/comms/asterisk16/patches/patch-ax b/comms/asterisk16/patches/patch-ax
index 99b1cfd6725..e6b18fb7842 100644
--- a/comms/asterisk16/patches/patch-ax
+++ b/comms/asterisk16/patches/patch-ax
@@ -1,33 +1,73 @@
-$NetBSD: patch-ax,v 1.1.1.1 2009/06/12 09:04:57 jnemeth Exp $
+$NetBSD: patch-ax,v 1.2 2009/07/07 08:14:43 jnemeth Exp $
 
---- apps/app_queue.c.orig	2009-02-11 15:04:10.000000000 -0800
+--- apps/app_queue.c.orig	2009-04-14 16:29:04.000000000 -0700
 +++ apps/app_queue.c
-@@ -2880,7 +2880,7 @@ static int wait_our_turn(struct queue_en
+@@ -2524,8 +2524,8 @@ static void record_abandoned(struct queu
+ 		"Uniqueid: %s\r\n"
+ 		"Position: %d\r\n"
+ 		"OriginalPosition: %d\r\n"
+-		"HoldTime: %d\r\n",
+-		qe->parent->name, qe->chan->uniqueid, qe->pos, qe->opos, (int)(time(NULL) - qe->start));
++		"HoldTime: %jd\r\n",
++		qe->parent->name, qe->chan->uniqueid, qe->pos, qe->opos, (intmax_t)(time(NULL) - qe->start));
  
- 		if (qe->parent->leavewhenempty && (stat == QUEUE_NO_MEMBERS)) {
+ 	qe->parent->callsabandoned++;
+ 	ao2_unlock(qe->parent);
+@@ -2944,7 +2944,7 @@ static int wait_our_turn(struct queue_en
+ 
+ 		if (qe->parent->leavewhenempty && (status == QUEUE_NO_MEMBERS)) {
  			*reason = QUEUE_LEAVEEMPTY;
 -			ast_queue_log(qe->parent->name, qe->chan->uniqueid, "NONE", "EXITEMPTY", "%d|%d|%ld", qe->pos, qe->opos, (long) time(NULL) - qe->start);
 +			ast_queue_log(qe->parent->name, qe->chan->uniqueid, "NONE", "EXITEMPTY", "%d|%d|%jd", qe->pos, qe->opos, (intmax_t) time(NULL) - qe->start);
  			leave_queue(qe);
  			break;
  		}
-@@ -2888,13 +2888,13 @@ static int wait_our_turn(struct queue_en
+@@ -2952,13 +2952,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) && (stat == QUEUE_NO_REACHABLE_MEMBERS || stat == QUEUE_NO_UNPAUSED_REACHABLE_MEMBERS)) {
+ 		if ((qe->parent->leavewhenempty == QUEUE_EMPTY_STRICT) && (status == QUEUE_NO_REACHABLE_MEMBERS || status == QUEUE_NO_UNPAUSED_REACHABLE_MEMBERS)) {
  			*reason = QUEUE_LEAVEUNAVAIL;
 -			ast_queue_log(qe->parent->name, qe->chan->uniqueid, "NONE", "EXITEMPTY", "%d|%d|%ld", qe->pos, qe->opos, (long) time(NULL) - qe->start);
 +			ast_queue_log(qe->parent->name, qe->chan->uniqueid, "NONE", "EXITEMPTY", "%d|%d|%jd", qe->pos, qe->opos, (intmax_t) time(NULL) - qe->start);
  			leave_queue(qe);
  			break;
  		}
- 		if ((qe->parent->leavewhenempty == QUEUE_EMPTY_LOOSE) && (stat == QUEUE_NO_REACHABLE_MEMBERS)) {
+ 		if ((qe->parent->leavewhenempty == QUEUE_EMPTY_LOOSE) && (status == QUEUE_NO_REACHABLE_MEMBERS)) {
  			*reason = QUEUE_LEAVEUNAVAIL;
 -			ast_queue_log(qe->parent->name, qe->chan->uniqueid, "NONE", "EXITEMPTY", "%d|%d|%ld", qe->pos, qe->opos, (long) time(NULL) - qe->start);
 +			ast_queue_log(qe->parent->name, qe->chan->uniqueid, "NONE", "EXITEMPTY", "%d|%d|%jd", qe->pos, qe->opos, (intmax_t) time(NULL) - qe->start);
  			leave_queue(qe);
  			break;
  		}
-@@ -3587,7 +3587,7 @@ static int try_calling(struct queue_ent 
+@@ -3145,12 +3145,12 @@ static void send_agent_complete(const st
+ 		"Channel: %s\r\n"
+ 		"Member: %s\r\n"
+ 		"MemberName: %s\r\n"
+-		"HoldTime: %ld\r\n"
+-		"TalkTime: %ld\r\n"
++		"HoldTime: %jd\r\n"
++		"TalkTime: %jd\r\n"
+ 		"Reason: %s\r\n"
+ 		"%s",
+ 		queuename, qe->chan->uniqueid, peer->name, member->interface, member->membername,
+-		(long)(callstart - qe->start), (long)(time(NULL) - callstart), reason,
++		(intmax_t)(callstart - qe->start), (intmax_t)(time(NULL) - callstart), reason,
+ 		qe->parent->eventwhencalled == QUEUE_EVENT_VARIABLES ? vars2manager(qe->chan, vars, vars_len) : "");
+ }
+ 
+@@ -3193,9 +3193,9 @@ static void queue_transfer_fixup(void *d
+ 	int callcompletedinsl = qtds->callcompletedinsl;
+ 	struct ast_datastore *datastore;
+ 
+-	ast_queue_log(qe->parent->name, qe->chan->uniqueid, member->membername, "TRANSFER", "%s|%s|%ld|%ld|%d",
+-				new_chan->exten, new_chan->context, (long) (callstart - qe->start),
+-				(long) (time(NULL) - callstart), qe->opos);
++	ast_queue_log(qe->parent->name, qe->chan->uniqueid, member->membername, "TRANSFER", "%s|%s|%jd|%jd|%d",
++				new_chan->exten, new_chan->context, (intmax_t) (callstart - qe->start),
++				(intmax_t) (time(NULL) - callstart), qe->opos);
+ 
+ 	update_queue(qe->parent, member, callcompletedinsl);
+ 	
+@@ -3651,7 +3651,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);
@@ -36,7 +76,7 @@ $NetBSD: patch-ax,v 1.1.1.1 2009/06/12 09:04:57 jnemeth Exp $
  				record_abandoned(qe);
  				ast_hangup(peer);
  				ao2_ref(member, -1);
-@@ -3631,8 +3631,8 @@ static int try_calling(struct queue_ent 
+@@ -3696,8 +3696,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) {
@@ -45,33 +85,61 @@ $NetBSD: patch-ax,v 1.1.1.1 2009/06/12 09:04:57 jnemeth Exp $
 +			snprintf(interfacevar, sizeof(interfacevar), "QEHOLDTIME=%jd,QEORIGINALPOS=%d",
 +				(intmax_t) time(NULL) - qe->start, qe->opos);
  			pbx_builtin_setvar_multiple(qe->chan, interfacevar);
+ 			pbx_builtin_setvar_multiple(peer, interfacevar);
  		}
- 	
-@@ -3872,7 +3872,7 @@ static int try_calling(struct queue_ent 
+@@ -3942,8 +3942,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++;
 -		ast_queue_log(queuename, qe->chan->uniqueid, member->membername, "CONNECT", "%ld|%s|%ld", (long) time(NULL) - qe->start, peer->uniqueid,
-+		ast_queue_log(queuename, qe->chan->uniqueid, member->membername, "CONNECT", "%jd|%s|%ld", (intmax_t) time(NULL) - qe->start, peer->uniqueid,
- 													(long)(orig - to > 0 ? (orig - to) / 1000 : 0));
+-													(long)(orig - to > 0 ? (orig - to) / 1000 : 0));
++		ast_queue_log(queuename, qe->chan->uniqueid, member->membername, "CONNECT", "%jd|%s|%jd", (intmax_t) time(NULL) - qe->start, peer->uniqueid,
++													(intmax_t)(orig - to > 0 ? (orig - to) / 1000 : 0));
  		if (update_cdr && qe->chan->cdr) 
  			ast_copy_string(qe->chan->cdr->dstchannel, member->membername, sizeof(qe->chan->cdr->dstchannel));
-@@ -3883,12 +3883,12 @@ static int try_calling(struct queue_ent 
+ 		if (qe->parent->eventwhencalled)
+@@ -3953,12 +3953,12 @@ static int try_calling(struct queue_ent 
  					"Channel: %s\r\n"
  					"Member: %s\r\n"
  					"MemberName: %s\r\n"
 -					"Holdtime: %ld\r\n"
 +					"Holdtime: %jd\r\n"
  					"BridgedChannel: %s\r\n"
- 					"Ringtime: %ld\r\n"
+-					"Ringtime: %ld\r\n"
++					"Ringtime: %jd\r\n"
  					"%s",
  					queuename, qe->chan->uniqueid, peer->name, member->interface, member->membername,
 -					(long) time(NULL) - qe->start, peer->uniqueid, (long)(orig - to > 0 ? (orig - to) / 1000 : 0),
-+					(intmax_t) time(NULL) - qe->start, peer->uniqueid, (long)(orig - to > 0 ? (orig - to) / 1000 : 0),
++					(intmax_t) time(NULL) - qe->start, peer->uniqueid, (intmax_t)(orig - to > 0 ? (orig - to) / 1000 : 0),
  					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));
-@@ -4770,8 +4770,8 @@ check_turns:
+@@ -3987,17 +3987,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)) {
+-				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);
++				ast_queue_log(queuename, qe->chan->uniqueid, member->membername, "TRANSFER", "%s|%s|%jd|%jd|%d",
++					qe->chan->exten, qe->chan->context, (intmax_t) (callstart - qe->start),
++					(intmax_t) (time(NULL) - callstart), qe->opos);
+ 				send_agent_complete(qe, queuename, peer, member, callstart, vars, sizeof(vars), TRANSFER);
+ 			} else if (ast_check_hangup(qe->chan)) {
+-				ast_queue_log(queuename, qe->chan->uniqueid, member->membername, "COMPLETECALLER", "%ld|%ld|%d",
+-					(long) (callstart - qe->start), (long) (time(NULL) - callstart), qe->opos);
++				ast_queue_log(queuename, qe->chan->uniqueid, member->membername, "COMPLETECALLER", "%jd|%jd|%d",
++					(intmax_t) (callstart - qe->start), (intmax_t) (time(NULL) - callstart), qe->opos);
+ 				send_agent_complete(qe, queuename, peer, member, callstart, vars, sizeof(vars), CALLER);
+ 			} else {
+-				ast_queue_log(queuename, qe->chan->uniqueid, member->membername, "COMPLETEAGENT", "%ld|%ld|%d",
+-					(long) (callstart - qe->start), (long) (time(NULL) - callstart), qe->opos);
++				ast_queue_log(queuename, qe->chan->uniqueid, member->membername, "COMPLETEAGENT", "%jd|%jd|%d",
++					(intmax_t) (callstart - qe->start), (intmax_t) (time(NULL) - callstart), qe->opos);
+ 				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);
  			reason = QUEUE_TIMEOUT;
  			res = 0;
@@ -82,7 +150,25 @@ $NetBSD: patch-ax,v 1.1.1.1 2009/06/12 09:04:57 jnemeth Exp $
  			break;
  		}
  
-@@ -4863,7 +4863,7 @@ check_turns:
+@@ -4942,7 +4942,7 @@ check_turns:
+ 		if (qe.parent->leavewhenempty && (status == QUEUE_NO_MEMBERS)) {
+ 			record_abandoned(&qe);
+ 			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:
+ 		if ((qe.parent->leavewhenempty == QUEUE_EMPTY_STRICT) && (status == QUEUE_NO_REACHABLE_MEMBERS || status == QUEUE_NO_UNPAUSED_REACHABLE_MEMBERS)) {
+ 			record_abandoned(&qe);
+ 			reason = QUEUE_LEAVEUNAVAIL;
+-			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;
+ 		}
+@@ -4967,7 +4967,7 @@ check_turns:
  			record_abandoned(&qe);
  			reason = QUEUE_TIMEOUT;
  			res = 0;
@@ -91,7 +177,7 @@ $NetBSD: patch-ax,v 1.1.1.1 2009/06/12 09:04:57 jnemeth Exp $
  			break;
  		}
  
-@@ -4890,8 +4890,8 @@ stop:
+@@ -4994,8 +4994,8 @@ stop:
  			if (!qe.handled) {
  				record_abandoned(&qe);
  				ast_queue_log(args.queuename, chan->uniqueid, "NONE", "ABANDON",
@@ -102,3 +188,14 @@ $NetBSD: patch-ax,v 1.1.1.1 2009/06/12 09:04:57 jnemeth Exp $
  				res = -1;
  			} else if (qcontinue) {
  				reason = QUEUE_CONTINUE;
+@@ -5765,8 +5765,8 @@ static char *__queues_show(struct manses
+ 					mem->paused ? " (paused)" : "",
+ 					devstate2str(mem->status));
+ 				if (mem->calls)
+-					ast_str_append(&out, 0, " has taken %d calls (last was %ld secs ago)",
+-						mem->calls, (long) (time(NULL) - mem->lastcall));
++					ast_str_append(&out, 0, " has taken %d calls (last was %jd secs ago)",
++						mem->calls, (intmax_t) (time(NULL) - mem->lastcall));
+ 				else
+ 					ast_str_append(&out, 0, " has taken no calls yet");
+ 				do_print(s, fd, out->str);
diff --git a/comms/asterisk16/patches/patch-ay b/comms/asterisk16/patches/patch-ay
index fb337309068..61fd3b8b6d2 100644
--- a/comms/asterisk16/patches/patch-ay
+++ b/comms/asterisk16/patches/patch-ay
@@ -1,16 +1,84 @@
-$NetBSD: patch-ay,v 1.1.1.1 2009/06/12 09:04:57 jnemeth Exp $
+$NetBSD: patch-ay,v 1.2 2009/07/07 08:14:43 jnemeth Exp $
 
---- main/features.c.orig	2009-02-12 12:59:09.000000000 -0800
+--- main/features.c.orig	2009-04-09 20:56:37.000000000 -0700
 +++ main/features.c
-@@ -3602,9 +3602,9 @@ static char *handle_parkedcalls(struct a
+@@ -693,12 +693,12 @@ static int ast_park_call_full(struct ast
+ 		"Channel: %s\r\n"
+ 		"Parkinglot: %s\r\n"
+ 		"From: %s\r\n"
+-		"Timeout: %ld\r\n"
++		"Timeout: %jd\r\n"
+ 		"CallerIDNum: %s\r\n"
+ 		"CallerIDName: %s\r\n"
+ 		"Uniqueid: %s\r\n",
+ 		pu->parkingexten, pu->chan->name, pu->parkinglot->name, event_from ? event_from : "",
+-		(long)pu->start.tv_sec + (long)(pu->parkingtime/1000) - (long)time(NULL),
++		(intmax_t)pu->start.tv_sec + (intmax_t)(pu->parkingtime/1000) - (intmax_t)time(NULL),
+ 		S_OR(pu->chan->cid.cid_num, "<unknown>"),
+ 		S_OR(pu->chan->cid.cid_name, "<unknown>"),
+ 		pu->chan->uniqueid
+@@ -979,7 +979,7 @@ static int builtin_automonitor(struct as
+ 			len = strlen(touch_monitor) + 50;
+ 			args = alloca(len);
+ 			touch_filename = 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_OR(caller_chan->cid.cid_num, caller_chan->name));
+@@ -987,7 +987,7 @@ static int builtin_automonitor(struct as
+ 			len = strlen(caller_chan_id) + strlen(callee_chan_id) + 50;
+ 			args = alloca(len);
+ 			touch_filename = 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);
+ 		}
  
- 	AST_LIST_LOCK(&parkinglot);
- 	AST_LIST_TRAVERSE(&parkinglot, cur, list) {
--		ast_cli(a->fd, "%-10.10s %25s (%-15s %-12s %-4d) %6lds\n"
-+		ast_cli(a->fd, "%-10.10s %25s (%-15s %-12s %-4d) %6jds\n"
- 			,cur->parkingexten, cur->chan->name, cur->context, cur->exten
--			,cur->priority, cur->start.tv_sec + (cur->parkingtime/1000) - time(NULL));
-+			,cur->priority, (intmax_t) (cur->start.tv_sec + (cur->parkingtime/1000) - time(NULL)));
+@@ -1092,7 +1092,7 @@ static int builtin_automixmonitor(struct
+ 			len = strlen(touch_monitor) + 50;
+ 			args = alloca(len);
+ 			touch_filename = 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_OR(caller_chan->cid.cid_num, caller_chan->name));
+@@ -1100,7 +1100,7 @@ static int builtin_automixmonitor(struct
+ 			len = strlen(caller_chan_id) + strlen(callee_chan_id) + 50;
+ 			args = alloca(len);
+ 			touch_filename = 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"));
+ 		}
  
- 		numparked++;
- 	}
+@@ -4194,10 +4194,10 @@ static char *handle_parkedcalls(struct a
+ 
+ 		AST_LIST_LOCK(&curlot->parkings);
+ 		AST_LIST_TRAVERSE(&curlot->parkings, cur, list) {
+-			ast_cli(a->fd, "%-10.10s %25s (%-15s %-12s %-4d) %6lds\n"
++			ast_cli(a->fd, "%-10.10s %25s (%-15s %-12s %-4d) %6jds\n"
+ 				,cur->parkingexten, cur->chan->name, cur->context, cur->exten
+ 				,cur->priority,
+-				(long)(cur->start.tv_sec + (cur->parkingtime/1000) - time(NULL)) );
++				(intmax_t)(cur->start.tv_sec + (cur->parkingtime/1000) - time(NULL)) );
+ 			numparked++;
+ 			numparked += lotparked;
+ 		}
+@@ -4249,13 +4249,13 @@ static int manager_parking_status(struct
+ 				"Exten: %d\r\n"
+ 				"Channel: %s\r\n"
+ 				"From: %s\r\n"
+-				"Timeout: %ld\r\n"
++				"Timeout: %jd\r\n"
+ 				"CallerIDNum: %s\r\n"
+ 				"CallerIDName: %s\r\n"
+ 				"%s"
+ 				"\r\n",
+ 				cur->parkingnum, cur->chan->name, cur->peername,
+-				(long) cur->start.tv_sec + (long) (cur->parkingtime / 1000) - (long) time(NULL),
++				(intmax_t) cur->start.tv_sec + (intmax_t) (cur->parkingtime / 1000) - (intmax_t) time(NULL),
+ 				S_OR(cur->chan->cid.cid_num, ""),	/* XXX in other places it is <unknown> */
+ 				S_OR(cur->chan->cid.cid_name, ""),
+ 				idText);
diff --git a/comms/asterisk16/patches/patch-az b/comms/asterisk16/patches/patch-az
index c47fea3b017..9b94d895235 100644
--- a/comms/asterisk16/patches/patch-az
+++ b/comms/asterisk16/patches/patch-az
@@ -1,15 +1,31 @@
-$NetBSD: patch-az,v 1.1.1.1 2009/06/12 09:04:57 jnemeth Exp $
+$NetBSD: patch-az,v 1.2 2009/07/07 08:14:43 jnemeth Exp $
 
---- main/manager.c.orig	2009-02-10 13:49:14.000000000 -0800
+--- main/manager.c.orig	2009-04-09 20:56:37.000000000 -0700
 +++ main/manager.c
-@@ -3084,8 +3084,8 @@ int __manager_event(int category, const 
- 	if (timestampevents) {
- 		now = ast_tvnow();
- 		ast_str_append(&buf, 0,
--				"Timestamp: %ld.%06lu\r\n",
--				 now.tv_sec, (unsigned long) now.tv_usec);
-+				"Timestamp: %jd.%06lu\r\n",
-+				 (intmax_t) now.tv_sec, (unsigned long) now.tv_usec);
+@@ -280,7 +280,7 @@ void ast_manager_unregister_hook(struct 
+ static time_t __deb(time_t start, const char *msg)
+ {
+ 	time_t now = time(NULL);
+-	ast_verbose("%4d th %p %s\n", (int)(now % 3600), pthread_self(), msg);
++	ast_verbose("%4jd th %p %s\n", (intmax_t)(now % 3600), pthread_self(), msg);
+ 	if (start != 0 && now - start > 5)
+ 		ast_verbose("+++ WOW, %s took %d seconds\n", msg, (int)(now - start));
+ 	return now;
+@@ -724,7 +724,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"
+-#define HSMCONN_FORMAT2 "  %-15.15s  %-15.15s  %-10d  %-10d  %-8d  %-8d  %-5.5d  %-5.5d\n"
++#define HSMCONN_FORMAT2 "  %-15.15s  %-15.15s  %-10jd  %-10jd  %-8d  %-8d  %-5.5d  %-5.5d\n"
+ 	int count = 0;
+ 	switch (cmd) {
+ 	case CLI_INIT:
+@@ -742,7 +742,7 @@ static char *handle_showmanconn(struct a
+ 
+ 	AST_LIST_LOCK(&sessions);
+ 	AST_LIST_TRAVERSE(&sessions, session, list) {
+-		ast_cli(a->fd, HSMCONN_FORMAT2, session->username, ast_inet_ntoa(session->sin.sin_addr), (int)(session->sessionstart), (int)(now - session->sessionstart), session->fd, session->inuse, session->readperm, session->writeperm);
++		ast_cli(a->fd, HSMCONN_FORMAT2, session->username, ast_inet_ntoa(session->sin.sin_addr), (intmax_t)(session->sessionstart), (intmax_t)(now - session->sessionstart), session->fd, session->inuse, session->readperm, session->writeperm);
+ 		count++;
  	}
- 	if (manager_debug) {
- 		static int seq;
+ 	AST_LIST_UNLOCK(&sessions);
diff --git a/comms/asterisk16/patches/patch-ba b/comms/asterisk16/patches/patch-ba
index b1a9393ad1e..8310364621a 100644
--- a/comms/asterisk16/patches/patch-ba
+++ b/comms/asterisk16/patches/patch-ba
@@ -1,18 +1,18 @@
-$NetBSD: patch-ba,v 1.1.1.1 2009/06/12 09:04:57 jnemeth Exp $
+$NetBSD: patch-ba,v 1.2 2009/07/07 08:14:43 jnemeth Exp $
 
---- main/sched.c.orig	2008-09-10 09:42:32.000000000 -0700
+--- main/sched.c.orig	2009-02-15 13:28:55.000000000 -0800
 +++ main/sched.c
-@@ -319,11 +319,11 @@ void ast_sched_dump(const struct sched_c
- 	AST_LIST_TRAVERSE(&con->schedq, q, list) {
- 		struct timeval delta = ast_tvsub(q->when, tv);
+@@ -435,11 +435,11 @@ void ast_sched_dump(struct sched_context
+ 	AST_DLLIST_TRAVERSE(&con->schedq, q, list) {
+ 		struct timeval delta = ast_tvsub(q->when, when);
  
 -		ast_debug(1, "|%.4d | %-15p | %-15p | %.6ld : %.6ld |\n", 
 +		ast_debug(1, "|%.4d | %-15p | %-15p | %.6jd : %.6ld |\n", 
  			q->id,
  			q->callback,
  			q->data,
--			delta.tv_sec,
-+			(intmax_t) delta.tv_sec,
+-			(long)delta.tv_sec,
++			(intmax_t)delta.tv_sec,
  			(long int)delta.tv_usec);
  	}
- 	ast_debug(1, "=============================================================\n");
+ 	ast_mutex_unlock(&con->lock);
diff --git a/comms/asterisk16/patches/patch-bb b/comms/asterisk16/patches/patch-bb
index 0fcf739de62..539e3f1d7ee 100644
--- a/comms/asterisk16/patches/patch-bb
+++ b/comms/asterisk16/patches/patch-bb
@@ -1,20 +1,20 @@
-$NetBSD: patch-bb,v 1.1.1.1 2009/06/12 09:04:56 jnemeth Exp $
+$NetBSD: patch-bb,v 1.2 2009/07/07 08:14:43 jnemeth Exp $
 
---- main/utils.c.orig	2008-12-22 09:30:05.000000000 -0800
+--- main/utils.c.orig	2009-03-18 07:32:47.000000000 -0700
 +++ main/utils.c
-@@ -1241,13 +1241,13 @@ int ast_false(const char *s)
+@@ -1348,13 +1348,13 @@ int ast_false(const char *s)
  static struct timeval tvfix(struct timeval a)
  {
  	if (a.tv_usec >= ONE_MILLION) {
 -		ast_log(LOG_WARNING, "warning too large timestamp %ld.%ld\n",
--			a.tv_sec, (long int) a.tv_usec);
+-			(long)a.tv_sec, (long int) a.tv_usec);
 +		ast_log(LOG_WARNING, "warning too large timestamp %jd.%ld\n",
 +			(intmax_t)a.tv_sec, (long int) a.tv_usec);
  		a.tv_sec += a.tv_usec / ONE_MILLION;
  		a.tv_usec %= ONE_MILLION;
  	} else if (a.tv_usec < 0) {
 -		ast_log(LOG_WARNING, "warning negative timestamp %ld.%ld\n",
--			a.tv_sec, (long int) a.tv_usec);
+-			(long)a.tv_sec, (long int) a.tv_usec);
 +		ast_log(LOG_WARNING, "warning negative timestamp %jd.%ld\n",
 +			(intmax_t)a.tv_sec, (long int) a.tv_usec);
  		a.tv_usec = 0;