--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrdump.8
+++ cyrus-imapd-2.2-2.2.13/debian/cyrdump.8
@@ -0,0 +1,16 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
+.TH CYRDUMP "8" "Project Cyrus" "CMU"
+.SH NAME
+cyrdump \- dump mailboxes to stdout
+.SH SYNOPSIS
+.B 
+cyrdump [-C <configfile>] [-v] [mboxpattern ...]
+.SH DESCRIPTION
+.PP
+A tool for dumping IMAP mailboxes on a server.
+.TP
+\fB\-C <configfile>\fR
+Specify an alternate configuration file ( is used by default)
+.TP
+\fB\-v\fR
+Increase program verbosity.
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-admin-2.2.menu
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-admin-2.2.menu
@@ -0,0 +1,6 @@
+?package(cyrus-admin-2.2):needs="text" section="Applications/System/Administration"\
+	hints="Mail,Admin,Cyrus"\
+	title="Cyrus 2.2 cyradm (cyrus@localhost)"\
+	longtitle="Administer local Cyrus IMAPd 2.2 accounts as user cyrus"\
+	icon="/usr/share/icons/cyradm.xpm"\
+	command="/usr/bin/cyradm --user cyrus localhost"
--- cyrus-imapd-2.2-2.2.13.orig/debian/arbitronsort.8
+++ cyrus-imapd-2.2-2.2.13/debian/arbitronsort.8
@@ -0,0 +1,15 @@
+.TH ARBITRONSORT "8" "Project Cyrus" "CMU"
+.SH NAME
+arbitronsort \- sorts arbitron(8) output
+.SH SYNOPSIS
+.B 
+arbitronsort
+.SH DESCRIPTION
+.PP
+This tool takes the output of arbitron (run without the -o option)
+on stdin and prints out first a ranking of mailboxes by number of 
+people who selected the mailbox, and then a ranking of mailbox by
+number of subscribers.
+.SH SEE ALSO
+.PP
+\fBarbitron(8)\fR
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-doc-2.2.doc-base
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-doc-2.2.doc-base
@@ -0,0 +1,10 @@
+Document: cyrus2.2-manual
+Title: CMU Cyrus 2.2 Manual
+Author: Carnegie Mellon University
+Abstract: This manual describes how to configure and administer 
+ the Cyrus POP/IMAP mail system, version 2.2
+Section: Network/Communication/Mail
+
+Format: HTML
+Index: /usr/share/doc/cyrus-doc-2.2/html/index.html
+Files: /usr/share/doc/cyrus-doc-2.2/html/*.html
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-common-2.2.prerm
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-common-2.2.prerm
@@ -0,0 +1,43 @@
+#! /bin/sh
+# prerm script for cyrus-common-2.2
+# Copyright (c) 2002 by Henrique de Moraes Holschuh
+# Distributed under the GNU General Public License version 2
+# $Id: cyrus-common-2.2.prerm 229 2005-12-08 23:26:29Z astronut $
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <prerm> `remove'
+#        * <old-prerm> `upgrade' <new-version>
+#        * <new-prerm> `failed-upgrade' <old-version>
+#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
+#        * <deconfigured's-prerm> `deconfigure' `in-favour'
+#          <package-being-installed> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    remove|upgrade|deconfigure)
+    	# Call initscript, if it is there to stop the daemon
+ 	invoke-rc.d cyrus2.2 stop || true
+        ;;
+    failed-upgrade)
+        ;;
+    *)
+        echo "prerm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
--- cyrus-imapd-2.2-2.2.13.orig/debian/README.sendmail
+++ cyrus-imapd-2.2-2.2.13/debian/README.sendmail
@@ -0,0 +1,69 @@
+Setting up Cyrus IMAPd for Sendmail (Debian)
+$Id: README.sendmail 308 2006-03-07 20:02:36Z sven $
+===========================================================
+
+[This is user-contributed, unverified information]
+
+First, do *not* use the old cyrus*.m4 macros, they won't work well. The one
+you can use is cyrusv2.m4. There are many methods of connecting Cyrus to
+sendmail, and replacing the local mailer with Cyrus lmtpd is just one of
+them.
+
+Andrzej Filip <anfi@priv.onet.pl> says:
+http://anfi.homeunix.net/sendmail/localNalias.html
+   Cyrus Aliases
+   It allows to use user@CYRUS redirections in virtusertable,
+   aliases and .forward file e.g.  I use the following ~anfi/.forward:
+   anfi@CYRUS
+
+http://anfi.homeunix.net/sendmail/localtab.html
+   Local Table
+
+http://anfi.homeunix.net/sendmail/rtcyrus2.html
+   Real Time Cyrus Integration
+   It allows sendmail to check presence of cyrus mailbox in real time, 
+   sendmail rejects message to non existing cyrus mailboxes in reply to 
+   "RCPT TO:"
+
+
+I am not sure how well these will work with sieve.  The one report I have
+for Cyrus + sendmail with working sieve is:
+
+"cyrus/sieve vacation seems to work only if you integrate cyrus via
+cyrusv2.m4 into sendmail (8.12.3-4)."
+
+Sample sendmail.mc that seems to work:
+--------
+[...]
+dnl define BIND_OPTS',`-DNSRCH -DEFNAMES')dnl
+define(`confLOCAL_MAILER', `cyrusv2')dnl
+MAILER(`local')dnl
+MAILER(`smtp')dnl
+MAILER(`cyrusv2')dnl
+dnl MODIFY_MAILER_FLAGS(`cyrus',`+w')dnl
+
+LOCAL_RULE_0
+Rbb + $+ < @ $=w . >    $#cyrusbb $: $1
+[...]
+--------
+
+Here's a sieve test script you can try. Change it as needed for your
+site:
+
+require "fileinto";
+require "vacation";
+require "envelope";
+
+if header :contains "subject" "vactest" {
+         vacation :days 7 :addresses ["me@home.de"] "vactest!";
+}
+
+
+Pierre Gambarotto <pierre.gambarotto@enseeiht.fr> says:
+The minimum in order to make it work with sendmail is:
+
+define(`confLOCAL_MAILER', `cyrusv2')
+define(`CYRUSV2_MAILER_ARGS',`FILE /var/run/cyrus/socket/lmtp')
+MAILER(`cyrusv2')
+
+The CYRUSV2_MAILER_ARGS is the key.
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-admin-2.2.README.Debian
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-admin-2.2.README.Debian
@@ -0,0 +1,9 @@
+Cyrus IMAP for Debian, admin utilities
+$Id: cyrus-admin-2.2.README.Debian 229 2005-12-08 23:26:29Z astronut $
+---------------------
+
+Refer to the cyrus-doc-2.2 package for more information.  There is a lot
+of it, and it will save you hours (or days) of frustating bug-hunting if
+you read them first.
+
+ -- Henrique de Moraes Holschuh <hmh@debian.org>
--- cyrus-imapd-2.2-2.2.13.orig/debian/gbp.conf
+++ cyrus-imapd-2.2-2.2.13/debian/gbp.conf
@@ -0,0 +1,9 @@
+[DEFAULT]
+debian-branch = debian-squeeze
+debian-tag = debian/%(version)s
+upstream-branch = upstream-squeeze
+upstream-tag = upstream/%(version)s
+pristine-tar = True
+
+[git-dch]
+meta = 1
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-imapd-2.2.links
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-imapd-2.2.links
@@ -0,0 +1 @@
+usr/share/doc/cyrus-common-2.2 usr/share/doc/cyrus-imapd-2.2
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-common-2.2.lintian
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-common-2.2.lintian
@@ -0,0 +1,4 @@
+cyrus-common-2.2: no-debconf-config
+cyrus-common-2.2: postinst-uses-db-input
+cyrus-common-2.2: dir-or-file-in-var-run var/run/cyrus/
+cyrus-common-2.2: dir-or-file-in-var-run var/run/cyrus/socket/
--- cyrus-imapd-2.2-2.2.13.orig/debian/UPGRADE.Debian
+++ cyrus-imapd-2.2-2.2.13/debian/UPGRADE.Debian
@@ -0,0 +1,204 @@
+For more information, see README.Debian[.gz] in /usr/share/doc/cyrus-common-2.2/
+and the web page below, part of the cyrus-utils project at SourceForge:
+
+  http://cyrus-utils.sourceforge.net/faq
+
+Upgrading from 2.2.12 or 2.2.13 versions prior to 2.2.13-5
+==========================================================
+
+In 2.2.13-5, a bug in debian/rules regarding the generation of
+cyrus-db-types.txt was fixed. As a result, the cyrus2.2 init script
+might complain about a database types mismatch. If this happens,
+please make sure that you are really upgrading from a Debian package 
+of cyrus-imapd version 2.2 (either the old experimental cyrus22-imapd
+or the newer cyrus-imapd-2.2 packages). If you do, please remove 
+/usr/lib/cyrus/cyrus-db-types.active and run
+dpkg-reconfigure cyrus-common-2.2
+
+Upgrading from cyrus 2.1
+========================
+
+If you upgrade from cyrus 2.1, all you need to do is to upgrade the 
+database files from the old database backend to the new one. If you use 
+sieve-scripts, you will also need to use sievec on them. The information
+how to do upgrade your database files is contained in the upgrade
+information from cyrus v1.5 below and in more detail in
+/usr/share/doc/cyrus-common-2.2/README.Debian.database. 
+
+The configuration option lmtp_overquota_perm_failure has been renamed 
+lmtp_over_quota_perm_failure. Please update your configuration accordingly.
+
+Please note that the 2.1 packages in Debian use a different format 
+from upstream, thus the upgrade is easier.
+
+Also, please note that The tls_[service]_* configuration options have been 
+removed. Now use [servicename]_tls_*, where servicename is the service 
+identifier from cyrus.conf for that particular process.
+
+Upgrading sieve scripts
+-----------------------
+
+Cyrus IMAPD 2.2 uses bytecode for sieve scripts. This means that you need to
+compile all existing sieve scripts so that they will work with cyrus 2.2. There
+is a small tool in /usr/lib/cyrus/upgrade, called masssievec which will
+automatically compile all installed scripts when called correctly. Please 
+refer to the script's usage information for details.
+The command line you will probably want to use is (as user cyrus):
+/usr/lib/cyrus/upgrade/masssievec /usr/lib/cyrus/bin/sievec /etc/imapd.conf
+
+Upgrading from cyrus 1.5.x
+==========================
+
+Upgrading cyrus-imapd to cyrus-imapd-2.2 on Debian
+(thanks to David D. Kilzer <ddkilzer@theracingworld.com> for this document)
+-----------------------------------------------
+
+This document describes the procedure for upgrading from the old cyrus-imapd
+(v1.5.x) package to the new cyrus-imapd-2.2 (v2.2) package.  While this is a
+manual process, it is very straightforward.
+
+The procedure for converting a v1.6 cyrus store to v2.2 is not explained here,
+but the tools to convert the sieve scripts are in /usr/lib/cyrus/upgrade.
+
+Your SASL installation may require further conversion steps, as Cyrus v2.2 uses
+SASL v2, while Cyrus v1.5 used SASL v1.5.  /usr/share/doc/libsasl2 has more
+information on SASL v2.  Do pay attention to your SASL v2 installation, such
+as permissions and such.  When in doubt, read the README.simpleinstall
+document, as it describes an initial SASLv2 setup.
+
+NOTE: If you've already installed the cyrus 2.2 packages, skip to step 5.
+
+ 1. Become the "root" user on your local system.
+
+    $ /bin/su -
+    #
+
+ 2. Look for any running cyrus daemons using the ps(1) command.  Use
+    kill(1) to stop any processes that are found.
+
+    # /etc/init.d/pwcheck stop
+    # ps auwwx | grep cyr
+    # ps auwwx | grep pop3d
+    # ps auwwx | grep imapd
+    # ps auwwx | grep nntpd
+
+ 3. Remove the old cyrus packages.
+
+    ######################################################################
+    WARNING  WARNING  WARNING  WARNING  WARNING  WARNING  WARNING  WARNING
+    ######################################################################
+ 
+    Some versions of the cyrus-imapd packages, with versions 1.5.19-9.10
+    up to 1.5.19-20 (shipped in Debian Sarge 3.1r1) will entirely erase
+    the mail spool when purged with no questions asked.
+
+    You must NOT purge these packages before moving /var/lib/cyrus and
+    /var/spool/cyrus to somewhere safe.  Failure to do so will cause data
+    loss.
+
+    # mv /var/lib/cyrus /var/lib/old-cyrus
+    # mv /var/spool/cyrus /var/spool/old-cyrus
+
+    The cyrus-imapd packages in Woody (1.5.19-9.2) are safe, as well as
+    the fixed cyrus-imapd packages 1.5.19-20.1 which should make it to
+    Debian Sarge 3.1r2.
+
+    ######################################################################
+
+    # apt-get --purge remove cyrus-common cyrus-admin cyrus-imapd cyrus-pop3d \
+      cyrus-nntpd   [BUT SEE THE ABOVE WARNING FIRST!!!]
+
+    or use dselect/aptitude/synaptic/your favorite deb management tool.
+
+    IMPORTANT: You must answer "n" to this question:  "Do you want me to
+    remove the Cyrus mail and news spool (y/n) [n] ?"
+
+    NOTE: You could also copy -a the /var/spool/cyrus and /var/lib/cyrus
+    folders somewhere else, just in case.
+
+ 4. Install the new cyrus-imapd-2.2 packages. Make sure no user will try
+    to connect to imapd/pop3d and that no MTA will try to deliver to lmtpd
+    until you do step 5.
+
+    cyrus-common-2.2       [required]
+    cyrus-admin-2.2        [required]
+    cyrus-imapd-2.2        [optional; must have one of imapd or pop3d]
+    cyrus-pop3d-2.2        [optional; must have one of imapd or pop3d]
+    libcyrus-imap-perl22 [required]
+
+    # apt-get install PACKAGE-NAME [PACKAGE_NAME ...]
+
+    or use dselect.
+
+ 5. Stop the cyrmaster process.
+
+    # /etc/init.d/cyrus2.2 stop
+
+ 5a. Make sure Cyrus won't start until the upgrade process is over.
+
+    # cp -f /usr/lib/cyrus/upgrade/cyrus-db-types.upgrading_from_1.5.txt \
+            /usr/lib/cyrus/cyrus-db-types.active
+
+ 6. Change to the "cyrus" user.
+
+    # /bin/su - cyrus
+    $
+
+ 7. Run the rehash program.
+
+    $ /usr/lib/cyrus/upgrade/rehash basic
+
+ 8. Run ctl_mboxlist to update the "mailboxes" file.
+
+    $ cd /var/lib/cyrus
+    $ /usr/sbin/ctl_mboxlist -u < mailboxes
+
+ 9. Run the cyrreconstruct program from the /var/spool/cyrus directory
+    to reconstruct the mailboxes.
+
+    $ cd /var/spool/cyrus
+    $ /usr/sbin/cyrreconstruct -r user.*
+
+    (you may need to cyrreconstruct other mailboxes, if you have any
+    system mailboxes or shared mailboxes not in the user hierarchy)
+
+10. Exit the "cyrus" user, back to "root".
+
+    $ exit
+    #
+
+11. Upgrade all of the BerkleyDB files used by Cyrus from their current format to db4.2. You need db4.2-util installed.
+
+    # find /var/lib/cyrus -name \*.db -print -exec /usr/bin/db4.2_upgrade {} \;
+
+12. Convert the state databases to those used by new Cyrus 2.2
+
+    Read /usr/share/doc/cyrus-common-2.2/README.Debian.database, and follow
+    whatever steps you need to change the backends from db3 to skiplist.
+
+    This step needs some work, if you can send your experiences with it
+    to hmh@debian.org, I will update this document accordingly.
+
+**** The upgrade of Cyrus' stores are now complete ****
+
+You may want to remove any left-over empty directories from the old version,
+and re-run /usr/sbin/cyrus-makedirs just in case you got one of them wrong.
+
+Now, you need to reconfigure the new Cyrus imapd to adequate it to your system
+and SASL requirements. The Cyrus config files are /etc/imapd.conf,
+/etc/cyrus.conf and /etc/default/cyrus2.2.
+
+Depending on your SASL configuration, you may also need to modify
+/etc/pam.d/{imap,pop,sieve,lmtp} and other SASL configuration files.
+
+Do not forget to edit /etc/imapd.conf to e.g. set the "admins: cyrus" line (if
+you use "cyrus" as the name for the administrator).
+
+NOTES about DRAC authentication
+===============================
+
+DRAC has been disabled in cyrus-imapd-2.2, it caused quite some trouble and
+wasn't used by many. You can however build your own version by editing 00list
+in debian/patches and adding 20-drac_auth.dpatch to it at the proper place 
+(i.e. right before the patch numbered 21) and building cyrus-imapd-2.2 with
+dpkg-buildpackage or a similar tool.
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-admin-2.2.dirs
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-admin-2.2.dirs
@@ -0,0 +1 @@
+usr/bin
--- cyrus-imapd-2.2-2.2.13.orig/debian/imap.pam
+++ cyrus-imapd-2.2-2.2.13/debian/imap.pam
@@ -0,0 +1,14 @@
+# PAM configuration file for Cyrus IMAP service
+# $Id: imap.pam 5 2005-03-12 23:19:45Z sven $
+#
+# If you want to use Cyrus in a setup where users don't have
+# accounts on the local machine, you'll need to make sure
+# you use something like pam_permit for account checking.
+#
+# Remember that SASL (and therefore Cyrus) accesses PAM 
+# modules through saslauthd, and that SASL can only deal with
+# plaintext passwords if PAM is used.
+#
+
+@include common-auth
+@include common-account
--- cyrus-imapd-2.2-2.2.13.orig/debian/README.exim
+++ cyrus-imapd-2.2-2.2.13/debian/README.exim
@@ -0,0 +1,66 @@
+Setting up Cyrus IMAPd for Exim
+$Id: README.exim 727 2007-06-19 12:33:18Z astronut $
+===========================================================
+
+This is very incomplete information, if you are an exim user, please send
+in a more complete document.
+
+
+General configuration hints (configuration examples assume you are using
+the Debian Exim4 configuration scheme and paths are relative to
+/etc/exim4):
+
+1. Use Exim version 4.  Exim version 3 just doesn't cut it in the lmtp
+   area, which is very important for performance when dealing with Cyrus
+   IMAPd.
+
+2. Use the LMTP transport to deliver using a unix socket (fastest), or 
+   the SMTP transport in LMTP mode to deliver over a TCP/IP socket.
+
+   For local delivery over a unix socket, add a file into conf.d/transports
+   with the following:
+
+   cyrus_delivery:
+      driver = lmtp
+      socket = /var/run/cyrus/socket/lmtp
+      batch_max = 20
+      user = mail
+
+   (set batch_max to whatever is best for your setup, and make sure you
+    allow enough Cyrus lmtp processes to serve that many lmtp connections)
+
+   If that doesn't work, I suggest you create a group for lmtp delivery,
+   add whichever user exim is running as to it, and use dpkg-statoverride
+   to make /var/run/cyrus/socket/lmtp writeable by that group.
+
+   To then deliver to Cyrus, you will need to comment out the check_local_user
+   stanza in conf.d/router/900_exim4-config_local_user (the entire file), and
+   change the dc_localdelivery variable in /etc/exim4/update-exim4.conf.conf to 
+   'cyrus_delivery'.
+
+   If you still want to deliver some messages to a mail spool then create
+   conf.d/router/899_exim4-config_copy_to_mbox and put this in it, changing
+   the local_parts as necessary:
+
+   copy_to_mbox:
+      debug_print = "R: copy_to_mbox for $local_part@$domain"
+      driver = accept
+      unseen
+      local_parts = postmaster
+      transport = mail_spool
+  
+   This will deliver postmaster mail to both cyrus and
+   /var/mail/postmaster.  You can comment the unseen option to have it only
+   deliver once to the mail_spool.  If you don't set check_local_user or
+   the user option the spool files will be owned by mail.
+
+3. Kill any NULs (ASCII 0x00) inside the message, if you don't want Cyrus
+   to bounce such malformed crap.  Calling "tr -d '\000'" as a filter might
+   do the trick.
+
+4. Sieve often needs to set -f option on /usr/sbin/sendmail when doing
+   redirects.  Exim allows only trusted_users to do this.  It is recommended
+   that you make sure "cyrus" is in the list of trusted_users in 
+   conf.d/main/02_exim4-config_options:
+   trusted_users = uucp:cyrus
+
--- cyrus-imapd-2.2-2.2.13.orig/debian/TODO.Debian
+++ cyrus-imapd-2.2-2.2.13/debian/TODO.Debian
@@ -0,0 +1,67 @@
+Todo list
+---------
+
+$Id: TODO.Debian 521 2006-07-29 03:39:05Z astronut $
+
+CONFIRMED TODO FOR 2.2:
+o Cyrus 2.1 has alarm() lock breaking on lib/lock_fcntl().  This has
+  not been ported to 2.2 yet.  And it should not be ported until
+  #358742 is fixed. Note that if the user has to *kill* imapd to
+  unstick the lock, the issue is not in the alarm() code.
+
+
+EXTRA HIGH
+o master leaks memory when a service path is not null
+
+HIGH
+o Update copyright to my new template
+o Shout loudly if anything in .stage needs cleaning up
+o VERIFY SASL LEAKING CRAP TO prot_stream 
+	[info-cyrus  Re: Log messages going into imap/pop stream]
+o Revise rehash, it is busted...
+o Write nice shell wrapper for chk_cyrus and suggest a event to run it
+o Clean up script, that finds all crap over one day old in .stage
+  and delete it (after logging a warning). Add it as event.
+
+o https://bugzilla.andrew.cmu.edu/show_bug.cgi?id=1735
+
+MEDIUM
+o Verify kerberos build is still OK [gssapi]
+o Add switch to enable do-not-add-return-path-if-it-is-already-there to
+  deliver and LMTP input:
+   - Return-path:  Override (default: drop old return-paths, add ours)
+                   add (add if there isn't one in there already)
+  note that no return-path is NOT an option ;-)
+  Obs: - lmtpengine uses msg->return_path to know wether it got a mail from!
+       - dropping old return-paths is non-trivial
+o Fulldir-hash detection using the same mech as db-backend
+o auth_ldap, and runtime-selection of auth backends. Add kerberos backend
+  and kerberos support while at it, as well. [ cyrus 2.2 only ]
+
+LOW
+o Verify alpha build logs, and fix the warnings
+o Better logcheck.ignore
+o verify section of libcyrus-*-perl, as well as the manpages'
+o Fix bogosity on perl manpages .TH
+o netsaint example of full monitoring (imap, pop, lmtp, master via snmp)
+o cyrus2-admin.menu
+o find and package snmp loggers for cyrus (as examples)
+o automated database backend conversion?
+o sanitize usernames and folders to lowercase, no spaces or ill. chars
+  [does this make any sense? shouldn't that be done by user name canon.?]
+
+WON'T DO
+o cyrus2-{pop3d,imapd} should deal with cyrus.conf
+  - not needed; cyrus deals gracefully with missing binaries
+o Debconf configuration
+  - too troublesome; lusers are not welcome to using cyrus
+    without reading docs anyway, and it is all SASL's fault.
+
+BACKBURNER IDEAS
+o master
+  - capabilities, so as to be able to bind to ports <1024
+  - jailing at user level (and what of shared mbx?)
+  - Better handling of fucked up children that refuse to start?
+    + requires 5th forked state in master
+o i18n (GNU gettext, with kerberos guard for logs, messages;
+  sanity-enforced txt files for return messages)
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-admin-2.2.lintian
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-admin-2.2.lintian
@@ -0,0 +1 @@
+cyrus-admin-2.2: shell-script-fails-syntax-check ./usr/bin/cyradm
--- cyrus-imapd-2.2-2.2.13.orig/debian/imapd.conf
+++ cyrus-imapd-2.2-2.2.13/debian/imapd.conf
@@ -0,0 +1,327 @@
+# Debian Cyrus imapd.conf
+# $Id: imapd.conf 565 2006-08-14 16:51:28Z sven $
+# See imapd.conf(5) for more information and more options
+
+# Configuration directory
+configdirectory: /var/lib/cyrus
+
+# Which partition to use for default mailboxes
+defaultpartition: default
+partition-default: /var/spool/cyrus/mail
+
+# News setup
+partition-news: /var/spool/cyrus/news
+newsspool: /var/spool/news
+
+# Alternate namespace
+# If enabled, activate the alternate namespace as documented in
+# /usr/share/doc/cyrus-doc-2.2/html/altnamespace.html, where an user's
+# subfolders are in the same level as the INBOX
+# See also userprefix and sharedprefix on imapd.conf(5)
+altnamespace: no
+
+# UNIX Hierarchy Convention
+# Set to yes, and cyrus will accept dots in names, and use the forward
+# slash "/" to delimit levels of the hierarchy. This is done by converting
+# internally all dots to "^", and all "/" to dots. So the "rabbit.holes"
+# mailbox of user "helmer.fudd" is stored in "user.elmer^fud.rabbit^holes"
+unixhierarchysep: no
+
+# Rejecting illegal characters in headers
+# Headers of RFC2882 messages must not have characters with the 8th bit
+# set. However, too many badly-written MUAs generate this, including most
+# spamware. Enable this to reject such messages.
+#reject8bit: yes
+
+# Munging illegal characters in headers
+# Headers of RFC2882 messages must not have characters with the 8th bit
+# set. However, too many badly-written MUAs generate this, including most
+# spamware. If you kept reject8bit disabled, you can choose to leave the
+# crappage untouched by disabling this (if you don't care that IMAP SEARCH
+# won't work right anymore.
+#munge8bit: no
+
+# Forcing recipient user to lowercase
+# Cyrus 2.2 is case-sensitive.  If all your mail users are in lowercase, it is
+# probably a very good idea to set lmtp_downcase_rcpt to true.  This is set by 
+# default, per RFC2821. This was not set by default in debian versions up to
+# and including 2.2.12-4.
+lmtp_downcase_rcpt: yes
+
+# Uncomment the following and add the space-separated users who 
+# have admin rights for all services.
+#admins: cyrus
+
+# Space-separated list of users that have lmtp "admin" status (i.e. that
+# can deliver email through TCP/IP lmtp). If specified, this parameter
+# overrides the "admins" parameter above
+#lmtp_admins: postman
+
+# Space-separated list of users that have mupdate "admin" status, in
+# addition to those in the admins: entry above. Note that mupdate slaves and 
+# backends in a Murder cluster need to autenticate against the mupdate master
+# as admin users.
+#mupdate_admins: mupdateman
+
+# Space-separated list of users that have imapd "admin" status, in
+# addition to those in the admins: entry above
+#imap_admins: cyrus
+
+# Space-separated list of users that have sieve "admin" status, in
+# addition to those in the admins: entry above
+#sieve_admins: cyrus
+
+# List of users and groups that are allowed to proxy for other users,
+# seperated by spaces.  Any user listed in this will be allowed to login
+# for any other user.  Like "admins:" above, you can have imap_proxyservers
+# and sieve_proxyservers.
+#proxyservers: cyrus
+
+# No anonymous logins
+allowanonymouslogin: no
+
+# Minimum time between POP mail fetches in minutes
+popminpoll: 1
+
+# If nonzero, normal users may create their own IMAP accounts by creating
+# the mailbox INBOX.  The user's quota is set to the value if it is positive,
+# otherwise the user has unlimited quota.
+autocreatequota: 0
+
+# umask used by Cyrus programs
+umask: 077
+
+# Sendmail binary location
+# DUE TO A BUG, Cyrus sends CRLF EOLs to this program. This breaks Exim 3. 
+# For now, to work around the bug, set this to a wrapper that calls 
+# /usr/sbin/sendmail -dropcr instead if you use Exim 3.
+#sendmail: /usr/sbin/sendmail
+
+# If enabled, cyrdeliver will look for Sieve scripts in user's home
+# directories: ~user/.sieve.
+sieveusehomedir: false
+
+# If sieveusehomedir is false, this directory is searched for Sieve scripts.
+sievedir: /var/spool/sieve
+
+# notifyd(8) method to use for "MAIL" notifications.  If not set, "MAIL"
+# notifications are disabled.  Valid methods are: null, log, zephyr
+#mailnotifier: zephyr
+
+# notifyd(8) method to use for "SIEVE" notifications.  If not set, "SIEVE"
+# notifications are disabled.  This method is only used when no method is
+# specified in the script.  Valid methods are null, log, zephyr, mailto
+#sievenotifier: zephyr
+
+# DRAC (pop-before-smtp, imap-before-smtp) support
+# Set dracinterval to the time in minutes to call DRAC while a user is
+# connected to the imap/pop services. Set to 0 to disable DRAC (default)
+# Set drachost to the host where the rpc drac service is running
+#dracinterval: 0
+#drachost: localhost
+
+# If enabled, the partitions will also be hashed, in addition to the hashing
+# done on configuration directories. This is recommended if one partition has a
+# very bushy mailbox tree.
+hashimapspool: true
+
+# Allow plaintext logins by default (SASL PLAIN)
+allowplaintext: yes
+
+# Force PLAIN/LOGIN authentication only
+# (you need to uncomment this if you are not using an auxprop-based SASL
+# mechanism.  saslauthd users, that means you!). And pay attention to
+# sasl_minimum_layer and allowapop below, too.
+#sasl_mech_list: PLAIN
+
+# Allow use of the POP3 APOP authentication command.
+# Note that this command requires that the plaintext passwords are 
+# available in a SASL auxprop backend (eg. sasldb), and that the system
+# can provide enough entropy (eg. from /dev/urandom) to create a challenge
+# in the banner.
+#allowapop: no
+
+# The minimum SSF that the server will allow a client to negotiate. A
+# value of 1 requires integrity protection; any higher value requires some
+# amount of encryption.
+#sasl_minimum_layer: 0
+
+# The maximum SSF that the server will allow a client to negotiate. A
+# value of 1 requires integrity protection; any higher value requires some
+# amount of encryption.
+#sasl_maximum_layer: 256
+
+# List of remote realms whose users may log in using cross-realm
+# authentications. Seperate each realm name by a space. A cross-realm
+# identity is considered any identity returned by SASL with an "@" in it.
+# NOTE: To support multiple virtual domains on the same interface/IP,
+# you need to list them all as loginreals. If you don't list them here,
+# (most of) your users probably won't be able to log in.
+#loginrealms: example.com
+
+# Enable virtual domain support.  If enabled, the user's domain will
+# be determined by splitting a fully qualified userid at the last '@'
+# or '%' symbol.  If the userid is unqualified, and the virtdomains
+# option is set to "on", then the domain will be determined by doing
+# a reverse lookup on the IP address of the incoming network
+# interface, otherwise the user is assumed to be in the default
+# domain (if set).
+#virtdomains: userid
+
+# The default domain for virtual domain support
+# If the domain of a user can't be taken from its login and it can't
+# be determined by doing a reverse lookup on the interface IP, this
+# domain is used.
+#defaultdomain: 
+
+#
+# SASL library options (these are handled directly by the SASL libraries,
+# refer to SASL documentation for an up-to-date list of these)
+#
+
+# The mechanism(s) used by the server to verify plaintext passwords. Possible
+# values are "saslauthd", "auxprop", "pwcheck" and "alwaystrue".  They
+# are tried in order, you can specify more than one, separated by spaces.
+#
+# Do note that, since sasl will be run as user cyrus, you may have a lot of
+# trouble to set this up right.
+sasl_pwcheck_method: auxprop
+
+# What auxpropd plugins to load, if using sasl_pwcheck_method: auxprop
+# by default, all plugins are tried (which is probably NOT what you want).
+#sasl_auxprop_plugin: sasldb
+
+# If enabled, the SASL library will automatically create authentication secrets
+# when given a plaintext password. Refer to SASL documentation 
+sasl_auto_transition: no
+
+#
+# SSL/TLS Options
+#
+
+# File containing the global certificate used for ALL services (imap, pop3,
+# lmtp, sieve)
+#tls_cert_file: /etc/ssl/certs/ssl-cert-snakeoil.pem
+
+# File containing the private key belonging to the global server certificate.
+#tls_key_file: /etc/ssl/private/ssl-cert-snakeoil.key
+
+# File containing the certificate used for imap. If not specified, the global
+# certificate is used.  A value of "disabled" will disable SSL/TLS for imap.
+#imap_tls_cert_file: /etc/ssl/certs/cyrus-imap.pem
+
+# File containing the private key belonging to the imap-specific server
+# certificate.  If not specified, the global private key is used.  A value of
+# "disabled" will disable SSL/TLS for imap.
+#imap_tls_key_file: /etc/ssl/private/cyrus-imap.key
+
+# File containing the certificate used for pop3. If not specified, the global
+# certificate is used.  A value of "disabled" will disable SSL/TLS for pop3.
+#pop3_tls_cert_file: /etc/ssl/certs/cyrus-pop3.pem
+
+# File containing the private key belonging to the pop3-specific server
+# certificate.  If not specified, the global private key is used.  A value of
+# "disabled" will disable SSL/TLS for pop3.
+#pop3_tls_key_file: /etc/ssl/private/cyrus-pop3.key
+
+# File containing the certificate used for lmtp. If not specified, the global
+# certificate is used.  A value of "disabled" will disable SSL/TLS for lmtp.
+#lmtp_tls_cert_file: /etc/ssl/certs/cyrus-lmtp.pem
+
+# File containing the private key belonging to the lmtp-specific server
+# certificate.  If not specified, the global private key is used.  A value of
+# "disabled" will disable SSL/TLS for lmtp.
+#lmtp_tls_key_file: /etc/ssl/private/cyrus-lmtp.key
+
+# File containing the certificate used for sieve. If not specified, the global
+# certificate is used.  A value of "disabled" will disable SSL/TLS for sieve.
+#sieve_tls_cert_file: /etc/ssl/certs/cyrus-sieve.pem
+
+# File containing the private key belonging to the sieve-specific server
+# certificate.  If not specified, the global private key is used.  A value of
+# "disabled" will disable SSL/TLS for sieve.
+#sieve_tls_key_file: /etc/ssl/private/cyrus-sieve.key
+
+# File containing one or more Certificate Authority (CA) certificates.
+#tls_ca_file: /etc/ssl/certs/cyrus-imapd-ca.pem
+
+# Path to directory with certificates of CAs.
+tls_ca_path: /etc/ssl/certs
+
+# The length of time (in minutes) that a TLS session will be cached for later
+# reuse.  The maximum value is 1440 (24 hours), the default.  A value of 0 will
+# disable session caching.
+tls_session_timeout: 1440
+
+# The list of SSL/TLS ciphers to allow, in decreasing order of precedence.  
+# The format of the string is described in ciphers(1).  The Debian default
+# selects TLSv1 high-security ciphers only, and removes all anonymous ciphers
+# from the list (because they provide no defense against man-in-the-middle
+# attacks).  It also orders the list so that stronger ciphers come first.
+tls_cipher_list: TLSv1+HIGH:!aNULL:@STRENGTH
+
+# Require a client certificate for ALL services (imap, pop3, lmtp, sieve).
+#tls_require_cert: false
+
+# Require a client certificate for imap ONLY.
+#imap_tls_require_cert: false
+
+# Require a client certificate for pop3 ONLY.
+#pop3_tls_require_cert: false
+
+# Require a client certificate for lmtp ONLY.
+#lmtp_tls_require_cert: false
+
+# Require a client certificate for sieve ONLY.
+#sieve_tls_require_cert: false
+
+#
+# Cyrus Murder cluster configuration
+#
+# Set the following options to the values needed for this server to
+# autenticate against the mupdate master server:
+# mupdate_server
+# mupdate_port
+# mupdate_username
+# mupdate_authname
+# mupdate_realm
+# mupdate_password
+# mupdate_retry_delay
+
+##
+## KEEP THESE IN SYNC WITH cyrus.conf
+##
+# Unix domain socket that lmtpd listens on.
+lmtpsocket: /var/run/cyrus/socket/lmtp
+
+# The idle backend to use for IDLE command.
+# Options: poll (default), idled, no
+# poll doesn't need the idled daemon and is supposed to be more robust.
+# however it doesn't update as quickly as the idled backend does. "no"
+# turns off IDLE support. If set to "idled", you will also need to enable
+# the "idled" entry in cyrus.conf.
+idlemethod: poll
+
+# Unix domain socket that idled listens on.
+idlesocket: /var/run/cyrus/socket/idle
+
+# Unix domain socket that the new mail notification daemon listens on.
+notifysocket: /var/run/cyrus/socket/notify
+
+# Syslog prefix. Defaults to cyrus (so logging is done as cyrus/imap etc.)
+syslog_prefix: cyrus
+
+##
+## DEBUGGING
+##
+# Debugging hook. See /usr/share/doc/cyrus-common-2.2/README.Debian.debug
+# Keep the hook disabled when it is not in use
+#
+# gdb Back-traces
+#debug_command: /usr/bin/gdb -batch -cd=/tmp -x /usr/lib/cyrus/get-backtrace.gdb /usr/lib/cyrus/bin/%s %d >/tmp/gdb-backtrace.cyrus.%1$s.%2$d <&- 2>&1 &
+#
+# system-call traces
+#debug_command: /usr/bin/strace -tt -o /tmp/strace.cyrus.%s.%d -p %2$d <&- 2>&1 &
+#
+# library traces
+#debug_command: /usr/bin/ltrace -tt -n 2 -o /tmp/ltrace.cyrus.%s.%d -p %2$d <&- 2>&1 &
--- cyrus-imapd-2.2-2.2.13.orig/debian/logcheck.ignore
+++ cyrus-imapd-2.2-2.2.13/debian/logcheck.ignore
@@ -0,0 +1,64 @@
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: skiplist: recovered
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: skiplist: checkpointed
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: duplicate_prune: pruning
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: duplicate_prune: purged
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: executed
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: accepted connection
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: telling master
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +mydelete:
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: (bad)?login:
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: starttls: [[:alnum:]]+ with cipher
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: (\[[a-z0-9]+\] )?STARTTLS( negotiation)? failed:
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: DIGEST-MD5 server step
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/ctl_cyrusdb\[[0-9]+\]: (done +)?recovering cyrus databases
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/ctl_cyrusdb\[[0-9]+\]: archiving
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/ctl_cyrusdb\[[0-9]+\]: checkpointing
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/ctl_cyrusdb\[[0-9]+\]: done checkpointing
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/ctl_deliver\[[0-9]+\]: duplicate_prune: pruning back
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/ctl_deliver\[[0-9]+\]: duplicate_prune: purged
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/tls_prune\[[0-9]+\]: (tls_prune: )?purged
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/master\[[0-9]+\]: ready for work
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/master\[[0-9]+\]: about to exec
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/master\[[0-9]+\]: process started
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/master\[[0-9]+\]: process [0-9]+ exited, status 0$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/master\[[0-9]+\]: service [a-zA-Z0-9]+ now has [0-9]+ workers
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: pop3s failed:
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: lmtp connection preauth'd as postman
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: dupelim: eliminated duplicate message to
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: duplicate_check:
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: duplicate_mark:
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: mystore: committing txn
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: mystore: starting txn
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: sieve parse error
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: sieve: discarded
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: abort_txn: aborting txn
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: delete: starting txn
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: open: user .* opened
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: mycommit: committing txn
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: myfetch: reusing txn
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: myfetch: starting txn
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: mystore: reusing txn
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: seen_db: user .* opened
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: Connection reset by peer, closing connection
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: SQUAT failed
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: SQUAT returned [0-9]+ messages
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: idle for too long, closing connection
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: annotatemore_store
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: created stage directory
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: imaps TLS negotiation failed
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: synchronizing mailbox
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: mailbox list synchronization
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: unready for connections
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/squatter\[[0-9]+\]: (done )?(indexing|skipping) mailbox
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/notifyd\[[0-9]+\]: do_notify using method
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/lmtpunix\[[0-9]+\]: IOERROR: fstating sieve script [/a-zA-Z^]+/defaultbc: No such file or directory
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/lmtpunix\[[0-9]+\]: WARNING: sieve script /var/spool/sieve/[._/[:alnum:]^-]+defaultbc doesn't exist: No such file or directory
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/sieve\[[0-9]+\]: entered bc_action_emit with filelen: [0-9]+$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/(imaps?|pop3s?)\[[0-9]+\]: no secret in database$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/cyr_expire\[[0-9]+\]: expunged 0 out of 0 messages from 0 mailboxes$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/(imaps?|pop3s?)\[[0-9]+\]: Expunged [0-9]+ messages from
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/(lmtp|lmtpunix)\[[0-9]+\]: Delivered: <?[^ >]+>? +to mailbox: .*$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ perl: DIGEST-MD5 client step [0-9]$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/lmtpunix\[[0-9]+\]: sieve redirected: <?[^ >]+>? +to: [._[:alnum:]-]+@[._[:alnum:]-]+$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/(lmtp|lmtpunix)\[[0-9]+\]: duplicate_(check|mark): .*$
+
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-nntpd-2.2.manpages
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-nntpd-2.2.manpages
@@ -0,0 +1,2 @@
+man/fetchnews.8
+man/nntpd.8
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-common-2.2.preinst
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-common-2.2.preinst
@@ -0,0 +1,55 @@
+#! /bin/sh
+# preinst script for cyrus-common-2.2
+# Copyright (c) 2006 by Sven Mueller
+# Distributed under the GNU General Public License version 2
+# $Id: cyrus-common-2.2.preinst 824 2009-09-08 08:22:11Z sven $
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+# <new-preinst> upgrade <old-version>
+# <new-preinst> install <old-version>
+# <old-preinst> abort-upgrade <new-version>
+# for details, see /usr/doc/packaging-manual/
+
+case "$1" in
+		upgrade)
+			# old version was fully installed
+			if dpkg --compare-versions "$2" lt "2.2.13-4bpo1"; then
+				# Upgrading from a version which used a wrong
+				# filename for the daily cronjob
+				if [ -f /etc/cron.daily/cyrus-common-2.2 ] \
+				&& [ ! -f /etc/cron.daily/cyrus22 ]; then
+					mv -f /etc/cron.daily/cyrus-common-2.2 /etc/cron.daily/cyrus22
+				fi
+			fi
+			;;
+		install)
+			# old version was in "configuration files only" state
+			if dpkg --compare-versions "$2" lt "2.2.13-4bpo1"; then
+				# Upgrading from a version which used a wrong
+				# filename for the daily cronjob
+				if [ -f /etc/cron.daily/cyrus-common-2.2 ] \
+				&& [ ! -f /etc/cron.daily/cyrus22 ]; then
+					mv -f /etc/cron.daily/cyrus-common-2.2 /etc/cron.daily/cyrus22
+				fi
+			fi
+			;;
+		abort-upgrade)
+			# upgrade failed after unpack - error unwind is tried
+			# however, if it works, new-postrm is also called with abort-upgrade
+			;;
+		*)
+			echo "postrm called with unknown argument \`$1'" >&2
+			exit 0
+
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-common-2.2.manpages
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-common-2.2.manpages
@@ -0,0 +1,23 @@
+debian/tmp/usr/share/man/man5/cyrus.conf.5
+debian/tmp/usr/share/man/man5/imapd.conf.5
+debian/tmp/usr/share/man/man8/cyrus-makedirs.8
+debian/tmp/usr/share/man/man8/cyrdump.8
+debian/tmp/usr/share/man/man8/mbpath.8
+debian/tmp/usr/share/man/man8/arbitron.8
+debian/tmp/usr/share/man/man8/arbitronsort.8
+debian/tmp/usr/share/man/man8/timsieved.8
+debian/tmp/usr/share/man/man8/notifyd.8
+debian/tmp/usr/share/man/man8/lmtpd.8
+debian/tmp/usr/share/man/man8/ctl_*.8
+debian/tmp/usr/share/man/man8/cvt_*.8
+debian/tmp/usr/share/man/man8/chk_*.8
+debian/tmp/usr/share/man/man8/fud.8
+debian/tmp/usr/share/man/man8/ipurge.8
+debian/tmp/usr/share/man/man8/tls_prune.8
+debian/tmp/usr/share/man/man8/cyrdeliver.8
+debian/tmp/usr/share/man/man8/cyrmaster.8
+debian/tmp/usr/share/man/man8/cyrreconstruct.8
+debian/tmp/usr/share/man/man8/cyrquota.8
+debian/tmp/usr/share/man/man8/mbexamine.8
+debian/tmp/usr/share/man/man8/smmapd.8
+debian/tmp/usr/share/man/man8/cyr_expire.8
--- cyrus-imapd-2.2-2.2.13.orig/debian/rules
+++ cyrus-imapd-2.2-2.2.13/debian/rules
@@ -0,0 +1,337 @@
+#!/usr/bin/make -f
+# debian/rules for CMU Cyrus IMAP version 2.2
+# GNU copyright 1997 by Joey Hess.
+# Copyright (c) 2001 by Henrique de Moraes Holschuh
+# Published under the GNU GPL license
+# Based on previous work by Michael-John Turner <mj@debian.org>,
+#			    David Parker <david@neongoat.com>
+#
+
+# DebHelper control
+export DH_ALWAYS_EXCLUDE=CVS
+
+export MAINPKG=cyrus-common-2.2
+export DOCPKG=cyrus-doc-2.2
+export TMPPKG := $(CURDIR)/debian/tmp
+export PKGDIR := $(CURDIR)/debian/$(MAINPKG)
+export DOCDIR := $(CURDIR)/debian/$(DOCPKG)/usr/share/doc/$(DOCPKG)
+
+export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+include /usr/share/quilt/quilt.make
+
+# Extra version information to add to Cyrus IMAPd ID
+DEBVERSION:=$(shell LCALL=C dpkg-parsechangelog | sed -ne 's/^Version: \(.*-\)/\1/p')
+EXTRA_IDENT:="Debian-$(DEBVERSION)"
+
+# DB engine version
+DBENGINE=BerkeleyDB4.7
+
+DEBUGFLAGS=-g
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	DEBUGFLAGS += -O0
+else
+	DEBUGFLAGS += -O2
+endif
+
+# TODO: Support parallel builds (make -j x)
+
+# FOR AUTOCONF 2.52 AND NEWER ONLY
+CONFFLAGS =
+ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+  CONFFLAGS += --build $(DEB_HOST_GNU_TYPE)
+else
+  CONFFLAGS += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
+endif
+
+# Other oddities
+ifneq (,$(findstring strict,$(DEB_BUILD_OPTIONS)))
+	CONFFLAGS += --enable-warnings-are-errors
+endif
+
+# The clean target will remove any and all cruft (as defined by 
+# configure ; make distclean ; cd intl; make distclean ). 
+# This is done to make sure the build daemon's source tree is the 
+# same as the one I am using to produce the i386 debs. 
+clean: unpatch
+	dh_testdir
+	dh_testroot
+	-xargs -t -r chmod +x < debian/executable.files
+	-rm -f build-indep-stamp build-arch-stamp configure-stamp install-arch-stamp install-indep-stamp build-stamp
+	[ ! -f Makefile ] || $(MAKE) -i distclean
+	-rm -f config.h config.cache config.status config.log stamp-config confdefs.h
+	-rm -f config.sub config.guess
+	-rm -f netnews/Makefile perl/imap/Makefile.old perl/sieve/managesieve/Makefile.old snmp/Makefile Makefile et/Makefile
+	-rm -f doc/pod2htm*
+	-rm -f master/makedepend.log imap/idled sieve/sievec sieve/sieved
+	-rm -rf doc/man
+	-rm -f debian/cyrus-db-types.txt debian/cyrus-hardwired-config.txt debian/README.configure-options
+	# -rm -rf et/
+	rm -rf autom4te.cache
+	-xargs -t -r rm -f < debian/deletable.files
+	dh_clean
+
+build: build-arch build-indep
+
+configure-stamp: $(QUILT_STAMPFN)
+	dh_testdir
+	cp /usr/share/misc/config.sub config.sub
+	cp /usr/share/misc/config.guess config.guess
+	touch configure.in && touch aclocal.m4 && touch configure
+	#
+	# IF YOU CHANGE BERKELEY DB VERSION, MAKE SURE TO UPDATE
+	# DBENGINE AT THE TOP OF THIS MAKEFILE!
+	./configure CFLAGS="-fno-strict-aliasing -fPIC -Wall -pipe $(DEBUGFLAGS)" $(CONFFLAGS) \
+	 --with-extraident=$(EXTRA_IDENT) \
+	 --prefix=/usr/share --exec-prefix=/usr --libexecdir=/usr/sbin \
+	 --bindir=/usr/sbin --sbindir=/usr/sbin \
+	 --includedir=/usr/include/cyrus \
+	 --datadir=/usr/share/cyrus --sysconfdir=/etc \
+	 --with-statedir=/var/state \
+	 --sharedstatedir=/usr/share/cyrus \
+	 --localstatedir=/var/lib/cyrus \
+	 --mandir=/usr/share/man \
+	 --with-cyrus-prefix=/usr/lib/cyrus --with-lock=fcntl \
+	 --with-perl=/usr/bin/perl \
+	 --with-openssl=/usr --with-auth=unix \
+	 --enable-murder --enable-nntp \
+	 --disable-listext --enable-annotatemore --with-sasl=/usr \
+	 --with-drac=/usr \
+	 --with-cyrus-user=cyrus --with-cyrus-group=mail \
+	 --with-tclsh=/usr/bin/tclsh --with-com_err=/usr \
+	 --with-pidfile=/var/run/cyrmaster.pid \
+	 --with-syslogfacility=MAIL \
+	 --with-seen-db=skiplist --with-mboxlist-db=skiplist \
+	 --enable-gssapi --with-gss_impl=heimdal \
+	 --with-ucdsnmp=/usr
+	if grep -q "WARNING: Disabling GSSAPI" config.log ; then \
+		echo "ERROR: GSSAPI not found by configure" >&2 ;\
+		exit 1 ;\
+	fi
+	echo 'To build this package, configure was called as follows:' \
+		> debian/README.configure-options
+	grep with\ options config.status \
+	| sed -e 's/^.*options \\"/configure /;s/\\"$///' \
+		>> debian/README.configure-options
+	sed -i 's/ -lsensors//' master/Makefile
+	touch configure-stamp
+
+build-arch: build-arch-stamp
+build-arch-stamp: configure-stamp
+	dh_testdir
+	#
+	PERL_MM_OPT="INSTALLDIRS=vendor" $(MAKE)
+	# store database configuration for possible automatic
+	# upgrading later
+	echo "DBENGINE $(DBENGINE)" >>debian/cyrus-db-types.txt
+	grep _db lib/imapoptions \
+	| cut -d, -f1-2 | sed -e 's/{ "//;s/_db", "/ /;s/"$$//' \
+	| sed -e 's/^tls.* /TLS /;s/^subs.* /SUBS /;s/^seen.* /SEEN /;s/^pts.* /PTS /;s/^mbox.* /MBOX /'\
+	| awk '{printf("%s %s\n",toupper($$1),$$2);}' \
+	>>debian/cyrus-db-types.txt
+	mv debian/cyrus-db-types.txt debian/cyrus-db-types.txt.old \
+	&& sort -u < debian/cyrus-db-types.txt.old > debian/cyrus-db-types.txt \
+	&& rm debian/cyrus-db-types.txt.old
+	#
+	# store some useful state about the current package
+	echo "PACKAGE_VERSION $(DEBVERSION)" >debian/cyrus-hardwired-config.txt
+	if grep -q -s -n -E '^[[:space:]]*#define[[:space:]]+USE_DIR_FULL[[:space:]]+1' config.h ; then \
+		echo "USE_DIR_FULL 1" >>debian/cyrus-hardwired-config.txt ;\
+	else \
+		echo "USE_DIR_FULL 0" >>debian/cyrus-hardwired-config.txt ;\
+	fi
+	touch build-arch-stamp
+
+# We aren't actually able to build arch-indep independently from
+# arch-dep, so we guarantee that the arch build has been done first
+build-indep: build-indep-stamp
+build-indep-stamp: configure-stamp build-arch-stamp
+	dh_testdir
+	cd doc &&\
+	pod2man ../perl/sieve/scripts/sieveshell.pl > ../man/sieveshell.1 &&\
+	fig2dev -L png murder.fig murder.png &&\
+	rm -f groff-html-*.png pod2htm*
+	cd doc &&\
+	mkdir -p man &&\
+	for man in ../man/*.[1-9] ../debian/*.[1-9]; do \
+	   echo "Generating html manpage for $$man..."; \
+	   groff -man -Thtml $$man > man/`basename $$man`.html; \
+	done
+	pod2html perl/imap/cyradm.sh > doc/man/cyradm.1.html
+	rm -f pod2htm*
+	touch build-indep-stamp
+
+install-arch: build-arch-stamp
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs -a
+	$(MAKE) install DESTDIR=$(TMPPKG)
+	# fix totaly broken location of the include files;
+	# while at it, also avoid namespace colision, and move
+	# lots of admin-only/system-only stuff to sbin and lib
+	# also, do the renaming needed for alternatives
+	# and fix the weird side-effect of setting the proper cyrus
+	# location in configure.
+	mkdir -p $(TMPPKG)/usr/sbin
+	mkdir -p $(TMPPKG)/usr/lib/cyrus
+	for i in master reconstruct quota deliver ; do \
+		mv $(TMPPKG)/usr/lib/cyrus/bin/$$i $(TMPPKG)/usr/sbin/cyr$$i ;\
+	done
+	for i in mbpath ctl_mboxlist ctl_deliver ctl_cyrusdb squatter \
+	         tls_prune ipurge cyrdump cvt_cyrusdb chk_cyrus arbitron \
+		 cyr_expire; do \
+		mv $(TMPPKG)/usr/lib/cyrus/bin/$$i $(TMPPKG)/usr/sbin/$$i ;\
+	done
+	mkdir -p $(TMPPKG)/usr/include
+	mv $(TMPPKG)/usr/share/include/cyrus $(TMPPKG)/usr/include
+	#mv $(TMPPKG)/bin/* $(TMPPKG)/usr/bin
+	# Move the perl crap to a saner place
+	mkdir -p $(TMPPKG)/usr/lib
+	mkdir -p $(TMPPKG)/usr/share/perl5
+	#mv $(TMPPKG)/lib/perl5/Cyrus $(TMPPKG)/usr/share/perl5/Cyrus
+	#mv $(TMPPKG)/lib/* $(TMPPKG)/usr/lib
+	# for stuff in /etc
+	mkdir -p $(TMPPKG)/etc/cyrus $(TMPPKG)/etc/pam.d
+	install -m 644 debian/imapd.conf    $(TMPPKG)/etc
+	install -m 644 debian/cyrus.conf    $(TMPPKG)/etc
+	(cd debian ; for i in *.pam ;\
+		do install -m 644 $$i $(TMPPKG)/etc/pam.d/$${i%.pam} ;\
+	done)
+	# We rename some utils, so we need to sort out the manpages
+	for i in master reconstruct quota deliver ; do \
+		mv $(TMPPKG)/usr/share/man/man8/$$i.8 $(TMPPKG)/usr/share/man/man8/cyr$${i}.8 ; \
+	done
+	# And add our own manpages
+	mkdir -p $(TMPPKG)/usr/share/man/man8
+	install -m 644 debian/cyrdump.8 $(TMPPKG)/usr/share/man/man8/cyrdump.8
+	install -m 644 debian/cyrus-makedirs.8 $(TMPPKG)/usr/share/man/man8/cyrus-makedirs.8
+	install -m 644 debian/arbitronsort.8 $(TMPPKG)/usr/share/man/man8/arbitronsort.8
+	# SNMP files
+	mkdir -p $(TMPPKG)/usr/share/snmp/mibs
+	install -m 644 master/CYRUS-MASTER.mib $(TMPPKG)/usr/share/snmp/mibs/CYRUS-MASTER-MIB.txt
+	# Install cyradm icons
+	mkdir -p $(TMPPKG)/usr/share/icons/mini
+	install -m 644 debian/cyradm-32x32.xpm $(TMPPKG)/usr/share/icons/cyradm.xpm
+	install -m 644 debian/cyradm-16x16.xpm $(TMPPKG)/usr/share/icons/mini/cyradm.xpm
+	# Install debian-provided scripts
+	install debian/cyrus-makedirs $(TMPPKG)/usr/sbin/cyrus-makedirs
+	install -m 644 debian/get-backtrace.gdb $(TMPPKG)/usr/lib/cyrus/get-backtrace.gdb
+	# and logcheck files
+	install -m 644 debian/logcheck.ignore \
+	  $(PKGDIR)/etc/logcheck/ignore.d.server/logcheck-cyrus2_2
+	install -m 644 debian/logcheck.violations.ignore \
+	  $(PKGDIR)/etc/logcheck/violations.ignore.d/logcheck-cyrus2_2
+	# Install the stuff needed for upgrades
+	for i in convert-sieve.pl dohash rehash undohash translatesieve \
+		 upgradesieve masssievec; do \
+		install -m 755 tools/$$i $(PKGDIR)/usr/lib/cyrus/upgrade ;\
+	done
+	install -m 644 debian/cyrus-db-types.upgrading_from_1.5.txt $(PKGDIR)/usr/lib/cyrus/upgrade
+	# And other upgrade helpers
+	install -m 644 debian/cyrus-db-types.txt debian/cyrus-hardwired-config.txt \
+		   $(PKGDIR)/usr/lib/cyrus
+	# And other misc useful tools
+	install -m 755 tools/arbitronsort.pl $(TMPPKG)/usr/sbin/arbitronsort
+	# Install imtest and its symlinks
+	mv $(TMPPKG)/usr/bin/imtest $(CURDIR)/debian/cyrus-clients-2.2/usr/bin
+	for i in $(TMPPKG)/usr/bin/*test ; do \
+		rm -f "$$i" || true ;\
+		(cd $(CURDIR)/debian/cyrus-clients-2.2/usr/bin &&\
+		 ln -s imtest `basename $$i`) ;\
+	done
+	# Lintian overrides
+	cd debian ; \
+	for i in *.lintian ; do \
+		mkdir -p "$${i%%.lintian}/usr/share/lintian/overrides" ;\
+		install  -m 644 "$$i" "$${i%%.lintian}/usr/share/lintian/overrides/$${i%%.lintian}" ;\
+	done
+	dh_install -a --sourcedir=$(TMPPKG)
+	touch install-arch-stamp
+
+# We aren't actually able to install arch-indep independently from
+# arch-dep, so we guarantee that the arch build has been done first
+install-indep: build-indep-stamp install-arch
+	dh_testdir
+	dh_testroot
+	#dh_clean -k
+	dh_installdirs -i
+	#
+	# Massage the documentation into place
+	#mkdir -p $(DOCDIR)
+	#find doc/text -name '[Ra-z]*' -type f -exec cp -f {} $(PKGDIR)/usr/share/doc/$(MAINPKG) \;
+	#-(cd $(PKGDIR)/usr/share/doc/$(MAINPKG) && rm copyrights changes htmlstrip.c)
+	#find $(PKGDIR)/usr/share/doc/$(MAINPKG) -type f ! -name '*txt' ! -name '*.*' -exec mv {} {}.txt \;
+	#
+	# Install the html docs and examples
+	mkdir -p $(DOCDIR)/html
+	install -m 644 doc/*.html doc/murder.png $(DOCDIR)/html
+	cp -a doc/man $(DOCDIR)/html
+	cp -a debian/examples $(DOCDIR)
+	install -m 644 doc/cyrusv2.mc $(DOCDIR)/examples
+	#
+	# Install contrib/ files
+	mkdir -p $(DOCDIR)/contrib
+	xargs < debian/cyrus-common-2.2.contrib -rti cp -r '{}' $(DOCDIR)/contrib
+	#
+	dh_install -i --sourcedir=$(TMPPKG)
+	find debian/cyrus-doc-2.2/usr/share/doc/cyrus-doc-2.2 -name .svn | xargs -r rm -rf
+
+binary-indep: install-indep
+	dh_testdir -i
+	dh_testroot -i
+#	dh_installdebconf -i
+	dh_installdocs -p cyrus-admin-2.2 -p cyrus-doc-2.2
+	dh_installexamples -p cyrus-admin-2.2
+	dh_installmenu -i
+#	dh_installlogrotate -i
+#	dh_installpam -i
+#	dh_installmime -i
+#	dh_installcron -i
+	dh_installman -i
+	dh_installchangelogs -p cyrus-admin-2.2 doc/changes.html
+	dh_installchangelogs -p cyrus-doc-2.2
+	dh_strip -i
+	dh_link -i
+	dh_compress -i
+	dh_fixperms -i
+	dh_makeshlibs -i
+	dh_installdeb -i
+	dh_perl -i
+	dh_shlibdeps -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
+
+binary-arch: install-arch
+	dh_testdir -a
+	dh_testroot -a
+	dh_installdebconf -a
+	dh_installdocs -p $(MAINPKG) -p cyrus-clients-2.2 -p libcyrus-imap-perl22
+	dh_installexamples -p $(MAINPKG) -p libcyrus-imap-perl22 -p cyrus-clients-2.2
+	dh_installmenu -a
+#	dh_installlogrotate -a
+#	dh_installpam -a
+#	dh_installmime -a
+	dh_installinit -p $(MAINPKG) --noscripts --name=cyrus2.2
+	dh_installcron -a --name=cyrus22 
+	dh_installman -a
+#	dh_installinfo -a
+	dh_installchangelogs -p $(MAINPKG) -p cyrus-clients-2.2 doc/changes.html
+	dh_installchangelogs -p libcyrus-imap-perl22 perl/imap/Changes
+	dh_fixperms -a
+	dh_strip -a
+	dh_link -a
+	dh_compress -a
+	dh_fixperms -a
+	dh_makeshlibs -a
+	dh_installdeb -a
+	dh_perl -a
+	dh_shlibdeps -a
+	dh_gencontrol -a
+	dh_md5sums -a
+	dh_builddeb -a
+
+binary: binary-indep binary-arch
+.PHONY: build build-indep build-arch clean binary-indep binary-arch binary install-arch install-indep
--- cyrus-imapd-2.2-2.2.13.orig/debian/libcyrus-imap-perl22.lintian
+++ cyrus-imapd-2.2-2.2.13/debian/libcyrus-imap-perl22.lintian
@@ -0,0 +1 @@
+libcyrus-imap-perl22: package-installs-nonbinary-perl-in-usr-lib-perl5
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-pop3d-2.2.manpages
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-pop3d-2.2.manpages
@@ -0,0 +1 @@
+man/pop3d.8
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-common-2.2.postinst
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-common-2.2.postinst
@@ -0,0 +1,160 @@
+#! /bin/sh
+# postinst script for cyrus-common-2.2
+# Copyright (c) 2002 by Henrique de Moraes Holschuh
+# Distributed under the GNU General Public License version 2
+# $Id: cyrus-common-2.2.postinst 825 2009-09-08 08:22:44Z sven $
+#
+# see: dh_installdeb(1)
+
+# debconf hook
+. /usr/share/debconf/confmodule
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see /usr/doc/packaging-manual/
+#
+# quoting from the policy:
+#     Any necessary prompting should almost always be confined to the
+#     post-installation script, and should be protected with a conditional
+#     so that unnecessary prompting doesn't happen if a package's
+#     installation fails and the `postinst' is called with `abort-upgrade',
+#     `abort-remove' or `abort-deconfigure'.
+
+export PATH=/sbin:/usr/sbin:/bin:/usr/bin
+
+verifydb() {
+   while read -r DBKEY DBVALUE ; do
+	match=`LC_ALL=C gawk "/^${DBKEY}[[:blank:]]/ { print \\$2 }" < $1`
+	[ "x${match}" != "x${DBVALUE}" ] && return 0
+   done
+   return 1
+}
+
+verifydbkey() {
+   while read -r DBKEY DBVALUE ; do
+	if [ "${DBKEY}" = "$2" ] ; then
+	    match=`LC_ALL=C gawk "/^${DBKEY}[[:blank:]]/ { print \\$2 }" < $1`
+	    [ "x${match}" != "x${DBVALUE}" ] && return 0
+	fi
+   done
+   return 1
+}
+
+case "$1" in
+    configure)
+	# Add the cyrus user (requires adduser >= 3.34)
+	echo "Creating/updating cyrus user account..."
+	adduser --quiet --system --ingroup mail --home /var/spool/cyrus \
+           --shell /bin/sh --no-create-home --disabled-password \
+	   --gecos "Cyrus Mailsystem User"  cyrus >/dev/null || {
+	   if getent passwd | grep -s -q -E '^cyrus:'; then
+		   echo "Non-system user cyrus found. I will not overwrite a non-system" >&2
+		   echo "user. Remove the user and reinstall cyrus-common-2.2." >&2
+		   exit 1
+	   fi
+	   # unknown adduser error, simply exit
+	   exit 1
+	}
+
+	# Force correct owner and modes
+	dpkg-statoverride --list /var/lib/cyrus 2>&1 >/dev/null ||
+		dpkg-statoverride --update --add cyrus mail 750 /var/lib/cyrus
+	dpkg-statoverride --list /var/spool/cyrus 2>&1 >/dev/null ||
+		dpkg-statoverride --update --add cyrus mail 755 /var/spool/cyrus
+	dpkg-statoverride --list /var/spool/sieve 2>&1 >/dev/null ||
+		dpkg-statoverride --update --add cyrus mail 755 /var/spool/sieve
+	dpkg-statoverride --list /var/run/cyrus 2>&1 >/dev/null ||
+		dpkg-statoverride --update --add cyrus mail 755 /var/run/cyrus
+	dpkg-statoverride --list /var/run/cyrus/socket 2>&1 >/dev/null ||
+		dpkg-statoverride --update --add cyrus mail 750 \
+				 /var/run/cyrus/socket
+
+	# Add user cyrus to group SASL, if such group exists
+	adduser cyrus sasl || true
+
+	# Convert the spool to the proper mode, if needed (autodetects
+	# only Debian's default spool, this codepath is meant for package
+	# upgrades only)
+	# DISABLED, since rehash seems busted
+	#[ -d /var/spool/cyrus/mail/A ] && {
+	#	echo Converting spools to basic hash scheme...
+	#	#su - cyrus -c "/usr/lib/cyrus/upgrade/rehash basic"
+	#	start-stop-daemon --start --exec /usr/lib/cyrus/upgrade/rehash --chuid cyrus:mail --verbose -- basic
+	#}
+
+	# Parse imapd.conf and generate all required directories...
+	# also kill any left over squatter indexes
+        # only run if old upstream version is lower than the new upstream
+	# version (or if its a fresh install)
+        if [ "$2" = "" ] || dpkg --compare-versions "$( echo $2 | cut -d- -f2)" lt "2.2.13" ; then
+		cyrus-makedirs --cleansquat
+	fi
+
+	# Deal with database type information
+	if [ -f /usr/lib/cyrus/cyrus-db-types.active ] ; then
+		# is it safe to start cyrmaster? compare "key value" pairs
+		# from the (old) active database types file with the new one
+		if verifydb /usr/lib/cyrus/cyrus-db-types.txt \
+		    < /usr/lib/cyrus/cyrus-db-types.active ; then
+		    db_input high cyrus-common-2.2/warnbackendchange || true
+		    db_go || true
+		else
+		    cp -p /usr/lib/cyrus/cyrus-db-types.txt /usr/lib/cyrus/cyrus-db-types.active
+		    db_fset cyrus-common-2.2/warnbackendchange seen false || true
+		fi
+	else
+		[ -f /usr/lib/cyrus/cyrus-db-types.txt ] && \
+		  cp -p /usr/lib/cyrus/cyrus-db-types.txt /usr/lib/cyrus/cyrus-db-types.active
+		db_fset cyrus-common-2.2/warnbackendchange seen false || true
+	fi
+
+	# Deal with hardwired config changes
+	if [ -f /usr/lib/cyrus/cyrus-hardwired-config.active ] ; then
+		# do we need to do something about a spool hash type change
+		# if verifydbkey /usr/lib/cyrus/cyrus-hardwired-config.txt USE_DIR_FULL \
+		#    < /usr/lib/cyrus/cyrus-hardwired-config.active ; then
+		# ... (do hash conversion)...
+		# fi
+		cp -p /usr/lib/cyrus/cyrus-hardwired-config.txt \
+		      /usr/lib/cyrus/cyrus-hardwired-config.active
+	else
+		[ -f /usr/lib/cyrus/cyrus-hardwired-config.txt ] && \
+		  cp -p /usr/lib/cyrus/cyrus-hardwired-config.txt \
+		        /usr/lib/cyrus/cyrus-hardwired-config.active
+	fi
+
+	# No leaking of debconf file handles to the initscript stuff
+	db_stop
+
+	# Register initscript, and start it (it is ok if start fails)
+	[ -x /etc/init.d/cyrus2.2 ] && {
+		update-rc.d cyrus2.2 defaults >/dev/null
+		invoke-rc.d cyrus2.2 start || true
+	}
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 0
+    ;;
+esac
+
+db_stop
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-common-2.2.cyrus2.2.init
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-common-2.2.cyrus2.2.init
@@ -0,0 +1,248 @@
+#! /bin/sh
+#
+### BEGIN INIT INFO
+# Provides: cyrus-common-2.2
+# Required-Start: $remote_fs $syslog $network
+# Required-Stop: $remote_fs $syslog $network
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: common init system for cyrus 2.2 IMAP/POP3 daemons.
+# Description: common init system the for cyrus 2.2 IMAP/POP3 daemons.
+#              starts the central cyrus 2.2 master process, which can 
+#              then start various services depending on configuration.
+#              Typically starts IMAP and POP3 daemons, but might also
+#              start an NNTP daemon and various helper daemons for
+#              distributed mail/news storage systems (high-performance
+#              and/or high-reliability setups).
+### END INIT INFO
+#
+#		Copyright 2001-2005 by Henrique de Moraes Holschuh <hmh@debian.org>
+#		Various modifications done by Sven Mueller <debian@incase.de>
+#		Distributed under the GPL version 2
+#
+# $Id: cyrus-common-2.2.cyrus2.2.init 759 2008-04-02 15:06:19Z sven $
+
+# Make sure we get sane results on borked locales
+LC_ALL=C
+export LC_ALL
+
+# Overridable defaults
+unset CYRUS_VERBOSE
+unset LISTENQUEUE
+unset CONF
+unset MASTERCONF
+[ -r /etc/default/cyrus2.2 ] && . /etc/default/cyrus2.2
+
+[ "x${CYRUS_VERBOSE}" != "x" ] && export CYRUS_VERBOSE
+# Make sure the master process is daemonized
+OPTIONS="${OPTIONS} -d"
+[ "x${CONF}" != "x" ] && OPTIONS="-C ${CONF} ${OPTIONS}"
+[ "x${MASTERCONF}" != "x" ] && OPTIONS="-M ${MASTERCONF} ${OPTIONS}"
+[ "x${LISTENQUEUE}" != "x" ] && OPTIONS="-l ${LISTENQUEUE} ${OPTIONS}"
+
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DAEMON=/usr/sbin/cyrmaster
+NAME=cyrmaster
+[ "x${PIDFILE}" = "x" ] && PIDFILE="/var/run/${NAME}.pid"
+DESC="Cyrus IMAPd"
+
+# Check if Cyrus 2.2 is installed
+test -x ${DAEMON} || exit 0
+grep -qE '^PACKAGE_VERSION[[:blank:]]+2[.]2' \
+	/usr/lib/cyrus/cyrus-hardwired-config.txt >/dev/null 2>&1 || exit 0
+
+set -e
+
+START="--start --quiet --pidfile ${PIDFILE} --exec ${DAEMON} --name ${NAME} -- ${OPTIONS}"
+
+verifydb() {
+   while read -r DBKEY DBVALUE ; do
+	match=`sort -u < $1 | gawk "/^${DBKEY}[[:blank:]]/ { print \\$2 }"`
+	[ "x${match}" != "x${DBVALUE}" ] && return 0
+   done
+   return 1
+}
+
+createdir() {
+# $1 = user
+# $2 = group
+# $3 = permissions (octal)
+# $4 = path to directory
+	[ -d "$4" ] || mkdir -p "$4"
+	chown -c -h "$1:$2" "$4"
+	chmod -c "$3" "$4"
+}
+
+missingstatoverride () {
+	echo "$0: You are missing a dpkg-statoverride on $1.  Add it." >&2
+	exit 1
+}
+
+fixdirs () {
+	dir=`dpkg-statoverride --list /var/run/cyrus` \
+		|| missingstatoverride /var/run/cyrus
+	[ -z "$dir" ] \
+		|| createdir $dir
+	dir=`dpkg-statoverride --list /var/run/cyrus/socket` \
+		|| missingstatoverride /var/run/cyrus/socket
+	[ -z "$dir" ] \
+		|| createdir $dir
+}
+
+check_status () {
+	if [ "$1" = "verbose" ]; then
+		PRINTIT=echo
+	else
+		PRINTIT=true 
+	fi
+	if [ ! -f ${PIDFILE} ]; then
+		# using [c] in the grep avoids catching the grep 
+		# process itself
+		if ps auxww | grep -qE 'usr/sbin/[c]yrmaster' ; then
+			# Damn, PID file doesn't exist, but cyrmaster process
+			# exists. Though strictly speaking, we should not
+			# do this, reconstruct the PID file here.
+			pidof /usr/sbin/cyrmaster > /dev/null 2>&1 \
+			&& pidof /usr/sbin/cyrmaster > ${PIDFILE}
+			${PRINTIT} "cyrmaster running with PID `cat ${PIDFILE}`"
+			return 0
+		fi
+	fi	
+	if [ -s ${PIDFILE} ] && kill -0 `cat ${PIDFILE}` > /dev/null 2>&1; then
+		${PRINTIT} "cyrmaster running with PID `cat ${PIDFILE}`"
+		return 0
+	else
+		# the PID file might simply not match the cyrmaster process.
+		if pidof /usr/sbin/cyrmaster > /dev/null 2>&1 ; then
+			# go ahead and fix it
+			pidof /usr/sbin/cyrmaster > ${PIDFILE}
+			${PRINTIT} "cyrmaster running with PID `cat ${PIDFILE}`"
+			return 0
+		else
+			# no process and/or no PID file, return failure
+			${PRINTIT} "cyrmaster not running with"
+			return 1
+		fi
+	fi
+	# this point should never be reached, return unknown status if it 
+	# is anyway
+	return 4
+}
+
+case "$1" in
+  start)
+  	# Verify if there are old Cyrus 1.5 spools that were not upgraded
+	[ -f /var/lib/cyrus/mailboxes -a -d /var/lib/cyrus/deliverdb -a \
+	  -d /var/spool/cyrus/mail/user -a ! -d /var/spool/cyrus/mail/stage. ] && {
+	  	echo "$0: It appears that you still have an version 1.5 spool" 1>&2
+		echo "$0: that needs to be upgraded. Please refer to the guide" 1>&2
+		echo "$0: at /usr/share/doc/cyrus-common-2.2/UPGRADE.Debian" 1>&2
+		echo
+		echo "$0: Cyrmaster not started."
+		exit 6
+	}
+	# Verify consistency of database backends
+	[ -f /usr/lib/cyrus/cyrus-db-types.active ] && {
+		# is it safe to start cyrmaster? compare "key value" pairs
+		# from the (old) active database types file with the new one
+		( sort -u /usr/lib/cyrus/cyrus-db-types.active \
+		  | grep DBENGINE \
+		  | verifydb /usr/lib/cyrus/cyrus-db-types.txt \
+		) && {
+		    echo "$0: Database backends mismatch! You must manually" 1>&2
+		    echo "$0: verify and update the Cyrus databases to the" 1>&2
+		    echo "$0: new backends." 1>&2
+		    echo "$0: Please refer to /usr/share/doc/cyrus-common-2.2/README.Debian" 1>&2
+		    echo "$0: for instructions." 1>&2
+		    echo
+		    echo "$0: Cyrmaster not started."
+		    exit 6
+		}
+	}
+	echo -n "Starting ${DESC}: "
+	fixdirs
+	if check_status ; then
+		echo "${DAEMON} already running."
+		exit 0
+	fi
+	if start-stop-daemon ${START} >/dev/null 2>&1 ; then
+		echo "$NAME."
+	else
+		if ! check_status ; then
+			echo "(failed)."
+			exit 1
+		fi
+	fi
+	;;
+  stop)
+	echo -n "Stopping $DESC: "
+	if start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid \
+		--name ${NAME} --quiet --startas $DAEMON >/dev/null 2>&1 ; then
+		echo "$NAME."
+		rm -f ${PIDFILE}
+		exit 0
+	else
+		# process running?
+		if check_status; then
+			# Yes, report failure.
+			echo "(failed)."
+			exit 1
+		else
+			# No, return as if stopped a running process 
+			# successfully.
+			echo "."
+			rm -f ${PIDFILE}
+			exit 0
+		fi
+	fi
+	;;
+  reload|force-reload)
+	echo "Reloading $DESC configuration files."
+	if start-stop-daemon --stop --signal 1 --quiet \
+		--name ${NAME} --pidfile /var/run/$NAME.pid >/dev/null 2>&1 ; then
+		exit 0
+	else
+		exit 1
+	fi
+  	;;
+  restart)
+  	$0 stop && {
+	  echo -n "Waiting for complete shutdown..."
+	  i=5
+	  while [ $i -gt 0 ] ; do
+	  	# exit look when server is not running
+	  	check_status || break
+		sleep 2s
+		i=$(($i - 1))
+		echo -n "."
+	  done
+	  [ $i -eq 0 ] && {
+	  	echo
+		echo "fatal: incomplete shutdown detected, aborting."
+		exit 1
+	  }
+	  echo
+	}
+	exec $0 start
+	;;
+  status)
+  	check_status verbose
+	exit $?
+	;;
+  try-restart)
+  	check_status
+	if [ "$?" -eq 0 ]; then
+		exec $0 restart
+	else
+  		# LSB says to return 0 in try-restart if the service is
+		# not running.
+		exit 0
+	fi
+	;;
+  *)
+	echo "Usage: $0 {start|stop|restart|reload|force-reload}" 1>&2
+	exit 1
+	;;
+esac
+
+exit 0
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-makedirs.8
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-makedirs.8
@@ -0,0 +1,49 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" $Id: cyrus-makedirs.8 229 2005-12-08 23:26:29Z astronut $
+.\" 
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH CYRUS-MAKEDIRS 8 "2002-12-08"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+cyrus-makedirs \- Sets up the Cyrus IMAPd system directories (spools)
+.SH SYNOPSIS
+.B cyrus-makedirs
+.RI [ configfile ]
+.br
+.SH DESCRIPTION
+This manual page documents briefly the
+.B cyrus-makedirs
+command.
+Cyrus-makedirs is the Debian version of Cyrus upstream's mkimap program.
+.PP
+You
+.B should
+call /usr/sbin/cyrus-makedirs when you change any imapd.conf(5) options
+that create or rename Cyrus mail stores/spools/partitions.  It will be called
+automatically on package upgrades.
+.PP
+.\" TeX users may be more comfortable with the \fB<whatever>\fP and
+.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
+.\" respectively.
+.SH OPTIONS
+You can optionally tell cyrus-makedirs the Cyrus imapd.conf config file
+to use.  /etc/imapd.conf is assumed, if no parameters are given.
+.SH SEE ALSO
+.BR imapd.conf(5),
+.BR /etc/default/cyrus2.2
+.SH AUTHOR
+This manual page was written by Henrique de Moraes Holschuh <hmh@debian.org>,
+for the Debian GNU/Linux system (but may be used by others).
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus.conf
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus.conf
@@ -0,0 +1,89 @@
+# Debian defaults for Cyrus IMAP server/cluster implementation
+# see cyrus.conf(5) for more information
+#
+# All the tcp services are tcpd-wrapped. see hosts_access(5)
+# $Id: cyrus.conf 567 2006-08-14 18:19:32Z sven $
+
+START {
+	# do not delete this entry!
+	recover		cmd="/usr/sbin/ctl_cyrusdb -r"
+  
+	# this is only necessary if idlemethod is set to "idled" in imapd.conf
+	#idled		cmd="idled"
+
+	# this is useful on backend nodes of a Murder cluster
+	# it causes the backend to syncronize its mailbox list with
+	# the mupdate master upon startup
+	#mupdatepush   cmd="/usr/sbin/ctl_mboxlist -m"
+
+	# this is recommended if using duplicate delivery suppression
+	delprune	cmd="/usr/sbin/cyr_expire -E 3"
+	# this is recommended if caching TLS sessions
+	tlsprune	cmd="/usr/sbin/tls_prune"
+}
+
+# UNIX sockets start with a slash and are absolute paths
+# you can use a maxchild=# to limit the maximum number of forks of a service
+# you can use babysit=true and maxforkrate=# to keep tight tabs on the service
+# most services also accept -U (limit number of reuses) and -T (timeout)
+SERVICES {
+	# --- Normal cyrus spool, or Murder backends ---
+	# add or remove based on preferences
+	imap		cmd="imapd -U 30" listen="imap" prefork=0 maxchild=100
+	#imaps		cmd="imapd -s -U 30" listen="imaps" prefork=0 maxchild=100
+	pop3		cmd="pop3d -U 30" listen="pop3" prefork=0 maxchild=50
+	#pop3s		cmd="pop3d -s -U 30" listen="pop3s" prefork=0 maxchild=50
+	nntp		cmd="nntpd -U 30" listen="nntp" prefork=0 maxchild=100
+	#nntps		cmd="nntpd -s -U 30" listen="nntps" prefork=0 maxchild=100
+
+	# At least one form of LMTP is required for delivery
+	# (you must keep the Unix socket name in sync with imap.conf)
+	#lmtp		cmd="lmtpd" listen="localhost:lmtp" prefork=0 maxchild=20
+	lmtpunix	cmd="lmtpd" listen="/var/run/cyrus/socket/lmtp" prefork=0 maxchild=20
+	# ----------------------------------------------
+
+	# useful if you need to give users remote access to sieve
+	# by default, we limit this to localhost in Debian
+  	sieve		cmd="timsieved" listen="localhost:sieve" prefork=0 maxchild=100
+
+	# this one is needed for the notification services
+	notify		cmd="notifyd" listen="/var/run/cyrus/socket/notify" proto="udp" prefork=1
+
+	# --- Murder frontends -------------------------
+	# enable these and disable the matching services above, 
+	# except for sieve (which deals automatically with Murder)
+
+	# mupdate database service - must prefork at least 1
+	# (mupdate slaves)
+	#mupdate       cmd="mupdate" listen=3905 prefork=1
+	# (mupdate master, only one in the entire cluster)
+	#mupdate       cmd="mupdate -m" listen=3905 prefork=1
+
+	# proxies that will connect to the backends
+	#imap		cmd="proxyd" listen="imap" prefork=0 maxchild=100
+	#imaps		cmd="proxyd -s" listen="imaps" prefork=0 maxchild=100
+	#pop3		cmd="pop3proxyd" listen="pop3" prefork=0 maxchild=50
+	#pop3s		cmd="pop3proxyd -s" listen="pop3s" prefork=0 maxchild=50
+	#lmtp		cmd="lmtpproxyd" listen="lmtp" prefork=1 maxchild=20
+	# ----------------------------------------------
+}
+
+EVENTS {
+	# this is required
+	checkpoint	cmd="/usr/sbin/ctl_cyrusdb -c" period=30
+
+	# this is only necessary if using duplicate delivery suppression
+	delprune	cmd="/usr/sbin/cyr_expire -E 3" at=0401
+
+	# this is only necessary if caching TLS sessions
+	tlsprune	cmd="/usr/sbin/tls_prune" at=0401
+	
+	# indexing of mailboxs for server side fulltext searches
+
+	# reindex changed mailboxes (fulltext) approximately every other hour
+	#squatter_1	cmd="/usr/bin/nice -n 19 /usr/sbin/squatter -s" period=120
+
+	# reindex all mailboxes (fulltext) daily
+	#squatter_a	cmd="/usr/sbin/squatter" at=0517
+}
+
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-db-types.upgrading_from_1.5.txt
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-db-types.upgrading_from_1.5.txt
@@ -0,0 +1,6 @@
+DBENGINE BerkeleyDB3.2
+DUPLICATE db3_nosync
+MBOX db3
+SEEN db3
+SUBS flat
+TLS db3_nosync
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-common-2.2.contrib
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-common-2.2.contrib
@@ -0,0 +1,7 @@
+contrib/cyrus-graphtools.1.0
+contrib/fud-client.c
+contrib/README
+contrib/sieve-spamasssassin
+contrib/squatrunner.pl
+contrib/squatrunner.txt
+contrib/add-cyrus-user
--- cyrus-imapd-2.2-2.2.13.orig/debian/README.Debian.database
+++ cyrus-imapd-2.2-2.2.13/debian/README.Debian.database
@@ -0,0 +1,132 @@
+Cyrus IMAP for Debian: Database backend conversion
+$Id: README.Debian.database 805 2009-09-07 07:36:52Z sven $
+--------------------------------------------------
+
+   "All systems administrators have their horror stories. For me, it was
+    setting up a HP Color Bubblejet under Linux using ghostscript before
+    linuxprinting.org was alive.  Well that was a piece of cake compared
+    to what I am about to describe in this document."
+         --  "Hosting email for virtual domains using Postfix and Cyrus"
+	                                     Haim Dimermanas, 2001-08-01
+
+           "I warned you to read all the documentation first, didn't I?"
+                                    --  Henrique M. Holschuh, 2002-10-01
+
+For more information, please consult http://asg.web.cmu.edu/cyrus/imapd/.
+There is also Cyrus-HOWTO (Cyrus-IMAP.txt) available as part of the LDP HOWTO
+collection.  Upgrade hints are in UPGRADE.Debian.  Outdated documentation will
+cause you much grief, so beware of that when hunting anywhere else than the
+Cyrus mailinglist for information.
+
+
+Database backends
+-----------------
+
+Cyrus can be compiled to use different types of database backends for each of
+its databases.  The package will warn you if you try to start Cyrus and the
+database backends seem to have changed since the last active version.
+
+After converting all the mail stores and /var/lib/cyrus to use the proper
+database backends using cvt_cyrusdb(8), remove
+/usr/lib/cyrus/cyrus-db-types.active and run "dpkg-reconfigure cyrus-common-2.2"
+once to reset the error trigger, and start cyrmaster.
+
+If cvt-cyrusdb locks up just at the beginning of the conversion, your databases
+might be locked.  Unlock them (i.e. REALLY stop Cyrus if it is still running,
+use the db* utilities (from the older Berkeley DB version) to clean any stray 
+locks, or try a reboot).
+
+IMPORTANT: If you changed the type of any of the databases through imapd.conf,
+   cyrus-db-types.txt isn't updated to match those. Be sure to cross-check
+   imapd.conf if you did that.
+
+
+Step-by-step conversion guide:
+
+1. Stop the Cyrus system
+   /etc/init.d/cyrus2.2 stop
+   
+2. Find out which databases to convert:
+   diff -u /usr/lib/cyrus/cyrus-db-types.active \
+           /usr/lib/cyrus/cyrus-db-types.txt
+
+   The databases are these in the default install:
+   DUPLICATE		/var/lib/cyrus/deliver.db
+   MBOX			/var/lib/cyrus/mailboxes.db
+   TLS			/var/lib/cyrus/tls_sessions.db
+
+   Don't bother upgrading the TLS database, just delete it: the information
+   there is not reused when you stop Cyrus.
+
+   If the BerkeleyDB version is what was changed, you need to use the
+   Berkeley DB upgrade utility in all db* databases.  See the manpages for
+   db*_upgrade. Note that you need to use the db*_upgrade utility with the
+   same version as given on the DBENGINE line of cyrus-db-types.txt.
+   You should look for lines with 'berkeley' or 'berkeley_nosync' on 
+   the right side. You can safely ignore lines with 'flat', 'skiplist' or 
+   'quotalegacy'.
+   The db*_upgrade utility (along with its manpage) is typically included
+   in the db*-util packages (for example, db4.7-util package for BerkeleyDB
+   4.7s db4.7_upgrade). 
+   
+   The SUBS and SEEN databases are different: there are many of them (one
+   for every user for SEEN and SUBS respectively) and you need to convert
+   every single one of them.
+
+   SUBS			/var/lib/cyrus/...../*.sub
+   SEEN			/var/lib/cyrus/...../*.seen
+
+   For Cyrus 1.x versions, these files are in /var/spool/cyrus/...../
+
+   SUBS contains the subscribed folders, and SEEN contains the seen state
+   of every mail in a folder.
+
+   Types db3_nosync and db3 are the same for database conversion matters.
+
+2.1 Converting from DB* to SKIPLIST
+
+   As user cyrus, do the following:
+   
+   cd /
+   /usr/sbin/cvt_cyrusdb <fullpath to database> db3 \
+                         /var/lib/cyrus/temp.db flat
+   rm -f <fullpath to database>
+   /usr/sbin/cvt_cyrusdb /var/lib/cyrus/temp.db flat \
+                         <fullpath to database> skiplist
+   chown cyrus:mail <fullpath to database>
+   rm -f /var/lib/cyrus/temp.db
+
+2.2 Converting from FLAT to SKIPLIST
+
+   As user cyrus, do the following:
+
+   cd /
+   mv <fullpath to database> <fullpath to database>.old
+   /usr/sbin/cvt_cyrusdb <fullpath to database>.old flat \
+                         <fullpath to database> skiplist
+   chown cyrus:mail <fullpath to database>
+   rm -f <fullpath to database>.old
+
+2.3 SUBS and SEEN databases
+
+   I suggest using a small shell script and using "find" to mass-convert
+   the SEEN databases:
+   find /var/lib/cyrus -type f -name '*.seen' -exec myshellscript {} \;
+
+   The "find" command above gives you the name of the database as "$1"
+   inside your shell script.
+
+3. Reset the database backend change system
+   rm /usr/lib/cyrus/cyrus-db-types.active
+   dpkg-reconfigure cyrus-common-2.2
+
+4. Start Cyrus, if not started by step 3
+   /etc/init.d/cyrus2.2 start
+
+WHY THERE IS NO AUTOMATED UPGRADE SCRIPT:  Because we are quite short on time
+lately: it is much faster to write a doc than to write and test the script.
+
+Maybe someone will write one (We will certainly include it in the package, if
+it is good enough).  Don't hold your breath, though.
+
+ - Your cyrus-imapd team <pkg-cyrus-imapd-debian-devel@lists.alioth.debian.org>
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-admin-2.2.manpages
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-admin-2.2.manpages
@@ -0,0 +1,3 @@
+man/sieveshell.1
+perl/imap/blib/man1/cyradm.1p
+debian/tmp/usr/share/man/man1/installsieve.1
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-murder-2.2.install
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-murder-2.2.install
@@ -0,0 +1,3 @@
+etc/pam.d/mupdate
+usr/lib/cyrus/bin/*proxyd
+usr/lib/cyrus/bin/mupdate*
--- cyrus-imapd-2.2-2.2.13.orig/debian/copyright
+++ cyrus-imapd-2.2-2.2.13/debian/copyright
@@ -0,0 +1,78 @@
+$Id: copyright 619 2006-09-19 00:48:49Z astronut $
+
+This package was debianized by Henrique de Moraes Holschuh <hmh@debian.org> on
+Wed Sep 12 09:35:30 BRT 2001, based on previous work by Michael-John Turner
+<mj@debian.org> and David Parker <david@neongoat.com>.
+
+The Debian packaging of Cyrus IMAPd v2.2 is:
+  Copyright (c) 2002-2006 by Henrique de Moraes Holschuh <hmh@debian.org>,
+  			     Sven Mueller <debian@incase.de>,
+			     Benjamin Seidenberg <astronut@dlgeek.net>
+  and distributed in the same license as the upstream source it applies to.
+
+The debian packages are maintained in a subversion repository at:
+	https://mail.incase.de/svn/cyrus22/
+
+Upstream sources are at: ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/.
+
+Upstream Author: Carnegie Mellon University <cyrus-bugs+@andrew.cmu.edu>
+Upstream bugs:   http://bugzilla.andrew.cmu.edu/
+
+Patches: 
+The Debian version of Cyrus IMAP is heavily patched to adequate it to Debian,
+and sometimes to add functionality.  All such patches are submitted upstream to
+CMU, for proper inclusion in Cyrus -- but not all of them will be accepted, of
+course.  See README.Debian for more details.  Also, many patches from the
+current CVS release of Cyrus IMAPd are folded in Debian updates; these are
+identified by "patchset" numbers, created by the cvsps utility.
+
+The IPv6 patch by Hajimu UMEMOTO <ume@mahoroba.org> has been applied.
+
+CMU release tarballs are often repacked minus the CVS/ directories to avoid
+problems in my build system.
+
+Copyright:
+ALL versions of the Cyrus IMAP server are now covered by the
+following copyright notice:
+
+ * Copyright (c) 1994-2000 Carnegie Mellon University.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For permission or any legal
+ *    details, please contact
+ *      Office of Technology Transfer
+ *      Carnegie Mellon University
+ *      5000 Forbes Avenue
+ *      Pittsburgh, PA  15213-3890
+ *      (412) 268-4387, fax: (412) 268-7395
+ *      tech-transfer@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by Computing Services
+ *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+For more information, see http://asg.web.cmu.edu/cyrus/imapd/license.html
+(local copy stored in /usr/share/doc/cyrus2-common/license.html)
+
--- cyrus-imapd-2.2-2.2.13.orig/debian/README.Debian.debug
+++ cyrus-imapd-2.2-2.2.13/debian/README.Debian.debug
@@ -0,0 +1,122 @@
+Cyrus IMAP for Debian, debugging procedures
+$Id: README.Debian.debug 649 2006-10-09 17:07:53Z astronut $
+-------------------------------------------
+
+For more information, please consult http://asg.web.cmu.edu/cyrus/imapd/.
+
+Cyrus has various levels of debugging aid, which can and should be used to
+offer more information about any problems you are facing with Cyrus.
+
+First, edit /etc/default/cyrus2.2, and set CYRUS_VERBOSE to a number higher
+than zero.  The higher the number, more debug information is provided. Numbers
+above 30 will cause Cyrus services to pause for 15s before executing (so that
+you can do something to it, such as attach strace or a debugger to the
+process).
+
+You can, and should use strace and ltrace to gather more information about what
+was happening to Cyrus when it malfunctioned.  straces are useful when
+networking or signal problems appear to be the issue, and ltraces can give
+hints on what the problem might be.
+
+If a Cyrus service is crashing and cyrmaster logs that the service is being
+killed by a signal, please use the debugging hooks to provide a back-trace
+using gdb (see below).  Back-traces are extremely useful when locating where
+Cyrus is dying, and why.
+
+Debugging information is sent to syslogd, using the DEBUG priority, facilities
+MAIL and DAEMON.
+
+You can also try to set MALLOC_CHECK_=2 in the environment, so that malloc()
+will cause Cyrus to dump core if it detects any sort of corruption.
+
+
+Telemetry logs
+--------------
+
+Cyrus will happily log all communications between the Cyrus store closed-box and
+the outside world.  These logs are sometimes vital to understand exactly what
+is happening and to reproduce bugs.
+
+To enable telemetry logging, create a directory under /var/lib/cyrus/log with
+the same name as the username for which you want the communication sessions to
+be logged.  Cyrus will log all imap, pop3, sieve and lmtp talks authenticated
+as that user (including proxied connections).  Make sure the directory is owned
+by user cyrus.
+
+IMPORTANT:
+Watch out for sensitive information such as passwords when you submit the
+telemetry logs to a public bug-tracking system or mailinglist.
+
+
+Recompiling Cyrus with debugging information
+--------------------------------------------
+
+In order to produce useful back-traces, or to interactively debug Cyrus,
+you must rebuild the package with debugging information.  It is quite
+easy to do so:
+
+1. Install all source dependencies to build the package (needs root):
+   apt-get install build-essential fakeroot
+   apt-get build-dep cyrus-imapd-2.2
+
+2. Download and rebuild Cyrus with debug information:
+   apt-get source cyrus-imapd-2.2
+   cd cyrus-imapd-2.2*
+   DEB_BUILD_OPTIONS=debug,noopt,nostrip dpkg-buildpackage -uc -us -rfakeroot
+
+3. Install the Cyrus packages with debug information (needs root):
+   cd ..
+   dpkg -i *deb     (or something like that)
+
+Now Cyrus should be working fine, using binaries with full debug information
+for gdb.  For interactive debugging, you may want to make sure there are no
+optimizations, in which case you should use "DEB_BUILD_OPTIONS=noopt,nostrip
+dpkg-buildpackage -uc -us -rfakeroot".
+
+Warning: the next time a new version of cyrus is released, apt will download
+the non-debugging version of the Cyrus debs, and install them over the debugging
+packages.
+
+To install the non-debugging, optimized version of Cyrus over the debugging
+one, issue "apt-get --reinstall install (package)" commands for all the Cyrus
+packages you want replaced.
+
+
+Attaching debuggers to Cyrus, and getting traces
+------------------------------------------------
+
+You can tell Cyrus services to run a debugging command just before they
+start doing real work.  This can be used to run strace, ltrace and gdb
+or ddd (for interactive debugging and back-tracing) quite easily.
+
+Set the shell command to be run in /etc/imapd.conf, option debug_command.
+Then, add the command line switch "-D" to the Cyrus services you want to
+run the debug_command in /etc/cyrus.conf, and restart cyrmaster using
+/etc/init.d/cyrus2.2 restart.
+
+The debugging command must be given as a single line in the configuration file.
+
+To get a back-trace using gdb:
+debug_command: /usr/bin/gdb -batch -cd=/tmp -x /usr/lib/cyrus/getbacktrace.gdb /usr/lib/cyrus/bin/%s %d >/tmp/gdb-backtrace.cyrus.%1$s.%2$d <&- 2>&1 &
+
+The above will produce a back-trace of every service run with -D that segfaults
+in the files /tmp/gdb-backtrace.cyrus.*;  /usr/lib/cyrus/getbacktrace.gdb
+simply has the sequence of commands for gdb: c (to continue running the
+service), bt (to get the back-trace if the program didn't exit normally), quit
+(to quit gdb).
+
+For strace, you can use:
+debug_command: /usr/bin/strace -tt -o /tmp/strace.cyrus.%s.%d -p %2$d <&- 2>&1 &
+
+Which will produce straces in /tmp/strace.cyrus.*
+
+For ltrace, you can use:
+debug_command: /usr/bin/ltrace -tt -n 2 -o /tmp/ltrace.cyrus.%s.%d -p %2$d <&- 2>&1 &
+
+Which will produce ltraces in /tmp/ltrace.cyrus.*
+
+Be warned that sensitive information such as passwords may be disclosed in the
+strace and ltrace output, so mangle them before sending such traces to public
+bug-tracking systems or mailing lists.
+
+ -- Henrique de Moraes Holschuh <hmh@debian.org>
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-nntpd-2.2.dirs
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-nntpd-2.2.dirs
@@ -0,0 +1,2 @@
+usr/sbin
+usr/lib/cyrus
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-dev-2.2.install
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-dev-2.2.install
@@ -0,0 +1,3 @@
+usr/lib/*.a
+usr/include/cyrus/*
+usr/share/man/man3/imclient*
--- cyrus-imapd-2.2-2.2.13.orig/debian/README.source
+++ cyrus-imapd-2.2-2.2.13/debian/README.source
@@ -0,0 +1,29 @@
+Debian packages for cyrus-imapd-2.2 use the dpatch patch system.
+
+If you are not familiar with this patch system, this document provides you
+with a very short description of how to patch the sources. It assumes that
+you want to add a patch on top of what the package already contains, not that
+you want to edit one of the existing patches.
+
+1) cd to the main source directory (the one containing debian/)
+3) Tell dpatch that you intend to edit your patch:
+      dpatch-edit-patch patch 99_your.dpatch \
+                   99-update-autoconf.dpatch \
+	--description="Description of your patch" \
+        --add2list
+   That command will create the new patch as file
+   debian/patches/99_your.dpatch, adding the Description to the patch header,
+   apply all patches up to 99-update-autoconf.dpatch, add your patch to the
+   list of patches that are to be applied on build and open a shell for you
+   in which you can do the edits.
+   If you want to edit your patch again later on, the first line of the above
+   multiline command will suffice.
+4) Do the edits you want to do and exit the shell with an
+   exit code of 0 (a plain "exit" will do that). If you want
+   to abort your edit, use "exit 230".
+5) Once finished, run "dpatch deapply-all" to unpatch the whole tree again
+   (i.e. return to an unpatched source, preserving your edits as
+   debian/patches/99_your.dpatch, which is now listed in debian/patches/00list
+   and will be applied automatically on package builds).
+
+Document your patch in debian/changelog, please.
--- cyrus-imapd-2.2-2.2.13.orig/debian/libcyrus-imap-perl22.install
+++ cyrus-imapd-2.2-2.2.13/debian/libcyrus-imap-perl22.install
@@ -0,0 +1,2 @@
+usr/lib/perl*
+usr/share/perl*
--- cyrus-imapd-2.2-2.2.13.orig/debian/README.Debian
+++ cyrus-imapd-2.2-2.2.13/debian/README.Debian
@@ -0,0 +1,334 @@
+Cyrus IMAP for Debian
+$Id: README.Debian 720 2007-05-28 01:48:39Z sven $
+---------------------
+
+   "All systems administrators have their horror stories. For me, it was
+    setting up a HP Color Bubblejet under Linux using ghostscript before
+    linuxprinting.org was alive.  Well that was a piece of cake compared
+    to what I am about to describe in this document."
+         --  "Hosting email for virtual domains using Postfix and Cyrus"
+	                                     Haim Dimermanas, 2001-08-01
+
+           "I warned you to read all the documentation first, didn't I?"
+                                    --  Henrique M. Holschuh, 2002-10-01
+
+IMPORTANT: Cyrus is a closed-box email system.  Your system will access your
+email through LMTP, IMAP and POP3 *only*.  No direct file access to the email
+store is supposed to take place.
+
+For more information, please consult http://asg.web.cmu.edu/cyrus/imapd/ and
+http://asg.web.cmu.edu/twiki/bin/view/Cyrus/WebHome (Cyrus WiKi).  There is
+also Cyrus-HOWTO (Cyrus-IMAP.txt) available as part of the LDP HOWTO
+collection.  Upgrade hints are in UPGRADE.Debian.gz  Outdated documentation
+will cause you much grief, so beware of that when hunting anywhere else than
+the Cyrus mailinglist for information.
+
+Backports of the latest packages for Debian Stable are available from
+http://www.backports.org
+
+WARNING: For one to get Cyrus IMAPd to work correctly, one must first get the
+SASL layer to work correctly.  This is far from trivial, so if you don't manage
+at first, don't go around filling bugs against Cyrus IMAPd before you make damn
+sure it is not a SASL configuration error.  Read the hint list later on this
+file as well.  Start by reading README.Debian.simpleinstall.
+
+The Debian packaging of Cyrus has a few quirks which are important to know
+about:
+
+1. Renaming of some Cyrus IMAP utilities
+
+   The quota, reconstruct, master and deliver utilities have been renamed to
+   cyrquota, cyrreconstruct, cyrmaster and cyrdeliver, following the template
+   set by upstream with "cyradm".  This was done because both Cyrus Debian
+   maintainers found the original names to be too generic and likely to cause
+   namespace collisions later.
+
+   Since documentation may refer to these utilities using their original
+   name, you must be aware of this fact.  Also, installsieve is deprecated
+   and will be removed from the Debian package in the future; use sieveshell
+   instead.
+
+2. Relocation of many Cyrus IMAP files
+
+   The default Cyrus install scatters files all over the place.  The Debian
+   package installs only a few files in /usr/bin (cyradm, sieveshell).
+   IMAP/email administrator utilities are installed in /usr/sbin (such as
+   cyrreconstruct).  Programs that must be run by cyrmaster are installed in
+   /usr/lib/cyrus (such as imapd and pop3d).  Sockets go into
+   /var/run/cyrus/socket, per FHS 2.2.  Sieve files go in /var/spool/sieve, but
+   an /etc/sieve compatibility symlink is also installed just in case.
+
+   The imapd.conf and cyrus.conf configuration files are in /etc. The PAM
+   policy files are in /etc/pam.d.
+
+   Feel free to use dpkg-statoverride to change the permission of
+   /var/run/cyrus/socket, the cyrus packages will not override your
+   configuration if dpkg-statoverride is used.  In fact, you will most likely
+   have to do so for postfix to deliver to Cyrus, for example.
+
+3. Cyrus Murder, the Cyrus IMAPd/POP3 aggregator is available.
+
+   However, you will have to configure it yourself.  No pre-packaged
+   configuration of Murder is available at this time...  The documentation is
+   all there, and the Cyrus packages will happily preserve your Cyrus Murder
+   configuration.  You do not have to install the cyrus-imapd-2.2 or
+   cyrus-pop3d-2.2 packages in hosts that only need the proxy daemons running,
+   but do note that the /etc/pam.d/imap and /etc/pam.d/pop files are in those
+   packages (and they are needed by the proxies), so you will have to create
+   the files manually.
+
+   One important note: MUPDATE doesn't support TLS, so you won't be able to
+   use plaintext authentication methods.  The easiest thing to do is to put
+   an entry for your mupdate user in sasldb2 and use DIGEST-MD5.
+
+4. Configurable idled support.
+  
+   Cyrus IMAPd supports three options of using IDLE in IMAP sessions. The first
+   option is not to support IDLE at all. The second is to use internal polling
+   in the IMAP daemon. The third option is to use an external daemon, idled.
+   Upstream only supports configuration of this during compilation, Debian
+   however includes a patch which makes this runtime-configurable. Please
+   set the 'idlemethod' imapd.conf option according to your needs and enable
+   idled in cyrus.conf if you want to use it.
+
+General notes and hints:
+------------------------
+
+ o *** ALWAYS READ /usr/share/doc/cyrus-common-2.2/NEWS.Debian *** after
+   you upgrade the package. This, and every other NEWS.Debian can automatically
+   be shown to you before the upgrade, see the apt-listchanges package for more
+   information.
+
+ o QUOTAS ARE LIMITIED TO 2GB on some platforms.
+   Be careful to not set quotas over that ammount if your platform doesn't
+   support the C datatype "long long". Things will break in very bad ways.
+   Yes, it is a big glitch, and no, there are no easy workarounds.
+   see https://bugzilla.andrew.cmu.edu/show_bug.cgi?id=1212
+   This has been fixed for the upcoming Cyrus 2.3.
+
+ o Either turn off logging of the DEBUG level, or don't complain about cyrus
+   verbosity on the logs.  Don't ever ask in the mailing lists about messages
+   logged in the DEBUG level before reading the source code.
+
+ o Watch out for your /dev/random bitbucket! SASL may use it, and if it
+   empties, it will hang the processes wrapped up by SASL.  This means
+   just about every Cyrus service (lmtp, imap, pop3, sieve)...  Disable
+   APOP in /etc/imapd.conf if you don't need it, as it is a serious draw
+   on randomness resources.
+
+ o One extremely important point to notice is that saslauthd works ONLY
+   with plaintext.  APOP, CRAM-MD5, OTP, DIGEST-MD5 and any other "auxprop"
+   SASL mech will *not* work through saslauthd.  This can and will cause
+   serious issues in Cyrus murder environments.
+
+ o When using ext3, Cyrus really wants data=journal.  However, up to
+   kernel 2.4.20 there are dangerous bugs in that option, so you're better
+   off not using that.  xfs is faster and better for Cyrus, anyway.
+   Please note that sarge was shipped with 2.4.27, and etch will not ship
+   any 2.4 kernels anymore."
+
+   2.4 kernels are NOT shipped with Debian Etch.
+
+ o nscd users: nscd is highly incompatible with ldap, and somewhat buggy
+   otherwise.  If you use nscd and Cyrus segfaults on you, try restarting
+   nscd, or disabling it.
+
+ o "The Debian libldap2 and cyrus-imapd packages are both compiled using the
+   SASL library.  If you use cyrus-imapd together with libnss-ldap, or
+   saslauthd together with libpam-ldap, the resulting double calls to SASL
+   library functions can trigger a double-free bug which may cause the calling
+   process to crash.  To avoid such a crash, you must recompile the libldap2
+   package --without-cyrus-sasl."  --  http://bugs.debian.org/145766 [!@#$%!!!
+   I didn't expect SASL 2.1 to still have this annoying problem]
+
+ o The lmtp service (allocated in Debian Woody to port 2003, and non-existent
+   on Debian Sarge and Etch) is non-standard.  It has no port officially
+   allocated anywhere; it is usually run bound to the localhost interface,
+   unless one needs it for clustering and high-availability scenarios.  If you
+   need it elsewhere, by all means move it -- you only need to edit
+   /etc/services, or change the port for the lmtp service in /etc/cyrus.conf.
+
+ o The lmtp service will only allow Cyrus lmtp administrators to authenticate.
+   Set them in /etc/imapd.conf.
+
+ o Cyrus can now use two different namespaces (the standard one, where all
+   subfolders are children of INBOX, and one where they are all in the same
+   hierarchical level).
+
+   See /usr/share/doc/cyrus-doc-2.2/html/altnamespace.html for details. If
+   you deal with a large population of winboze users, this option can save
+   you some headaches.
+
+ o One can also chose between netnews-style notation for folders
+   (INBOX.subfolder), where the "." character is reserved to separate folders;
+   or UNIX-style notation (INBOX/subfolder), where dots are allowed in names,
+   and the slash separate folders (the "^" character is reserved in this
+   mode).
+
+   See /usr/share/doc/cyrus-common-2.2/html/altnamespace.html for details.
+
+ o When using SASL, do keep in mind that cyrus runs under user cyrus, and not
+   root.  It cannot read shadow files (unless you add the user cyrus to group
+   shadow), or perform any root-only operations directly.  You need to use the
+   saslauthd (or, if available, auxpropd) mechanism to authenticate against
+   root-only data.  And that also means user cyrus must be able to talk to the
+   unix socket saslauthd uses (which is controlled by SASL, not Cyrus IMAPd).
+
+ o Any of the SASL configure options can be inserted in imapd.conf, just
+   prefix it with "sasl_" (e.g.: sasl_mech_list: PLAIN).  The list of SASL
+   options is in /usr/share/doc/libsasl2/options.html.
+
+ o The services are tcp-wrapped.  Their hosts.allow/hosts.deny id is the
+   service name in /etc/cyrus.conf. See hosts_access(5).
+
+ o The PAM service names for use with SASL (via saslauthd) are:
+   "imap", "sieve", "lmtp", "pop", "mupdate".
+
+ o You need to specify your admin users in /etc/imapd.conf before you can
+   add mailboxes, or deliver through authenticated lmtp. Do NOT use root.
+   We suggest user cyrus, which is already used by the system for all
+   things Cyrus IMAPd... but it need not be an existing user.  As long as
+   SASL will authenticate against it, it will work.
+
+ o Do NOT read your admin user's email via IMAP (see the FAQ for details).
+
+ o Don't export your mail store over NFS or AFS (read the FAQ for more info).
+   You have been warned.  You really want a journaled (as in journaling for the
+   metadata), local filesystem for the store.  Failing that, you need
+   something with very strict and correct lock semantics, and full mmap
+   support.
+
+ o Ext2 is slow on very large directories (right now), and sync metadata
+   writes enabled are a huge performance hit. If you need high IO throughput
+   from Cyrus, you will need to use ext3, reiserfs, xfs or something similar.
+
+ o You may want to enable/disable synchronous metadata writes to your mail
+   store dirs (check /usr/share/doc/cyrus-doc-2.2/html/install.html for more
+   info, in package cyrus-docs-2.2).  The cyrus-makedirs script tries to do the
+   right thing for ext2 and ext3 filesystems.  Failure to correctly update the
+   metadata in the right order can completely screw up your Cyrus store on a
+   power-loss or another disk failure.
+
+ o Try mounting the store and cyrus database filesystems with noatime for
+   performance gains.  Load-balance the store using multiple partitions on
+   different physical devices for even better performance gains.
+
+ o Cyrus IMAPd should be fed mail through LMTP.  If at all possible, use
+   the Unix socket for that -- it automatically authenticates as user
+   postman and that will help wonders.  cyrdeliver can also be used to
+   inject mail, but it will simply open an LMTP socket to cyrus and
+   deliver through that -- this is much slower than using LMTP directly.
+   The UNIX socket is in /var/run/cyrus/socket/lmtp.  Use dpkg-statoverride
+   if you need to change the permissions of the socket directory.
+
+ o You can use /usr/sbin/cyrus-makedirs to generate the needed directories
+   for cyrus partitions.  It is run automatically by the package postinst,
+   and it knows to parse the /etc/imapd.conf file to verify if hash
+   subdirectories are needed or not.  It cannot detect what kind of hashing
+   should be used yet.  If you recompile the package with full hashing,
+   change it.
+
+ o Refer to cyrus-utils.sourceforge.net and the info-cyrus mailinglist
+   for mailbox/imap to cyrus conversion scripts.
+
+ o If you don't have pop3 or something else enabled by default in cyrus.conf,
+   installed, disable it.  Otherwise, Cyrus master will log warnings that the
+   service could not be started.
+
+ o If you want to run something that is not in /usr/lib/cyrus/bin in
+   cyrus.conf, just use the full path in cyrus.conf (e.g.:
+   cmd="/usr/sbin/squatter").
+
+ o Sieveshell is really lacking on auth capabilities, and timsieved is quite
+   strict on what auth capabilities it offers.  So, pay attention to
+   sasl_minimum_layer, and see bug #151295 for more details
+   (http://bugs.debian.org/151295).  Also, make sure you have the correct set
+   of SASL2 modules installed in in your system.
+
+ o uw-mailutils has some nice utilities to migrate mail stores from/to imap
+   servers.  You might find it quite useful to migrate a site to Cyrus.
+
+Known bugs
+----------
+
+  Please see
+http://bugs.debian.org/cgi-bin/pkgreport.cgi?which=src&data=cyrus-imapd-2.2&
+archive=no&version=
+  for a list of any known bugs.
+
+
+SNMP logging
+------------
+
+cyrmaster is an agentx SNMP subagent, and it can interface to a agentx SNMP
+master.  It will export data at OID .1.3.6.1.4.1.3.6.1 (cyrusMasterMIB).
+
+The ucd-snmp daemon (package snmpd) is NOT configured to work
+as agentx master agent by default -- you have to do that manually,
+by adding "master agentx" to the /etc/snmp/snmpd.conf file.
+
+cyrmaster will register with the snmp agentx master when it is started,
+so if the snmp master is restarted after cyrmaster, it will not forward
+the snmp requests to cyrmaster anymore.  Check your system for any cron
+scripts that might be restarting the snmp process if that happens.
+
+See /usr/share/snmp/mib/CYRUS-MASTER-MIB.txt for more details.
+
+
+Backing up for rainy days
+------------------------
+
+Cyrus automatically checkpoints and backups some of its databases, using the
+ctl_cyrusdb(8) utility (EVENTS in /etc/cyrus.conf).  It is supposed to be also
+capable of recovering automatically from these backups, and to attempt to do so
+at startup.  However, ctl_cyrusdb -r is NOT FULLY IMPLEMENTED YET... you are on
+your own to recover from corrupt databases.
+
+This recovery can be done using the db3 utilities, and even by smart usage of
+cvt_cyrusdb(8) and ctl_mboxlist(8).  The automatic backups are useful, too,
+even if they are not restored automatically.
+
+The database backups are stored at /var/lib/cyrus/db.backup*, you may want to
+copy the files there to backup media in a cronjob, or something like that.  You
+can kill the TLS cache database, as long as Cyrus is stopped when you do it.
+Loss of the delivery database is not very bad, it just means some users might
+get duplicated messages.
+
+Cyrus does NOT backup the mail store automatically.  To backup the mail store
+partitions, you must stop Cyrus and dump the entire partition to your backup
+media.  The MH-like structure of the Cyrus store do make them suitable for
+incremental backups.  Hot-backups of the store can be made, but you risk losing
+some non-critical metadata when the restore is done.
+
+You can backup all Cyrus non-text databases to a flat text file format using the
+cvt_cyrusdb utility (and recover back from the flat text file format), but you
+should stop Cyrus first.
+
+If you ever need to recover the mail store from backup, you should run
+cyrreconstruct(8) to rebuild the mailbox indexes.
+
+A daily maintenance cronjob uses ctl_mboxlist(8) to dump the mailboxes database
+to /var/backup. That backup copy can be used as a last-resort copy if the hot
+backups become corrupted somehow.
+
+
+Debian source package quirks
+----------------------------
+
+Patching is done using dpatch. Patches from upstream CVS are marked as such.
+
+
+THANKS
+------
+
+Thanks go to the CMU crew for producing Cyrus IMAPd in the first place;
+Michael-John Turner <mj@debian.org> for maintaining the v1.5 branch and setting
+the groundstones for the v2.1 package; David Parker <david@neongoat.com> and
+David D. Kilzer <ddkilzer@theracingworld.com> for their huge help in getting
+the v2.1 packages out-of-the-door, and the upgrade from v1.5 guide; Fabian
+Fagerholm <fabbe@paniq.net> for stress testing the daemons, and useful
+feedback; Gilles Bouthenot <gilles.bouthenot@fcomte.iufm.fr> for good
+feedback; and Henrique de Moraes Holschuh for maintaining the 2.1 branch.
+
+ -- The Debian Cyrus Team <pkg-cyrus-imapd-debian-devel@lists.alioth.debian.org>
+
--- cyrus-imapd-2.2-2.2.13.orig/debian/get-backtrace.gdb
+++ cyrus-imapd-2.2-2.2.13/debian/get-backtrace.gdb
@@ -0,0 +1,4 @@
+c
+bt
+quit
+
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-pop3d-2.2.dirs
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-pop3d-2.2.dirs
@@ -0,0 +1 @@
+usr/lib/cyrus
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-common-2.2.cyrus22.cron.daily
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-common-2.2.cyrus22.cron.daily
@@ -0,0 +1,74 @@
+#!/bin/sh
+# Cyrus IMAPd daily maintenance script
+# Copyright (c) 2002,2003 by Henrique M. Holschuh
+# $Id: cyrus-common-2.2.cyrus22.cron.daily 673 2006-10-25 13:24:13Z sven $
+# Distributed under the terms of the GNU General Public License version 2
+#
+# This script:
+#   1. Backups the mailbox database to the portable text format,
+#      and compresses the result.  This backup can be used to restore
+#      the Cyrus mailbox database using ctl_mboxlist (after uncompressing
+#      the backup file).
+#
+#   2. Cleans up any leftover crap in .stage directories.
+#
+#   3. Runs chk_cyrus and outputs warning messages (so that cron
+#      sends them to the administrator) if any problems are detected.
+
+set -e
+
+# Make sure we get sane behaviour in broken locales
+LC_ALL=C
+export LC_ALL
+
+bak=/var/backups
+bakfile=${bak}/cyrus-mboxlist.txt.gz
+CONF=/etc/imapd.conf
+CHKCYRUS=0
+[ -r /etc/default/cyrus2.2 ] && . /etc/default/cyrus2.2
+umask 022
+
+# check wether ctl_mboxlist  and cyrus-hardwired-config.txt exist
+# exit cleanly if they don't
+[ -x /usr/sbin/ctl_mboxlist ] \
+&& [ -f /usr/lib/cyrus/cyrus-hardwired-config.txt ] \
+|| exit 0
+# Check if Cyrus 2.2 is installed (vs. removed but not purged)
+grep -qE '^PACKAGE_VERSION[[:blank:]]+2[.]2' \
+	/usr/lib/cyrus/cyrus-hardwired-config.txt >/dev/null 2>&1 || exit 0
+
+# 1. backup mailbox database
+[ -d $bak ] || ( mkdir -p $bak ; chmod 600 $bak )
+[ -f $bakfile ] && mv ${bakfile} ${bakfile}.bak
+#	su "--command=/usr/sbin/ctl_mboxlist -d" - cyrus | ...
+start-stop-daemon --start --exec /usr/sbin/ctl_mboxlist --quiet --chuid cyrus -- -d | gzip -9 >${bakfile}
+
+# 2. clean up all leftover .stage directories in all spools listed in
+#    the default config file
+[ $CHKCYRUS -ne 0 ] && {
+    [ -r "$CONF" ] || {
+	echo $0: unable to read configuration file $CONF. Aborting...
+	exit 1
+    }
+    partitions=$(sed --silent -e "/^[[:blank:]]*partition-[[:alnum:]]\+:/ { \
+            s#^[[:blank:]]*partition-[[:alnum:]]\+:[[:blank:]]*## \
+	    p
+	    } " < "$CONF" | sort | uniq | xargs)
+    for i in $partitions ; do
+	find "$i" -name '.stage' -type d -print0 | \
+	  xargs --null -n 1 -r -i'{1}' \
+	    find {1} -type f -ctime +1 -exec rm -f {} \;
+    done
+}
+
+# 3. runs chk_cyrus
+[ -x /usr/sbin/chk_cyrus ] && {
+	tmpfile=$(mktemp -t cyrus-daily-cronjob.XXXXXXXXXX)
+	trap 'rm -f "${tmpfile}"' 0
+#	su "--command=/usr/sbin/chk_cyrus" - cyrus | ...
+	start-stop-daemon --start --exec /usr/sbin/chk_cyrus --quiet --chuid cyrus >"${tmpfile}" 2>&1 || cat "${tmpfile}" 1>&2
+	rm -f "${tmpfile}"
+	trap '' 0
+}
+
+exit 0
--- cyrus-imapd-2.2-2.2.13.orig/debian/sieve.pam
+++ cyrus-imapd-2.2-2.2.13/debian/sieve.pam
@@ -0,0 +1,14 @@
+# PAM configuration file for Cyrus SIEVE timsieved service
+# $Id: sieve.pam 5 2005-03-12 23:19:45Z sven $
+#
+# If you want to use Cyrus in a setup where users don't have
+# accounts on the local machine, you'll need to make sure
+# you use something like pam_permit for account checking.
+#
+# Remember that SASL (and therefore Cyrus) accesses PAM 
+# modules through saslauthd, and that SASL can only deal with
+# plaintext passwords if PAM is used.
+#
+
+@include common-auth
+@include common-account
--- cyrus-imapd-2.2-2.2.13.orig/debian/changelog
+++ cyrus-imapd-2.2-2.2.13/debian/changelog
@@ -0,0 +1,643 @@
+cyrus-imapd-2.2 (2.2.13-19squeeze3build0.10.10.1) maverick-security; urgency=low
+
+  * fake sync from Debian
+
+ -- Steve Beattie <sbeattie@ubuntu.com>  Fri, 27 Jan 2012 17:18:29 -0800
+
+cyrus-imapd-2.2 (2.2.13-19+squeeze3) stable-security; urgency=high
+
+  * Non-maintainer upload by the Security Team.
+  * Fix possible NULL pointer dereference via crafted message reference
+    id caused by a missing sanitizing of the mail headers. This can be
+    exploited from a client making use of the IMAP threading feature
+    (CVE-2011-3481).
+
+ -- Nico Golde <nion@debian.org>  Sun, 01 Jan 2012 18:10:58 +0000
+
+cyrus-imapd-2.2 (2.2.13-19+squeeze2) stable-security; urgency=low
+
+  * Update Vcs-* and Homepage
+  * Fix stack-based buffer overflow in the split_wildmats function in
+    nntpd.c (CVE-2011-3208)
+  * Fix for authentication bypass in nntpd (SA46093)
+
+ -- Ondřej Surý <ondrej@debian.org>  Mon, 26 Sep 2011 10:29:58 +0200
+
+cyrus-imapd-2.2 (2.2.13-19+squeeze1) stable-security; urgency=low
+
+  * Fix infinite loop in case of corrupted index files (Closes: #627078)
+  * Add gbp.conf to easy future updates
+  * Fix CVE-2011-1926: STARTTLS plaintext command injection
+    vulnerability (VU#555316) (Closes: #627081)
+
+ -- Ondřej Surý <ondrej@debian.org>  Wed, 18 May 2011 10:15:26 +0200
+
+cyrus-imapd-2.2 (2.2.13-19) unstable; urgency=low
+
+  * Switch to BerkeleyDB 4.7, the version OpenLDAP uses.
+  * Add patch by Cristian Rigamonti to fix logcheck rules for "defaultbc
+    doesn't exist" error message. (Closes: #511030)
+  * Update Vietnamese debconf translation, thanks Clytie Siddall.
+    (Closes: #548052)
+  * Upload to unstable for the libkrb transition.
+
+ -- Christoph Berg <myon@debian.org>  Sat, 23 Jan 2010 23:35:21 +0100
+
+cyrus-imapd-2.2 (2.2.13-18) experimental; urgency=low
+
+  [ Henrique de Moraes Holschuh ]
+  * sieve/bc_eval.c (0025-upstream-fix-cve-2009-3235.dpatch):
+    update for completeness to match the patch used by the security-team:
+    use snprintf for scount, to future-proof against "int" larger than
+    64 bits.
+
+  [ Christoph Berg ]
+  * Add myself to Uploaders.
+  * Upgrade to use BerkeleyDB 4.8. (Closes: #421942)
+  * Convert to use quilt, and update the patch headers to use clean paths.
+    (Closes: #563303)
+  * Add patch by Mathieu Parent to fix conflicting getline definition.
+    (Closes: #552865)
+
+ -- Christoph Berg <myon@debian.org>  Fri, 22 Jan 2010 22:16:02 +0100
+
+cyrus-imapd-2.2 (2.2.13-17) unstable; urgency=high
+
+  * Security Update: CVE-2009-3235:
+    Multiple stack-based buffer overflows in the Sieve parsing code,
+    patches taken from upstream CVS (closes: #547947)
+
+ -- Henrique de Moraes Holschuh <hmh@debian.org>  Tue, 22 Sep 2009 17:17:17 -0300
+
+cyrus-imapd-2.2 (2.2.13-16) unstable; urgency=high
+
+  * Justification for high urgency: Get security update from -15 into
+    testing as fast as possible since -15 was removed before it could
+    migrate.
+  * Fix build dependency on tcl-dev (keeping old tcl8.3-dev to make
+    backports easier) (Closes: 545281) 
+  * Fix up README.Debian.database (Closes: 543293)
+  * Build against newer cyrus-sasl (Closes: 527495,528468)
+  * Fix cyrus-common postinst to only run makedirs if a new upstream
+    is installed (Closes: 545512), add a README to note that the
+    postinst needs to be changed with each new upstream
+  * Fix find syntax in cyrus-makedirs (Closes: 545554)
+
+ -- Sven Mueller <sven@debian.org>  Tue, 08 Sep 2009 10:04:14 +0200
+
+cyrus-imapd-2.2 (2.2.13-15) unstable; urgency=high
+
+  [Security Update]
+  * Fixes buffer overflow in SIEVE script handling -> high urgency
+    Problem has no CVE tag assigned, is not yet announced by upstream,
+    but upstream patch is in public CVS -> not embargoed.
+
+  [Sven Mueller]
+  * change example script mbox2cyrus to remove bashisms (Closes: #489558,
+    thanks to Andres Mejia)
+  * change Makefile so that no (intended) non-phony target invokes a phony
+    target. Also remove empty lines inside rules or replace them by comment
+    lines
+  * Added patches for translation updates as provided by Christian Perrier
+    (see below)
+  * update cyrus-makedirs to be more performant (using xargs to call chmod
+    et al. instead of using find -exec, this avoids lots of forks)
+  * remove build dependency alternate libsnmp5-dev (not even in oldstable
+    anymore), add alternative libsnmp-dev (as in stable)
+  * update standards-version to 3.8.3.0
+    - add README.source
+    - remove version from perl build dependency
+
+  [ Christian Perrier ]
+  * Debconf templates and debian/control reviewed by the debian-l10n-
+    english team as part of the Smith review project. Closes: #523989
+  * [Debconf translation updates]
+    - Swedish. Closes: #524090
+    - Czech. Closes: #524092
+    - Japanese. Closes: #524121
+    - Russian. Closes: #525704
+    - Portuguese. Closes: #525912
+    - German. Closes: #525913
+    - Galician. Closes: #524267
+    - Italian. Closes: #524312
+    - French. Closes: #524954
+    - Finnish. Closes: #526182
+    - BokmĂĄl, Norwegian. Closes: #526231
+    - Spanish. Closes: #526358
+    - Basque. Closes: #530856
+
+ -- Sven Mueller <sven@debian.org>  Fri, 04 Sep 2009 09:58:54 +0200
+
+cyrus-imapd-2.2 (2.2.13-14) unstable; urgency=low
+
+  [ Sven Mueller ]
+  * Fix a problem in lib/Makefile.in with multi-word CCs
+    (problem found by Uwe Hermann's try at building all Debian packages with
+    Open64 - kudos to him for this nice little project)
+  * Update portoguese debconf translations (Closes: #439405)
+  * Add Homepage field to debian/control
+  * Use official VCS fields to document repository
+
+  [ Benjamin Seidenberg ]
+  * Fix the finds in cyrus-makedirs (which weren't working properly) to use
+    xargs instead of -exec. (Closes #442491)
+
+  [ Sven Mueller ]
+  * Fix control file (lintian warning: substvar-source-version-is-deprecated)
+  * Check for necessary changes regarding policy version 3.7.3.0, there where
+    none, so upgrading debian/control
+  * Fix init script LSB header (closes: 470110)
+  * Update logcheck rules and the rule filenames (closes: 473526)
+  * Add finnish translation (Closes: 473792)
+  * Update galician translation (Closes: 473886)
+  * Add basque translation (Closes: 473914)
+  * add norwegian bokmal translation (Closes: 474360)
+  * Add patch to add sasl_{minimum,maximum}_layer details can be found
+    in libsasl documentation. (Closes: 402814)
+
+ -- Sven Mueller <sven@debian.org>  Tue, 15 Apr 2008 12:37:26 +0200
+
+cyrus-imapd-2.2 (2.2.13-13) unstable; urgency=low
+
+  * Change messages and chown's in cyrus-makedirs (Use find instead)
+    (Closes: #404446, 411529)
+  * Fix logcheck rule to ignore nonexistant sieve scripts (Closes #416826)
+  * Update README.exim to something more debian specific. Thanks: Romain
+    Chantereau <romain@mezimail.com> and Steve Kemp <skx@debian.org>.
+    (Closes: #395504)
+  * Update README.Debian.databases. Along with other fixes from a long time
+    ago, this addresses almost all of the issues raised in an upgrade report.
+    (Closes: #409945)
+  * Add a patch by Andrew Morgan <morgan@orst.edu> that adds a config option
+    to disable referrals from frontends to backends 
+
+ -- Benjamin Seidenberg <benjamin@debian.org>  Fri, 22 Jun 2007 16:50:45 +0100
+
+cyrus-imapd-2.2 (2.2.13-12) unstable; urgency=low
+
+  * The "This-would-be-a-lot-easier-if-Ross-Boylan-used-courier" Release
+
+  [ Sven Mueller ]
+  * Add rules to logcheck.violations.ignore, eliminating "SQUAT failed"
+    generic error message as far as logcheck is concerned.
+  * Fix bug number in README.Debian (151295, not 151925) (Closes: #426334)
+
+  [ Benjamin Seidenberg ]
+  * Remove a redundant part of patches//13-master_process_handling.dpatch
+    which causes a double free. (Closes: #425844, #429164)
+  * Add information about tls_[service]_* options changing in UPGRADE.Debian.
+    (Closes: #408503)
+
+ -- Benjamin Seidenberg <benjamin@debian.org>  Mon, 18 Jun 2007 15:38:01 -0400
+
+cyrus-imapd-2.2 (2.2.13-11) unstable; urgency=low
+
+  * Fix a bug in cyrus-common-2.2 postrm script:
+    Even when a package Depends on debconf, it is not guaranteed to be there
+    when postrm is called. (Closes: #416739)
+  * Assume removal of spools is not desired if debconf isn't available (least
+    surprise / least chance of data loss principle).
+  * Add Xs-Vcs-Browser and Xs-Vcs-Svn control fields for the PTS.
+  * Fix a number of small issues with the 64bit quota patch.
+  * update automake/autoconf patch with latest autotools-dev and
+    automake/autoconf packages from unstable.
+  * Add optional patch which allows uploads of messages with "From " headers.
+    Taken from fastmail.fm patchset.
+  * Add upstream patch to avoid sending empty literal responses.
+  * Add upstream patch to sort illegal dates before legal ones.
+  * Add galician debconf translation (Closes: #412809)
+  * Add portuguese debconf translation (Closes: #410964)
+  * Add a little more detail to the squatter manpage (Closes: #395063)
+  * Add dependency on heimdal-dev, add check to debian/rules wether GSSAPI is
+    used (Closes: #423970)
+
+ -- Sven Mueller <sven@debian.org>  Fri, 18 May 2007 13:05:58 +0200
+
+cyrus-imapd-2.2 (2.2.13-10) unstable; urgency=high
+
+  * High urgency due to #400747
+  
+  [ Sven Mueller ]
+  * Update README.Debian.simpleinstall (Closes: #395250)
+  * Upstream change: applied RFC4314 READ-ONLY logic
+
+  [ Benjamin Seidenberg ]
+  * Add notice about lmtp overquota configuration option rename to
+    UPGRADE.Debian (Closes: #400645)
+  * Disable upstream patch 0019 due to bad sasl interactions (Closes: #400747) 
+
+ -- Benjamin Seidenberg <benjamin@debian.org>  Sat,  9 Dec 2006 10:03:38 -0500
+
+cyrus-imapd-2.2 (2.2.13-9) unstable; urgency=high
+
+  * The "Benjamin made it in time for etch" release.
+  * High urgency upload with simple fixes for Etch
+
+  [ Henrique de Moraes Holschuh ]
+  * Prevent cronjobs and initscript from working when another version
+    of Cyrus IMAPD is installed and 2.2 is in removed but not purged
+    state (Closes: #393596)
+
+ -- Benjamin Seidenberg <benjamin@debian.org>  Wed, 25 Oct 2006 13:39:08 -0400
+
+cyrus-imapd-2.2 (2.2.13-8) unstable; urgency=medium
+
+  [ Sven Mueller ]
+  * Remove unneeded drac dependency
+  * New vietnamese translation (thanks to Clytie Siddall, Closes: #383281)
+  * New russian translation (thanks to Yuri Kozlov, Closes: #383217)
+  * Updated dutch translation (thanks to Kurt De Bree, Closes: #384870)
+  * Updated logcheck rules a bit more, thanks to Ross Boylan (Closes: #384265)
+  * Add spanish debconf translation thanks to CĂ©sar GĂłmez MartĂ­n.
+  * Add patch to fix FTBFS on GNU/kFreeBSD thanks to Petr Salinger.
+    (Closes: #388242)
+  * Run autoconf to generate update configure script after above patch was
+    applied to configure.in
+  * Add patch by Ben Poliakoff which fixes an inability to set annotations
+    from IMAP::Admin perl module (Closes: #389597)
+    urgency=medium because of this bug. Might have been medium, but the
+    combination of this bug and the one below seems severe enough for high.
+    It makes the package unusable to anyone using annotations (guess is 40%
+    of new installs).
+  * Update dutch debconf translation (Closes: #389783)
+  * Fix a problem with repeated builds from the same tree.
+  * Add upstream patch to imtest.c prefixing raw client responses with C:
+
+  [ Henrique de Moraes Holschuh ]
+  * Update pt_BR debconf translation
+
+  [ Benjamin Seidenberg ]
+  * Update date span in debian/copyright
+  * Fix mistake in init script, ! check_status instead of !check_status.
+    Thanks to Farzad FARID
+  * Fix DOS encoding on several files in debian/ (Closes: #391092)
+    Thanks to Farzad FARID
+  * Changed my email in debian/control 
+
+ -- Benjamin Seidenberg <benjamin@debian.org>  Mon, 16 Oct 2006 19:41:37 -0400
+
+cyrus-imapd-2.2 (2.2.13-7) unstable; urgency=low
+
+  * The "Bad translations in the middle of the night" release.
+  * Update czech translation by Martin ?Ă­n <martin.sin@zshk.cz>
+    (Closes: #382775,#383226)
+  * Add logcheck ignore line for lmtp delivery log entries (Closes: #382942)
+  * Update imapd.conf and cyrus.conf to reflect the configurable IDLE patch
+    applied since 2.2.13-5. (Closes: #382938)
+  * Update a debconf question so that it doesn't ask in first persion. Fixes a
+    lintian warning or even two.
+  * Fix delprune event in cyrus.conf to use cyr_expire (Closes: #383015)
+  * Add swedish translation by Daniel Nylander <po@danielnylander.se>
+  * Fix some mistakes in the german translation, most corrections by Holger
+    Wansing <linux@wansing-online.de>
+  * Update italian translation by Cristian Rigamonti <cri@linux.it>
+  * Correct README.Debian.database regarding number of .seen and .sub
+    databases. (Closes: #383484)
+  * Change wording regarding installsieve in README.Debian. (Closes: #383485)
+  * Add a "WARNING" prefix to the error message about missing sieve scripts.
+    (Closes: #383640)
+  * Add a logcheck ignore clause for sieve redirects. (Closes: #384265)
+  * Fix an implicit pointer conversion in imap/global.c (Closes: #384279)
+  * Update french translation thanks to Philippe Batailler and the
+    debian-l10n-french mailing list. (Closes: #384288)
+  * added 'sieve_allowreferrals' option which controls whether timsieved
+    issues referrals (default) or proxies (by murch@andrew.cmu.edu)
+  * update japanese debconf translation, thanks to Hideki Yamane
+    (henrich@samba.gr.jp)
+  * Update logcheck rules (thanks to Paul Traina <reportbug@st04.pst.org>)
+    (Closes: #387180)
+  * Add a patch to change a log message when a user has no sieve file.
+
+ -- Sven Mueller <sven@debian.org>  Thu, 14 Sep 2006 18:58:49 +0200
+
+cyrus-imapd-2.2 (2.2.13-6) unstable; urgency=low
+
+  * Fix a problem in cyrus-common-2.2 preinst 
+
+ -- Sven Mueller <sven@debian.org>  Thu, 10 Aug 2006 03:58:58 +0200
+
+cyrus-imapd-2.2 (2.2.13-5) unstable; urgency=low
+
+  * The "Need to clean the Windows" release
+
+    [ Benjamin Seidenberg ]
+  * Update the following documentation:
+    - README.Debian
+    - README.Debian.database
+    - README.Debian.postfix
+    - README.Debian.
+    (Closes: #378520, #369882)
+  * Bump debian policy to version 3.7.2 (No changes required)
+  * Move cyr_expire to /usr/sbin as this is used in cyrus.conf.
+    Thanks to Alexander Turic <alexander@turcic.com>. (Closes: #380595)
+  * Rename cron script to cyrus22 since dots aren't allowed
+    (Closes: #382069)
+
+  [ Sven Mueller ]
+  * Remove outdated entry about netnews removal from README.Debian
+    (Closes: #378519)
+  * Add --no-create-home to adduser arguments in cyrus-common2.2's
+    postinst script. (Closes: #378518)
+  * Modify debian/rules to once again create a meaningful
+    cyrus-db-types.txt file (Closes: #366957)
+  * Improve imapd.conf documentation to show how service specific options can
+    be given. Also update packaged imapd.conf to reflect 2.2 syntax and
+    behaviour. (Closes: #379881)
+  * Use ssl-cert and reference system-wide ssl certificates in imapd.conf,
+    leaving the service specific ssl certs as-is.
+  * Update imapd.conf documentation to clarify behaviour of allowplaintext in
+    combination with sasl_mech_list.
+  * Sync with 2.2 CVS tree from upstream, including a few documentation fixes
+    and a fix returning empty strings for empty message parts instead of NULL
+  * Use configurable idle patch from Ondřej Surý
+  * Add some more options to /etc/default/cyrus2.2 and use them in the init
+    script, including a generic OPTIONS variable to allow setting of any
+    commandline option for cyrmaster. (Closes: #382061)
+  * Add logic in cyrus-common-2.2 preinst/postrm scripts to rename the
+    cron.daily script. Supplements change by Benjamin Seidenberg, closing
+    #382069.
+
+ -- Sven Mueller <sven@debian.org>  Thu, 10 Aug 2006 03:17:27 +0200
+
+cyrus-imapd-2.2 (2.2.13-4) unstable; urgency=low
+
+  [ Benjamin Seidenberg ]
+  * Switch from dh_movefiles (deprecated) to dh_install
+
+  [ Sven Mueller ]
+  * Integrate 4 upstream CVS updates/fixes:
+    - Upstream fix: only free() the backend struct if we allocated it
+      (don't free cached connections)
+    - remove limit on the size of mailbox files that can be received by UNDUMP
+      (write file directly to disk rather than reading the literal into
+      memory)
+    - better logging to facilitate message tracking (Wes Craig
+      <wes@umich.edu>)
+    - remove redundant check for wildcards in mailbox names (Wes Craig
+      <wes@umich.edu>)
+  * Move expiry from ctl_deliver to cyr_expire as suggested by upstreams
+    upgrade information.
+  * Add upstream patch to fix a small issue with linking and libRSAglue
+  * Add upstream patch to compile with MIT krb5 1.4.3 (Philip Guenther
+    <guenther@sendmail.com>)
+  * Add upstream patch to allow reporting of mailbox sizes above 4GB
+  * Add upstream patch to fix a documentation error in imapoptions
+  * Add patch to fix some compiler warnings about casts from pointer to
+    integer of different size
+  * Change the init script to actuall print some information when called with
+    the "status" argument
+  * Add upstream typo fixes of the day. See 0016-upstream-fix-typos for
+    reference to upstream CVS
+
+  [ Benjamin Seidenberg ]
+  * Fix typos in UPGRADE.Debian (Closes: #368675)
+  * Fix link in doc/html/readme.html (Closes: #368676)
+  * Add upstream patch to fix POP locking when reconstructing
+
+ -- Sven Mueller <sven@debian.org>  Wed, 28 Jun 2006 22:21:51 +0200
+
+cyrus-imapd-2.2 (2.2.13-3) unstable; urgency=high
+
+  [ Sven Mueller ]
+  * [Security] Add upstream patch to disallow user probes
+  * Add upstream patch to fix dump/undump of remote mailboxes (ctl_mboxlist)
+  * Add upstream patch to allow ACL removal for invalid IDs
+  * Add upstream patch to properly handle timezones and DST in fetchnews
+  * Urgency=high for both security fix and patch to dump/undump bug which
+    makes package unusuable in many supported setups
+
+  [ Benjamin Seidenberg ]
+  * Add build dependency on libkvm-dev for kfreebsd (Closes: #366113)
+
+ -- Sven Mueller <debian@incase.de>  Fri,  5 May 2006 18:01:41 +0200
+
+cyrus-imapd-2.2 (2.2.13-2) unstable; urgency=low
+
+  [ Sven Mueller ]
+  * Apply fix from upstream CVS to imap/backend.c (Closes: #365629) 
+
+ -- Sven Mueller <debian@incase.de>  Tue,  2 May 2006 22:14:03 +0200
+
+cyrus-imapd-2.2 (2.2.13-1) unstable; urgency=low
+
+  [ Sven Mueller ]
+  * Switch to new upstream release (2.2.13)
+  * Fix spelling mistake in debian/control (Closes: #363329)
+  * Fix logcheck rule (Closes: #364835)
+
+ -- Sven Mueller <debian@incase.de>  Sat, 29 Apr 2006 22:31:42 +0200
+
+cyrus-imapd-2.2 (2.2.12-5) unstable; urgency=low
+
+  [ Sven Mueller ]
+  * Add example entries for squatter to cyrus.conf (Closes: #355303)
+  * Fix URLs in README.sendmail (Closes: #355771)
+  * Remove STDERR redirection from cyrus-common-2.2 postinst call to adduser
+
+  [ Benjamin Seidenberg ]
+  * Default to lmtp_downcase_rcpt: yes for compliance with RFC 2821
+    (Closes: #357040)
+
+ -- Sven Mueller <debian@incase.de>  Fri, 31 Mar 2006 20:11:54 +0200
+
+cyrus-imapd-2.2 (2.2.12-4) unstable; urgency=low
+
+  [ Benjamin Seidenberg ]
+  * Change maintainer to mailing list
+  * Remove multiple provides: lines in cyrus-nntpd-2.2 (Closes: #352240)
+  * Add lintian override for CVS dirs in source tarball, we need to hit
+    upstream with a cluebat for this.
+  * Move all Build-Depends-Indep dependencies to Build-Depends because of the
+    way debian/rules invokes this target, they are not installed, fixes FTBFS.
+    (Closes: #352775, #352779)
+
+  [ Sven Mueller ]
+  * Disable DRAC authentication
+  * Fix reference in debian/po/POTFILES.in (Closes: #352948)
+
+  [ Ondřej Surý ]
+  * Upload to unstable.
+
+ -- Ondřej Surý <ondrej@debian.org>  Wed, 15 Feb 2006 22:42:35 +0100
+
+cyrus-imapd-2.2 (2.2.12-3) unstable; urgency=low
+
+  [ Sven Mueller ]
+  * Add a script which helps downloading, editing and re-uploading
+    sieve scripts
+  * Add a patch to fix db_err callback prototype when building against
+    Berkeley DB 4.3 or newer
+
+  [ Henrique de Moraes Holschuh ]
+  * UPGRADE.Debian: warn of dangerous problem in cyrus-imapd from sarge,
+    which would cause data loss when UPGRADE.Debian instructions were
+    followed.
+
+  [ Benjamin Seidenberg ]
+  * Changed debian/control so that the doc package is in section doc to match
+    ftpmaster override.
+
+  [ Ondřej Surý ]
+  * Updated and renamed logcheck rules.
+  * Upload to unstable.
+
+ -- Ondřej Surý <ondrej@debian.org>  Mon, 13 Feb 2006 14:16:44 +0100
+
+cyrus-imapd-2.2 (2.2.12-2) experimental; urgency=low
+
+  [ Henrique de Moraes Holschuh ]
+  * Modify the Debian default TLS cipher list to use only secure ciphers
+    suitable for imap/pop/smtp/lmtp TLS, and add an explanation
+
+  [ Benjamin Seidenberg ]
+  * Rewrote descriptions to all refer to cyrus-common-2.2
+  * Changed all package names in all required files within /debian to reflect
+    the new naming scheme
+  * Deleted two files in /usr/lib/cyrus in the purge target of postrm so that
+    this folder is deleted correctly
+  * Changed policy version to 3.6.2
+  * Added upstream patchset 6662:
+    imap/spool.c:1.7->1.8: don't catch our own NULL (off by one error)
+    (Closes: #342314)
+
+  [ Sven Mueller ]
+  * Add a small sed call to debian rules to work around libsnmp[59]-dev
+    problem which causes an unneccesary "-lsensors" in master/Makefile,
+    resulting in an unnessary build dependency on libsensors-dev.
+    Proper fix has to go into netsmp packages, also we need to properly use
+    Debian's libtool. (Closes: #341580)
+  * Add czech translation (thanks to Martin Sin and the debian-l10n-czech
+    team) with a spelling correction from Ondrej SurĂ˝.
+  * Adjust kolab2 annotation patch according to patch from Steffen Joeris
+    (Closes: #347527)
+  * Apply patch fixing some error messages in Shell.pm (Closes: #347658)
+
+  [ Ondřej Surý ]
+  * Upload to experimental.
+
+ -- Ondřej Surý <ondrej@debian.org>  Fri, 13 Jan 2006 11:52:58 +0100
+
+cyrus22-imapd (2.2.12-1) experimental; urgency=low
+
+  [ Benjamin Seidenberg ]
+  * Revised to build against pristine upstream sources.
+  [ Sven Mueller ]
+  * Fixed a discrepancy between documentation and actual behaviour of the
+    "dracinterval" imapd.conf option. Documentation always said the default
+    would be 0, while the default was actually 5.
+  [ Henrique de Moraes Holschuh ]
+  * Change build-dependency from libsnmp4.2-dev (ucd snmp) to libsnmp9-dev |
+    libsnmp5-dev (netsnmp), so that it works right in sid/etch and sarge
+  * Upload to experimental
+
+ -- Henrique de Moraes Holschuh <hmh@debian.org>  Tue, 29 Nov 2005 02:10:21 -0200
+
+cyrus22-imapd (2.2.12-0.9) unstable; urgency=low
+
+  [ Sven Mueller ]
+  * Add patch to be compatible with BerkeleyDB 4.3
+  * Add patch to fix TLS/SSL shutdown in timsieved
+
+ -- Sven Mueller <debian@incase.de>  Mon, 14 Nov 2005 14:56:20 +0100
+
+cyrus22-imapd (2.2.12-0.8) unstable; urgency=low
+
+  [ Sven Mueller ]
+  * Fix a problem in the init scripts new status check, found by Benjamin
+    Seidenberg.
+
+ -- Sven Mueller <debian@incase.de>  Sun, 13 Nov 2005 20:14:05 +0100
+
+cyrus22-imapd (2.2.12-0.7) unstable; urgency=low
+
+  [ Sven Mueller ]
+  * Switch most deletions of autogenerated files to use debian/deletable.files
+  * Switch all remaining patches to dpatch so that the .diff.gz should now be
+    clean except for the files in debian/.
+
+ -- Sven Mueller <debian@incase.de>  Thu, 10 Nov 2005 16:06:09 +0100
+
+cyrus22-imapd (2.2.12-0.6) unstable; urgency=low
+
+  [ Sven Mueller ]
+  * Added kolab2 annotation patch as proposed by Christoper Sacca
+  * Added a small patch to lower the minimum pop3 timeout to 1 minute.
+    The default is still at 10 minutes. I also added some documentation to make
+    it clear to admins that it is _not_ recommended to lower the value to less
+    than 10 minutes (because that is what the standard says it should be at).
+    I needed this change for use at my workplace though. The patch is disabled
+    by default.
+  * Patched init script to support everything LSB 3.0 asks for, including the
+    "right" return codes, as far as we can.
+  * Add patch to enhance sieveshell a bit:
+    - Add --execfile parameter to read commands from a file
+    - Add --password parameter to pass the users parameter on the commandline
+    - Add code to return with a non-zero exit code if the last command
+      executed failed for some reason.
+
+  [ Ondřej Surý ]
+  * Add 64bit quota dpatch.
+  * Rerun autoconf and add result as dpatch. 
+
+ -- Sven Mueller <debian@incase.de>  Fri, 23 Sep 2005 18:55:57 +0200
+
+cyrus22-imapd (2.2.12-0.5) unstable; urgency=low
+
+  * Update upgrading information
+  * Include masssievec in cyrus22-common
+  * Applied patch from Raphaël 'SurcouF' Bordet <surcouf@debianfr.net> to add
+    nntp support again.
+  * Eliminate an unused variable from tools/masssievec to get rid of perl
+    warning.
+  * Update Recommends and Suggests for cyrus22-common as suggested by HMH
+  * Move several patches from patching the source directly to patching through
+    the use of dpatch
+
+ -- Sven Mueller <debian@incase.de>  Tue, 24 May 2005 23:13:18 +0200
+
+cyrus22-imapd (2.2.12-0.4) unstable; urgency=low
+
+  * Fix usage message in deliver.c to reflect Debian naming of (cyr)deliver,
+    (cyr)quota and (cyr)reconstruct
+  * Document the defaultdomain setting a bit better (hopefully)
+  * fix deletion of debian/cyrus-hardwired-config.txt during cleanup
+  * build both arch-dependend and arch-independend parts when debian/rules is
+    called for the build target
+  * Add Sven Mueller to the list of uploaders
+
+ -- Sven Mueller <debian@incase.de>  Fri, 29 Apr 2005 00:14:04 +0200
+
+cyrus22-imapd (2.2.12-0.3) unstable; urgency=low
+
+  * Add a README which contains the configure options used to
+    compile the package. The README is auto-generated by debian/rules
+  * cyrus22-clients needs to conflict with cyrus21-clients
+  * cyrus22-common needs to conflict with cyrus21-common 
+  * Add a guess of what the problem might be to the set_cert_stuff failure
+    message
+  * Update a few Replaces:, Provides: and Conflicts: lines in debian/control
+
+ -- Sven Mueller <debian@incase.de>  Thu, 24 Mar 2005 12:26:27 +0100
+
+cyrus22-imapd (2.2.12-0.2) unstable; urgency=low
+
+  * Fix some more perl executable paths
+  * clean up debian directory a bit
+  * install sievec with cyrus22-common
+  * install mbexamine with cyrus22-common
+  * install smmapd with cyrus22-common
+  * install cyr_expire with cyrus22-common
+  * install installsieve with cyrus22-admin
+
+ -- Sven Mueller <debian@incase.de>  Tue, 22 Mar 2005 14:48:33 +0100
+
+cyrus22-imapd (2.2.12-0.1) unstable; urgency=low
+
+  * Initial revision of cyrus22-imapd package
+    - debian packaging taken from cyrus21-imapd_2.1.18-1
+  * Add/fix imapd.conf info regarding virtual domains
+  * Add DRAC support (i.e. apply DRAC patch from /contrib)
+  * Add syncldap2cyrus.pl script from #260833 (a cyrus21 bug)
+
+ -- Sven Mueller <debian@incase.de>  Fri, 18 Mar 2005 13:34:09 +0100
+
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-dev-2.2.links
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-dev-2.2.links
@@ -0,0 +1,2 @@
+usr/share/doc/cyrus-common-2.2 usr/share/doc/cyrus-dev-2.2
+
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-common-2.2.links
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-common-2.2.links
@@ -0,0 +1,3 @@
+var/spool/sieve etc/sieve
+usr/sbin/cyrreconstruct usr/lib/cyrus/bin/reconstruct
+usr/sbin/cyrquota usr/lib/cyrus/bin/quota
--- cyrus-imapd-2.2-2.2.13.orig/debian/control
+++ cyrus-imapd-2.2-2.2.13/debian/control
@@ -0,0 +1,218 @@
+Source: cyrus-imapd-2.2
+Section: mail
+Priority: extra
+Maintainer: Debian Cyrus Team <pkg-cyrus-imapd-debian-devel@lists.alioth.debian.org>
+Uploaders: Henrique de Moraes Holschuh <hmh@debian.org>, Sven Mueller <sven@debian.org>, Benjamin Seidenberg <benjamin@debian.org>, Ondřej Surý <ondrej@debian.org>, Christoph Berg <myon@debian.org>
+Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 5), quilt, tcl-dev | tcl8.3-dev, libwrap0-dev, libpam0g-dev, libdb4.7-dev, libssl-dev, libzephyr-dev, libsasl2-dev (>= 2.1.9), comerr-dev, libsnmp-dev | libsnmp9-dev, perl, xutils-dev | xutils, flex, bison, autotools-dev, po-debconf, transfig, ghostscript | gs-gpl, groff, libkvm-dev [kfreebsd-i386], libkvm-dev [kfreebsd-amd64], heimdal-dev
+Vcs-Browser: http://git.debian.org/?p=pkg-cyrus-imapd/cyrus-imapd-2.2.git
+Vcs-Git: git://git.debian.org/pkg-cyrus-imapd/cyrus-imapd-2.2.git
+Homepage: http://www.cyrusimap.org/
+
+Package: cyrus-common-2.2
+Architecture: any
+Section: mail
+Depends: postfix | mail-transport-agent, adduser (>= 3.34), dpkg (>> 1.9.0), netbase (>= 4.07), gawk, ${shlibs:Depends}, ${perl:Depends}, ${misc:Depends}
+Recommends: cyrus-imapd-2.2 | cyrus-pop3d-2.2 | cyrus-murder-2.2 | cyrus-nntpd-2.2 | cyrus-admin-2.2
+Suggests: cyrus-clients-2.2, cyrus-admin-2.2, cyrus-imapd-2.2, cyrus-pop3d-2.2, cyrus-murder-2.2, cyrus-nntpd-2.2, cyrus-doc-2.2, sasl2-bin, apt-listchanges (>= 2.35)
+Conflicts: suidmanager (<< 0.50), cyrus-common, cyrus21-common, cyrus22-common
+Replaces: cyrus21-common, cyrus22-common
+Provides: cyrus21-common, cyrus22-common
+Description: Cyrus mail system - common files
+ Cyrus is an IMAP server designed to handle massive quantities of mail,
+ with a number of features not found in other IMAP implementations,
+ including support for:
+  - running the daemon without root privileges;
+  - POP3 and NNTP in addition to plain IMAP;
+  - POP/IMAP-before-SMTP using DRAC;
+  - secure IMAP using SSL;
+  - server-side filtering with Sieve;
+  - mail users without login accounts;
+  - simple mail quotas;
+  - virtual domains;
+  - IPv6.
+ .
+ Cyrus doesn't support reading from and storing mail in the
+ standard mail spool. It stores mail in a separate directory in its
+ own MH-like format.
+ .
+ This package contains the common files needed by the other Cyrus
+ components. The cyrus22-imapd and/or cyrus22-pop3d packages are needed
+ to enable IMAP and POP3 support respectively. cyrus22-murder can be
+ used to enable IMAP, POP3, and LMTP proxying.
+
+Package: cyrus-doc-2.2
+Architecture: all
+Section: doc
+Provides: cyrus21-doc, cyrus22-doc
+Depends: ${misc:Depends}
+Replaces: cyrus21-doc, cyrus22-doc
+Conflicts: cyrus21-doc, cyrus22-doc
+Description: Cyrus mail system - documentation files
+ Cyrus is an IMAP server designed to handle massive quantities of mail,
+ with a number of features not found in other IMAP implementations,
+ including support for:
+  - running the daemon without root privileges;
+  - POP3 and NNTP in addition to plain IMAP;
+  - POP/IMAP-before-SMTP using DRAC;
+  - secure IMAP using SSL;
+  - server-side filtering with Sieve;
+  - mail users without login accounts;
+  - simple mail quotas;
+  - virtual domains;
+  - IPv6.
+ .
+ This package contains the documentation for the Cyrus IMAPd suite.
+
+Package: cyrus-imapd-2.2
+Architecture: any
+Section: mail
+Depends: cyrus-common-2.2 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Provides: imap-server, cyrus21-imapd, cyrus22-imapd
+Conflicts: imap-server, cyrus21-imapd, cyrus22-imapd
+Replaces: cyrus21-imapd, cyrus22-imapd
+Description: Cyrus mail system - IMAP support
+ Cyrus is an IMAP server designed to handle massive quantities of mail,
+ with a number of features not found in other IMAP implementations,
+ including support for:
+  - running the daemon without root privileges;
+  - POP3 and NNTP in addition to plain IMAP;
+  - POP/IMAP-before-SMTP using DRAC;
+  - secure IMAP using SSL;
+  - server-side filtering with Sieve;
+  - mail users without login accounts;
+  - simple mail quotas;
+  - virtual domains;
+  - IPv6.
+ .
+ This package contains the IMAP (Internet Mail Access Protocol) portion
+ of the Cyrus IMAPd suite.
+
+Package: cyrus-pop3d-2.2
+Architecture: any
+Section: mail
+Depends: cyrus-common-2.2 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Provides: cyrus21-pop3d, cyrus22-pop3d, pop3-server
+Conflicts: cyrus21-pop3d, cyrus22-pop3d, pop3-server
+Replaces: cyrus21-pop3d, cyrus22-pop3d
+Description: Cyrus mail system - POP3 support
+ Cyrus is an IMAP server designed to handle massive quantities of mail,
+ with a number of features not found in other IMAP implementations,
+ including support for:
+  - running the daemon without root privileges;
+  - POP3 and NNTP in addition to plain IMAP;
+  - POP/IMAP-before-SMTP using DRAC;
+  - secure IMAP using SSL;
+  - server-side filtering with Sieve;
+  - mail users without login accounts;
+  - simple mail quotas;
+  - virtual domains;
+  - IPv6.
+ .
+ This package contains the POP3 (Post Office Protocol) portion of the Cyrus
+ IMAPd suite.
+
+Package: cyrus-admin-2.2
+Architecture: all
+Section: mail
+Depends: libcyrus-imap-perl22 (>= ${source:Version}), ${misc:Depends}
+Suggests: sasl2-bin
+Conflicts: cyrus-admin, cyrus21-admin, cyrus22-admin
+Replaces: cyrus21-admin, cyrus22-admin
+Provides: cyrus21-admin, cyrus22-admin
+Description: Cyrus mail system - administration tools
+ Cyrus is an IMAP server designed to handle massive quantities of mail,
+ with a number of features not found in other IMAP implementations,
+ including support for:
+  - running the daemon without root privileges;
+  - POP3 and NNTP in addition to plain IMAP;
+  - POP/IMAP-before-SMTP using DRAC;
+  - secure IMAP using SSL;
+  - server-side filtering with Sieve;
+  - mail users without login accounts;
+  - simple mail quotas;
+  - virtual domains;
+  - IPv6.
+ . 
+ This package provides the administrative tools for the Cyrus IMAPd suite.
+ It contains cyradm, which can be used to administer both local and remote
+ Cyrus mail systems, plus sieveshell (and its deprecated cousin
+ installsieve), which can be used to manage Sieve scripts.
+
+Package: cyrus-murder-2.2
+Section: mail
+Architecture: any
+Depends: cyrus-common-2.2 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Recommends: cyrus-imapd-2.2 (= ${binary:Version}), cyrus-pop3d-2.2 (= ${binary:Version})
+Conflicts: cyrus21-murder, cyrus22-murder
+Replaces: cyrus21-murder, cyrus22-murder
+Provides: cyrus21-murder, cyrus22-murder
+Description: Cyrus mail system (proxies and aggregator)
+ This package contains the Cyrus IMAPd suite murder aggregator system,
+ i.e. IMAP, POP3  and LMTP proxies, and the mupdate mailbox master daemon.
+ It allows for cluster setups where there are many backend Cyrus spools and
+ frontend proxy servers.
+ .
+ For more information, please see the cyrus-common-2.2 package.
+
+Package: cyrus-nntpd-2.2
+Architecture: any
+Section: mail
+Depends: cyrus-common-2.2 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Conflicts: news-transport-system
+Replaces: cyrus21-nntpd, cyrus22-nntpd
+Provides: news-transport-system, cyrus21-nntpd, cyrus22-nntpd
+Description: Cyrus mail system (NNTP support)
+ This package contains the NNTP (Network News Transfer Protocol) portion of
+ the Cyrus IMAPd suite.
+ .
+ For more information, please see the cyrus-common-2.2 package.
+ 
+Package: cyrus-clients-2.2
+Architecture: any
+Section: mail
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: cyrus21-clients, cyrus22-clients
+Provides: cyrus21-clients, cyrus22-clients
+Replaces: cyrus21-clients, cyrus22-clients
+Description: Cyrus mail system (test clients)
+ This package contains client tools to test the Cyrus IMAPd suite.
+ It contains the mupdatetest, sivtest, smtptest, lmtptest,
+ imtest and pop3test tools which can be used to interactively talk to 
+ a mupdate, Sieve, SMTP, LMTP, IMAP or POP3 server.
+ The clients are fully SASL-enabled for authentication.
+ .
+ For more information, please see the cyrus-common-2.2 package.
+
+Package: cyrus-dev-2.2
+Architecture: any
+Section: devel
+Depends: libcyrus-imap-perl22 (>= ${binary:Version}), cyrus-common-2.2 (= ${binary:Version}), libsasl2-dev (>= 2.1.9), ${misc:Depends}
+Conflicts: cyrus-dev, cyrus21-dev, cyrus22-dev, libdb3-dev (<< 3.2.9-15), libdb2-dev (<< 2.7.7.0-6), libdb4.2-dev (<<4.2.52)
+Replaces: cyrus21-dev, cyrus22-dev
+Provides: cyrus21-dev, cyrus22-dev
+Description: Cyrus mail system (developer files)
+ This package contains header files and the static library needed 
+ to develop IMAP applications that interface with the Cyrus IMAPd suite.
+ .
+ For more information, please see the cyrus-common-2.2 package.
+
+Package: libcyrus-imap-perl22
+Architecture: any
+Depends: ${perl:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Provides: libcyrus-imap-perl, libcyrus-imap-perl21
+Conflicts: libcyrus-imap-perl, libcyrus-imap-perl21
+Replaces: libcyrus-imap-perl21
+Section: perl
+Description: Interface to Cyrus imap client imclient library
+ The Cyrus::IMAP module provides an interface to the Cyrus imclient
+ library.  These are primarily useful for implementing cyradm operations
+ within a Perl script; there are easier ways to implement general client
+ operations, although they may be more limited in terms of authentication
+ options when talking to a Cyrus imapd.
+ .
+ The modules that compose Cyrus::SIEVE are also included, but they are
+ undocumented upstream.
+ .
+ For more information, please see the cyrus-common-2.2 package.
+
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-pop3d-2.2.install
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-pop3d-2.2.install
@@ -0,0 +1,3 @@
+etc/pam.d/pop
+usr/lib/cyrus/bin/pop3d
+usr/share/man/man8/pop3d*
--- cyrus-imapd-2.2-2.2.13.orig/debian/deletable.files
+++ cyrus-imapd-2.2-2.2.13/debian/deletable.files
@@ -0,0 +1,98 @@
+doc/man/arbitron.8.html
+doc/man/chk_cyrus.8.html
+doc/man/ctl_cyrusdb.8.html
+doc/man/ctl_deliver.8.html
+doc/man/ctl_mboxlist.8.html
+doc/man/cvt_cyrusdb.8.html
+doc/man/cyr_expire.8.html
+doc/man/cyradm.1.html
+doc/man/cyrus.conf.5.html
+doc/man/deliver.8.html
+doc/man/fetchnews.8.html
+doc/man/fud.8.html
+doc/man/idled.8.html
+doc/man/imapd.8.html
+doc/man/imapd.conf.5.html
+doc/man/imclient.3.html
+doc/man/imtest.1.html
+doc/man/installsieve.1.html
+doc/man/ipurge.8.html
+doc/man/krb.equiv.5.html
+doc/man/lmtpd.8.html
+doc/man/lmtptest.1.html
+doc/man/master.8.html
+doc/man/mbexamine.8.html
+doc/man/mbpath.8.html
+doc/man/mupdatetest.1.html
+doc/man/nntpd.8.html
+doc/man/nntptest.1.html
+doc/man/notifyd.8.html
+doc/man/pop3d.8.html
+doc/man/pop3test.1.html
+doc/man/quota.8.html
+doc/man/reconstruct.8.html
+doc/man/rmnews.8.html
+doc/man/sieveshell.1.html
+doc/man/sivtest.1.html
+doc/man/smmapd.8.html
+doc/man/smtptest.1.html
+doc/man/squatter.8.html
+doc/man/syncnews.8.html
+doc/man/timsieved.8.html
+doc/man/tls_prune.8.html
+doc/man/w
+doc/murder.png
+doc/netnews.png
+doc/text/altnamespace
+doc/text/anoncvs
+doc/text/bugs
+doc/text/changes
+doc/text/faq
+doc/text/feedback
+doc/text/index
+doc/text/install
+doc/text/install-admin-mb
+doc/text/install-auth
+doc/text/install-compile
+doc/text/install-configure
+doc/text/install-murder
+doc/text/install-netnews
+doc/text/install-perf
+doc/text/install-prereq
+doc/text/install-sieve
+doc/text/install-snmpmon
+doc/text/install-testing
+doc/text/install-upgrade
+doc/text/install-virtdomains
+doc/text/mailing-list
+doc/text/man
+doc/text/notes
+doc/text/os
+doc/text/overview
+doc/text/questions
+doc/text/readme
+doc/text/sieve
+doc/text/sieve-protocol
+doc/text/specs
+imap/imap_err.c
+imap/imap_err.h
+imap/lmtpstats.c
+imap/lmtpstats.h
+imap/mupdate_err.c
+imap/mupdate_err.h
+imap/nntp_err.c
+imap/nntp_err.h
+imap/pushstats.c
+imap/pushstats.h
+lib/imapopts.c
+lib/imapopts.h
+man/imapd.conf.5
+man/sieveshell.1
+sieve/addr-lex.c
+sieve/addr.c
+sieve/addr.h
+sieve/sieve-lex.c
+sieve/sieve.c
+sieve/sieve.h
+sieve/sieve_err.c
+sieve/sieve_err.h
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-murder-2.2.links
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-murder-2.2.links
@@ -0,0 +1 @@
+usr/share/doc/cyrus-common-2.2 usr/share/doc/cyrus-murder-2.2
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-common-2.2.NEWS
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-common-2.2.NEWS
@@ -0,0 +1,86 @@
+cyrus22-imapd (2.2.12-1) unstable; urgency=low
+
+  cyrus now supports realms by default and is therefor suitable for virtual
+  domains much better than it was before. However, this might break upgrades
+  from v2.1 installations, especially when the hostname might change during
+  operation (for example in hot-standby high-Availability setups). 
+
+  This is the first cyrus22 package
+
+ -- Sven Mueller <debian@incase.de>  Sun, 13 Feb 2005 00:49:12 -0100
+ 
+cyrus21-imapd (2.1.16-1) unstable; urgency=low
+
+  ipurge behaviour is now that of the patch accepted upstream.  It uses the
+  date: header by default, and it can use the internal date of the message as
+  an alternative.
+
+  Cyrus 2.1 is officially in maintenance mode now, and the Debian packages will
+  follow suit.  I will switch development efforts to the Cyrus 2.2 package, and
+  update 2.1 only to fix bugs, and apply anything that shows up on CVS.
+
+ -- Henrique de Moraes Holschuh <hmh@debian.org>  Sun, 23 Nov 2003 11:59:12 -0200
+
+cyrus21-imapd (2.1.15-8) unstable; urgency=low
+
+  ipurge has been patched in a way that changes its default behaviour.  Now, it
+  uses the internal date of the message (i.e. when it entered the mail store,
+  be it through lmtp or imap append) instead of the Date: header for date
+  comparasions.
+
+  The old behaviour is still available, refer to the ipurge manpage for more
+  information.
+
+  These changes have not been accepted upstream yet, so I don't promise they
+  will stay around forever.
+
+ -- Henrique de Moraes Holschuh <hmh@debian.org>  Tue, 21 Oct 2003 13:18:30 -0200
+
+cyrus21-imapd (2.1.15-1) unstable; urgency=low
+
+  Cyrus has a big bug regarding EOL markers for /usr/sbin/sendmail.  It sends
+  CRLF-terminated lines to the /usr/sbin/sendmail wrapper (or to whatever you
+  configure for sendmail: in /etc/imapd.conf), when it should be sending
+  LF-terminated lines only.
+
+  Postfix and sendmail are fine with CRLF EOLs.  Exim 4 can be configured
+  to strip the CRs off all the time in its configuration file.
+   
+  I am writing a patch to allow one to configure parameters for sendmail, but
+  while it is not ready and accepted upstream, users of Exim 3 should set 
+  their sendmail: in imapd.conf to a shell wrapper that calls 
+  /usr/sbin/sendmail -dropcr "$@" or something to that extent.
+   
+ -- Henrique de Moraes Holschuh <hmh@debian.org>  Tue, 19 Aug 2003 07:40:40 -0300
+
+cyrus21-imapd (2.1.14-1) unstable; urgency=low
+
+  Initial instance of NEWS.Debian support.  This file will be used to note all
+  changes the local admin must do to a Cyrus system when upgrading.
+   
+  Upgrading checklist for recent 2.1.x packages:
+
+  1. timsieved was corrected to behave properly in the altnamespace
+     configuration.  However, this means that it was previously looking for
+     sieve scripts in "user.name" format instead of the (correct) "user^name"
+     format.  A sample script to do this (which should be run in the top level
+     of the sieve directories) is in /usr/lib/cyrus/upgrade/convert-sieve.pl.
+     Note that this is only needed if you are running with altnamespace turned
+     on.
+   
+  2. We are now more forgiving of MIME boundry headers generated by earlier
+     versions of eudora by default (you can switch to the more strict checks
+     that used to be the default using the rfc2046_strict imapd.conf(5)
+     option. 
+     
+     However, if you have messages already in the mailstore that you want to
+     fix you will need to reconstruct the affected mailboxes to regenerate
+     the cached bodystructure data to take this into account.  Nothing needs
+     to be done for new messages to be treated in this way.
+   
+   
+  Upgrading checklist for old Cyrus 1.5 or 1.6:
+  
+     Read /usr/share/doc/cyrus21-common/UPGRADE.Debian.gz
+   
+ -- Henrique de Moraes Holschuh <hmh@debian.org>  Fri,  4 Jul 2003 10:10:53 -0300
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-imapd-2.2.dirs
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-imapd-2.2.dirs
@@ -0,0 +1,2 @@
+usr/sbin
+usr/lib/cyrus
--- cyrus-imapd-2.2-2.2.13.orig/debian/README.Debian.simpleinstall
+++ cyrus-imapd-2.2-2.2.13/debian/README.Debian.simpleinstall
@@ -0,0 +1,183 @@
+Cyrus IMAP for Debian, Simple Install Guide
+$Id: README.Debian.simpleinstall 683 2006-10-29 22:33:52Z sven $
+-------------------------------------------
+
+   "All systems administrators have their horror stories. For me, it was
+    setting up a HP Color Bubblejet under Linux using ghostscript before
+    linuxprinting.org was alive.  Well that was a piece of cake compared
+    to what I am about to describe in this document."
+         --  "Hosting email for virtual domains using Postfix and Cyrus"
+	                                     Haim Dimermanas, 2001-08-01
+
+           "I warned you to read all the documentation first, didn't I?"
+                                    --  Henrique M. Holschuh, 2002-10-01
+
+
+This document describes how to get Cyrus running with a simple configuration
+that you can then tweak to your real needs.
+
+READ README.Debian AS WELL. I MEAN IT!  Cyrus is easy, all the trouble is
+in SASL, and even that becomes easy after you understand how SASL works.
+
+IMPORTANT: Cyrus is a closed-box email system.  Your system will access your
+email through LMTP, IMAP and POP3 *only*.  No direct file access to the email
+store is supposed to take place.
+
+
+To setup Cyrus so that you can administer it (i.e. create users),
+and get email inside it for those users:
+
+ 1. Make sure libsasl2-modules, libsasl2 and sasl2-bin are installed
+
+ 2. Make sure /etc/sasldb2 is readable by group sasl.  Pay attention
+    to overrides (dpkg-statoverride)!
+
+ 3. Make sure user cyrus belongs to group sasl (cyrus-common-2.2's install
+    tries to do this automatically for you).
+
+ 4. Edit /etc/cyrus.conf, and make sure the services you need are
+    enabled.  These are most probably "imap", "pop3", "lmtpunix".
+
+ 5. Edit /etc/imapd.conf, and make sure you have some admin users
+    listed in the entry "admins:".  I suggest using "cyrus" as your
+    admin.
+
+    I also suggest enabling plain text logins, and setting 
+    sasl_minimum_layer: 0
+
+    If you have unixhierarchysep enabled in imapd.conf, change all
+    "." in mailbox names mentioned on this document to "/", since Cyrus 
+    will use "/" as the hierarchy separator instead of the default ".".
+    I suggest you just leave unixhierarchysep set to false for now.
+
+ 6. Restart Cyrus  (/etc/init.d/cyrus2.2 restart)
+
+ 7. Use saslpasswd2 -c  to create an account for your admin:
+    saslpasswd2 -c cyrus
+
+ 8. Use sasldblistusers2 to make sure step 7 worked fine.
+
+ 9. Add other users to SASL likewise (saslpasswd2 -c).
+
+10. Log in cyrus as the administrator, and create the mailboxes:
+    cyradm --user cyrus localhost
+    cm user.bob
+    cm user.anna
+    cm user.clark...
+    ^D
+
+    (notice that there is an "user." in front of the mailbox name!)
+    You must use "user/bob", "user/anna" instead if you have the
+    unixhierarchysep option enabled in imapd.conf.
+
+    For this to work, you obviously need the cyrus-admin-2.2 package
+    installed.
+
+11. Try to login as a normal user, using imtest or a IMAP/POP3 client.
+    If you have trouble with mutt and CRAM-MD5 or DIGEST-MD5, edit
+    /etc/imapd.conf, and look for sasl_mech_list.  Set it to:
+    sasl_mech_list: plain cram-md5
+    (this will disable digest-md5, which causes trouble with mutt).
+
+12. Setup your MTA to deliver email inside Cyrus.  Basically that can
+    be done (easily) by:
+
+    a)  running /usr/sbin/cyrdeliver  (SLOW)
+        You need the lmtpunix service enabled in /etc/cyrus.conf for this
+	to work.
+    b)  delivering using LMTP to /var/run/cyrus/socket/lmtp
+        You need the lmtpunix service enabled in /etc/cyrus.conf for this
+	to work.
+
+	Just make sure (and use dpkg-statoverride to do that) that your
+	MTA can get to /var/run/cyrus/socket/lmtp.  It works just like any
+	file in a Unix system. Use this for example if you use postfix or
+	any other MTA which tries to delivery through LMTP with a user in
+	the "lmtp" group (i.e. the delivery agent program is probably set 
+	up with the setgid bit set and with owning group set to "lmtp"):
+	dpkg-statoverride --force --update --add cyrus lmtp 750 /var/run/cyrus
+	
+	If you run Postfix, make sure that the LMTP delivery agent is not
+	run chrooted in this setup (the line starting with "lmtp" should
+	have an "n" as the fifth field). If you want to run that agent
+	chrooted, you need to move the lmtp socket into the chroot or bind
+	mount /var/run/cyrus/socket into the chroot.
+
+    Cyrus REQUIRES a valid RFC2822 message, and will refuse messages with
+    bad headers (such as that From foobar header, notice the missing ':'),
+    embedded NULLs or any other crap.
+
+
+That's it.  See /usr/share/doc/cyrus-common-2.2/README.{postfix,exim,sendmail}
+for help on how to setup your MTA to correctly deliver to Cyrus.
+
+
+LDAP SETUP
+----------
+
+First, do the steps above and verify that your system is working fine.
+
+SASL is perfectly capable of trying various authentication methods one after
+another.  We will change our Cyrus setup for SASL to use a LDAP server lookup
+through saslauthd.
+
+1. Create the configuration for saslauthd to know what it must do:
+
+   Write the following file to /etc/saslauthd.conf:
+----CUTHERE----
+ldap_servers: ldap://127.0.0.1/
+ldap_version: 3
+ldap_timeout: 10
+ldap_time_limit: 10
+ldap_cache_ttl: 30
+ldap_cache_mem: 32768
+ldap_scope: sub
+ldap_search_base: ou=mail,o=mydomain
+ldap_auth_method: bind
+ldap_filter: maildrop=%u
+----CUTHERE----
+   And of course, edit it to fit your LDAP setup.
+
+2. Now, configure saslauthd to use LDAP mode and our config file:
+
+   Modify /etc/default/saslauthd so that it reads:
+   MECHANISMS="ldap"
+   PARAMS="-O /etc/saslauthd.conf"
+
+   (MECHANISMS can be a space-separated list of authentication
+   mechanisms. If you wanted saslauthd to try LDAP, then PAM, you
+   could use MECHANISMS="ldap pam")
+
+3. Start saslauthd
+
+   /etc/init.d/saslauthd restart
+
+4. Make sure Cyrus will be able to talk to saslauthd
+
+   Set the following options in /etc/imapd.conf:
+   sasl_mech_list: PLAIN
+   allowapop: no
+   allowplaintext: yes
+   sasl_minimum_layer: 0
+   sasl_pwcheck_method: saslauthd
+
+   And restart Cyrus.  You'd better understand that the above allows
+   plaintext logins over the network.  There is a LDAP SASL auxprop
+   plugin being worked on that might fix this issue.  As it stands
+   right now, you're better off by only accepting IMAPS (secure IMAP)
+   connections.
+
+   (sasl_pwcheck_method is a space separated list of SASL methods to
+   try.  If you want to have some local users in /etc/sasldb2, for
+   example, you could have "sasl_pwcheck_method: auxprop saslauthd"
+   and also "sasl_auxprop_plugin: sasldb")
+
+   One *extremely* important point to notice is that saslauthd works
+   ONLY with plaintext.  APOP, CRAM-MD5, OTP, DIGEST-MD5 and any other
+   "auxprop" SASL mech will *not* work through saslauthd.
+
+5. That's it.  There is a LDAP auxprop module in the works which can deal
+   with APOP, CRAM-MD5, OTP, DIGEST-MD5 and so on, look for it in the SASL
+   docs and openldap's contrib stuff.
+
+ -- Henrique de Moraes Holschuh <hmh@debian.org>
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyradm-32x32.xpm
+++ cyrus-imapd-2.2-2.2.13/debian/cyradm-32x32.xpm
@@ -0,0 +1,61 @@
+/* XPM */
+static char *magick[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 23 1",
+"  c Gray0",
+". c #191919",
+"X c Gray20",
+"o c #00007f",
+"O c #007f00",
+"+ c #007f7f",
+"@ c #7f0000",
+"# c #7f007f",
+"$ c #7f7f00",
+"% c #4c4c4c",
+"& c #666667",
+"* c Gray50",
+"= c Blue",
+"- c Green",
+"; c Cyan",
+": c Red",
+"> c Magenta",
+", c Yellow",
+"< c Gray60",
+"1 c #b2b2b2",
+"2 c Gray80",
+"3 c Gray90",
+"4 c Gray100",
+/* pixels */
+"222111112;2112121222111112112121",
+"121112;2112211223+11212111121111",
+"221112222112111333+221121221112;",
+"2112111211222133333&12222;212222",
+"11111112212122333323$221+2121211",
+"212121112122333%3 332&41%1111121",
+";212112;22132233211%44443&112211",
+"2211222222233.3112344444442112;2",
+"11111211133321114444441444%22121",
+"1212222133311 444444*%4444%22212",
+"211112233111444444:4334%444%2111",
+";11222331 433223* 2332%322231112",
+"222213&&11&*&&%#%%# %&#%  #%&221",
+"12233343434444434444344444443311",
+"113&2&&&3333333333333332222333+2",
+"2133333333333333332333232X**23%o",
+"22344333333333232233222221#*24.%",
+"124#&34#&#333333333223323:.#24.%",
+"223333333333333333322332332224.%",
+"214333333323333323322222322224.X",
+"11333333 &23X&2&&3223223222234.X",
+"123334433333333333222232223234.%",
+"12333333&2X12X& &13X2322322134.%",
+"123333333233333332333222222224.X",
+"21333332&&&1&X2 3&&3X&&X222234.X",
+"213333333333323222222222222134.%",
+"123333333333332223322322222134.X",
+"113333233233232332232222322324.X",
+"223334434434444444434434444444.%",
+"12 .     .                    .X",
+"2112%%%%o%%X%%o%X%%%o%X%X%oXXo%%",
+"11121222122212122122122122222222"
+};
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-common-2.2.install
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-common-2.2.install
@@ -0,0 +1,20 @@
+etc/*conf
+etc/pam.d/lmtp
+etc/pam.d/sieve
+usr/sbin/cyr*
+usr/sbin/ctl_*
+usr/sbin/cvt_*
+usr/sbin/chk_*
+usr/sbin/ipurge
+usr/sbin/tls_prune
+usr/sbin/mbpath
+usr/sbin/arbitron*
+usr/lib/cyrus/bin/lmtpd
+usr/lib/cyrus/bin/timsieved
+usr/lib/cyrus/bin/sievec
+usr/lib/cyrus/bin/mbexamine
+usr/lib/cyrus/bin/smmapd
+usr/lib/cyrus/bin/notifyd
+usr/lib/cyrus/bin/fud
+usr/lib/cyrus/get-backtrace.gdb
+usr/share/snmp
--- cyrus-imapd-2.2-2.2.13.orig/debian/mupdate.pam
+++ cyrus-imapd-2.2-2.2.13/debian/mupdate.pam
@@ -0,0 +1,14 @@
+# PAM configuration file for Cyrus Murder mupdate service
+# $Id: mupdate.pam 5 2005-03-12 23:19:45Z sven $
+#
+# If you want to use Cyrus in a setup where users don't have
+# accounts on the local machine, you'll need to make sure
+# you use something like pam_permit for account checking.
+#
+# Remember that SASL (and therefore Cyrus) accesses PAM 
+# modules through saslauthd, and that SASL can only deal with
+# plaintext passwords if PAM is used.
+#
+
+@include common-auth
+@include common-account
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-imapd-2.2.install
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-imapd-2.2.install
@@ -0,0 +1,4 @@
+etc/pam.d/imap
+usr/lib/cyrus/bin/imapd
+usr/lib/cyrus/bin/idled
+usr/sbin/squatter
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-common-2.2.cyrus2.2.default
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-common-2.2.cyrus2.2.default
@@ -0,0 +1,40 @@
+# Defaults for Cyrus IMAPd 2.2 scripts
+# $Id: cyrus-common-2.2.cyrus2.2.default 543 2006-08-08 16:36:00Z sven $
+# sourced by /etc/init.d/cyrus2.2, /usr/sbin/cyrus-makedirs
+# installed at /etc/default/cyrus2.2 by the maintainer scripts
+#
+
+#
+# This is a POSIX shell fragment
+#
+
+# Set this to 1 or higher to enable debugging on cyrmaster
+#CYRUS_VERBOSE=1
+
+# Socket listen queue backlog size
+# See listen(2). Default is 32, you may want to increase
+# this number if you have a very high connection rate
+#LISTENQUEUE=32
+
+# Wether cyrus-makedirs should optimize filesystems
+# or not.  Switch it off if you are going to do your
+# own optimizations.  Set to 1 to enable, 0 to disable
+#CYRUSOPTFILESYS=1
+
+# The default Cyrus IMAP config file that the scripts should
+# use. You better know what you're doing if you change this
+#CONF=/etc/imapd.conf
+
+# The default cyrus master config file that the scripts shoud
+# use. You better know what you're doing if you change this.
+#MASTERCONF=/etc/cyrus.conf
+
+# Check spool condition with chk_cyrus on daily cronjob
+# Set to 1 to enable, default is disabled
+#CHKCYRUS=0
+
+# Set the path to the PID file
+#PIDFILE=/var/run/cyrmaster.pid
+
+# Set other Options here. 
+OPTIONS=""
--- cyrus-imapd-2.2-2.2.13.orig/debian/libcyrus-imap-perl22.manpages
+++ cyrus-imapd-2.2-2.2.13/debian/libcyrus-imap-perl22.manpages
@@ -0,0 +1,5 @@
+perl/imap/blib/man3/Cyrus::IMAP.3pm
+perl/imap/blib/man3/Cyrus::IMAP::Admin.3pm
+perl/imap/blib/man3/Cyrus::IMAP::IMSP.3pm
+perl/imap/blib/man3/Cyrus::IMAP::Shell.3pm
+perl/sieve/managesieve/blib/man3/Cyrus::SIEVE::managesieve.3pm
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-doc-2.2.docs
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-doc-2.2.docs
@@ -0,0 +1,2 @@
+debian/UPGRADE.Debian
+debian/README.*
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-pop3d-2.2.links
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-pop3d-2.2.links
@@ -0,0 +1,2 @@
+usr/share/doc/cyrus-common-2.2 usr/share/doc/cyrus-pop3d-2.2
+
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-common-2.2.docs
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-common-2.2.docs
@@ -0,0 +1,2 @@
+debian/UPGRADE.Debian
+debian/README.*
--- cyrus-imapd-2.2-2.2.13.orig/debian/logcheck.violations.ignore
+++ cyrus-imapd-2.2-2.2.13/debian/logcheck.violations.ignore
@@ -0,0 +1,8 @@
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/(lmtp|lmtpunix)\[[0-9]+\]: IOERROR: fstating sieve script [/a-zA-Z^]+/defaultbc: No such file or directory$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/lmtpunix\[[0-9]+\]: WARNING: sieve script %s doesn't exist: [._/a-zA-Z^-]+/defaultbc: No such file or directory
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/(imaps?|pop3s?|lmtp|lmtpunix)\[[0-9]+\]: SQUAT failed to open index file$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/(imaps?|pop3s?|lmtp|lmtpunix)\[[0-9]+\]: SQUAT failed$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/(imaps?|pop3s?|lmtp|lmtpunix)\[[0-9]+\]: DBERROR db[34]: [0-9]+ lockers$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/(imaps?|pop3s?)\[[0-9]+\]: (START)?TLS( negotiation)? failed:
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/(lmtp|lmtpunix)\[[0-9]+\]: duplicate_(check|mark): .*$
+
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-clients-2.2.dirs
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-clients-2.2.dirs
@@ -0,0 +1 @@
+usr/bin
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyradm-16x16.xpm
+++ cyrus-imapd-2.2-2.2.13/debian/cyradm-16x16.xpm
@@ -0,0 +1,45 @@
+/* XPM */
+static char *magick[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 23 1",
+"  c Gray0",
+". c #191919",
+"X c Gray20",
+"o c #00007f",
+"O c #007f00",
+"+ c #007f7f",
+"@ c #7f0000",
+"# c #7f007f",
+"$ c #7f7f00",
+"% c #4c4c4c",
+"& c #666667",
+"* c Gray50",
+"= c Blue",
+"- c Green",
+"; c Cyan",
+": c Red",
+"> c Magenta",
+", c Yellow",
+"< c Gray60",
+"1 c #b2b2b2",
+"2 c Gray80",
+"3 c Gray90",
+"4 c Gray100",
+/* pixels */
+"22111;1212211111",
+"211221213<121221",
+"2111212232<11122",
+"121121221<231<11",
+"2112232<34334112",
+"1112222243213212",
+";2221<11*&<<*<<1",
+"1221233323232231",
+"2233223333332&1<",
+"2213123333233*1*",
+"123312121222233*",
+"1233212<<213223<",
+"12331<1<<11<123*",
+"123333322222223*",
+"123223322222323*",
+"2<&%%%X%%%%X%%X%"
+};
--- cyrus-imapd-2.2-2.2.13.orig/debian/README.new_upstream
+++ cyrus-imapd-2.2-2.2.13/debian/README.new_upstream
@@ -0,0 +1,3 @@
+If a new upstream version is integrated, make sure you edit
+cyrus2.2-common.postinst and fix the version in there with
+the new upstream version (search for compare-versions).
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-nntpd-2.2.install
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-nntpd-2.2.install
@@ -0,0 +1,3 @@
+etc/pam.d/nntp
+usr/lib/cyrus/bin/fetchnews
+usr/lib/cyrus/bin/nntpd
--- cyrus-imapd-2.2-2.2.13.orig/debian/pop.pam
+++ cyrus-imapd-2.2-2.2.13/debian/pop.pam
@@ -0,0 +1,14 @@
+# PAM configuration file for Cyrus POP3 service
+# $Id: pop.pam 5 2005-03-12 23:19:45Z sven $
+#
+# If you want to use Cyrus in a setup where users don't have
+# accounts on the local machine, you'll need to make sure
+# you use something like pam_permit for account checking.
+#
+# Remember that SASL (and therefore Cyrus) accesses PAM 
+# modules through saslauthd, and that SASL can only deal with
+# plaintext passwords if PAM is used.
+#
+
+@include common-auth
+@include common-account
--- cyrus-imapd-2.2-2.2.13.orig/debian/watch
+++ cyrus-imapd-2.2-2.2.13/debian/watch
@@ -0,0 +1,2 @@
+version=2
+ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-imapd-(2\.2\..*).tar.(?:gz|bz2)
--- cyrus-imapd-2.2-2.2.13.orig/debian/compat
+++ cyrus-imapd-2.2-2.2.13/debian/compat
@@ -0,0 +1 @@
+5
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-clients-2.2.manpages
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-clients-2.2.manpages
@@ -0,0 +1 @@
+man/*test.1
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-common-2.2.templates
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-common-2.2.templates
@@ -0,0 +1,34 @@
+# These templates have been reviewed by the debian-l10n-english
+# team
+#
+# If modifications/additions/rewording are needed, please ask
+# debian-l10n-english@lists.debian.org for advice.
+#
+# Even minor modifications require translation updates and such
+# changes should be coordinated with translators and reviewers.
+
+Template: cyrus-common-2.2/warnbackendchange
+Type: error
+_Description: Modified database backends
+ Comparison between /usr/lib/cyrus/cyrus-db-types.txt and
+ /usr/lib/cyrus/cyrus-db-types.active shows that database backends for
+ Cyrus IMAPd have been changed.
+ .
+ This means that those databases for which the database backends changed
+ might need to be converted manually to the new format, using the
+ cvt_cyrusdb(8) utility.
+ .
+ Please refer to /usr/share/doc/cyrus-common-2.2/README.Debian.database
+ for more information.  Do not start cyrmaster until you have converted
+ the databases to the new format.
+
+Template: cyrus-common-2.2/removespools
+Type: boolean
+Default: false
+_Description: Remove the mail and news spools?
+ The Cyrus mail and news spools, as well as users' sieve scripts,
+ can be removed when the package is purged.
+ .
+ This question only applies to the default spools and sieve script
+ directories in /var.  If you modified their location in imapd.conf, the
+ new locations will not be removed; just the old ones in /var.
--- cyrus-imapd-2.2-2.2.13.orig/debian/lmtp.pam
+++ cyrus-imapd-2.2-2.2.13/debian/lmtp.pam
@@ -0,0 +1,14 @@
+# PAM configuration file for Cyrus LMTP service
+# $Id: lmtp.pam 5 2005-03-12 23:19:45Z sven $
+#
+# If you want to use Cyrus in a setup where users don't have
+# accounts on the local machine, you'll need to make sure
+# you use something like pam_permit for account checking.
+#
+# Remember that SASL (and therefore Cyrus) accesses PAM 
+# modules through saslauthd, and that SASL can only deal with
+# plaintext passwords if PAM is used.
+#
+
+@include common-auth
+@include common-account
--- cyrus-imapd-2.2-2.2.13.orig/debian/license.html
+++ cyrus-imapd-2.2-2.2.13/debian/license.html
@@ -0,0 +1,161 @@
+
+
+<! $Id: license.html 5 2005-03-12 23:19:45Z sven $ >
+<HTML>
+<TITLE>
+Cyrus IMAP Licensing
+</TITLE>
+
+</HEAD>
+<BODY BGCOLOR="#ffffff">
+<P><MAP NAME="masthead">
+    <AREA SHAPE="rect" COORDS="0,0,125,22" HREF="http://www.cmu.edu/computing/">
+    <AREA SHAPE="rect" COORDS="429,2,539,27" HREF="http://www.cmu.edu/">
+</MAP><IMG SRC="/images/masthead.jpg" ALT="Masthead" 
+ALIGN="BOTTOM" NATURALSIZEFLAG="3" ISMAP BORDER="0" USEMAP="#masthead"><BR>
+<TABLE WIDTH="575" BORDER="0" CELLSPACING="0" CELLPADDING="0">
+<TR>
+<TD WIDTH="50%" VALIGN="TOP"><B><BIG><FONT FACE="geneva,
+		arial,helvetica, times" SIZE=+3>
+Cyrus IMAP Licensing
+</FONT></BIG></B><BR>
+<IMG SRC="/images/w.jpg" WIDTH="270" HEIGHT="1" ALIGN="BOTTOM" NATURALSIZEFLAG=
+"0"></TD>
+<TD WIDTH="50%" VALIGN="TOP" ALIGN="RIGHT">
+<FONT FACE="geneva, arial, helvetica, times" SIZE=-2>
+<A HREF="/">
+ASG Home</a></FONT>&nbsp;&nbsp;
+
+<FONT FACE="geneva, arial, helvetica, times" SIZE=-2>
+<A HREF="/whatsnew.html">
+What's New</a></FONT>&nbsp;&nbsp;
+
+<FONT FACE="geneva, arial, helvetica, times" SIZE=-2>
+<A HREF="/jobs.html">
+Jobs</a></FONT>&nbsp;&nbsp;
+
+<FONT FACE="geneva, arial, helvetica, times" SIZE=-2>
+<A HREF="/search.html">
+Search</a></FONT>&nbsp;&nbsp;
+
+<FONT FACE="geneva, arial, helvetica, times" SIZE=-2>
+<A HREF="mailto:andrew2-webmaster+@andrew.cmu.edu">
+Contact Us</a></FONT>&nbsp;&nbsp;<BR>
+
+
+<FONT FACE="geneva, arial, helvetica, times" SIZE=-1>
+<A HREF="/cyrus/download">
+<b>Download Software</b></a></FONT>&nbsp;&nbsp;
+
+<FONT FACE="geneva, arial, helvetica, times" SIZE=-1>
+<A HREF="/cyrus/mailing-list.html">
+<b>Mailing lists</b></a></FONT>&nbsp;&nbsp;
+
+<FONT FACE="geneva, arial, helvetica, times" SIZE=-1>
+<A HREF="/cyrus">
+Project Cyrus Home</a></FONT>&nbsp;&nbsp;
+<br>
+
+
+
+<br>
+<IMG SRC="/images/w.jpg" WIDTH="250" HEIGHT="1" ALIGN="BOTTOM"
+NATURALSIZEFLAG= "0"></TD></TR>
+  </TABLE>
+<p>
+
+
+Please direct technical questions or issues to <tt><a
+href="mailto:cyrus-bugs+@andrew.cmu.edu">cyrus-bugs@andrew.cmu.edu</a></tt>.
+<br>
+Please direct any licensing issues to <tt><a
+      href="mailto:tech-transfer+@andrew.cmu.edu">tech-transfer@andrew.cmu.edu</a></tt>.
+<hr>
+
+<b>ALL</b> versions of the Cyrus IMAP server are now covered by the
+following copyright message. However, please note that in
+  distributions before 2.0, there may still be files that have the old 
+  copyright text.
+
+<blockquote>
+<xmp>
+ * Copyright (c) 1994-2000 Carnegie Mellon University.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For permission or any legal
+ *    details, please contact  
+ *      Office of Technology Transfer
+ *      Carnegie Mellon University
+ *      5000 Forbes Avenue
+ *      Pittsburgh, PA  15213-3890
+ *      (412) 268-4387, fax: (412) 268-7395
+ *      tech-transfer@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by Computing Services
+ *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+</xmp>
+</blockquote>
+
+<p>
+If you find this software useful and valuable in your work, we welcome
+any support you can offer toward continuing this work.
+ 
+<p>We gratefully accept contributions, whether intellectual or
+monetary.  Intellectual contributions in the form of code or
+constructive collaboration can be directed to <a
+href="mailto:cyrus-bugs+@andrew.cmu.edu"><tt>cyrus-bugs+@andrew.cmu.edu</tt></a>
+(even if it is not a bug).
+
+<p>If you wish to provide financial support to the Cyrus Project, send a
+check payable to <b>Carnegie Mellon University</b> to
+ 
+<blockquote>
+<xmp>
+       Project Cyrus
+       Computing Services
+       Carnegie Mellon University
+       5000 Forbes Ave
+       Pittsburgh, PA 15213
+       USA
+</xmp>
+</blockquote>
+<hr>
+<p>
+Please direct technical questions or issues to <tt><a
+href="mailto:cyrus-bugs+@andrew.cmu.edu">cyrus-bugs@andrew.cmu.edu</a></tt>.
+<br>
+Please direct any licensing issues to <tt><a
+      href="mailto:tech-transfer+@andrew.cmu.edu">tech-transfer@andrew.cmu.edu</a></tt>.
+
+<p>
+    <hr>
+    <address><! (c) 1999 Carnegie Mellon University. All Rights Reserved.</address>
+<font size="-2">
+Last Updated: Thursday, 12-Oct-2000 16:38:41 EDT
+</font>
+  </body>
+</html>
+
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-dev-2.2.dirs
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-dev-2.2.dirs
@@ -0,0 +1,2 @@
+usr/include/cyrus
+usr/lib
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-common-2.2.postrm
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-common-2.2.postrm
@@ -0,0 +1,103 @@
+#! /bin/sh
+# postrm script for cyrus-common-2.2
+# Copyright (c) 2002 by Henrique de Moraes Holschuh
+# Distributed under the GNU General Public License version 2
+# $Id: cyrus-common-2.2.postrm 717 2007-05-18 11:16:11Z sven $
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# debconf hook
+if [ -e /usr/share/debconf/confmodule ]; then
+	. /usr/share/debconf/confmodule
+	DEBCONFEXISTS="true"
+	export DEBCONFEXISTS
+else
+	DEBCONFEXISTS="false"
+	export DEBCONFEXISTS
+fi
+
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <overwriter> <new-version>
+# for details, see /usr/doc/packaging-manual/
+
+case "$1" in
+		remove)
+			;;
+		purge)
+			for i in /var/lib/cyrus /var/spool/sieve \
+				 /var/spool/cyrus \
+				 /var/run/cyrus /var/run/cyrus/socket ; do
+				dpkg-statoverride --remove $i || true
+			done
+			rm -rf /var/run/cyrus || true
+			rm  /usr/lib/cyrus/cyrus-db-types.active || true
+			rm usr/lib/cyrus/cyrus-hardwired-config.active || true
+
+			# Should we remove our precious data?
+			if [ "$DEBCONFEXISTS" = "true" ]; then
+				db_title "Cyrus IMAPd 2.2" || true
+				db_fset cyrus-common-2.2/removespools seen false || true
+				db_input high cyrus-common-2.2/removespools || true
+				db_go || true
+
+				db_get cyrus-common-2.2/removespools
+			else
+				RET="false"
+			fi
+			[ "${RET}" = "true" ] && {
+				for i in /var/spool/cyrus /var/lib/cyrus \
+				         /var/spool/sieve /etc/sieve ; do
+				        find "$i" -type f -exec rm -f '{}' \; || true
+				        find "$i" -type d -depth -not -name 'lost+found' -exec rmdir '{}' \; || true
+				done
+				# Remove database type information
+				rm -f /usr/lib/cyrus/cyrus-*.active
+			}
+
+			if [ -x /usr/sbin/update-rc.d ]; then
+				update-rc.d cyrus2.2 remove >/dev/null
+			fi
+        	;;
+
+		upgrade|failed-upgrade|disappear)
+			;;
+		abort-upgrade)
+			# old version was in "configuration files only" state,
+			# installation of new package failed before or after unpack
+			if dpkg --compare-versions "$2" lt "2.2.13-4bpo1" ; then
+				if [ -f /etc/cron.daily/cyrus22 ] \
+				&& [ ! -f /etc/cron.daily/cyrus-common-2.2 ]; then
+					mv -f /etc/cron.daily/cyrus22 /etc/cron.daily/cyrus-common-2.2
+				fi
+			fi
+			;;
+		abort-install)
+			# old version was fully installed, but upgrade failed
+			if dpkg --compare-versions "$2" lt "2.2.13-4bpo1" ; then
+				if [ -f /etc/cron.daily/cyrus22 ] \
+				&& [ ! -f /etc/cron.daily/cyrus-common-2.2 ]; then
+					mv -f /etc/cron.daily/cyrus22 /etc/cron.daily/cyrus-common-2.2
+				fi
+			fi
+			;;
+		*)
+			echo "postrm called with unknown argument \`$1'" >&2
+			exit 0
+
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-nntpd-2.2.links
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-nntpd-2.2.links
@@ -0,0 +1 @@
+usr/share/doc/cyrus-common-2.2 usr/share/doc/cyrus-nntpd-2.2
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-admin-2.2.install
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-admin-2.2.install
@@ -0,0 +1,4 @@
+usr/bin/cyradm
+usr/bin/sieveshell
+usr/bin/installsieve
+usr/share/icons/*
--- cyrus-imapd-2.2-2.2.13.orig/debian/source.lintian-overrides
+++ cyrus-imapd-2.2-2.2.13/debian/source.lintian-overrides
@@ -0,0 +1 @@
+cyrus-imapd-2.2 source: source-contains-CVS-dir
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-makedirs
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-makedirs
@@ -0,0 +1,146 @@
+#!/bin/sh -e
+#
+#  cyrus-makedirs  -  Parses a Cyrus imap.d configuration file, and creates
+#                     the correct directory trees for all partitions
+#
+#  Copyright 2001,2002 by Henrique de Moraes Holschuh <hmh@debian.org.
+#  Released under the terms of the GNU General Public License (GPL) version 2
+#
+# $Id: cyrus-makedirs 793 2009-09-03 09:35:11Z sven $
+
+# See lib/util.c, dir_hash_c for Cyrus' directory hashing
+# for the new hash style
+#HASHDIRS="A B C D E F G H I J K L M N O P Q R S T U V W"
+# for the old hash style
+HASHDIRS="a b c d e f g h i j k l m n o p q r s t u v w x y z"
+
+# Sane locale, please
+LC_ALL=C
+export LC_ALL
+
+CYRUSOPTFILESYS=1
+CONF=/etc/imapd.conf
+[ -r /etc/default/cyrus2.2 ] && . /etc/default/cyrus2.2
+
+getconf () {
+	confvalue=`sed --silent -e "/^[[:blank:]]*$1:/ { \
+	s#^[[:blank:]]*$1:[[:blank:]]*## \
+	p
+	}" < "$CONF" | head -1`
+	result=${confvalue:-$2}
+}
+
+killsquat=0
+[ "$1" = "--cleansquat" ] && {
+	killsquat=1
+	shift
+}
+
+
+CONF="${1:-$CONF}"
+[ -r "$CONF" ] || {
+	echo $0: unable to read configuration file $CONF. Aborting...
+	exit 1
+}
+
+getconf configdirectory /var/lib/cyrus
+confdir="$result"
+[ -d "$confdir" ] || {
+	echo $0: $confdir is not an directory. Aborting...
+	exit 2
+}
+
+getconf sievedir /etc/sieve
+sievedir="$result"
+
+getconf sieveusehomedir 0
+case "$result" in
+	1|t|true|yes|on) nosievedir=1
+			;;
+	*)		nosievedir=0
+			;;
+esac
+
+getconf hashimapspool 0
+case "$result" in
+	1|t|true|yes|on) hashspool=1
+			;;
+	*)		hashspool=0
+			;;
+esac
+
+# Partitions list
+partitions=`sed --silent -e "/^[[:blank:]]*partition-[[:alnum:]]\+:/ { \
+            s#^[[:blank:]]*partition-[[:alnum:]]\+:[[:blank:]]*## \
+	    p
+	    } " < "$CONF" | sort | uniq | xargs`
+
+# First, fix up the entire confdir subtree
+echo "Creating/updating cyrus control directories in ${confdir}..."
+[ -d "$confdir" ] || mkdir -p "$confdir"
+chmod 750 "$confdir"
+for i in db proc socket log msg user quota; do
+    [ -d "$confdir/$i" ] || mkdir -p "$confdir/$i"
+    chmod 700 "$confdir/$i"
+done
+chmod 750 $confdir/socket
+for i in user quota ; do
+    for j in $HASHDIRS ; do
+    	[ -d "$confdir/$i/$j" ] || mkdir "$confdir/$i/$j"
+    done
+done
+find "$confdir" \( -not -user cyrus -or  -not -group mail \) -print0 | xargs -r -0 chown cyrus:mail
+
+# Now, create the spool partitions
+for i in $partitions ; do
+	echo "Creating/updating partition spool $i..."
+	[ -d "$i" ] || mkdir -p "$i"
+	chmod 750 "$i"
+	[ $hashspool -eq 1 ] && {
+	   for j in $HASHDIRS ; do
+	        [ -d "$i/$j" ] || mkdir "$i/$j"
+	   done
+	}
+	[ -d "$i/stage." ] || mkdir "$i/stage."
+	find "$i" \( -not -user cyrus -or  -not -group mail \) -print0 | xargs -r -0 chown cyrus:mail
+	# and kill any squatter indexes
+	[ $killsquat -ne 0 ] && find "$i" -name 'cyrus.squat' -type f -print0 | xargs -r -0 rm -f
+done
+
+# And the sieve directory structure
+[ $nosievedir -eq 0 ] && {
+	[ -d "$sievedir" ] || mkdir "$sievedir"
+	chmod 755 "$sievedir"
+	for j in $HASHDIRS ; do
+		[ -d "$sievedir/$j" ] || mkdir "$sievedir/$j"
+		chmod 755 "$sievedir/$j"
+	done
+	find "$sievedir" \( -not -user cyrus -or  -not -group mail \) -print0 | xargs -r -0 chown cyrus:mail
+}
+
+[ "x${CYRUSOPTFILESYS}" != "x1" ] && exit 0
+#
+# Fix attributes for every partition
+#
+# ext2:  Don't use ext2 for Cyrus spools. But if you must, enable Sync writes
+# ext3:  Journal data too, since that improves access time a LOT
+#        (maybe in the future, there's a bug in 2.4.18 ext3 w/ +j)
+#
+echo "Trying to optimize Cyrus partitions, edit /etc/default/cyrus2.2 to disable..."
+partsys="${confdir} ${partitions}"
+filesys=`df -P -T ${partsys} | sed -e "1 d" -e "s/ \+/ /g" | cut -d " " -f 2 | xargs`
+for i in ${filesys} ; do
+	case ${i} in
+	ext2)
+  		echo "Setting attributes to +S for  ${partsys%% *}..."
+		find "${partsys%% *}" -type d -print0 | xargs -r -0 chattr +S
+		;;
+	ext3)
+  		echo "Setting attributes to -S -j for  ${partsys%% *}..."
+		find "${partsys%% *}" -type d -print0 | xargs -r -0  chattr -S -j
+		;;
+	esac
+	partsys="${partsys#* }"
+done
+
+exit 0
--- cyrus-imapd-2.2-2.2.13.orig/debian/executable.files
+++ cyrus-imapd-2.2-2.2.13/debian/executable.files
@@ -0,0 +1,42 @@
+./autogen.sh
+./configure
+./contrib/cyrus-graphtools.1.0/cgi-bin/cyrus_master.pl
+./contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db-sum.pl
+./contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db.pl
+./contrib/cyrus-graphtools.1.0/script/cyrus.pl
+./contrib/cyrus-graphtools.1.0/script/run
+./contrib/mupdate-test.pl
+./contrib/notify_unix/simple_notify.pl
+./contrib/notify_unix/sql_notify.pl
+./debian/cyrus-makedirs
+./debian/cyrus-common-2.2.cyrus2.2.init
+./debian/cyrus-common-2.2.postinst
+./debian/cyrus-common-2.2.postrm
+./debian/cyrus-common-2.2.prerm
+./debian/examples/mboxtocyrus
+./debian/rules
+./doc/internal/internationalization.html
+./et/compile_et.sh
+./et/config_script
+./imap/xversion.sh
+./install-sh
+./lib/test/run
+./makedepend/configure
+./makedepend/install-sh
+./mkinstalldirs
+./netnews/inn.diffs
+./perl/imap/examples/test-imsp.pl
+./snmp/snmpgen
+./tools/arbitronsort.pl
+./tools/config2header
+./tools/config2man
+./tools/dohash
+./tools/masssievec
+./tools/mkimap
+./tools/mknewsgroups
+./tools/mupdate-loadgen.pl
+./tools/not-mkdep
+./tools/rehash
+./tools/translatesieve
+./tools/undohash
+./tools/upgradesieve
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-common-2.2.dirs
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-common-2.2.dirs
@@ -0,0 +1,12 @@
+etc/pam.d
+etc/default
+etc/logcheck/ignore.d.server
+etc/logcheck/violations.ignore.d
+usr/sbin
+usr/lib/cyrus
+usr/lib/cyrus/upgrade
+usr/share/snmp/mibs
+var/lib/cyrus
+var/spool/cyrus
+var/spool/sieve
+var/run/cyrus/socket
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-doc-2.2.links
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-doc-2.2.links
@@ -0,0 +1 @@
+usr/share/doc/cyrus-doc-2.2 usr/share/doc/cyrus-common-2.2/docs
--- cyrus-imapd-2.2-2.2.13.orig/debian/README.postfix
+++ cyrus-imapd-2.2-2.2.13/debian/README.postfix
@@ -0,0 +1,147 @@
+Setting up Cyrus IMAPd for Postfix (Debian)
+$Id: README.postfix 649 2006-10-09 17:07:53Z astronut $
+===========================================================
+
+Cyrus works wonderfully well with Postfix, both in single-system stores (where
+Postfix runs in the same host as Cyrus IMAPd), and remote mail stores (where
+Cyrus IMAPd is in a different host than Postfix).
+
+Delivery to Cyrus should _always_ be done through direct LMTP from Postfix.  It
+is far simpler and faster to do such delivery using Unix sockets, but Unix
+sockets are only an option for single-system stores.  Cyrdeliver is just a
+stdio-to-LMTP proxy, and it slows down mail delivery greatly.
+
+Cyrus requires LMTP deliveries to be authenticated.  It assumes that any
+deliveries done through an Unix socket are trustable, and pre-authenticates
+them as if coming from the "postman" (fictitious) user (but you _can_
+re-authenticate them as another lmtp admin user, if you wish).
+
+Deliveries done through TCP sockets are not limited to the same host, unlike
+the Unix socket ones, and can therefore be used in remote mail stores.
+However, Cyrus requires that the LMTP session be authenticated using one of the
+SASL mechs available to Cyrus (you can switch this off by giving a "-a"
+parameter to lmtpd in cyrus.conf, but that is unsafe since anyone can bypass
+any user authentication controls you might have on mail delivery, that way).
+
+TCP-socket LMTP sessions should be authenticated as one of the Cyrus LMTP
+admins, normal Cyrus users are not enough.  This requires Postfix with SASL
+support.
+
+
+Setting up Postfix for LMTP delivery to Cyrus
+=============================================
+
+Just set up a transport (either using a transport map, or the default_transport
+configuration directive of Postfix).  Do not use cyrdeliver.
+
+I suggest that the lmtp transport be duplicated and renamed to cyrus if you
+use it to talk to anything else (such as amavisd-new, or amavis-ng). That
+way, LMTP connection caching to the Cyrus store gets optimized, and you can
+use the lmtp-named LMTP transport for something else.
+
+WARNING: Postfix 2.0 does not downcase the recipient in LMTP deliveries, so if
+your users require it, you will have to set lmtp_downcase_rcpt: yes in
+imapd.conf.
+
+
+Unix sockets:
+-------------
+
+For Unix sockets, the Postfix transport is specified as
+"lmtp:unix:/var/run/cyrus/socket/lmtp", (we are using the default Cyrus unix
+socket location as an example, you can change it in /etc/cyrus.conf and
+/etc/imapd.conf). 
+
+You need a Cyrus lmtpd service listening on that socket, of course, so make
+sure something like:
+
+lmtpunix        cmd="lmtpd" listen="/var/run/cyrus/socket/lmtp"
+
+is in the SERVICES section of the /etc/cyrus.conf file.  You also need to make
+sure both Cyrus and Postfix can talk through that socket.  Unix sockets work
+just like files, so that translates to making sure both the user "cyrus" and
+the user Postfix is using for LMTP delivery can both read and write to that
+file.
+
+WARNING:  Since Cyrus pre-auths anything coming through the Unix socket, anyone
+who can write to it will be able to inject email into Cyrus directly.
+
+Use dpkg-statoverride to make sure your configuration for the socket
+permissions will not be overwritten by the Cyrus packages.  Do remember that
+Postfix usually runs the LMTP transport as user "postfix" (configurable in
+/etc/postfix/master.cf).  Also, do not run the postfix lmtp transport chrooted
+if the socket is not inside the chroot.
+
+1. Create a lmtp group:
+	# addgroup lmtp
+
+2. Put user postfix in that group:
+	# adduser postfix lmtp
+
+3. Fix the socket directory permissions:
+	# dpkg-statoverride --force --update --add \
+	  cyrus lmtp 750 /var/run/cyrus/socket
+
+4. Restart Postfix and Cyrus IMAPd
+	# /etc/init.d/postfix restart
+	# /etc/init.d/cyrus2.2 restart
+
+
+TCP sockets:
+------------
+
+TCP sockets are easier on the Cyrus side, and more complicated on the Postfix
+side.  For Cyrus, it is enough to have an "lmtpd" service listening on the
+desired IP interface (or in all of them, if you leave the interface unspecified
+as in the example below), that means something like this in /etc/cyrus.conf
+SERVICES area:
+
+lmtp            cmd="lmtpd" listen="lmtp"
+
+(do note that you MUST have an lmtp entry in /etc/services for this to work.
+This can be any available port, for historical reasons, 2003 is most often used).
+
+Also, remember that Cyrus observes tcpwrapper permissions (/etc/hosts.allow and
+/etc/hosts.deny), make sure they're set up correctly or Cyrus might refuse the
+connections.
+
+To configure Postfix' lmtp transport to authenticate using SASL, do the
+following:
+Note: On Sarge systems, you will also need the postfix-tls package for SASL
+support. On etch and above, the support is included in the postfix package.
+
+1. Configure the lmtp transport SASL layer:
+   (add to /etc/postfix/main.cf):
+   lmtp_sasl_auth_enable = yes
+   lmtp_sasl_password_maps = hash:/etc/postfix/sasl_passwd
+   lmtp_sasl_security_options = 
+   lmtp_destination_concurrency_limit = 100
+   lmtp_destination_recipient_limit = 0
+
+   The *_limit values should match whatever you configured as limits in
+   Cyrus.  The above configuration will allow plain text logins.
+
+   Create the password map /etc/postfix/sasl_passwd to tell postfix
+   of a Cyrus LMTP administrator user and password to use.
+
+   e.g.:
+   echo "mycyrusspool.my.domain.org postman:foobar" >sasl_passwd
+   postmap sasl_passwd
+
+2. Configure Cyrus to accept that user as a lmtp administrator
+   (add to /etc/imapd.conf)
+   lmtp_admins: postman
+
+3. Tell postfix to use the lmtp transport to deliver email using
+   transport maps or something else.  I suggest making a copy of the
+   postfix lmtp transport in master.cf, renaming it to "cyrus", and 
+   using that.
+
+4. Note that to use the new feature of virtual domains in Cyrus v2.2,
+   you need to tell postfix to use the lmtp transport as the 
+   virtual_transport. If you also want "local" mail recipients, i.e.
+   those that are addressed to hosts listed in mydestination, to
+   be delivered to Cyrus v2.2, you also need to use lmtp as the 
+   mailbox_transport.
+
+   That's it!
--- cyrus-imapd-2.2-2.2.13.orig/debian/nntp.pam
+++ cyrus-imapd-2.2-2.2.13/debian/nntp.pam
@@ -0,0 +1,13 @@
+# PAM configuration file for Cyrus NNTP service
+#
+# If you want to use Cyrus in a setup where users don't have
+# accounts on the local machine, you'll need to make sure
+# you use something like pam_permit for account checking.
+#
+# Remember that SASL (and therefore Cyrus) accesses PAM 
+# modules through saslauthd, and that SASL can only deal with
+# plaintext passwords if PAM is used.
+#
+
+@include common-auth
+@include common-account
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-imapd-2.2.manpages
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-imapd-2.2.manpages
@@ -0,0 +1,3 @@
+debian/tmp/usr/share/man/man8/idled.8
+debian/tmp/usr/share/man/man8/imapd.8
+debian/tmp/usr/share/man/man8/squatter.8
--- cyrus-imapd-2.2-2.2.13.orig/debian/cyrus-clients-2.2.README.Debian
+++ cyrus-imapd-2.2-2.2.13/debian/cyrus-clients-2.2.README.Debian
@@ -0,0 +1,9 @@
+Cyrus IMAP for Debian, generic SASL-enabled protocol clients
+$Id: cyrus-clients-2.2.README.Debian 229 2005-12-08 23:26:29Z astronut $
+---------------------
+
+Refer to the cyrus-doc-2.2 package for more information.  There is a lot
+of it, and it will save you hours (or days) of frustating bug-hunting if
+you read them first.
+
+ -- Henrique de Moraes Holschuh <hmh@debian.org>
--- cyrus-imapd-2.2-2.2.13.orig/debian/po/vi.po
+++ cyrus-imapd-2.2-2.2.13/debian/po/vi.po
@@ -0,0 +1,81 @@
+# Vietnamese translation for Cyrus-IMAPd.
+# Copyright © 2009 Free Software Foundation, Inc.
+# Clytie Siddall <clytie@riverland.net.au>, 2006-2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: cyrus-imapd-2.2 2.2.13-15\n"
+"Report-Msgid-Bugs-To: cyrus-imapd-2.2@packages.debian.org\n"
+"POT-Creation-Date: 2009-04-14 17:58+0200\n"
+"PO-Revision-Date: 2009-09-23 23:16+0930\n"
+"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
+"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: LocFactoryEditor 1.8\n"
+
+#: ../cyrus-common-2.2.templates:2001
+#. Type: error
+#. Description
+msgid "Modified database backends"
+msgstr "Hậu phương cơ sở dữ liệu bị sửa đổi"
+
+#: ../cyrus-common-2.2.templates:2001
+#. Type: error
+#. Description
+msgid ""
+"Comparison between /usr/lib/cyrus/cyrus-db-types.txt and /usr/lib/cyrus/"
+"cyrus-db-types.active shows that database backends for Cyrus IMAPd have been "
+"changed."
+msgstr ""
+"So sánh « /usr/lib/cyrus/cyrus-db-types.txt » và « /usr/lib/cyrus/cyrus-db-types.active » thì phát hiện rằng một số hậu phương cơ sở dữ liệu cho Cyrus IMAPd đã bị sửa đổi."
+
+#: ../cyrus-common-2.2.templates:2001
+#. Type: error
+#. Description
+msgid ""
+"This means that those databases for which the database backends changed "
+"might need to be converted manually to the new format, using the cvt_cyrusdb"
+"(8) utility."
+msgstr ""
+"Có nghĩa là những co sở dữ liệu cho chúng hậu phương co sở dữ liệu đã thay đổi cũng cần phải được chuy�n đổi bằng tay sang định dạng mơi, dùng tiện ích « cvt_cyrusdb(8) »."
+
+#: ../cyrus-common-2.2.templates:2001
+#. Type: error
+#. Description
+msgid ""
+"Please refer to /usr/share/doc/cyrus-common-2.2/README.Debian.database for "
+"more information.  Do not start cyrmaster until you have converted the "
+"databases to the new format."
+msgstr ""
+"Xem tài liệu �ọc �i « /usr/share/doc/cyrus-common-2.2/README.Debian.database » đ� tìm thêm thông tin. �ừng khởi chạy cyrmaster trước khi chuy�n đổi các cơ sở dữ liệu sang định dạng mới."
+
+#: ../cyrus-common-2.2.templates:3001
+#. Type: boolean
+#. Description
+msgid "Remove the mail and news spools?"
+msgstr "Gỡ bỏ ống chỉ thư tín và tin tức ?"
+
+#: ../cyrus-common-2.2.templates:3001
+#. Type: boolean
+#. Description
+#| msgid ""
+#| "The Cyrus mail and news spools, as well as the user's sieve scripts can "
+#| "be removed when the package is purged."
+msgid ""
+"The Cyrus mail and news spools, as well as users' sieve scripts, can be "
+"removed when the package is purged."
+msgstr ""
+"Các ống chỉ thư tín và tin tức của Cyrus, cùng với các v�n lệnh sieve của người dùng, có th� được gỡ bỏ khi tẩy gói."
+
+#: ../cyrus-common-2.2.templates:3001
+#. Type: boolean
+#. Description
+msgid ""
+"This question only applies to the default spools and sieve script "
+"directories in /var.  If you modified their location in imapd.conf, the new "
+"locations will not be removed; just the old ones in /var."
+msgstr ""
+"Câu hỏi này áp dụng chỉ cho những ống chỉ và thư mục v�n lệnh sieve cả mặc định trong « /var ». Nếu bạn đã sửa đổi vị trí của ống chỉ hay thư mục như vậy trong tập tin cấu hình « imapd.conf » thì không gỡ bỏ gì ở vị trí mới, chỉ ở vị trí cũ trong « /var »."
--- cyrus-imapd-2.2-2.2.13.orig/debian/po/nl.po
+++ cyrus-imapd-2.2-2.2.13/debian/po/nl.po
@@ -0,0 +1,105 @@
+# Translation of cyrus-imapd-2.2 2.2.13-7_templates.po to Debian l10n Dutch
+# This file is distributed under the same license as the cyrus-imapd package.
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans#
+#    Developers do not need to manually edit POT or PO files.
+#
+# Luk Claes <luk.claes@ugent.be>, 2004
+# Kurt De Bree <kdebree@telenet.be>, 2006
+# This is an unofficial translation
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: cyrus-imapd-2.2 2.2.13-7\n"
+"Report-Msgid-Bugs-To: cyrus-imapd-2.2@packages.debian.org\n"
+"POT-Creation-Date: 2009-04-14 17:58+0200\n"
+"PO-Revision-Date: 2006-09-18 20:27+0100\n"
+"Last-Translator: Kurt De Bree <kdebree@telenet.be>\n"
+"Language-Team: Debian l10n Dutch <debian-l10n-dutch@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: error
+#. Description
+#: ../cyrus-common-2.2.templates:2001
+msgid "Modified database backends"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../cyrus-common-2.2.templates:2001
+msgid ""
+"Comparison between /usr/lib/cyrus/cyrus-db-types.txt and /usr/lib/cyrus/"
+"cyrus-db-types.active shows that database backends for Cyrus IMAPd have been "
+"changed."
+msgstr ""
+"Een vergelijking tussen /usr/lib/cyrus/cyrus-db-types.txt en /usr/lib/cyrus/"
+"cyrus-db-types.active leert ons dat de database-backends voor Cyrus IMAPd "
+"gewijzigd zijn."
+
+#. Type: error
+#. Description
+#: ../cyrus-common-2.2.templates:2001
+msgid ""
+"This means that those databases for which the database backends changed "
+"might need to be converted manually to the new format, using the cvt_cyrusdb"
+"(8) utility."
+msgstr ""
+"Dit betekent dat deze databases, waarvan de database-backends zijn "
+"gewijzigd, mogelijk handmatig moeten worden geconverteerd naar de nieuwe "
+"indeling, gebruikmakend van het cvt_cyrusdb(8)-hulpmiddel."
+
+#. Type: error
+#. Description
+#: ../cyrus-common-2.2.templates:2001
+msgid ""
+"Please refer to /usr/share/doc/cyrus-common-2.2/README.Debian.database for "
+"more information.  Do not start cyrmaster until you have converted the "
+"databases to the new format."
+msgstr ""
+"Raadpleeg /usr/share/doc/cyrus-common-2.2/README.Debian.database voor meer "
+"informatie. Start cyrmaster niet vooraleer u de databases naar de nieuwe "
+"indeling geconverteerd hebt."
+
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:3001
+msgid "Remove the mail and news spools?"
+msgstr "Mail- en nieuws-spools verwijderen?"
+
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:3001
+#, fuzzy
+#| msgid ""
+#| "The Cyrus mail and news spools, as well as the user's sieve scripts can "
+#| "be removed when the package is purged."
+msgid ""
+"The Cyrus mail and news spools, as well as users' sieve scripts, can be "
+"removed when the package is purged."
+msgstr ""
+"De Cyrus mail- en nieuws-spools alsook de gebruikers-sieve-scripts kunnen "
+"worden verwijderd wanneer het pakket wordt gewist (purged)."
+
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:3001
+msgid ""
+"This question only applies to the default spools and sieve script "
+"directories in /var.  If you modified their location in imapd.conf, the new "
+"locations will not be removed; just the old ones in /var."
+msgstr ""
+"Deze vraag heeft enkel betrekking op de standaard spools en de sieve-"
+"scriptmappen in /var. Als u deze locatie heeft gewijzigd in imapd.conf, dan "
+"zal de nieuwe locatie niet worden verwijderd; enkel de oude in /var."
+
+#~ msgid "Database backends have changed!"
+#~ msgstr "Database-backends zijn gewijzigd!"
--- cyrus-imapd-2.2-2.2.13.orig/debian/po/pt_BR.po
+++ cyrus-imapd-2.2-2.2.13/debian/po/pt_BR.po
@@ -0,0 +1,93 @@
+# PO-DEBCONF TEMPLATE FOR cyrus22-imapd.
+# Copyright (C) 2002 Henrique de Moraes Holschuh <hmh@debian.org>
+# This file is distributed under the same license as the cyrus22-imapd package.
+# $Id: pt_BR.po 779 2009-06-20 14:48:02Z sven $
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: cyrus-imapd-2.2 2.1.12-1\n"
+"Report-Msgid-Bugs-To: cyrus-imapd-2.2@packages.debian.org\n"
+"POT-Creation-Date: 2009-04-14 17:58+0200\n"
+"PO-Revision-Date: 2003-03-03 10:45-0300\n"
+"Last-Translator: Henrique de Moraes Holschuh <hmh@debian.org>\n"
+"Language-Team: pt_BR <pt_BR@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: error
+#. Description
+#: ../cyrus-common-2.2.templates:2001
+msgid "Modified database backends"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../cyrus-common-2.2.templates:2001
+msgid ""
+"Comparison between /usr/lib/cyrus/cyrus-db-types.txt and /usr/lib/cyrus/"
+"cyrus-db-types.active shows that database backends for Cyrus IMAPd have been "
+"changed."
+msgstr ""
+"Comparaçăo entre /usr/lib/cyrus/cyrus-db-types.txt e /usr/lib/cyrus/cyrus-db-"
+"types.active levam a crer que o sistema de base de dados do Cyrus IMAPd foi "
+"mudado."
+
+#. Type: error
+#. Description
+#: ../cyrus-common-2.2.templates:2001
+msgid ""
+"This means that those databases for which the database backends changed "
+"might need to be converted manually to the new format, using the cvt_cyrusdb"
+"(8) utility."
+msgstr ""
+"Isso significa que as bases de dados cujo sistema mudou precisam ser "
+"migradas para o novo sistema manualmente, através do utilitário cvt_cyrusdb"
+"(8)."
+
+#. Type: error
+#. Description
+#: ../cyrus-common-2.2.templates:2001
+msgid ""
+"Please refer to /usr/share/doc/cyrus-common-2.2/README.Debian.database for "
+"more information.  Do not start cyrmaster until you have converted the "
+"databases to the new format."
+msgstr ""
+"Maiores informaçőes estăo disponíveis em /usr/share/doc/cyrus-common-2.2/"
+"README.Debian.database.  Năo inicie cyrmaster até ter convertido o "
+"formatodas bases de dados."
+
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:3001
+msgid "Remove the mail and news spools?"
+msgstr "Removo as spools do Cyrus e os scripts sieve?"
+
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:3001
+#, fuzzy
+#| msgid ""
+#| "The Cyrus mail and news spools, as well as the user's sieve scripts can "
+#| "be removed when the package is purged."
+msgid ""
+"The Cyrus mail and news spools, as well as users' sieve scripts, can be "
+"removed when the package is purged."
+msgstr ""
+"É possível remover as áreas de armazenagem (spools) usadas pelo Cyrus, e "
+"também as áreas usadas para armazenar os scripts sieve dos usuários quando o "
+"pacote for eliminado (purge) do sistema."
+
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:3001
+msgid ""
+"This question only applies to the default spools and sieve script "
+"directories in /var.  If you modified their location in imapd.conf, the new "
+"locations will not be removed; just the old ones in /var."
+msgstr ""
+"Apenas as áreas padrăo em /var serăo removidas. Caso vocę tenha configurado "
+"outras áreas em imapd.conf, elas năo serăo removidas."
+
+#~ msgid "Database backends have changed!"
+#~ msgstr "Mudança de sistema nas bases de dados!"
--- cyrus-imapd-2.2-2.2.13.orig/debian/po/es.po
+++ cyrus-imapd-2.2-2.2.13/debian/po/es.po
@@ -0,0 +1,114 @@
+# cyrus-imapd-2.2 po-debconf translation to Spanish
+# Copyright (C) 2006, 2009 Software in the Public Interest
+# This file is distributed under the same license as the cyrus-imapd-2.2 package.
+#
+# Changes:
+#   - Initial translation
+#       CĂ©sar GĂłmez MartĂ­n <cesar.gomez@gmail.com>, 2006
+#
+#   - Updates
+#       Francisco Javier Cuadrado <fcocuadrado@gmail.com>, 2009
+#
+# Traductores, si no conocen el formato PO, merece la pena leer la
+# documentaciĂłn de gettext, especialmente las secciones dedicadas a este
+# formato, por ejemplo ejecutando:
+#       info -n '(gettext)PO Files'
+#       info -n '(gettext)Header Entry'
+#
+# Equipo de traducción al español, por favor, lean antes de traducir
+# los siguientes documentos:
+#
+#   - El proyecto de traducción de Debian al español
+#     http://www.debian.org/intl/spanish/
+#     especialmente las notas de traducciĂłn en
+#     http://www.debian.org/intl/spanish/notas
+#
+#   - La guĂ­a de traducciĂłn de po's de debconf:
+#     /usr/share/doc/po-debconf/README-trans
+#     o http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: cyrus-imapd-2.2 2.2.13-15\n"
+"Report-Msgid-Bugs-To: cyrus-imapd-2.2@packages.debian.org\n"
+"POT-Creation-Date: 2009-04-14 17:58+0200\n"
+"PO-Revision-Date: 2009-04-27 10:51+0100\n"
+"Last-Translator: Francisco Javier Cuadrado <fcocuadrado@gmail.com>\n"
+"Language-Team: Debian l10n spanish <debian-l10n-spanish@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: error
+#. Description
+#: ../cyrus-common-2.2.templates:2001
+msgid "Modified database backends"
+msgstr "Gestores de base de datos modificados"
+
+#. Type: error
+#. Description
+#: ../cyrus-common-2.2.templates:2001
+msgid ""
+"Comparison between /usr/lib/cyrus/cyrus-db-types.txt and /usr/lib/cyrus/"
+"cyrus-db-types.active shows that database backends for Cyrus IMAPd have been "
+"changed."
+msgstr ""
+"La comparación entre «/usr/lib/cyrus/cyrus-db-types.txt» y «/usr/lib/cyrus/"
+"cyrus-db-types.active» muestra que se han cambiado los gestores de base de "
+"datos de Cyrus IMAPd."
+
+#. Type: error
+#. Description
+#: ../cyrus-common-2.2.templates:2001
+msgid ""
+"This means that those databases for which the database backends changed "
+"might need to be converted manually to the new format, using the cvt_cyrusdb"
+"(8) utility."
+msgstr ""
+"Esto significa que, quizás, se necesite convertir manualmente al nuevo "
+"formato las bases de datos para las que ha cambiado el gestor, para ello "
+"puede usar la herramienta cvt_cyrusdb(8)."
+
+#. Type: error
+#. Description
+#: ../cyrus-common-2.2.templates:2001
+msgid ""
+"Please refer to /usr/share/doc/cyrus-common-2.2/README.Debian.database for "
+"more information.  Do not start cyrmaster until you have converted the "
+"databases to the new format."
+msgstr ""
+"Por favor, consulte «/usr/share/doc/cyrus-common-2.2/README.Debian.database» "
+"si desea más información. No ejecute cyrmaster hasta que se hayan convertido "
+"las bases de datos al nuevo formato."
+
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:3001
+msgid "Remove the mail and news spools?"
+msgstr "ÂżDesea eliminar las colas de correo y noticias?"
+
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:3001
+msgid ""
+"The Cyrus mail and news spools, as well as users' sieve scripts, can be "
+"removed when the package is purged."
+msgstr ""
+"Al purgar el paquete se pueden eliminar tanto el correo de Cyrus y las colas "
+"de noticias, como los scripts de filtrado de los usuarios."
+
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:3001
+msgid ""
+"This question only applies to the default spools and sieve script "
+"directories in /var.  If you modified their location in imapd.conf, the new "
+"locations will not be removed; just the old ones in /var."
+msgstr ""
+"Esta pregunta sĂłlo se aplica a los directorios predeterminados de las colas "
+"y de los scripts de filtrado de «/var». Si modificó sus ubicaciones en el "
+"archivo «imapd.conf», las nuevas ubicaciones no se eliminarán; sólo lo harán "
+"las viejas de «/var»."
+
+#~ msgid "Database backends have changed!"
+#~ msgstr "¡Los gestores de la base de datos han cambiado!"
--- cyrus-imapd-2.2-2.2.13.orig/debian/po/fr.po
+++ cyrus-imapd-2.2-2.2.13/debian/po/fr.po
@@ -0,0 +1,93 @@
+# French translation for cyrus22-imapd.
+# Copyright (C) 2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the cyrus22-imapd package.
+#
+# Translators:
+# Philippe Batailler <philippe.batailler@free.fr>, 2009
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: cyrus-imapd-2.2 2.2.13\n"
+"Report-Msgid-Bugs-To: cyrus-imapd-2.2@packages.debian.org\n"
+"POT-Creation-Date: 2009-04-14 17:58+0200\n"
+"PO-Revision-Date: 2009-04-16 20:31+0200\n"
+"Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: error
+#. Description
+#: ../cyrus-common-2.2.templates:2001
+msgid "Modified database backends"
+msgstr "Modifications de l'interface avec les bases de données"
+
+#. Type: error
+#. Description
+#: ../cyrus-common-2.2.templates:2001
+msgid ""
+"Comparison between /usr/lib/cyrus/cyrus-db-types.txt and /usr/lib/cyrus/"
+"cyrus-db-types.active shows that database backends for Cyrus IMAPd have been "
+"changed."
+msgstr ""
+"Une comparaison entre /usr/lib/cyrus/cyrus-db-types.txt et /usr/lib/cyrus/"
+"cyrus-db-types.active montre que l'interface entre Cyrus IMAPd et les bases "
+"de données a changé."
+
+#. Type: error
+#. Description
+#: ../cyrus-common-2.2.templates:2001
+msgid ""
+"This means that those databases for which the database backends changed "
+"might need to be converted manually to the new format, using the cvt_cyrusdb"
+"(8) utility."
+msgstr ""
+"Cela signifie que les bases de données pour lesquelles l'interface a changé "
+"peuvent nécessiter une conversion manuelle au nouveau format avec "
+"l'utilitaire cvt_cyrusdb(8)."
+
+#. Type: error
+#. Description
+#: ../cyrus-common-2.2.templates:2001
+msgid ""
+"Please refer to /usr/share/doc/cyrus-common-2.2/README.Debian.database for "
+"more information.  Do not start cyrmaster until you have converted the "
+"databases to the new format."
+msgstr ""
+"Veuillez-vous reporter Ă  /usr/share/doc/cyrus-common-2.2/README.Debian."
+"database pour des informations supplémentaires. Ne lancez pas cyrmaster "
+"avant d'avoir converti les bases de données au nouveau format."
+
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:3001
+msgid "Remove the mail and news spools?"
+msgstr ""
+"Faut-il supprimer les répertoires contenant les courriers et les nouvelles ?"
+
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:3001
+msgid ""
+"The Cyrus mail and news spools, as well as users' sieve scripts, can be "
+"removed when the package is purged."
+msgstr ""
+"Les répertoires stockant le courrier et les nouvelles, ainsi que les filtres "
+"sieve des utilisateurs, peuvent être supprimés en même temps que le paquet."
+
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:3001
+msgid ""
+"This question only applies to the default spools and sieve script "
+"directories in /var.  If you modified their location in imapd.conf, the new "
+"locations will not be removed; just the old ones in /var."
+msgstr ""
+"Cette question concerne uniquement les répertoires par défaut situés dans /"
+"var et contenant le « spool » et les filtres sieve. Si vous aviez modifié "
+"leurs emplacements grâce au fichier imapd.conf, ils ne seront pas "
+"supprimés ; seuls les anciens, dans /var, le seront."
+
+#~ msgid "Database backends have changed!"
+#~ msgstr "Modifications dans l'interfaçage avec les bases de données"
--- cyrus-imapd-2.2-2.2.13.orig/debian/po/sv.po
+++ cyrus-imapd-2.2-2.2.13/debian/po/sv.po
@@ -0,0 +1,99 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: cyrus22-imapd\n"
+"Report-Msgid-Bugs-To: cyrus-imapd-2.2@packages.debian.org\n"
+"POT-Creation-Date: 2009-04-14 17:58+0200\n"
+"PO-Revision-Date: 2009-04-14 20:18+0100\n"
+"Last-Translator: Martin Bagge <brother@bsnet.se>\n"
+"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Swedish\n"
+"X-Poedit-Country: Sweden\n"
+
+#. Type: error
+#. Description
+#: ../cyrus-common-2.2.templates:2001
+msgid "Modified database backends"
+msgstr "Förändrade databasbakdelar"
+
+#. Type: error
+#. Description
+#: ../cyrus-common-2.2.templates:2001
+msgid ""
+"Comparison between /usr/lib/cyrus/cyrus-db-types.txt and /usr/lib/cyrus/"
+"cyrus-db-types.active shows that database backends for Cyrus IMAPd have been "
+"changed."
+msgstr ""
+"En jämförelse mellan /usr/lib/cyrus/cyrus-db-types.txt och /usr/lib/cyrus/"
+"cyrus-db-types.active visar att databasbakänderna för Cyrus IMAPd har "
+"ändrats."
+
+#. Type: error
+#. Description
+#: ../cyrus-common-2.2.templates:2001
+msgid ""
+"This means that those databases for which the database backends changed "
+"might need to be converted manually to the new format, using the cvt_cyrusdb"
+"(8) utility."
+msgstr ""
+"Detta innebär att de databaser som databasbakdelarna har ändrats för kanske "
+"manuellt behöver konverteras till det nya formatet med verktyget cvt_cyrusdb"
+"(8)."
+
+#. Type: error
+#. Description
+#: ../cyrus-common-2.2.templates:2001
+msgid ""
+"Please refer to /usr/share/doc/cyrus-common-2.2/README.Debian.database for "
+"more information.  Do not start cyrmaster until you have converted the "
+"databases to the new format."
+msgstr ""
+"Läs /usr/share/doc/cyrus-common-2.2/README.Debian.database för mer "
+"information. Starta inte cyrmaster innan du har konverterat databaserna till "
+"det nya formatet."
+
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:3001
+msgid "Remove the mail and news spools?"
+msgstr "Ta bort köfiler för e-post och nyhetsgrupper?"
+
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:3001
+msgid ""
+"The Cyrus mail and news spools, as well as users' sieve scripts, can be "
+"removed when the package is purged."
+msgstr ""
+"Cyrus köfiler för e-post och nyhetsgrupper, såväl som användarnas sieve-"
+"skript kan tas bort när paketet rensas ut."
+
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:3001
+msgid ""
+"This question only applies to the default spools and sieve script "
+"directories in /var.  If you modified their location in imapd.conf, the new "
+"locations will not be removed; just the old ones in /var."
+msgstr ""
+"Denna fråga gäller endast för standardköfilerna och sieve-skriptkatalogerna "
+"under /var. Om du har ändrat dess plats i imapd.conf kommer inte de nya "
+"platserna att tas bort, endast de gamla under /var."
+
+#~ msgid "Database backends have changed!"
+#~ msgstr "Databasbak�¤nderna har �¤ndrats!"
--- cyrus-imapd-2.2-2.2.13.orig/debian/po/ja.po
+++ cyrus-imapd-2.2-2.2.13/debian/po/ja.po
@@ -0,0 +1,93 @@
+# 
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+# 
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+# 
+#    Developers do not need to manually edit POT or PO files.
+# 
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: cyrus-imapd-2.2 2.2.13-15\n"
+"Report-Msgid-Bugs-To: cyrus-imapd-2.2@packages.debian.org\n"
+"POT-Creation-Date: 2009-04-14 17:58+0200\n"
+"PO-Revision-Date: 2009-04-15 05:25+0900\n"
+"Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n"
+"Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: error
+#. Description
+#: ../cyrus-common-2.2.templates:2001
+msgid "Modified database backends"
+msgstr "��クエ�����タ��ス�変更"
+
+#. Type: error
+#. Description
+#: ../cyrus-common-2.2.templates:2001
+msgid ""
+"Comparison between /usr/lib/cyrus/cyrus-db-types.txt and /usr/lib/cyrus/"
+"cyrus-db-types.active shows that database backends for Cyrus IMAPd have been "
+"changed."
+msgstr ""
+"/usr/lib/cyrus/cyrus-db-types.txt � /usr/lib/cyrus/cyrus-db-types.active を"
+"比�����ろ Cyrus IMAPd ���タ��ス�変更�れ����。"
+
+#. Type: error
+#. Description
+#: ../cyrus-common-2.2.templates:2001
+msgid ""
+"This means that those databases for which the database backends changed "
+"might need to be converted manually to the new format, using the cvt_cyrusdb"
+"(8) utility."
+msgstr ""
+"�れら���クエ���変更�れ���タ��ス� cvt_cyrusdb(8) ���ィ��ィ"
+"を使��手動�新��形式�変換�る必���り��。"
+
+#. Type: error
+#. Description
+#: ../cyrus-common-2.2.templates:2001
+msgid ""
+"Please refer to /usr/share/doc/cyrus-common-2.2/README.Debian.database for "
+"more information.  Do not start cyrmaster until you have converted the "
+"databases to the new format."
+msgstr ""
+"�り詳細����� /usr/share/doc/cyrus-common-2.2/README.Debian.database を"
+"参照������。��タ��スを新��形式�変換�る�� cyrmaster を起動��"
+"������。"
+
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:3001
+msgid "Remove the mail and news spools?"
+msgstr "Cyrus ス�������ザ� sieve スク���を削除����?"
+
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:3001
+msgid ""
+"The Cyrus mail and news spools, as well as users' sieve scripts, can be "
+"removed when the package is purged."
+msgstr ""
+"Cyrus ����news ス���� sieve スク����������ケ�ジ�完全�削"
+"除�れる際���ザ�削除����。"
+
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:3001
+msgid ""
+"This question only applies to the default spools and sieve script "
+"directories in /var.  If you modified their location in imapd.conf, the new "
+"locations will not be removed; just the old ones in /var."
+msgstr ""
+"��質問� /var ��る標準�ス���� sieve スク����ィ�ク������用"
+"�れ��。imapd.conf ��ィ�ク��を変更���る場��変更後��ィ�ク���"
+"�るも��削除�れ��ん。/var ��る古�も�����。"
--- cyrus-imapd-2.2-2.2.13.orig/debian/po/templates.pot
+++ cyrus-imapd-2.2-2.2.13/debian/po/templates.pot
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: cyrus-imapd-2.2@packages.debian.org\n"
+"POT-Creation-Date: 2009-04-14 17:58+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: error
+#. Description
+#: ../cyrus-common-2.2.templates:2001
+msgid "Modified database backends"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../cyrus-common-2.2.templates:2001
+msgid ""
+"Comparison between /usr/lib/cyrus/cyrus-db-types.txt and /usr/lib/cyrus/"
+"cyrus-db-types.active shows that database backends for Cyrus IMAPd have been "
+"changed."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../cyrus-common-2.2.templates:2001
+msgid ""
+"This means that those databases for which the database backends changed "
+"might need to be converted manually to the new format, using the cvt_cyrusdb"
+"(8) utility."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../cyrus-common-2.2.templates:2001
+msgid ""
+"Please refer to /usr/share/doc/cyrus-common-2.2/README.Debian.database for "
+"more information.  Do not start cyrmaster until you have converted the "
+"databases to the new format."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:3001
+msgid "Remove the mail and news spools?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:3001
+msgid ""
+"The Cyrus mail and news spools, as well as users' sieve scripts, can be "
+"removed when the package is purged."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:3001
+msgid ""
+"This question only applies to the default spools and sieve script "
+"directories in /var.  If you modified their location in imapd.conf, the new "
+"locations will not be removed; just the old ones in /var."
+msgstr ""
--- cyrus-imapd-2.2-2.2.13.orig/debian/po/ru.po
+++ cyrus-imapd-2.2-2.2.13/debian/po/ru.po
@@ -0,0 +1,98 @@
+# translation of ru.po to Russian
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans#
+#    Developers do not need to manually edit POT or PO files.
+#
+# Yuri Kozlov <kozlov.y@gmail.com>, 2006.
+# Yuri Kozlov <yuray@komyakino.ru>, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: cyrus-imapd-2.2 2.2.13-15\n"
+"Report-Msgid-Bugs-To: cyrus-imapd-2.2@packages.debian.org\n"
+"POT-Creation-Date: 2009-04-14 17:58+0200\n"
+"PO-Revision-Date: 2009-04-20 20:08+0400\n"
+"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
+"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#. Type: error
+#. Description
+#: ../cyrus-common-2.2.templates:2001
+msgid "Modified database backends"
+msgstr "�зменения в поддержке баз данных"
+
+#. Type: error
+#. Description
+#: ../cyrus-common-2.2.templates:2001
+msgid ""
+"Comparison between /usr/lib/cyrus/cyrus-db-types.txt and /usr/lib/cyrus/"
+"cyrus-db-types.active shows that database backends for Cyrus IMAPd have been "
+"changed."
+msgstr ""
+"Сравнение файлов /usr/lib/cyrus/cyrus-db-types.txt и /usr/lib/cyrus/cyrus-db-"
+"types.active показало, что интерфей�ы баз данных для Cyrus IMAPd были "
+"изменены."
+
+#. Type: error
+#. Description
+#: ../cyrus-common-2.2.templates:2001
+msgid ""
+"This means that those databases for which the database backends changed "
+"might need to be converted manually to the new format, using the cvt_cyrusdb"
+"(8) utility."
+msgstr ""
+"Это означает, что для баз данных � изменённой �ерверной ча�тью может "
+"потребовать�я преобразование в новый формат вр�чн�ю � помощью �тилиты "
+"cvt_cyrusdb(8)."
+
+#. Type: error
+#. Description
+#: ../cyrus-common-2.2.templates:2001
+msgid ""
+"Please refer to /usr/share/doc/cyrus-common-2.2/README.Debian.database for "
+"more information.  Do not start cyrmaster until you have converted the "
+"databases to the new format."
+msgstr ""
+"Подробней об этом напи�ано в файле /usr/share/doc/cyrus-common-2.2/README."
+"Debian.database. Не зап��кайте cyrmaster, пока не преобраз�ете базы данных в "
+"новый формат."
+
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:3001
+msgid "Remove the mail and news spools?"
+msgstr "Удалять б�феры почты и ново�тей?"
+
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:3001
+msgid ""
+"The Cyrus mail and news spools, as well as users' sieve scripts, can be "
+"removed when the package is purged."
+msgstr ""
+"Б�феры Cyrus для почты и ново�тей, а также пользователь�кие фильтр�ющие "
+"�ценарии мог�т �далять�я при вычи�тке пакета."
+
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:3001
+msgid ""
+"This question only applies to the default spools and sieve script "
+"directories in /var.  If you modified their location in imapd.conf, the new "
+"locations will not be removed; just the old ones in /var."
+msgstr ""
+"Это отно�ит�я только к б�ферам по �молчанию и каталогам � фильтр�ющими "
+"�ценариями в /var. Е�ли вы изменили их ра�положение в файле imapd.conf, то в "
+"новых ме�тах они �далять�я не б�д�т -- только �тарые в /var."
--- cyrus-imapd-2.2-2.2.13.orig/debian/po/eu.po
+++ cyrus-imapd-2.2-2.2.13/debian/po/eu.po
@@ -0,0 +1,96 @@
+# translation of cyrus-imapd-2.2-eu.po to Euskara
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Piarres Beobide <pi@beobide.net>, 2008.
+msgid ""
+msgstr ""
+"Project-Id-Version: cyrus-imapd-2.2-eu\n"
+"Report-Msgid-Bugs-To: cyrus-imapd-2.2@packages.debian.org\n"
+"POT-Creation-Date: 2009-04-14 17:58+0200\n"
+"PO-Revision-Date: 2009-05-28 11:56+0200\n"
+"Last-Translator: pi <pi>\n"
+"Language-Team: Euskara <debian-l10n-basque@lists.debian.org>\n"
+"Language: eu\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 1.2.1\n"
+
+#. Type: error
+#. Description
+#: ../cyrus-common-2.2.templates:2001
+msgid "Modified database backends"
+msgstr "Eraldatutako datu-base interfazeak"
+
+#. Type: error
+#. Description
+#: ../cyrus-common-2.2.templates:2001
+msgid ""
+"Comparison between /usr/lib/cyrus/cyrus-db-types.txt and /usr/lib/cyrus/"
+"cyrus-db-types.active shows that database backends for Cyrus IMAPd have been "
+"changed."
+msgstr ""
+"/usr/lib/cyrus/cyrus-db-types.txt eta /usr/lib/cyrus/cyrus-db-types.active "
+"arteko parekatzeak Cyrus IMAPd-en datu-base interfazea aldatu dela erakusten "
+"du."
+
+#. Type: error
+#. Description
+#: ../cyrus-common-2.2.templates:2001
+msgid ""
+"This means that those databases for which the database backends changed "
+"might need to be converted manually to the new format, using the cvt_cyrusdb"
+"(8) utility."
+msgstr ""
+"Honek datu-base interfazea aldatu diren datu-baseetan formatu berrira "
+"cvt_cyrusdb(8) lanabesa erabiliaz eskuzko bihurketa bat egin behar dela esan "
+"nahi du."
+
+#. Type: error
+#. Description
+#: ../cyrus-common-2.2.templates:2001
+msgid ""
+"Please refer to /usr/share/doc/cyrus-common-2.2/README.Debian.database for "
+"more information.  Do not start cyrmaster until you have converted the "
+"databases to the new format."
+msgstr ""
+"Mesedez begiratu /usr/share/doc/cyrus-common-2.2/README.Debian. datu-base "
+"argibide gehiagorako.  Ez cyrmaster abiarazi datu-basea formatu berrira "
+"bihurtu arte."
+
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:3001
+msgid "Remove the mail and news spools?"
+msgstr "Eposta eta ilara berriak ezabatu?"
+
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:3001
+#| msgid ""
+#| "The Cyrus mail and news spools, as well as the user's sieve scripts can "
+#| "be removed when the package is purged."
+msgid ""
+"The Cyrus mail and news spools, as well as users' sieve scripts, can be "
+"removed when the package is purged."
+msgstr ""
+"Cyrus posta eta ilara berriak, baita erabiltzaileren sieve script-ak ere "
+"ezabatu egin daitezke paketea garbitzerakoan."
+
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:3001
+msgid ""
+"This question only applies to the default spools and sieve script "
+"directories in /var.  If you modified their location in imapd.conf, the new "
+"locations will not be removed; just the old ones in /var."
+msgstr ""
+"Galdera honek /var direktorioko lehenetsiriko ilara eta sieve script-ei "
+"bakarrik dagokie.  Zuk horien kokapena imapd-con fitxategian aldatu baduzu, "
+"kokaleku berriaz ez dira ezabatu, /var-en daudenak zaharrak bakarrik "
+"ezabatuko dira."
+
+#~ msgid "Database backends have changed!"
+#~ msgstr "Datubase interfazea aldatu egin da!"
--- cyrus-imapd-2.2-2.2.13.orig/debian/po/POTFILES.in
+++ cyrus-imapd-2.2-2.2.13/debian/po/POTFILES.in
@@ -0,0 +1 @@
+[type: gettext/rfc822deb] cyrus-common-2.2.templates
--- cyrus-imapd-2.2-2.2.13.orig/debian/po/pt.po
+++ cyrus-imapd-2.2-2.2.13/debian/po/pt.po
@@ -0,0 +1,85 @@
+# Portuguese translation of cyrus-imapd-2.2 debconf messages.
+# Copyright (C) 2009 Carlos Lisboa
+# This file is distributed under the same license as the cyrus-imapd-2.2 package.
+# Carlos Lisboa <carloslisboa@gmail.com>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: cyrus-imapd-2.2\n"
+"Report-Msgid-Bugs-To: cyrus-imapd-2.2@packages.debian.org\n"
+"POT-Creation-Date: 2009-04-14 17:58+0200\n"
+"PO-Revision-Date: 2009-04-27 21:19+0100\n"
+"Last-Translator: Carlos Lisboa <carloslisboa@gmail.com>\n"
+"Language-Team: Portuguese <traduz@debianpt.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: error
+#. Description
+#: ../cyrus-common-2.2.templates:2001
+msgid "Modified database backends"
+msgstr "Base de dados do 'backend' modificada"
+
+#. Type: error
+#. Description
+#: ../cyrus-common-2.2.templates:2001
+msgid ""
+"Comparison between /usr/lib/cyrus/cyrus-db-types.txt and /usr/lib/cyrus/"
+"cyrus-db-types.active shows that database backends for Cyrus IMAPd have been "
+"changed."
+msgstr ""
+"Comparando /usr/lib/cyrus/cyrus-db-types.txt e /usr/lib/cyrus/cyrus-db-types."
+"active mostra que o 'backend' da base de dados Cyrus IMAPd foi alterado."
+
+#. Type: error
+#. Description
+#: ../cyrus-common-2.2.templates:2001
+msgid ""
+"This means that those databases for which the database backends changed "
+"might need to be converted manually to the new format, using the cvt_cyrusdb"
+"(8) utility."
+msgstr ""
+"Isto significa que as bases de dados cujos 'backends' foram alterados "
+"poderĂŁo necessitar de conversĂŁo manual para o novo formato, usando o "
+"utilitário cvt_cyrusdb(8)."
+
+#. Type: error
+#. Description
+#: ../cyrus-common-2.2.templates:2001
+msgid ""
+"Please refer to /usr/share/doc/cyrus-common-2.2/README.Debian.database for "
+"more information.  Do not start cyrmaster until you have converted the "
+"databases to the new format."
+msgstr ""
+"Por favor veja o /usr/share/doc/cyrus-common-2.2/README.Debian.database para "
+"mais informações. Não inicie o cyrmaster até que tenha convertido as bases "
+"de dados para o novo formato."
+
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:3001
+msgid "Remove the mail and news spools?"
+msgstr "Remover os spools de e-mail e notĂ­cias (news)?"
+
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:3001
+msgid ""
+"The Cyrus mail and news spools, as well as users' sieve scripts, can be "
+"removed when the package is purged."
+msgstr ""
+"Os spools de e-mail e notĂ­cias Cyrus, assim como os 'scripts sieve' do "
+"utilizador, podem ser removidos quando o pacote for purgado."
+
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:3001
+msgid ""
+"This question only applies to the default spools and sieve script "
+"directories in /var.  If you modified their location in imapd.conf, the new "
+"locations will not be removed; just the old ones in /var."
+msgstr ""
+"Esta questĂŁo apenas se aplica aos directĂłrios de spools e script sieve por "
+"omissĂŁo em /var. Se tiver modificado o seu local em imapd.conf, os novos "
+"locais nĂŁo serĂŁo removidos, apenas os antigos em /var."
--- cyrus-imapd-2.2-2.2.13.orig/debian/po/nb.po
+++ cyrus-imapd-2.2-2.2.13/debian/po/nb.po
@@ -0,0 +1,90 @@
+# translation of nb.po to Norwegian BokmĂĄl
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Bjørn Steensrud <bjornst@skogkatt.homelinux.org>, 2008, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: nb\n"
+"Report-Msgid-Bugs-To: cyrus-imapd-2.2@packages.debian.org\n"
+"POT-Creation-Date: 2009-04-14 17:58+0200\n"
+"PO-Revision-Date: 2009-04-30 02:18+0200\n"
+"Last-Translator: Bjørn Steensrud <bjornst@skogkatt.homelinux.org>\n"
+"Language-Team: Norwegian BokmĂĄl <i18n-nb@lister.ping.uio.no>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 0.3\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. Type: error
+#. Description
+#: ../cyrus-common-2.2.templates:2001
+msgid "Modified database backends"
+msgstr "Endrede databasemotorer"
+
+#. Type: error
+#. Description
+#: ../cyrus-common-2.2.templates:2001
+msgid ""
+"Comparison between /usr/lib/cyrus/cyrus-db-types.txt and /usr/lib/cyrus/"
+"cyrus-db-types.active shows that database backends for Cyrus IMAPd have been "
+"changed."
+msgstr ""
+"Sammenlikning mellom /usr/lib/cyrus/cyrus-db-types.txt og  /usr/lib/cyrus/"
+"cyrus-db-types.active viser at databasemotorene for Cyrus IMAPd er endret."
+
+#. Type: error
+#. Description
+#: ../cyrus-common-2.2.templates:2001
+msgid ""
+"This means that those databases for which the database backends changed "
+"might need to be converted manually to the new format, using the cvt_cyrusdb"
+"(8) utility."
+msgstr ""
+"Dette betyr at det kan være nødvendig å konvertere til det nye formatet de "
+"databasene der bakgrunnsmotorene er endret. Det gjøres med verktøyet "
+"cvt_cyrusdb(8)."
+
+#. Type: error
+#. Description
+#: ../cyrus-common-2.2.templates:2001
+msgid ""
+"Please refer to /usr/share/doc/cyrus-common-2.2/README.Debian.database for "
+"more information.  Do not start cyrmaster until you have converted the "
+"databases to the new format."
+msgstr ""
+"Se etter mer informasjon i /usr/share/doc/cyrus-common-2.2/README.Debian."
+"database. Ikke start cyrmaster før databasene er blitt konvertert til det "
+"nye formatet."
+
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:3001
+msgid "Remove the mail and news spools?"
+msgstr "Skal e-postlager og njuslagre fjernes?"
+
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:3001
+msgid ""
+"The Cyrus mail and news spools, as well as users' sieve scripts, can be "
+"removed when the package is purged."
+msgstr ""
+"E-postlageret og njuslagrene til Cyrus, og ogsĂĄ brukernes sieve-skripter, "
+"kan fjernes nĂĄr pakka fjernes fullstendig."
+
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:3001
+msgid ""
+"This question only applies to the default spools and sieve script "
+"directories in /var.  If you modified their location in imapd.conf, the new "
+"locations will not be removed; just the old ones in /var."
+msgstr ""
+"Dette spørsmålet gjelder bare standard lagre og sieve-skripter i mapper "
+"under /var.  Hvis de er gitt nye adresser i imapd.conf, sĂĄ blir ikke de nye "
+"stedene ryddet, bare de gamle i /var."
+
+#~ msgid "Database backends have changed!"
+#~ msgstr "Databasemotorene i bakgrunnen er endret!"
--- cyrus-imapd-2.2-2.2.13.orig/debian/po/it.po
+++ cyrus-imapd-2.2-2.2.13/debian/po/it.po
@@ -0,0 +1,86 @@
+# Traduzione italiana di cyrus22-imapd
+# Copyright (C) 2009 Free Software Foundation, Inc.
+# Cristian Rigamonti <cri@linux.it>, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: cyrus-imapd-2.2 2.2.13-15\n"
+"Report-Msgid-Bugs-To: cyrus-imapd-2.2@packages.debian.org\n"
+"POT-Creation-Date: 2009-04-14 17:58+0200\n"
+"PO-Revision-Date: 2009-04-15 21:13+0200\n"
+"Last-Translator: Cristian Rigamonti <cri@linux.it>\n"
+"Language-Team: Italian <tp@lists.linux.it>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: error
+#. Description
+#: ../cyrus-common-2.2.templates:2001
+msgid "Modified database backends"
+msgstr "Backend di database cambiati"
+
+#. Type: error
+#. Description
+#: ../cyrus-common-2.2.templates:2001
+msgid ""
+"Comparison between /usr/lib/cyrus/cyrus-db-types.txt and /usr/lib/cyrus/"
+"cyrus-db-types.active shows that database backends for Cyrus IMAPd have been "
+"changed."
+msgstr ""
+"Il confronto tra /usr/lib/cyrus/cyrus-db-types.txt e /usr/lib/cyrus/cyrus-db-"
+"types.active mostra che i backend di database per Cyrus IMAPd sono cambiati."
+
+#. Type: error
+#. Description
+#: ../cyrus-common-2.2.templates:2001
+msgid ""
+"This means that those databases for which the database backends changed "
+"might need to be converted manually to the new format, using the cvt_cyrusdb"
+"(8) utility."
+msgstr ""
+"Ciň significa che i database per cui sono cambiati i backend devono essere "
+"convertiti manualmente al nuovo formato, usando l'utilitŕ cvt_cyrusdb(8)."
+
+#. Type: error
+#. Description
+#: ../cyrus-common-2.2.templates:2001
+msgid ""
+"Please refer to /usr/share/doc/cyrus-common-2.2/README.Debian.database for "
+"more information.  Do not start cyrmaster until you have converted the "
+"databases to the new format."
+msgstr ""
+"Si veda /usr/share/doc/cyrus-common-2.2/README.Debian.database per maggiori "
+"informazioni.  Non avviare cyrmaster prima di aver convertito i database al "
+"nuovo formato."
+
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:3001
+msgid "Remove the mail and news spools?"
+msgstr "Rimuovere gli spool di Cyrus e gli script sieve degli utenti?"
+
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:3001
+msgid ""
+"The Cyrus mail and news spools, as well as users' sieve scripts, can be "
+"removed when the package is purged."
+msgstr ""
+"Gli spool di posta e news di Cyrus, oltre agli script sieve degli utenti, "
+"possono essere rimossi quando il pacchetto sarŕ rimosso."
+
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:3001
+msgid ""
+"This question only applies to the default spools and sieve script "
+"directories in /var.  If you modified their location in imapd.conf, the new "
+"locations will not be removed; just the old ones in /var."
+msgstr ""
+"Questa domanda si riferisce solo agli spool predefiniti e alle directory "
+"degli script sieve in /var.  Se la posizione di questi file č stata "
+"modificata in imapd.conf, essi non saranno rimossi; saranno rimossi solo i "
+"file in /var."
+
+#~ msgid "Database backends have changed!"
+#~ msgstr "I backend di database sono cambiati!"
--- cyrus-imapd-2.2-2.2.13.orig/debian/po/cs.po
+++ cyrus-imapd-2.2-2.2.13/debian/po/cs.po
@@ -0,0 +1,84 @@
+# Czech translation of cyrus-imapd-2.2 templates
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: cyrus-imapd-2.2\n"
+"Report-Msgid-Bugs-To: cyrus-imapd-2.2@packages.debian.org\n"
+"POT-Creation-Date: 2009-04-14 17:58+0200\n"
+"PO-Revision-Date: 2009-04-14 20:28+0200\n"
+"Last-Translator: Martin Sin <martin.sin@zshk.cz>\n"
+"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: error
+#. Description
+#: ../cyrus-common-2.2.templates:2001
+msgid "Modified database backends"
+msgstr "Upravené databázové backendy"
+
+#. Type: error
+#. Description
+#: ../cyrus-common-2.2.templates:2001
+msgid ""
+"Comparison between /usr/lib/cyrus/cyrus-db-types.txt and /usr/lib/cyrus/"
+"cyrus-db-types.active shows that database backends for Cyrus IMAPd have been "
+"changed."
+msgstr ""
+"Srovnání mezi /usr/lib/cyrus/cyrus-db-types.txt a /usr/lib/cyrus/cyrus-db-"
+"types.active ukázalo, že se změnil backend databáze pro Cyrus IMAPd."
+
+#. Type: error
+#. Description
+#: ../cyrus-common-2.2.templates:2001
+msgid ""
+"This means that those databases for which the database backends changed "
+"might need to be converted manually to the new format, using the cvt_cyrusdb"
+"(8) utility."
+msgstr ""
+"To znamená, že ty databáze, u kterých se databázové backendy změnily, budou "
+"možná vyžadovat ruční převod do nového formátu utilitou cvt_cyrusdb(8)."
+
+#. Type: error
+#. Description
+#: ../cyrus-common-2.2.templates:2001
+msgid ""
+"Please refer to /usr/share/doc/cyrus-common-2.2/README.Debian.database for "
+"more information.  Do not start cyrmaster until you have converted the "
+"databases to the new format."
+msgstr ""
+"Pro vĂ­ce informacĂ­ se prosĂ­m podĂ­vejte do /usr/share/doc/cyrus-common-2.2/"
+"README.Debian.database. Nespouštějte cyrmaster, dokud nepřevedete databáze "
+"do nového formátu."
+
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:3001
+msgid "Remove the mail and news spools?"
+msgstr "Odstranit spool adresáře pošty a news?"
+
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:3001
+msgid ""
+"The Cyrus mail and news spools, as well as users' sieve scripts, can be "
+"removed when the package is purged."
+msgstr ""
+"Při odstranění balíku mohou být smazány i spool adresáře s poštou a news "
+"příspěvky a také uživatelské filtrovací skripty v jazyce Sieve."
+
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:3001
+msgid ""
+"This question only applies to the default spools and sieve script "
+"directories in /var.  If you modified their location in imapd.conf, the new "
+"locations will not be removed; just the old ones in /var."
+msgstr ""
+"Tato otázka se týká pouze výchozích spool adresářů a Sieve skriptů ve /var. "
+"Při změně jejich umístění v imapd.conf nebude odstraněno jejich nové "
+"umístění, ale pouze jejich staré ve /var."
+
+#~ msgid "Database backends have changed!"
+#~ msgstr "Backendy databáze se změnily!"
--- cyrus-imapd-2.2-2.2.13.orig/debian/po/fi.po
+++ cyrus-imapd-2.2-2.2.13/debian/po/fi.po
@@ -0,0 +1,86 @@
+# Esko Arajärvi <edu@iki.fi>, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: cyrus-imapd-2.2\n"
+"Report-Msgid-Bugs-To: cyrus-imapd-2.2@packages.debian.org\n"
+"POT-Creation-Date: 2009-04-14 17:58+0200\n"
+"PO-Revision-Date: 2009-04-29 21:54+0300\n"
+"Last-Translator: Esko Arajärvi <edu@iki.fi>\n"
+"Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Finnish\n"
+"X-Poedit-Country: FINLAND\n"
+"X-Generator: Lokalize 0.3\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. Type: error
+#. Description
+#: ../cyrus-common-2.2.templates:2001
+msgid "Modified database backends"
+msgstr "Taustatietokantoja on muutettu"
+
+#. Type: error
+#. Description
+#: ../cyrus-common-2.2.templates:2001
+msgid ""
+"Comparison between /usr/lib/cyrus/cyrus-db-types.txt and /usr/lib/cyrus/"
+"cyrus-db-types.active shows that database backends for Cyrus IMAPd have been "
+"changed."
+msgstr ""
+"Tiedostojen /usr/lib/cyrus/cyrus-db-types.txt ja /usr/lib/cyrus/cyrus-db-"
+"types.active vertailu osoittaa, että Cyrus IMAPdin taustatietokantoja on "
+"muutettu."
+
+#. Type: error
+#. Description
+#: ../cyrus-common-2.2.templates:2001
+msgid ""
+"This means that those databases for which the database backends changed "
+"might need to be converted manually to the new format, using the cvt_cyrusdb"
+"(8) utility."
+msgstr ""
+"Tämä tarkoittaa, että muuttuneet taustatietokannat täytyy ehkä muuntaa käsin "
+"uuteen muotoon käyttäen työkalua cvt_cyrusdb(8)."
+
+#. Type: error
+#. Description
+#: ../cyrus-common-2.2.templates:2001
+msgid ""
+"Please refer to /usr/share/doc/cyrus-common-2.2/README.Debian.database for "
+"more information.  Do not start cyrmaster until you have converted the "
+"databases to the new format."
+msgstr ""
+"Lisätietoja löytyy tiedostosta /usr/share/doc/cyrus-common-2.2/README.Debian."
+"database. Ohjelmaa cyrmaster ei tule käynnistää ennen kuin tietokannat on "
+"muuunnettu uuteen muotoon."
+
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:3001
+msgid "Remove the mail and news spools?"
+msgstr "Poistetaanko sähköposti- ja uutislaatikot?"
+
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:3001
+msgid ""
+"The Cyrus mail and news spools, as well as users' sieve scripts, can be "
+"removed when the package is purged."
+msgstr ""
+"Cyrusin sähköposti-ja uutislaatikot, samoin kuin käyttäjien sieve-"
+"komentosarjat, voidaan poistaa, kun paketti siivotaan."
+
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:3001
+msgid ""
+"This question only applies to the default spools and sieve script "
+"directories in /var.  If you modified their location in imapd.conf, the new "
+"locations will not be removed; just the old ones in /var."
+msgstr ""
+"Tämä kysymys koskee vain oletuslaatikoita ja hakemistopuussa /var olevia "
+"sieve-komentosarjahakemistoja. Jos näiden sijaintia on muokattu tiedostossa "
+"imapd.conf, siirrettyjä ei poisteta vaan ainoastaan vanhat hakemistopuusta /"
+"var."
--- cyrus-imapd-2.2-2.2.13.orig/debian/po/de.po
+++ cyrus-imapd-2.2-2.2.13/debian/po/de.po
@@ -0,0 +1,87 @@
+# translation of cyrus-imapd_2.2 2.2.13-15_de.po to German
+#
+# Erik Schanze <eriks@debian.org>, 2004-2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: cyrus-imapd_2.2 2.2.13-15_de\n"
+"Report-Msgid-Bugs-To: cyrus-imapd-2.2@packages.debian.org\n"
+"POT-Creation-Date: 2009-04-14 17:58+0200\n"
+"PO-Revision-Date: 2009-04-27 22:30+0200\n"
+"Last-Translator: Erik Schanze <eriks@debian.org>\n"
+"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+
+#. Type: error
+#. Description
+#: ../cyrus-common-2.2.templates:2001
+msgid "Modified database backends"
+msgstr "Datenbankanbindungen geändert"
+
+#. Type: error
+#. Description
+#: ../cyrus-common-2.2.templates:2001
+msgid ""
+"Comparison between /usr/lib/cyrus/cyrus-db-types.txt and /usr/lib/cyrus/"
+"cyrus-db-types.active shows that database backends for Cyrus IMAPd have been "
+"changed."
+msgstr ""
+"Ein Vergleich der Dateien /usr/lib/cyrus/cyrus-db-types.txt und /usr/lib/"
+"cyrus/cyrus-db-types.active zeigt, dass die Datenbankanbindungen des Cyrus "
+"IMAPd geändert wurden."
+
+#. Type: error
+#. Description
+#: ../cyrus-common-2.2.templates:2001
+msgid ""
+"This means that those databases for which the database backends changed "
+"might need to be converted manually to the new format, using the cvt_cyrusdb"
+"(8) utility."
+msgstr ""
+"Die Datenbanken, für die sich die Anbindung geändert hat, müssen mit dem "
+"Hilfsprogramm cvt_cyrusdb(8) gegebenenfalls manuell in das neue Format "
+"ĂĽberfĂĽhrt werden."
+
+#. Type: error
+#. Description
+#: ../cyrus-common-2.2.templates:2001
+msgid ""
+"Please refer to /usr/share/doc/cyrus-common-2.2/README.Debian.database for "
+"more information.  Do not start cyrmaster until you have converted the "
+"databases to the new format."
+msgstr ""
+"Mehr Informationen finden Sie in der Datei /usr/share/doc/cyrus-common-2.2/"
+"README.Debian.database. Starten Sie keinesfalls »cyrmaster«, bevor Sie die "
+"Datenbank in das neue Format ĂĽberfĂĽhrt haben."
+
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:3001
+msgid "Remove the mail and news spools?"
+msgstr "E-Mail- und News-Zwischenspeicher entfernen?"
+
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:3001
+msgid ""
+"The Cyrus mail and news spools, as well as users' sieve scripts, can be "
+"removed when the package is purged."
+msgstr ""
+"Die Zwischenspeicher von Cyrus fĂĽr E-Mail und News, sowie die Filterskripte "
+"(Sieve-Skripte) der Benutzer, können gelöscht werden, wenn das Paket restlos "
+"entfernt wird (purge)."
+
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:3001
+msgid ""
+"This question only applies to the default spools and sieve script "
+"directories in /var.  If you modified their location in imapd.conf, the new "
+"locations will not be removed; just the old ones in /var."
+msgstr ""
+"Diese Frage betrifft nur die Standard-Zwischenspeicher und -"
+"Filterskriptverzeichnisse in /var. Wenn Sie deren Ort in der Datei imapd."
+"conf geändert haben, werden sie an den neuen Stellen nicht gelöscht, nur an "
+"den alten im Verzeichnis /var."
--- cyrus-imapd-2.2-2.2.13.orig/debian/po/gl.po
+++ cyrus-imapd-2.2-2.2.13/debian/po/gl.po
@@ -0,0 +1,91 @@
+# Galician translation of cyrus21-imapd's debconf templates
+# This file is distributed under the same license as the cyrus21-imapd package.
+#
+# Jacobo Tarrio <jtarrio@debian.org>, 2007, 2008.
+# marce villarino <mvillarino@users.sourceforge.net>, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: cyrus21-imapd\n"
+"Report-Msgid-Bugs-To: cyrus-imapd-2.2@packages.debian.org\n"
+"POT-Creation-Date: 2009-04-14 17:58+0200\n"
+"PO-Revision-Date: 2009-04-15 22:42+0200\n"
+"Last-Translator: marce villarino <mvillarino@users.sourceforge.net>\n"
+"Language-Team: Galician <proxecto@trasno.ent>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 0.2\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. Type: error
+#. Description
+#: ../cyrus-common-2.2.templates:2001
+msgid "Modified database backends"
+msgstr "Modificáronse as infraestruturas de base de datos"
+
+#. Type: error
+#. Description
+#: ../cyrus-common-2.2.templates:2001
+msgid ""
+"Comparison between /usr/lib/cyrus/cyrus-db-types.txt and /usr/lib/cyrus/"
+"cyrus-db-types.active shows that database backends for Cyrus IMAPd have been "
+"changed."
+msgstr ""
+"A comparaciĂłn entre /usr/lib/cyrus/cyrus-db-types.txt e /usr/lib/cyrus/cyrus-"
+"db-types.active mostra que os motores de bases de datos de Cyrus IMAPd "
+"cambiaron."
+
+#. Type: error
+#. Description
+#: ../cyrus-common-2.2.templates:2001
+msgid ""
+"This means that those databases for which the database backends changed "
+"might need to be converted manually to the new format, using the cvt_cyrusdb"
+"(8) utility."
+msgstr ""
+"Isto quere dicir que Ă© posible que as bases de datos para as que os motores "
+"cambiaron se teñan que converter manualmente ao novo formato, empregando a "
+"utilidade cvt_cyrusdb(8)."
+
+#. Type: error
+#. Description
+#: ../cyrus-common-2.2.templates:2001
+msgid ""
+"Please refer to /usr/share/doc/cyrus-common-2.2/README.Debian.database for "
+"more information.  Do not start cyrmaster until you have converted the "
+"databases to the new format."
+msgstr ""
+"Consulte /usr/share/doc/cyrus-common-2.2/README.Debian.database para máis "
+"información. Non inicie cyrmaster ata que teña convertido as bases de datos "
+"ao novo formato."
+
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:3001
+msgid "Remove the mail and news spools?"
+msgstr "Desexa eliminar os directorios de correo e novas?"
+
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:3001
+msgid ""
+"The Cyrus mail and news spools, as well as users' sieve scripts, can be "
+"removed when the package is purged."
+msgstr ""
+"PĂłdense eliminar os directorios de correo e novas de Cyrus, asĂ­ como os "
+"scripts de sieve dos usuarios, ao purgar o paquete."
+
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:3001
+msgid ""
+"This question only applies to the default spools and sieve script "
+"directories in /var.  If you modified their location in imapd.conf, the new "
+"locations will not be removed; just the old ones in /var."
+msgstr ""
+"Esta pregunta sĂł se aplica aos directorios de traballo e de scripts de sieve "
+"por defecto de /var. Se modificou a sĂşa localizaciĂłn en imapd.conf, non se "
+"han eliminar as novas localizaciĂłns; sĂł as antigas de /var."
+
+#~ msgid "Database backends have changed!"
+#~ msgstr "Os motores de bases de datos cambiaron"
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/82-allow-from_-header.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/82-allow-from_-header.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 82-allow-from_-header by FastMail.fm
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Allow message upload of messages with a "From " header, as for example
+## DP: Outlook sometimes tries (occured with Thunderbird as well)
+
+@DPATCH@
+diff -urNad cyrus-imapd-2.2.13/imap/message.c cyrus-imapd-2.2.13/imap/message.c
+--- cyrus-imapd-2.2.13/imap/message.c	2007-02-25 21:28:42.000000000 +0100
++++ cyrus-imapd-2.2.13/imap/message.c	2007-02-25 21:29:40.841335772 +0100
+@@ -296,6 +296,7 @@
+ 	/* Check for valid header name */
+ 	if (sawnl && buf[0] != ' ' && buf[0] != '\t') {
+ 	    if (buf[0] == ':') return IMAP_MESSAGE_BADHEADER;
++	if (strstr(buf,"From ") != buf )
+ 	    for (p = (unsigned char *)buf; *p != ':'; p++) {
+ 		if (*p <= ' ') return IMAP_MESSAGE_BADHEADER;
+ 	    }
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/0024-upstream-fix-sieve.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/0024-upstream-fix-sieve.dpatch
@@ -0,0 +1,79 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 0024-upstream-fix-sieve.dpatch by Sven Mueller <sven@debian.org>
+##
+## DP: Upstream patch fixing a buffer overflow bug in sieve
+## DP: Taken from https://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/sieve/script.c.diff?r1=1.62&r2=1.62.2.1
+
+@DPATCH@
+diff -urNad cyrus-imapd-2.2.13~/sieve/script.c cyrus-imapd-2.2.13/sieve/script.c
+--- cyrus-imapd-2.2.13~/sieve/script.c	2009-09-03 10:51:31.000000000 +0200
++++ cyrus-imapd-2.2.13/sieve/script.c	2009-09-03 11:16:34.831047555 +0200
+@@ -546,7 +546,7 @@
+ 	ret |= keep_ret;
+         if (keep_ret == SIEVE_OK)
+             snprintf(actions_string+strlen(actions_string),
+-		     sizeof(actions_string)-strlen(actions_string),
++		     ACTIONS_STRING_LEN-strlen(actions_string),
+ 		     "Kept\n");
+ 	else {
+ 	    implicit_keep = 0;	/* don't try an implicit keep again */
+@@ -599,7 +599,7 @@
+ 	    
+ 	    if (ret == SIEVE_OK)
+ 		snprintf(actions_string+strlen(actions_string),
+-			 sizeof(actions_string)-strlen(actions_string), 
++			 ACTIONS_STRING_LEN-strlen(actions_string), 
+ 			 "Rejected with: %s\n", a->u.rej.msg);
+ 
+ 	    break;
+@@ -615,7 +615,7 @@
+ 
+ 	    if (ret == SIEVE_OK)
+ 		snprintf(actions_string+strlen(actions_string),
+-			 sizeof(actions_string)-strlen(actions_string),
++			 ACTIONS_STRING_LEN-strlen(actions_string),
+ 			 "Filed into: %s\n",a->u.fil.mailbox);
+ 	    break;
+ 	case ACTION_KEEP:
+@@ -629,7 +629,7 @@
+ 			       &errmsg);
+ 	    if (ret == SIEVE_OK)
+ 		snprintf(actions_string+strlen(actions_string),
+-			 sizeof(actions_string)-strlen(actions_string),
++			 ACTIONS_STRING_LEN-strlen(actions_string),
+ 			 "Kept\n");
+ 	    break;
+ 	case ACTION_REDIRECT:
+@@ -643,7 +643,7 @@
+ 				   &errmsg);
+ 	    if (ret == SIEVE_OK)
+ 		snprintf(actions_string+strlen(actions_string),
+-			 sizeof(actions_string)-strlen(actions_string),
++			 ACTIONS_STRING_LEN-strlen(actions_string),
+ 			 "Redirected to %s\n", a->u.red.addr);
+ 	    break;
+ 	case ACTION_DISCARD:
+@@ -655,7 +655,7 @@
+ 				      &errmsg);
+ 	    if (ret == SIEVE_OK)
+ 		snprintf(actions_string+strlen(actions_string),
+-			 sizeof(actions_string)-strlen(actions_string),
++			 ACTIONS_STRING_LEN-strlen(actions_string),
+ 			 "Discarded\n");
+ 	    break;
+ 
+@@ -689,12 +689,12 @@
+ 
+ 		    if (ret == SIEVE_OK)
+ 			snprintf(actions_string+strlen(actions_string),
+-				 sizeof(actions_string)-strlen(actions_string),
++				 ACTIONS_STRING_LEN-strlen(actions_string),
+ 				 "Sent vacation reply\n");
+ 
+ 		} else if (ret == SIEVE_DONE) {
+ 		    snprintf(actions_string+strlen(actions_string),
+-			     sizeof(actions_string)-strlen(actions_string),
++			     ACTIONS_STRING_LEN-strlen(actions_string),
+ 			     "Vacation reply suppressed\n");
+ 
+ 		    ret = SIEVE_OK;
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/0011-upstream-allow-compile-with-krb5-1.4.3.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/0011-upstream-allow-compile-with-krb5-1.4.3.dpatch
@@ -0,0 +1,43 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 0011-upstream-allow-compile-with-krb5-1.4.3 by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: patch to compile with MIT krb5 1.4.3 (Philip Guenther <guenther@sendmail.com>)
+
+@DPATCH@
+diff -urNad cyrus-imapd-2.2.13/cmulocal/sasl2.m4 cyrus-imapd-2.2.13/cmulocal/sasl2.m4
+--- cyrus-imapd-2.2.13/cmulocal/sasl2.m4	2006-03-31 20:18:13.000000000 +0200
++++ cyrus-imapd-2.2.13/cmulocal/sasl2.m4	2006-05-19 15:18:35.458325180 +0200
+@@ -1,6 +1,6 @@
+ # sasl2.m4--sasl2 libraries and includes
+ # Rob Siemborski
+-# $Id: sasl2.m4,v 1.51 2005/05/07 04:15:17 shadow Exp $
++# $Id: sasl2.m4,v 1.52 2006/05/18 19:25:00 murch Exp $
+ 
+ # SASL2_CRYPT_CHK
+ # ---------------
+@@ -110,9 +110,12 @@
+   fi
+ 
+   if test "$gss_impl" = "auto" -o "$gss_impl" = "mit"; then
++    # check for libkrb5support first
++    AC_CHECK_LIB(krb5support,krb5int_getspecific,K5SUP=-lkrb5support K5SUPSTATIC=$gssapi_dir/libkrb5support.a,,${LIB_SOCKET})
++
+     gss_failed=0
+     AC_CHECK_LIB(gssapi_krb5,gss_unwrap,gss_impl="mit",gss_failed=1,
+-                 ${GSSAPIBASE_LIBS} -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${LIB_SOCKET})
++                 ${GSSAPIBASE_LIBS} -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${K5SUP} ${LIB_SOCKET})
+     if test "$gss_impl" != "auto" -a "$gss_failed" = "1"; then
+       gss_impl="failed"
+     fi
+@@ -164,8 +167,8 @@
+   fi
+ 
+   if test "$gss_impl" = "mit"; then
+-    GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err"
+-    GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a"
++    GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${K5SUP}"
++    GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a ${K5SUPSTATIC}"
+   elif test "$gss_impl" = "heimdal"; then
+     CPPFLAGS="$CPPFLAGS -DKRB5_HEIMDAL"
+     GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err"
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/18-fix_strlen_return_type.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/18-fix_strlen_return_type.dpatch
@@ -0,0 +1,606 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 18-fix_strlen_return_type.dpatch by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix return type of strlen calls and snprintf/prot_printf format
+## DP: strings.
+
+@DPATCH@
+diff -urNad cyrus-imapd-2.2.13~/imap/imapd.c cyrus-imapd-2.2.13/imap/imapd.c
+--- cyrus-imapd-2.2.13~/imap/imapd.c	2008-04-15 13:11:16.498055004 +0200
++++ cyrus-imapd-2.2.13/imap/imapd.c	2008-04-15 13:11:16.650068029 +0200
+@@ -6095,8 +6095,8 @@
+     memset(&tmp, 0, sizeof(struct buf));
+     memset(&user, 0, sizeof(struct buf));
+ 
+-    prot_printf(pout, "ACL0 GETACL {%d+}\r\n%s\r\n",
+-		strlen(mailbox), mailbox);
++    prot_printf(pout, "ACL0 GETACL {%lu+}\r\n%s\r\n",
++		(unsigned long) strlen(mailbox), mailbox);
+ 
+     while(1) {
+ 	c = getword(pin, &tag);
+@@ -6146,9 +6146,9 @@
+ 
+ 		snprintf(tagbuf, sizeof(tagbuf), "ACL%d", ++i);
+ 		
+-		prot_printf(pout, "%s DELETEACL {%d+}\r\n%s {%d+}\r\n%s\r\n",
+-			    tagbuf, strlen(mailbox), mailbox,
+-			    strlen(user.s), user.s);
++		prot_printf(pout, "%s DELETEACL {%lu+}\r\n%s {%lu+}\r\n%s\r\n",
++			    tagbuf, (unsigned long) strlen(mailbox), mailbox,
++			    (unsigned long) strlen(user.s), user.s);
+ 		if(c == '\r') {
+ 		    c = prot_getc(pin);
+ 		    if(c != '\n') {
+@@ -6223,11 +6223,11 @@
+ 
+ 	snprintf(tag, sizeof(tag), "SACL%d", tagnum++);
+ 	
+-	prot_printf(pout, "%s SETACL {%d+}\r\n%s {%d+}\r\n%s {%d+}\r\n%s\r\n",
++	prot_printf(pout, "%s SETACL {%d+}\r\n%s {%lu+}\r\n%s {%lu+}\r\n%s\r\n",
+ 		    tag,
+ 		    mailboxlen, mailbox,
+-		    strlen(acl), acl,
+-		    strlen(rights), rights);
++		    (unsigned long) strlen(acl), acl,
++		    (unsigned long) strlen(rights), rights);
+ 
+ 	while(1) {
+ 	    c = getword(pin, &inbuf);
+@@ -6341,11 +6341,11 @@
+     if(!r) {
+ 	if(topart) {
+ 	    /* need to send partition as an atom */
+-	    prot_printf(be->out, "LC1 LOCALCREATE {%d+}\r\n%s %s\r\n",
+-			strlen(name), name, topart);
++	    prot_printf(be->out, "LC1 LOCALCREATE {%lu+}\r\n%s %s\r\n",
++			(unsigned long) strlen(name), name, topart);
+ 	} else {
+-	    prot_printf(be->out, "LC1 LOCALCREATE {%d+}\r\n%s\r\n",
+-			strlen(name), name);
++	    prot_printf(be->out, "LC1 LOCALCREATE {%lu+}\r\n%s\r\n",
++			(unsigned long) strlen(name), name);
+ 	}
+ 	r = getresult(be->in, "LC1");
+ 	if(r) syslog(LOG_ERR, "Could not move mailbox: %s, LOCALCREATE failed",
+@@ -6379,7 +6379,8 @@
+     if(!r) {
+ 	backout_mupdate = 1;
+ 
+-	prot_printf(be->out, "D01 UNDUMP {%d+}\r\n%s ", strlen(name), name);
++	prot_printf(be->out, "D01 UNDUMP {%lu+}\r\n%s ",
++		    (unsigned long) strlen(name), name);
+ 
+ 	r = dump_mailbox(NULL, mailboxname, path, acl, 0, be->in, be->out,
+ 			 imapd_authstate);
+@@ -6425,8 +6426,8 @@
+ 	/* 6.5) Kick remote server to correct mupdate entry */
+ 	/* Note that we don't really care if this succeeds or not */
+ 	if (mupdate_h) {
+-	    prot_printf(be->out, "MP1 MUPDATEPUSH {%d+}\r\n%s\r\n",
+-			strlen(name), name);
++	    prot_printf(be->out, "MP1 MUPDATEPUSH {%lu+}\r\n%s\r\n",
++			(unsigned long) strlen(name), name);
+ 	    rerr = getresult(be->in, "MP1");
+ 	    if(rerr) {
+ 		syslog(LOG_ERR,
+@@ -6465,8 +6466,8 @@
+     }
+     if(r && backout_remotebox) {
+ 	rerr = 0;
+-	prot_printf(be->out, "LD1 LOCALDELETE {%d+}\r\n%s\r\n",
+-		    strlen(name), name);
++	prot_printf(be->out, "LD1 LOCALDELETE {%lu+}\r\n%s\r\n",
++		    (unsigned long) strlen(name), name);
+ 	rerr = getresult(be->in, "LD1");
+  	if(rerr) {
+ 	    syslog(LOG_ERR,
+@@ -6661,9 +6662,10 @@
+ 	    if(!r) {
+ 		/* note use of + to force the setting of a nonexistant
+ 		 * quotaroot */
+-		prot_printf(be->out, "Q01 SETQUOTA {%d+}\r\n" \
++		prot_printf(be->out, "Q01 SETQUOTA {%lu+}\r\n" \
+ 			    "+%s (STORAGE %d)\r\n",
+-			    strlen(name)+1, name, quota.limit);
++			    (unsigned long) strlen(name)+1,
++			    name, quota.limit);
+ 		r = getresult(be->in, "Q01");
+ 		if(r) syslog(LOG_ERR,
+ 			     "Could not move mailbox: %s, " \
+@@ -7207,7 +7209,7 @@
+ 
+     /* if it's too long, literal it */
+     if (*p || len >= 1024) {
+-	prot_printf(imapd_out, "{%u}\r\n%s", strlen(s), s);
++	prot_printf(imapd_out, "{%lu}\r\n%s", (unsigned long) strlen(s), s);
+     } else {
+ 	prot_printf(imapd_out, "\"%s\"", s);
+     }
+@@ -7237,7 +7239,7 @@
+ 
+     /* if it's too long, literal it */
+     if (*p || len >= 1024) {
+-	prot_printf(imapd_out, "{%u}\r\n%s", strlen(s), s);
++	prot_printf(imapd_out, "{%lu}\r\n%s", (unsigned long) strlen(s), s);
+     } else {
+ 	prot_printf(imapd_out, "\"%s\"", s);
+     }
+diff -urNad cyrus-imapd-2.2.13~/imap/mbdump.c cyrus-imapd-2.2.13/imap/mbdump.c
+--- cyrus-imapd-2.2.13~/imap/mbdump.c	2008-04-15 13:11:16.338041293 +0200
++++ cyrus-imapd-2.2.13/imap/mbdump.c	2008-04-15 13:11:16.654068370 +0200
+@@ -271,8 +271,8 @@
+ 
+ 	/* send filename, size, and contents */
+ 	if(first) {
+-	    prot_printf(pout, "{%d}\r\n",
+-			strlen(name));
++	    prot_printf(pout, "{%lu}\r\n",
++			(unsigned long) strlen(name));
+ 
+ 	    if(!tag) {
+ 		/* synchronize */
+@@ -292,8 +292,8 @@
+ 
+ 	    first = 0;
+ 	} else {
+-	    prot_printf(pout, " {%d%s}\r\n%s {%lu%s}\r\n",
+-			strlen(name),
++	    prot_printf(pout, " {%lu%s}\r\n%s {%lu%s}\r\n",
++			(unsigned long) strlen(name),
+ 			(!tag ? "+" : ""),
+ 			name, len,
+ 			(!tag ? "+" : ""));
+@@ -327,8 +327,8 @@
+ 
+ 	/* send filename, size, and contents */
+ 	if(first) {
+-	    prot_printf(pout, "{%d}\r\n",
+-			strlen(data_files[i]));
++	    prot_printf(pout, "{%lu}\r\n",
++			(unsigned long) strlen(data_files[i]));
+ 	    
+ 	    if(!tag) {
+ 		/* synchronize */
+@@ -347,8 +347,8 @@
+ 			(!tag ? "+" : ""));
+ 	    first = 0;
+ 	} else {
+-	    prot_printf(pout, " {%d%s}\r\n%s {%lu%s}\r\n",
+-			strlen(data_files[i]),
++	    prot_printf(pout, " {%lu%s}\r\n%s {%lu%s}\r\n",
++			(unsigned long) strlen(data_files[i]),
+ 			(!tag ? "+" : ""),
+ 			data_files[i], len,
+ 			(!tag ? "+" : ""));
+@@ -474,8 +474,8 @@
+ 				snprintf(ext_fname, sizeof(ext_fname),
+ 					 "SIEVE-%s", next->d_name);
+ 			    }
+-			    prot_printf(pout, " {%d%s}\r\n%s {%lu%s}\r\n",
+-					strlen(ext_fname), 
++			    prot_printf(pout, " {%lu%s}\r\n%s {%lu%s}\r\n",
++					(unsigned long) strlen(ext_fname), 
+ 					(!tag ? "+" : ""),
+ 					ext_fname,
+ 					len,
+diff -urNad cyrus-imapd-2.2.13~/imap/message.c cyrus-imapd-2.2.13/imap/message.c
+--- cyrus-imapd-2.2.13~/imap/message.c	2008-04-15 13:11:16.546059116 +0200
++++ cyrus-imapd-2.2.13/imap/message.c	2008-04-15 13:11:16.654068370 +0200
+@@ -2060,7 +2060,7 @@
+     if (*p || len >= 1024) {
+ 	/* Write out as literal */
+ 	char buf[100];
+-	snprintf(buf, sizeof(buf), "{%u}\r\n", strlen(s));
++	snprintf(buf, sizeof(buf), "{%lu}\r\n", (unsigned long) strlen(s));
+ 	message_ibuf_ensure(ibuf, strlen(s)+strlen(buf));
+ 	for (p = buf; *p; p++) *(ibuf->end)++ = *p;
+ 	for (p = s; *p; p++) *(ibuf->end)++ = *p;
+diff -urNad cyrus-imapd-2.2.13~/imap/mupdate-client.c cyrus-imapd-2.2.13/imap/mupdate-client.c
+--- cyrus-imapd-2.2.13~/imap/mupdate-client.c	2008-04-15 13:11:15.753991248 +0200
++++ cyrus-imapd-2.2.13/imap/mupdate-client.c	2008-04-15 13:11:16.654068370 +0200
+@@ -330,9 +330,11 @@
+     if (!handle->saslcompleted) return MUPDATE_NOAUTH;
+ 
+     prot_printf(handle->pout,
+-		"X%u ACTIVATE {%d+}\r\n%s {%d+}\r\n%s {%d+}\r\n%s\r\n", 
+-		handle->tagn++, strlen(mailbox), mailbox, 
+-		strlen(server), server, strlen(acl), acl);
++		"X%u ACTIVATE {%lu+}\r\n%s {%lu+}\r\n%s {%lu+}\r\n%s\r\n", 
++		handle->tagn++,
++		(unsigned long) strlen(mailbox), mailbox,
++		(unsigned long) strlen(server), server,
++		(unsigned long) strlen(acl), acl);
+ 
+     ret = mupdate_scarf(handle, mupdate_scarf_one, NULL, 1, &response);
+     if (ret) {
+@@ -355,9 +357,10 @@
+     if (!handle->saslcompleted) return MUPDATE_NOAUTH;
+ 
+     prot_printf(handle->pout,
+-		"X%u RESERVE {%d+}\r\n%s {%d+}\r\n%s\r\n",
+-		handle->tagn++, strlen(mailbox), mailbox, 
+-		strlen(server), server);
++		"X%u RESERVE {%lu+}\r\n%s {%lu+}\r\n%s\r\n",
++		handle->tagn++,
++		(unsigned long) strlen(mailbox), mailbox, 
++		(unsigned long) strlen(server), server);
+ 
+     ret = mupdate_scarf(handle, mupdate_scarf_one, NULL, 1, &response);
+     if (ret) {
+@@ -380,9 +383,10 @@
+     if (!handle->saslcompleted) return MUPDATE_NOAUTH;
+ 
+     prot_printf(handle->pout,
+-		"X%u DEACTIVATE {%d+}\r\n%s {%d+}\r\n%s\r\n",
+-		handle->tagn++, strlen(mailbox), mailbox, 
+-		strlen(server), server);
++		"X%u DEACTIVATE {%lu+}\r\n%s {%lu+}\r\n%s\r\n",
++		handle->tagn++,
++		(unsigned long) strlen(mailbox), mailbox, 
++		(unsigned long) strlen(server), server);
+ 
+     ret = mupdate_scarf(handle, mupdate_scarf_one, NULL, 1, &response);
+     if (ret) {
+@@ -405,8 +409,8 @@
+     if (!handle->saslcompleted) return MUPDATE_NOAUTH;
+ 
+     prot_printf(handle->pout,
+-		"X%u DELETE {%d+}\r\n%s\r\n", handle->tagn++, 
+-		strlen(mailbox), mailbox);
++		"X%u DELETE {%lu+}\r\n%s\r\n", handle->tagn++, 
++		(unsigned long) strlen(mailbox), mailbox);
+ 
+     ret = mupdate_scarf(handle, mupdate_scarf_one, NULL, 1, &response);
+     if (ret) {
+@@ -474,8 +478,8 @@
+     if(!handle || !mailbox || !target) return MUPDATE_BADPARAM;
+ 
+     prot_printf(handle->pout,
+-		"X%u FIND {%d+}\r\n%s\r\n", handle->tagn++, 
+-		strlen(mailbox), mailbox);
++		"X%u FIND {%lu+}\r\n%s\r\n", handle->tagn++, 
++		(unsigned long) strlen(mailbox), mailbox);
+ 
+     memset(&(handle->mailboxdata_buf), 0, sizeof(handle->mailboxdata_buf));
+ 
+@@ -507,8 +511,8 @@
+ 
+     if(prefix) {
+ 	prot_printf(handle->pout,
+-		    "X%u LIST {%d+}\r\n%s\r\n", handle->tagn++,
+-		    strlen(prefix), prefix);
++		    "X%u LIST {%lu+}\r\n%s\r\n", handle->tagn++,
++		    (unsigned long) strlen(prefix), prefix);
+     } else {
+ 	prot_printf(handle->pout,
+ 		    "X%u LIST\r\n", handle->tagn++);
+diff -urNad cyrus-imapd-2.2.13~/imap/mupdate.c cyrus-imapd-2.2.13/imap/mupdate.c
+--- cyrus-imapd-2.2.13~/imap/mupdate.c	2008-04-15 13:11:15.753991248 +0200
++++ cyrus-imapd-2.2.13/imap/mupdate.c	2008-04-15 13:11:16.654068370 +0200
+@@ -1613,20 +1613,20 @@
+     pthread_mutex_unlock(&mailboxes_mutex); /* UNLOCK */
+ 
+     if (m && m->t == SET_ACTIVE) {
+-	prot_printf(C->pout, "%s MAILBOX {%d+}\r\n%s {%d+}\r\n%s {%d+}\r\n%s\r\n",
++	prot_printf(C->pout, "%s MAILBOX {%lu+}\r\n%s {%lu+}\r\n%s {%lu+}\r\n%s\r\n",
+ 		    tag,
+-		    strlen(m->mailbox), m->mailbox,
+-		    strlen(m->server), m->server,
+-		    strlen(m->acl), m->acl);
++		    (unsigned long) strlen(m->mailbox), m->mailbox,
++		    (unsigned long) strlen(m->server), m->server,
++		    (unsigned long) strlen(m->acl), m->acl);
+     } else if (m && m->t == SET_RESERVE) {
+-	prot_printf(C->pout, "%s RESERVE {%d+}\r\n%s {%d+}\r\n%s\r\n",
++	prot_printf(C->pout, "%s RESERVE {%lu+}\r\n%s {%lu+}\r\n%s\r\n",
+ 		    tag,
+-		    strlen(m->mailbox), m->mailbox,
+-		    strlen(m->server), m->server);
++		    (unsigned long) strlen(m->mailbox), m->mailbox,
++		    (unsigned long) strlen(m->server), m->server);
+     } else if (send_delete) {
+ 	/* not found, if needed, send a delete */
+-	prot_printf(C->pout, "%s DELETE {%d+}\r\n%s\r\n",
+-		    tag, strlen(mailbox), mailbox);
++	prot_printf(C->pout, "%s DELETE {%lu+}\r\n%s\r\n",
++		    tag, (unsigned long) strlen(mailbox), mailbox);
+     }
+     
+     free_mbent(m);
+@@ -1668,17 +1668,17 @@
+ 	    switch (m->t) {
+ 	    case SET_ACTIVE:
+ 		prot_printf(C->pout,
+-			    "%s MAILBOX {%d+}\r\n%s {%d+}\r\n%s {%d+}\r\n%s\r\n",
++			    "%s MAILBOX {%lu+}\r\n%s {%lu+}\r\n%s {%lu+}\r\n%s\r\n",
+ 			    C->streaming,
+-			    strlen(m->mailbox), m->mailbox,
+-			    strlen(m->server), m->server,
+-			    strlen(m->acl), m->acl);
++			    (unsigned long) strlen(m->mailbox), m->mailbox,
++			    (unsigned long) strlen(m->server), m->server,
++			    (unsigned long) strlen(m->acl), m->acl);
+ 		break;
+ 	    case SET_RESERVE:
+-		prot_printf(C->pout, "%s RESERVE {%d+}\r\n%s {%d+}\r\n%s\r\n",
++		prot_printf(C->pout, "%s RESERVE {%lu+}\r\n%s {%lu+}\r\n%s\r\n",
+ 			    C->streaming,
+-			    strlen(m->mailbox), m->mailbox,
+-			    strlen(m->server), m->server);
++			    (unsigned long) strlen(m->mailbox), m->mailbox,
++			    (unsigned long) strlen(m->server), m->server);
+ 		break;
+ 		
+ 	    case SET_DELETE:
+diff -urNad cyrus-imapd-2.2.13~/imap/proxyd.c cyrus-imapd-2.2.13/imap/proxyd.c
+--- cyrus-imapd-2.2.13~/imap/proxyd.c	2008-04-15 13:11:16.514056374 +0200
++++ cyrus-imapd-2.2.13/imap/proxyd.c	2008-04-15 13:11:16.654068370 +0200
+@@ -2841,7 +2841,8 @@
+     if (!r) {
+ 	int is_active = 1;
+ 	s->context = (void*) &is_active;
+-	prot_printf(s->out, "%s Append {%d+}\r\n%s ", tag, strlen(name), name);
++ 	prot_printf(s->out, "%s Append {%lu+}\r\n%s ", tag,
++ 			(unsigned long) strlen(name), name);
+ 	if (!(r = pipe_command(s, 16384))) {
+ 	    pipe_until_tag(s, tag, 0);
+ 	}
+@@ -2917,8 +2918,8 @@
+ 	return;
+     }
+ 
+-    prot_printf(backend_current->out, "%s %s {%d+}\r\n%s\r\n", tag, cmd, 
+-		strlen(name), name);
++    prot_printf(backend_current->out, "%s %s {%lu+}\r\n%s\r\n", tag, cmd, 
++		(unsigned long) strlen(name), name);
+     switch (pipe_including_tag(backend_current, tag, 0)) {
+     case PROXY_OK:
+ 	proc_register("proxyd", proxyd_clienthost, proxyd_userid, mailboxname);
+@@ -3148,8 +3149,9 @@
+ 		    r == 0 ? "[TRYCREATE] " : "", error_message(r));
+     } else if (s == backend_current) {
+ 	/* this is the easy case */
+-	prot_printf(backend_current->out, "%s %s %s {%d+}\r\n%s\r\n",
+-		    tag, cmd, sequence, strlen(name), name);
++	prot_printf(backend_current->out, "%s %s %s {%lu+}\r\n%s\r\n",
++		    tag, cmd, sequence, 
++		    (unsigned long) strlen(name), name);
+ 	pipe_including_tag(backend_current, tag, 0);
+     } else {
+ 	char mytag[128];
+@@ -3310,7 +3312,8 @@
+ 	}
+ 
+ 	/* start the append */
+-	prot_printf(s->out, "%s Append {%d+}\r\n%s", tag, strlen(name), name);
++	prot_printf(s->out, "%s Append {%lu+}\r\n%s", tag,
++			(unsigned long) strlen(name), name);
+ 	prot_printf(backend_current->out, "%s %s %s (Rfc822.peek)\r\n",
+ 		    mytag, usinguid ? "Uid Fetch" : "Fetch", sequence);
+ 	for (/* each FETCH response */;;) {
+@@ -3555,8 +3558,8 @@
+ 
+     if (!r) {
+ 	/* ok, send the create to that server */
+-	prot_printf(s->out, "%s CREATE {%d+}\r\n%s\r\n", 
+-		    tag, strlen(name), name);
++	prot_printf(s->out, "%s CREATE {%lu+}\r\n%s\r\n", 
++		    tag, (unsigned long) strlen(name), name);
+ 	res = pipe_including_tag(s, tag, 0);
+ 	tag = "*";		/* can't send another tagged response */
+ 	
+@@ -3596,8 +3599,8 @@
+     }
+ 
+     if (!r) {
+-	prot_printf(s->out, "%s DELETE {%d+}\r\n%s\r\n", 
+-		    tag, strlen(name), name);
++	prot_printf(s->out, "%s DELETE {%lu+}\r\n%s\r\n", 
++		    tag, (unsigned long) strlen(name), name);
+ 	res = pipe_including_tag(s, tag, 0);
+ 	tag = "*";		/* can't send another tagged response */
+ 
+@@ -3698,17 +3701,17 @@
+ 		/* Cross Server */
+ 		/* <tag> XFER <name> <dest server> <dest partition> */
+ 		prot_printf(s->out,
+-			    "%s XFER {%d+}\r\n%s {%d+}\r\n%s {%d+}\r\n%s\r\n", 
+-			    tag, strlen(oldname), oldname,
+-			    strlen(newserver), newserver,
+-			    strlen(destpart), destpart);
++			    "%s XFER {%lu+}\r\n%s {%lu+}\r\n%s {%lu+}\r\n%s\r\n", 
++			    tag, (unsigned long) strlen(oldname), oldname,
++			    (unsigned long) strlen(newserver), newserver,
++			    (unsigned long) strlen(destpart), destpart);
+ 	    }
+ 	    
+ 	} else {
+ 	    /* <tag> XFER <name> <dest server> */
+-	    prot_printf(s->out, "%s XFER {%d+}\r\n%s {%d+}\r\n%s\r\n", 
+-			tag, strlen(oldname), oldname,
+-			strlen(partition), partition);
++	    prot_printf(s->out, "%s XFER {%lu+}\r\n%s {%lu+}\r\n%s\r\n", 
++			tag, (unsigned long) strlen(oldname), oldname,
++			(unsigned long) strlen(partition), partition);
+ 	}
+ 	
+ 	res = pipe_including_tag(s, tag, 0);
+@@ -3724,9 +3727,9 @@
+ 	    /* do MUPDATE create operations for new mailbox */
+ 	}
+ 
+-	prot_printf(s->out, "%s RENAME {%d+}\r\n%s {%d+}\r\n%s\r\n", 
+-		    tag, strlen(oldname), oldname,
+-		    strlen(newname), newname);
++	prot_printf(s->out, "%s RENAME {%lu+}\r\n%s {%lu+}\r\n%s\r\n", 
++		    tag, (unsigned long) strlen(oldname), oldname,
++		    (unsigned long) strlen(newname), newname);
+ 	res = pipe_including_tag(s, tag, 0);
+ 	tag = "*";		/* can't send another tagged response */
+ 	
+@@ -3761,8 +3764,8 @@
+ 
+ 	if (backend_inbox) {
+ 	    prot_printf(backend_inbox->out, 
+-			"%s Lsub \"\" {%d+}\r\n%s\r\n",
+-			tag, strlen(pattern), pattern);
++			"%s Lsub \"\" {%lu+}\r\n%s\r\n",
++			tag, (unsigned long) strlen(pattern), pattern);
+ 	    pipe_lsub(backend_inbox, tag, 0, "MAILBOX");
+ 	} else {		/* user doesn't have an INBOX */
+ 	    /* noop */
+@@ -3831,9 +3834,9 @@
+ 
+ 	if (backend_inbox) {
+ 	    prot_printf(backend_inbox->out, 
+-			"%s Lsub {%d+}\r\n%s {%d+}\r\n%s\r\n",
+-			tag, strlen(reference), reference,
+-			strlen(pattern), pattern);
++			"%s Lsub {%lu+}\r\n%s {%lu+}\r\n%s\r\n",
++			tag, (unsigned long) strlen(reference), reference,
++			(unsigned long) strlen(pattern), pattern);
+ 	    pipe_lsub(backend_inbox, tag, 0, (listopts & LIST_LSUB) ? "LSUB" : "LIST");
+ 	} else {		/* user doesn't have an INBOX */
+ 	    /* noop */
+@@ -3922,14 +3925,14 @@
+ 	
+ 	if (namespace) {
+ 	    prot_printf(backend_inbox->out, 
+-			"%s %s {%d+}\r\n%s {%d+}\r\n%s\r\n", 
++			"%s %s {%lu+}\r\n%s {%lu+}\r\n%s\r\n", 
+ 			tag, cmd, 
+-			strlen(namespace), namespace,
+-			strlen(name), name);
++			(unsigned long) strlen(namespace), namespace,
++			(unsigned long) strlen(name), name);
+ 	} else {
+-	    prot_printf(backend_inbox->out, "%s %s {%d+}\r\n%s\r\n", 
++	    prot_printf(backend_inbox->out, "%s %s {%lu+}\r\n%s\r\n", 
+ 			tag, cmd, 
+-			strlen(name), name);
++			(unsigned long) strlen(name), name);
+ 	}
+ 	pipe_including_tag(backend_inbox, tag, 0);
+     } else {
+@@ -4161,15 +4164,15 @@
+     } else if (!r) {
+ 	if (rights) {
+ 	    prot_printf(s->out, 
+-			"%s Setacl {%d+}\r\n%s {%d+}\r\n%s {%d+}\r\n%s\r\n",
+-			tag, strlen(name), name,
+-			strlen(identifier), identifier,
+-			strlen(rights), rights);
++			"%s Setacl {%lu+}\r\n%s {%lu+}\r\n%s {%lu+}\r\n%s\r\n",
++			tag, (unsigned long) strlen(name), name,
++			(unsigned long) strlen(identifier), identifier,
++			(unsigned long) strlen(rights), rights);
+ 	} else {
+ 	    prot_printf(s->out, 
+-			"%s Deleteacl {%d+}\r\n%s {%d+}\r\n%s\r\n",
+-			tag, strlen(name), name,
+-			strlen(identifier), identifier);
++			"%s Deleteacl {%lu+}\r\n%s {%lu+}\r\n%s\r\n",
++			tag, (unsigned long) strlen(name), name,
++			(unsigned long) strlen(identifier), identifier);
+ 	}	    
+ 	res = pipe_including_tag(s, tag, 0);
+ 	tag = "*";		/* can't send another tagged response */
+@@ -4269,8 +4272,8 @@
+ 	s = proxyd_findserver(server);
+ 
+ 	if (s) {
+-	    prot_printf(s->out, "%s Getquotaroot {%d+}\r\n%s\r\n",
+-			tag, strlen(name), name);
++	    prot_printf(s->out, "%s Getquotaroot {%lu+}\r\n%s\r\n",
++			tag, (unsigned long) strlen(name), name);
+ 	    pipe_including_tag(s, tag, 0);
+ 	} else {
+ 	    r = IMAP_SERVER_UNAVAILABLE;
+@@ -4495,8 +4498,8 @@
+     if (!r) s = proxyd_findserver(server);
+     if (!r && !s) r = IMAP_SERVER_UNAVAILABLE;
+     if (!r) {
+-	prot_printf(s->out, "%s Status {%d+}\r\n%s ", tag,
+-		    strlen(name), name);
++	prot_printf(s->out, "%s Status {%lu+}\r\n%s ", tag,
++		    (unsigned long) strlen(name), name);
+ 	if (!pipe_command(s, 65536)) {
+ 	    pipe_until_tag(s, tag, 0);
+ 	}
+@@ -4636,7 +4639,7 @@
+ 
+     /* if it's too long, literal it */
+     if (*p || len >= 1024) {
+-	prot_printf(proxyd_out, "{%u}\r\n%s", strlen(s), s);
++	prot_printf(proxyd_out, "{%lu}\r\n%s", (unsigned long) strlen(s), s);
+     } else {
+ 	prot_printf(proxyd_out, "\"%s\"", s);
+     }
+@@ -4664,7 +4667,7 @@
+ 
+     /* if it's too long, literal it */
+     if (*p || len >= 1024) {
+-	prot_printf(proxyd_out, "{%u}\r\n%s", strlen(s), s);
++	prot_printf(proxyd_out, "{%lu}\r\n%s", (unsigned long) strlen(s), s);
+     } else {
+ 	prot_printf(proxyd_out, "\"%s\"", s);
+     }
+diff -urNad cyrus-imapd-2.2.13~/imtest/imtest.c cyrus-imapd-2.2.13/imtest/imtest.c
+--- cyrus-imapd-2.2.13~/imtest/imtest.c	2008-04-15 13:11:16.518056717 +0200
++++ cyrus-imapd-2.2.13/imtest/imtest.c	2008-04-15 13:11:16.654068370 +0200
+@@ -624,14 +624,14 @@
+ 	return (ret);
+     
+     if (cmd == (BIO_CB_READ | BIO_CB_RETURN)) {
+-	printf("read from %08X [%08lX] (%d bytes => %ld (0x%X))\n",
+-	       (unsigned int) bio, (long unsigned int) argp,
++	printf("read from %p [%p] (%d bytes => %ld (0x%X))\n",
++	       (void*) bio, (void*) argp,
+ 	       argi, ret, (unsigned int) ret);
+ 	tls_dump(argp, (int) ret);
+ 	return (ret);
+     } else if (cmd == (BIO_CB_WRITE | BIO_CB_RETURN)) {
+-	printf("write to %08X [%08lX] (%d bytes => %ld (0x%X))\n",
+-	       (unsigned int) bio, (long unsigned int) argp,
++	printf("write to %p [%p] (%d bytes => %ld (0x%X))\n",
++	       (void*) bio, (void*) argp,
+ 	       argi, ret, (unsigned int) ret);
+ 	tls_dump(argp, (int) ret);
+     }
+@@ -1778,7 +1778,8 @@
+ {
+     int lup;
+     
+-    prot_printf(pout,"A003 APPEND %s (\\Seen) {%u}\r\n",mbox,size+strlen(HEADERS));
++    prot_printf(pout,"A003 APPEND %s (\\Seen) {%lu}\r\n",mbox,
++		    (unsigned long) size+strlen(HEADERS));
+     /* do normal header foo */
+     prot_printf(pout,HEADERS);
+     
+diff -urNad cyrus-imapd-2.2.13~/master/master.c cyrus-imapd-2.2.13/master/master.c
+--- cyrus-imapd-2.2.13~/master/master.c	2008-04-15 13:11:16.534058088 +0200
++++ cyrus-imapd-2.2.13/master/master.c	2008-04-15 13:11:16.658068714 +0200
+@@ -1883,7 +1883,7 @@
+ 	    }
+ 	    
+ 	    /* Write PID */
+-	    snprintf(buf, sizeof(buf), "%lu\n", (unsigned long int)getpid());
++	    snprintf(buf, sizeof(buf), "%lu\n", (unsigned long int) getpid());
+ 	    if(lseek(pidfd, 0, SEEK_SET) == -1 ||
+ 	       ftruncate(pidfd, 0) == -1 ||
+ 	       write(pidfd, buf, strlen(buf)) == -1) {
+diff -urNad cyrus-imapd-2.2.13~/timsieved/actions.c cyrus-imapd-2.2.13/timsieved/actions.c
+--- cyrus-imapd-2.2.13~/timsieved/actions.c	2008-04-15 13:11:15.757991591 +0200
++++ cyrus-imapd-2.2.13/timsieved/actions.c	2008-04-15 13:11:16.658068714 +0200
+@@ -364,7 +364,8 @@
+ 
+   if (result != TIMSIEVE_OK) {
+       if (errstr && *errstr) { 
+-	  prot_printf(conn, "NO {%d}\r\n%s\r\n", strlen(errstr), errstr);
++	  prot_printf(conn, "NO {%lu}\r\n%s\r\n",
++			  (unsigned long) strlen(errstr), errstr);
+ 	  free(errstr);
+       } else {
+ 	  if (errstr) free(errstr);
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/85-fix-option-passing.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/85-fix-option-passing.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 85-fix-option-passing.dpatch by Sven Mueller <sven@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad cyrus-imapd-2.2.13~/lib/Makefile.in cyrus-imapd-2.2.13/lib/Makefile.in
+--- cyrus-imapd-2.2.13~/lib/Makefile.in	2007-08-06 21:16:23.419137227 +0200
++++ cyrus-imapd-2.2.13/lib/Makefile.in	2007-08-06 21:23:51.158077242 +0200
+@@ -134,7 +134,7 @@
+ 	$(RANLIB) libcyrus_min.a
+ 
+ imapopts.c: imapoptions $(srcdir)/../tools/config2header
+-	sed -e "s/%IDLE%/$(IDLE)/g" < $(srcdir)/imapoptions | $(srcdir)/../tools/config2header CC=$(CC) $(srcdir)/imapopts.c $(srcdir)/imapopts.h
++	sed -e "s/%IDLE%/$(IDLE)/g" < $(srcdir)/imapoptions | $(srcdir)/../tools/config2header CC="$(CC)" $(srcdir)/imapopts.c $(srcdir)/imapopts.h
+ 
+ imapopts.h: imapopts.c
+ 
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/30-update_perlcalling.sh.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/30-update_perlcalling.sh.dpatch
@@ -0,0 +1,493 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 30_update_perlcalling.sh.dpatch by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: updates calling of the perl interpreter to what we expect in Debian.
+## DP: More precisely: Call /usr/bin/perl directly instead of using some
+## DP: shell magic to locate perl and run it.
+## DP: NOTE: only some script use the "-w" or even the "-T" flag for perl.
+## DP:       This should be the default actually. 
+
+@DPATCH@
+diff -urNad cyrus-imapd-2.2.12/contrib/cyrus-graphtools.1.0/cgi-bin/cyrus_master.pl cyrus-imapd-2.2.12/contrib/cyrus-graphtools.1.0/cgi-bin/cyrus_master.pl
+--- cyrus-imapd-2.2.12/contrib/cyrus-graphtools.1.0/cgi-bin/cyrus_master.pl	2005-05-24 22:13:04.000000000 +0200
++++ cyrus-imapd-2.2.12/contrib/cyrus-graphtools.1.0/cgi-bin/cyrus_master.pl	2005-05-24 22:44:39.039570899 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl5
++#!/usr/bin/perl
+ 
+ #
+ # Created by Alison Greenwald <alison@andrew.cmu.edu> 21 Sep 2000
+diff -urNad cyrus-imapd-2.2.12/contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db-sum.pl cyrus-imapd-2.2.12/contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db-sum.pl
+--- cyrus-imapd-2.2.12/contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db-sum.pl	2005-05-24 22:13:04.000000000 +0200
++++ cyrus-imapd-2.2.12/contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db-sum.pl	2005-05-24 22:44:39.038570809 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl5
++#!/usr/bin/perl
+ 
+ #
+ # Created by Alison Greenwald 21 Sep 2000
+diff -urNad cyrus-imapd-2.2.12/contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db.pl cyrus-imapd-2.2.12/contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db.pl
+--- cyrus-imapd-2.2.12/contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db.pl	2005-05-24 22:13:04.000000000 +0200
++++ cyrus-imapd-2.2.12/contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db.pl	2005-05-24 22:44:39.038570809 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl5 
++#!/usr/bin/perl 
+ 
+ #
+ # Created by Alison Greenwald <alison@andrew.cmu.edu> 21 Sep 2000
+diff -urNad cyrus-imapd-2.2.12/contrib/mupdate-test.pl cyrus-imapd-2.2.12/contrib/mupdate-test.pl
+--- cyrus-imapd-2.2.12/contrib/mupdate-test.pl	2005-05-24 22:13:04.000000000 +0200
++++ cyrus-imapd-2.2.12/contrib/mupdate-test.pl	2005-05-24 22:44:39.048571710 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl
++#!/usr/bin/perl
+ 
+ # Create a workload against a murder frontend
+ # that will give the MUPDATE server a workout.
+diff -urNad cyrus-imapd-2.2.12/perl/imap/examples/auditmbox.pl cyrus-imapd-2.2.12/perl/imap/examples/auditmbox.pl
+--- cyrus-imapd-2.2.12/perl/imap/examples/auditmbox.pl	2005-05-24 22:13:05.000000000 +0200
++++ cyrus-imapd-2.2.12/perl/imap/examples/auditmbox.pl	2005-05-24 22:44:39.058572611 +0200
+@@ -1,4 +1,4 @@
+-#! /usr/bin/perl -w
++#!/usr/bin/perl -w
+ # 
+ # Copyright (c) 2000 Carnegie Mellon University.  All rights reserved.
+ #
+diff -urNad cyrus-imapd-2.2.12/perl/imap/examples/imapcollate.pl cyrus-imapd-2.2.12/perl/imap/examples/imapcollate.pl
+--- cyrus-imapd-2.2.12/perl/imap/examples/imapcollate.pl	2005-05-24 22:13:05.000000000 +0200
++++ cyrus-imapd-2.2.12/perl/imap/examples/imapcollate.pl	2005-05-24 22:44:39.057572521 +0200
+@@ -1,4 +1,4 @@
+-#! /usr/bin/perl -w
++#!/usr/bin/perl -w
+ # 
+ # Copyright (c) 2000 Carnegie Mellon University.  All rights reserved.
+ #
+diff -urNad cyrus-imapd-2.2.12/perl/imap/examples/imapdu.pl cyrus-imapd-2.2.12/perl/imap/examples/imapdu.pl
+--- cyrus-imapd-2.2.12/perl/imap/examples/imapdu.pl	2005-05-24 22:13:05.000000000 +0200
++++ cyrus-imapd-2.2.12/perl/imap/examples/imapdu.pl	2005-05-24 22:44:39.059572701 +0200
+@@ -1,4 +1,4 @@
+-#! /usr/local/bin/perl -w
++#!/usr/bin/perl -w
+ #
+ # $Id: imapdu.pl,v 1.8 2001/11/30 19:30:45 leg Exp $
+ # 
+diff -urNad cyrus-imapd-2.2.12/perl/imap/examples/test-imsp.pl cyrus-imapd-2.2.12/perl/imap/examples/test-imsp.pl
+--- cyrus-imapd-2.2.12/perl/imap/examples/test-imsp.pl	2005-05-24 22:13:05.000000000 +0200
++++ cyrus-imapd-2.2.12/perl/imap/examples/test-imsp.pl	2005-05-24 22:44:39.057572521 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl -w
++#!/usr/bin/perl -w
+ 
+ # test-imsp.pl
+ #
+diff -urNad cyrus-imapd-2.2.12/perl/sieve/scripts/installsieve.pl cyrus-imapd-2.2.12/perl/sieve/scripts/installsieve.pl
+--- cyrus-imapd-2.2.12/perl/sieve/scripts/installsieve.pl	2005-05-24 22:13:05.000000000 +0200
++++ cyrus-imapd-2.2.12/perl/sieve/scripts/installsieve.pl	2005-05-24 22:44:39.061572881 +0200
+@@ -1,6 +1,4 @@
+-#! /bin/sh
+-exec perl -x -S $0 ${1+"$@"} # -*-perl-*-
+-#!perl -w
++#!/usr/bin/perl -w
+ # 
+ # Copyright (c) 2000 Carnegie Mellon University.  All rights reserved.
+ #
+diff -urNad cyrus-imapd-2.2.12/perl/sieve/scripts/sieveshell.pl cyrus-imapd-2.2.12/perl/sieve/scripts/sieveshell.pl
+--- cyrus-imapd-2.2.12/perl/sieve/scripts/sieveshell.pl	2005-05-24 22:13:05.000000000 +0200
++++ cyrus-imapd-2.2.12/perl/sieve/scripts/sieveshell.pl	2005-05-24 22:44:39.062572971 +0200
+@@ -1,6 +1,4 @@
+-#! /bin/sh
+-exec perl -x -S $0 ${1+"$@"} # -*-perl-*-
+-#!perl -w
++#!/usr/bin/perl -w
+ # 
+ # Copyright (c) 2000 Carnegie Mellon University.  All rights reserved.
+ #
+diff -urNad cyrus-imapd-2.2.12/snmp/snmpgen cyrus-imapd-2.2.12/snmp/snmpgen
+--- cyrus-imapd-2.2.12/snmp/snmpgen	2005-05-24 22:13:05.000000000 +0200
++++ cyrus-imapd-2.2.12/snmp/snmpgen	2005-05-24 22:44:39.073573962 +0200
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/usr/bin/perl -w
+ # 
+ # Copyright (c) 2000 Carnegie Mellon University.  All rights reserved.
+ #
+@@ -38,25 +38,8 @@
+ # AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ # OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ #
+-exec perl -x -S $0 ${1+"$@"} # -*-perl-*-
+-#!perl -w
+ # $Id: snmpgen,v 1.18 2005/04/11 06:08:58 shadow Exp $
+ 
+-if ($] !~ /^5\..*/) {
+-  # uh-oh. this isn't perl 5.
+-  foreach (split(/:/, $ENV{PATH})) { # try to find "perl5".
+-    exec("$_/perl5", "-w", "-x", "-S", $0, @ARGV) if (-x "$_/perl5");
+-  }
+-  # we failed. bail.
+-  die "Your perl is too old; I need perl 5.\n";
+-}
+-
+-# load the real script. this is isolated in an 'eval' so perl4 won't
+-# choke on the perl5-isms.
+-eval join("\n", <DATA>);
+-if ($@) { die "$@"; }
+-
+-__END__
+ require 5;
+ 
+ #Tim Martin
+diff -urNad cyrus-imapd-2.2.12/tools/arbitronsort.pl cyrus-imapd-2.2.12/tools/arbitronsort.pl
+--- cyrus-imapd-2.2.12/tools/arbitronsort.pl	2005-05-24 22:13:04.000000000 +0200
++++ cyrus-imapd-2.2.12/tools/arbitronsort.pl	2005-05-24 22:44:39.018569008 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl
++#!/usr/bin/perl
+ 
+ #
+ # This script takes the output of arbitron (run without the -o option)
+diff -urNad cyrus-imapd-2.2.12/tools/config2header cyrus-imapd-2.2.12/tools/config2header
+--- cyrus-imapd-2.2.12/tools/config2header	2005-05-24 22:13:04.000000000 +0200
++++ cyrus-imapd-2.2.12/tools/config2header	2005-05-24 22:44:39.017568918 +0200
+@@ -1,4 +1,5 @@
+-#!/bin/sh
++#!/usr/bin/perl -w
++#
+ # $Id: config2header,v 1.12 2005/04/19 18:54:32 shadow Exp $
+ #
+ # Copyright (c) 2001 Carnegie Mellon University.  All rights reserved.
+@@ -39,24 +40,6 @@
+ # AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ # OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ #
+-exec perl -x -S $0 ${1+"$@"} # -*-perl-*-
+-#!perl -w
+-
+-if ($] !~ /^5\..*/) {
+-  # uh-oh. this isn't perl 5.
+-  foreach (split(/:/, $ENV{PATH})) { # try to find "perl5".
+-    exec("$_/perl5", "-x", "-S", $0, @ARGV) if (-x "$_/perl5");
+-  }
+-  # we failed. bail.
+-  die "Your perl is too old; I need perl 5.\n";
+-}
+-
+-# load the real script. this is isolated in an 'eval' so perl4 won't
+-# choke on the perl5-isms.
+-eval join("\n", <DATA>);
+-if ($@) { die "$@"; }
+-
+-__END__
+ require 5;
+ 
+ use strict;
+diff -urNad cyrus-imapd-2.2.12/tools/config2man cyrus-imapd-2.2.12/tools/config2man
+--- cyrus-imapd-2.2.12/tools/config2man	2005-05-24 22:13:04.000000000 +0200
++++ cyrus-imapd-2.2.12/tools/config2man	2005-05-24 22:44:39.020569188 +0200
+@@ -1,4 +1,5 @@
+-#!/bin/sh
++#!/usr/bin/perl -w
++#
+ # $Id: config2man,v 1.3 2003/12/09 18:33:52 ken3 Exp $
+ #
+ # Copyright (c) 2001 Carnegie Mellon University.  All rights reserved.
+@@ -39,24 +40,6 @@
+ # AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ # OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ #
+-exec perl -x -S $0 ${1+"$@"} # -*-perl-*-
+-#!perl -w
+-
+-if ($] !~ /^5\..*/) {
+-  # uh-oh. this isn't perl 5.
+-  foreach (split(/:/, $ENV{PATH})) { # try to find "perl5".
+-    exec("$_/perl5", "-x", "-S", $0, @ARGV) if (-x "$_/perl5");
+-  }
+-  # we failed. bail.
+-  die "Your perl is too old; I need perl 5.\n";
+-}
+-
+-# load the real script. this is isolated in an 'eval' so perl4 won't
+-# choke on the perl5-isms.
+-eval join("\n", <DATA>);
+-if ($@) { die "$@"; }
+-
+-__END__
+ require 5;
+ 
+ use strict;
+diff -urNad cyrus-imapd-2.2.12/tools/dohash cyrus-imapd-2.2.12/tools/dohash
+--- cyrus-imapd-2.2.12/tools/dohash	2005-05-24 22:13:04.000000000 +0200
++++ cyrus-imapd-2.2.12/tools/dohash	2005-05-24 22:44:39.023569458 +0200
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/usr/bin/perl -w
+ # 
+ # Copyright (c) 2000 Carnegie Mellon University.  All rights reserved.
+ #
+@@ -38,27 +38,10 @@
+ # AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ # OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ #
+-exec perl -x -S $0 ${1+"$@"} # -*-perl-*-
+-#!perl -w
+ # script to upgrade from versions of imapd previous to 1.6.2
+ # make sure you run it as the cyrus user
+ # $Id: dohash,v 1.11 2005/12/01 22:01:12 murch Exp $
+ 
+-if ($] !~ /^5\..*/) {
+-  # uh-oh. this isn't perl 5.
+-  foreach (split(/:/, $ENV{PATH})) { # try to find "perl5".
+-    exec("$_/perl5", "-x", "-S", $0, @ARGV) if (-x "$_/perl5");
+-  }
+-  # we failed. bail.
+-  die "Your perl is too old; I need perl 5.\n";
+-}
+-
+-# load the real script. this is isolated in an 'eval' so perl4 won't
+-# choke on the perl5-isms.
+-eval join("\n", <DATA>);
+-if ($@) { die "$@"; }
+-
+-__END__
+ require 5;
+ 
+ $| = 1;
+diff -urNad cyrus-imapd-2.2.12/tools/masssievec cyrus-imapd-2.2.12/tools/masssievec
+--- cyrus-imapd-2.2.12/tools/masssievec	2005-05-24 22:13:04.000000000 +0200
++++ cyrus-imapd-2.2.12/tools/masssievec	2005-05-24 22:44:39.019569098 +0200
+@@ -1,4 +1,6 @@
+-#!/bin/sh
++#!/usr/bin/perl -w
++# 
++# Script for mass compilation of sieve scripts.
+ # 
+ # Copyright (c) 2000 Carnegie Mellon University.  All rights reserved.
+ #
+@@ -38,28 +40,11 @@
+ # AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ # OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ #
+-exec perl -x -S $0 ${1+"$@"} # -*-perl-*-
+-#!perl -w
+ #
+ # Script for mass compilation of sieve scripts.
+ #
+ # $Id: masssievec,v 1.5 2005/12/01 22:01:12 murch Exp $
+ 
+-if ($] !~ /^5\..*/) {
+-  # uh-oh. this isn't perl 5.
+-  foreach (split(/:/, $ENV{PATH})) { # try to find "perl5".
+-    exec("$_/perl5", "-x", "-S", $0, @ARGV) if (-x "$_/perl5");
+-  }
+-  # we failed. bail.
+-  die "Your perl is too old; I need perl 5.\n";
+-}
+-
+-# load the real script. this is isolated in an 'eval' so perl4 won't
+-# choke on the perl5-isms.
+-eval join("\n", <DATA>);
+-if ($@) { die "$@"; }
+-
+-__END__
+ require 5;
+ 
+ $| = 1;
+diff -urNad cyrus-imapd-2.2.12/tools/mkimap cyrus-imapd-2.2.12/tools/mkimap
+--- cyrus-imapd-2.2.12/tools/mkimap	2005-05-24 22:13:04.000000000 +0200
++++ cyrus-imapd-2.2.12/tools/mkimap	2005-05-24 22:44:39.030570089 +0200
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/usr/bin/perl
+ # 
+ # Copyright (c) 2000 Carnegie Mellon University.  All rights reserved.
+ #
+@@ -38,25 +38,8 @@
+ # AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ # OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ #
+-exec perl -x -S $0 ${1+"$@"} # -*-perl-*-
+-#!perl -w
+ # $Id: mkimap,v 1.17 2005/12/01 19:12:34 murch Exp $
+ 
+-if ($] !~ /^5\..*/) {
+-  # uh-oh. this isn't perl 5.
+-  foreach (split(/:/, $ENV{PATH})) { # try to find "perl5".
+-    exec("$_/perl5", "-x", "-S", $0, @ARGV) if (-x "$_/perl5");
+-  }
+-  # we failed. bail.
+-  die "Your perl is too old; I need perl 5.\n";
+-}
+-
+-# load the real script. this is isolated in an 'eval' so perl4 won't
+-# choke on the perl5-isms.
+-eval join("\n", <DATA>);
+-if ($@) { die "$@"; }
+-
+-__END__
+ require 5;
+ 
+ sub read_conf {
+diff -urNad cyrus-imapd-2.2.12/tools/mknewsgroups cyrus-imapd-2.2.12/tools/mknewsgroups
+--- cyrus-imapd-2.2.12/tools/mknewsgroups	2005-05-24 22:13:04.000000000 +0200
++++ cyrus-imapd-2.2.12/tools/mknewsgroups	2005-05-24 22:44:39.022569368 +0200
+@@ -1,5 +1,8 @@
+-#!/bin/sh
++#!/usr/bin/perl -w
+ # 
++# Create newsgroups on imap server
++# Based on the make_fromactive.pl script by Tim Martin
++#
+ # Copyright (c) 2003 Carnegie Mellon University.  All rights reserved.
+ #
+ # Redistribution and use in source and binary forms, with or without
+@@ -38,29 +41,6 @@
+ # AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ # OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ #
+-exec perl -x -S $0 ${1+"$@"} # -*-perl-*-
+-#!perl -w
+-#
+-# Create newsgroups on imap server
+-# Based on the make_fromactive.pl script by Tim Martin
+-#
+-# $Id: mknewsgroups,v 1.2 2003/10/22 18:03:47 rjs3 Exp $
+-
+-if ($] !~ /^5\..*/) {
+-  # uh-oh. this isn't perl 5.
+-  foreach (split(/:/, $ENV{PATH})) { # try to find "perl5".
+-    exec("$_/perl5", "-x", "-S", $0, @ARGV) if (-x "$_/perl5");
+-  }
+-  # we failed. bail.
+-  die "Your perl is too old; I need perl 5.\n";
+-}
+-
+-# load the real script. this is isolated in an 'eval' so perl4 won't
+-# choke on the perl5-isms.
+-eval join("\n", <DATA>);
+-if ($@) { die "$@"; }
+-
+-__END__
+ require 5;
+ 
+ use Getopt::Long;
+diff -urNad cyrus-imapd-2.2.12/tools/rehash cyrus-imapd-2.2.12/tools/rehash
+--- cyrus-imapd-2.2.12/tools/rehash	2005-05-24 22:13:04.000000000 +0200
++++ cyrus-imapd-2.2.12/tools/rehash	2005-05-24 22:44:39.029569999 +0200
+@@ -1,4 +1,8 @@
+-#!/bin/sh
++#!/usr/bin/perl
++# script to upgrade from simple hashing scheme to full hashing scheme
++# make sure you run it as the cyrus user
++# 
++# Written by Gary Mills <mills@cc.UManitoba.CA>
+ # 
+ # Copyright (c) 2000 Carnegie Mellon University.  All rights reserved.
+ #
+@@ -38,8 +42,6 @@
+ # AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ # OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ #
+-exec perl -x -S $0 ${1+"$@"} # -*-perl-*-
+-#!perl -w
+ # script to upgrade from simple hashing scheme to full hashing scheme
+ # make sure you run it as the cyrus user
+ #
+@@ -47,21 +49,6 @@
+ #
+ # $Id: rehash,v 1.8 2005/12/01 22:01:12 murch Exp $
+ 
+-if ($] !~ /^5\..*/) {
+-  # uh-oh. this isn't perl 5.
+-  foreach (split(/:/, $ENV{PATH})) { # try to find "perl5".
+-    exec("$_/perl5", "-x", "-S", $0, @ARGV) if (-x "$_/perl5");
+-  }
+-  # we failed. bail.
+-  die "Your perl is too old; I need perl 5.\n";
+-}
+-
+-# load the real script. this is isolated in an 'eval' so perl4 won't
+-# choke on the perl5-isms.
+-eval join("\n", <DATA>);
+-if ($@) { die "$@"; }
+-
+-__END__
+ require 5;
+ 
+ $| = 1;
+diff -urNad cyrus-imapd-2.2.12/tools/translatesieve cyrus-imapd-2.2.12/tools/translatesieve
+--- cyrus-imapd-2.2.12/tools/translatesieve	2005-05-24 22:13:04.000000000 +0200
++++ cyrus-imapd-2.2.12/tools/translatesieve	2005-05-24 22:44:39.027569818 +0200
+@@ -1,6 +1,4 @@
+-#!/bin/sh
+-exec perl -x -S $0 ${1+"$@"} # -*-perl-*-
+-#!perl -w
++#!/usr/bin/perl
+ # script to translate sieve scripts to use unixhierarchysep and/or altnamespace
+ # make sure you run it as the cyrus user
+ #!/usr/bin/perl
+@@ -45,21 +43,6 @@
+ # OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ #
+ 
+-if ($] !~ /^5\..*/) {
+-  # uh-oh. this isn't perl 5.
+-  foreach (split(/:/, $ENV{PATH})) { # try to find "perl5".
+-    exec("$_/perl5", "-x", "-S", $0, @ARGV) if (-x "$_/perl5");
+-  }
+-  # we failed. bail.
+-  die "Your perl is too old; I need perl 5.\n";
+-}
+-
+-# load the real script. this is isolated in an 'eval' so perl4 won't
+-# choke on the perl5-isms.
+-eval join("\n", <DATA>);
+-if ($@) { die "$@"; }
+-
+-__END__
+ require 5;
+ 
+ $| = 1;
+diff -urNad cyrus-imapd-2.2.12/tools/undohash cyrus-imapd-2.2.12/tools/undohash
+--- cyrus-imapd-2.2.12/tools/undohash	2005-05-24 22:13:04.000000000 +0200
++++ cyrus-imapd-2.2.12/tools/undohash	2005-05-24 22:44:39.028569908 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl
++#!/usr/bin/perl -w
+ # script to downgrade from cyrus imapd 1.6.2+ to earlier.
+ # do NOT run this script while imapd's are running
+ # $Id: undohash,v 1.8 2005/12/01 22:01:13 murch Exp $
+diff -urNad cyrus-imapd-2.2.12/tools/upgradesieve cyrus-imapd-2.2.12/tools/upgradesieve
+--- cyrus-imapd-2.2.12/tools/upgradesieve	2005-05-24 22:13:04.000000000 +0200
++++ cyrus-imapd-2.2.12/tools/upgradesieve	2005-05-24 22:44:39.021569278 +0200
+@@ -1,6 +1,4 @@
+-#!/bin/sh
+-exec perl -x -S $0 ${1+"$@"} # -*-perl-*-
+-#!perl -w
++#!/usr/bin/perl -w
+ # script to upgrade sievedir from imapd 1.6.13
+ # make sure you run it as the cyrus user
+ #!/usr/bin/perl
+@@ -45,21 +43,6 @@
+ # OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ #
+ 
+-if ($] !~ /^5\..*/) {
+-  # uh-oh. this isn't perl 5.
+-  foreach (split(/:/, $ENV{PATH})) { # try to find "perl5".
+-    exec("$_/perl5", "-x", "-S", $0, @ARGV) if (-x "$_/perl5");
+-  }
+-  # we failed. bail.
+-  die "Your perl is too old; I need perl 5.\n";
+-}
+-
+-# load the real script. this is isolated in an 'eval' so perl4 won't
+-# choke on the perl5-isms.
+-eval join("\n", <DATA>);
+-if ($@) { die "$@"; }
+-
+-__END__
+ require 5;
+ 
+ $| = 1;
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/72-faster-isdigit.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/72-faster-isdigit.dpatch
@@ -0,0 +1,145 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 72-faster-isdigit.dpatch by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Use a smaller (but less intelligent) isdigit() implementation,
+## DP: a simple range-check. Patch backported from:
+## DP: http://cyrus.brong.fastmail.fm/patches/cyrus-isdigit-2.3.3.diff
+
+@DPATCH@
+diff -urNad cyrus-imapd-2.2.13/imap/index.c cyrus-imapd-2.2.13/imap/index.c
+--- cyrus-imapd-2.2.13/imap/index.c	2006-05-24 14:47:49.000000000 +0200
++++ cyrus-imapd-2.2.13/imap/index.c	2006-05-24 14:49:15.509369880 +0200
+@@ -490,8 +490,8 @@
+      */
+     old = seenuids;
+     new = newseenuids;
+-    while (isdigit((int) *old)) oldnext = oldnext * 10 + *old++ - '0';
+-    while (isdigit((int) *new)) newnext = newnext * 10 + *new++ - '0';
++    while (cyrus_isdigit((int) *old)) oldnext = oldnext * 10 + *old++ - '0';
++    while (cyrus_isdigit((int) *new)) newnext = newnext * 10 + *new++ - '0';
+ 
+     for (msgno = 1; msgno <= imapd_exists; msgno++) {
+ 	uid = UID(msgno);
+@@ -505,7 +505,7 @@
+ 		oldnext = 0;
+ 		if (!*old) oldnext = mailbox->last_uid+1;
+ 		else old++;
+-		while (isdigit((int) *old)) {
++		while (cyrus_isdigit((int) *old)) {
+ 		    oldnext = oldnext * 10 + *old++ - '0';
+ 		}
+ 		oldnext += oldseen;
+@@ -524,7 +524,7 @@
+ 		    neweof++;
+ 		}
+ 		else new++;
+-		while (isdigit((int) *new)) {
++		while (cyrus_isdigit((int) *new)) {
+ 		    newnext = newnext * 10 + *new++ - '0';
+ 		}
+ 		newnext += newseen;
+@@ -643,7 +643,7 @@
+ 		neweof++;
+ 	    }
+ 	    else new++;
+-	    while (isdigit((int) *new)) newnext = newnext * 10 + *new++ - '0';
++	    while (cyrus_isdigit((int) *new)) newnext = newnext * 10 + *new++ - '0';
+ 	    newnext += newseen;
+ 	}
+     }
+@@ -661,7 +661,7 @@
+ 		/* There's a ":M" after the ",N".  Parse/include that too. */
+ 		new++;
+ 		newnext = 0;
+-		while (isdigit((int) *new)) newnext = newnext * 10 + *new++ - '0';
++		while (cyrus_isdigit((int) *new)) newnext = newnext * 10 + *new++ - '0';
+ 	    }
+ 	    uid = newnext;
+ 	    newseen++;		/* Forget we parsed ",N" */
+@@ -1504,7 +1504,7 @@
+     }
+ 
+     for (;;) {
+-	if (isdigit((int) *sequence)) {
++	if (cyrus_isdigit((int) *sequence)) {
+ 	    start = start*10 + *sequence - '0';
+ 	}
+ 	else if (*sequence == '*') {
+@@ -1513,7 +1513,7 @@
+ 	else if (*sequence == ':') {
+ 	    end = 0;
+ 	    sequence++;
+-	    while (isdigit((int) *sequence)) {
++	    while (cyrus_isdigit((int) *sequence)) {
+ 		end = end*10 + *sequence++ - '0';
+ 	    }
+ 	    if (*sequence == '*') {
+@@ -1571,7 +1571,7 @@
+     unsigned i, start = 0, end;
+ 
+     for (;;) {
+-	if (isdigit((int) *sequence)) {
++	if (cyrus_isdigit((int) *sequence)) {
+ 	    start = start*10 + *sequence - '0';
+ 	}
+ 	else if (*sequence == '*') {
+@@ -1581,7 +1581,7 @@
+ 	else if (*sequence == ':') {
+ 	    end = 0;
+ 	    sequence++;
+-	    while (isdigit((int) *sequence)) {
++	    while (cyrus_isdigit((int) *sequence)) {
+ 		end = end*10 + *sequence++ - '0';
+ 	    }
+ 	    if (*sequence == '*') {
+@@ -1705,7 +1705,7 @@
+     while (*p != ']' && *p != 'M') {
+ 	/* Generate the actual part number */
+ 	skip = 0;
+-	while (isdigit((int) *p)) {
++	while (cyrus_isdigit((int) *p)) {
+             skip = skip * 10 + *p++ - '0';
+             /* xxx overflow */
+         }
+@@ -1834,7 +1834,7 @@
+ 
+     while (*p != 'H') {
+ 	skip = 0;
+-	while (isdigit((int) *p)) {
++	while (cyrus_isdigit((int) *p)) {
+             skip = skip * 10 + *p++ - '0';
+             /* xxx overflow */
+         }
+@@ -3378,7 +3378,7 @@
+ 	case '{':			/* literal */
+ 	    c++;			/* skip open brace */
+ 	    len = 0;			/* determine length of literal */
+-	    while (isdigit((int) *c)) {
++	    while (cyrus_isdigit((int) *c)) {
+ 		len = len*10 + *c - '0';
+ 		c++;
+ 	    }
+@@ -3532,7 +3532,7 @@
+ 			break;
+ 		    			/* if we have a digit, and we're still
+ 					   counting, keep building the count */
+-		    } else if (isdigit((int) *x) && count != -1) {
++		    } else if (cyrus_isdigit((int) *x) && count != -1) {
+ 			count = count * 10 + *x - '0';
+                         if (count < 0) {                /* overflow */
+                             count = -1; /* abort counting */
+diff -urNad cyrus-imapd-2.2.13/lib/util.h cyrus-imapd-2.2.13/lib/util.h
+--- cyrus-imapd-2.2.13/lib/util.h	2005-03-12 23:09:22.000000000 +0100
++++ cyrus-imapd-2.2.13/lib/util.h	2006-05-24 14:48:36.634022360 +0200
+@@ -107,4 +107,10 @@
+  */
+ extern int cyrus_mkdir(const char *path, mode_t mode);
+ 
++/* Some systems have very inefficient implementations of isdigit,
++ * and we use it in a lot of inner loops
++ */
++
++#define cyrus_isdigit(x) ((x) >= '0' && (x) <= '9')
++
+ #endif /* INCLUDED_UTIL_H */
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/90-add-sasl-options-docs.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/90-add-sasl-options-docs.dpatch
@@ -0,0 +1,29 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 90-add-sasl-options-docs.dpatch by Sven Mueller <sven@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad cyrus-imapd-2.2.13~/lib/imapoptions cyrus-imapd-2.2.13/lib/imapoptions
+--- cyrus-imapd-2.2.13~/lib/imapoptions	2008-04-15 12:59:05.287411927 +0200
++++ cyrus-imapd-2.2.13/lib/imapoptions	2008-04-15 12:59:05.403421868 +0200
+@@ -755,12 +755,15 @@
+ 
+ { "sasl_maximum_layer", 256, INT }
+ /* Maximum SSF (security strength factor) that the server will allow a
+-   client to negotiate. */
++   client to negotiate. This corresponds to the max_ssf option of libsasl.
++   Please check the libsasl documentation for available values. */
+ 
+ { "sasl_minimum_layer", 0, INT }
+ /* The minimum SSF that the server will allow a client to negotiate.
+-   A value of 1 requires integrity protection; any higher value  
+-   requires some amount of encryption. */
++   A value of 1 requires integrity protection (i.e. checksums); any higher
++   value requires some amount of encryption. This corresponds to the min_ssf
++   option of libsasl. Please check libsasl documentation for available
++   values. */
+ 
+ # Commented out - used by libsasl
+ # { "sasl_option", 0, STRING }
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/77-change-missing-sieve-notice.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/77-change-missing-sieve-notice.dpatch
@@ -0,0 +1,32 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 77-change-missing-sieve-notice.dpatch.dpatch by Sven Mueller <sven@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Change the wording of sieved's notice when a user's default sieve
+## DP: script is missing
+
+@DPATCH@
+diff -urNad cyrus-imapd-2.2.13/sieve/script.c cyrus-imapd-2.2.13/sieve/script.c
+--- cyrus-imapd-2.2.13/sieve/script.c	2005-03-12 23:09:22.000000000 +0100
++++ cyrus-imapd-2.2.13/sieve/script.c	2006-08-21 23:31:25.979899091 +0200
+@@ -37,6 +37,7 @@
+ #include <sys/types.h>
+ #include <unistd.h>
+ #include <assert.h>
++#include <errno.h>
+ 
+ #include "xmalloc.h"
+ 
+@@ -418,7 +419,11 @@
+     if (!fname || !ret) return SIEVE_FAIL;
+     
+     if (stat(fname, &sbuf) == -1) {
+-	syslog(LOG_DEBUG, "IOERROR: fstating sieve script %s: %m", fname);
++	if (errno == ENOENT) {
++		syslog(LOG_DEBUG, "WARNING: sieve script %s doesn't exist: %m", fname);
++	} else {
++		syslog(LOG_DEBUG, "IOERROR: fstating sieve script %s: %m", fname);
++	}
+ 	return SIEVE_FAIL;
+     }
+ 
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/14-xmalloc.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/14-xmalloc.dpatch
@@ -0,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 14-xmalloc.dpatch by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix xmalloc usage
+
+@DPATCH@
+diff -urNad complete.dpatch/lib/map_stupidshared.c complete.dpatch/lib/map_stupidshared.c
+--- complete.dpatch/lib/map_stupidshared.c	2003-10-22 20:50:12.000000000 +0200
++++ complete.dpatch/lib/map_stupidshared.c	2005-11-11 14:29:02.586035529 +0100
+@@ -52,6 +52,7 @@
+ #include <sys/stat.h>
+ #include <syslog.h>
+ 
++#include "xmalloc.h"
+ #include "map.h"
+ #include "exitcodes.h"
+ 
+diff -urNad complete.dpatch/lib/xmalloc.h complete.dpatch/lib/xmalloc.h
+--- complete.dpatch/lib/xmalloc.h	2003-10-22 20:50:12.000000000 +0200
++++ complete.dpatch/lib/xmalloc.h	2005-11-11 14:29:30.174327237 +0100
+@@ -65,7 +65,7 @@
+ 
+ /* Functions using xmalloc.h must provide a function called fatal() conforming
+    to the following: */
+-extern void fatal(const char *fatal_message, int fatal_code);
+-/*   __attribute__ ((noreturn));*/
++extern void fatal(const char *fatal_message, int fatal_code)
++   __attribute__ ((noreturn));
+ 
+ #endif /* INCLUDED_XMALLOC_H */
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/75-update-imapd.conf-documentation.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/75-update-imapd.conf-documentation.dpatch
@@ -0,0 +1,42 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 75-update-imapd.conf-documentation.dpatch by Sven Mueller <sven@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: update imapd.conf option descriptions to be a bit more verbose about
+## DP: supported option names
+
+@DPATCH@
+diff -urNad cyrus-imapd-2.2.13/lib/imapoptions cyrus-imapd-2.2.13/lib/imapoptions
+--- cyrus-imapd-2.2.13/lib/imapoptions	2006-08-02 23:15:02.000000000 +0200
++++ cyrus-imapd-2.2.13/lib/imapoptions	2006-08-02 23:17:59.362341706 +0200
+@@ -69,7 +69,10 @@
+ \fB/etc/imapd.conf\fR file, and show each option's default value.
+ Some options have no default value, these are listed with
+ ``<no default>''.  Some options default to the empty string, these
+-are listed with ``<none>''.
++are listed with ``<none>''. It is also possible to override options by
++specifying them as <service_id>_<optionname>. One example is ``lmtp_admins'',
++which overrides ``admins'' just for the lmtp service. The <service_id> is the
++one you specified in the \fB/etc/cyrus.conf\fR file.
+ */
+ 
+ # OPTIONS
+@@ -122,7 +125,17 @@
+   enabled when absolutely necessary. */
+ 
+ { "allowplaintext", 1, SWITCH }
+-/* Allow the use of cleartext passwords on the wire. */
++/* Allow the use of cleartext passwords on the wire.
++.PP
++  To disallow the use of plaintext passwords for authentication, you can
++  set ``allowplaintext: no'' in imapd.conf. This will still allow PLAIN
++  under TLS, but IMAP LOGIN commands will now fail.
++.PP
++  If you only list plaintext authentication mechanisms in ``sasl_mech_list''
++  and set ``allowplaintext: no'', only users on encrypted sessions (TLS or
++  SSL) will be able to authenticate. On the other hand, if you list no
++  plaintext authentication options in ``sasl_mech_list'',
++  ``allowplaintext: yes'' would have no effect. */
+    
+ { "allowusermoves", 0, SWITCH }
+ /* Allow moving user accounts (with associated meta-data) via RENAME
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/50-fix-imclient-manpage.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/50-fix-imclient-manpage.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50-fix-imclient-manpage.dpatch by Sven Mueller <sven@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix formatting of imclient manpage
+
+@DPATCH@
+diff -urNad cyrus-imapd-2.2-2.2.13~/man/imclient.3 cyrus-imapd-2.2-2.2.13/man/imclient.3
+--- cyrus-imapd-2.2-2.2.13~/man/imclient.3	2005-04-11 07:48:28.000000000 +0200
++++ cyrus-imapd-2.2-2.2.13/man/imclient.3	2009-09-08 09:24:19.651356667 +0200
+@@ -41,7 +41,7 @@
+ .\" $Id: imclient.3,v 1.11 2005/04/11 05:48:28 shadow Exp $
+ 
+ .SH NAME
+-imclient library - authenticating callback interface to IMAP/IMSP servers
++imclient \- (library) authenticating callback interface to IMAP/IMSP servers
+ .SH SYNOPSIS
+ .ad l
+ .ft B
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/0018-upstream-ntohl-instead-of-htonl.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/0018-upstream-ntohl-instead-of-htonl.dpatch
@@ -0,0 +1,50 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 0018-upstream-ntohl-instead-of-htonl by murch@andrew.cmu.edu
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: use ntohl() instead of htonl() in mailbox_read_index_record()
+
+@DPATCH@
+diff -urNad cyrus-imapd-2.2.13/imap/mailbox.c cyrus-imapd-2.2.13/imap/mailbox.c
+--- cyrus-imapd-2.2.13/imap/mailbox.c	2006-08-06 20:03:02.000000000 +0200
++++ cyrus-imapd-2.2.13/imap/mailbox.c	2006-08-06 20:03:13.168502599 +0200
+@@ -1,5 +1,5 @@
+ /* mailbox.c -- Mailbox manipulation routines
+- * $Id: mailbox.c,v 1.161 2006/06/02 18:56:52 murch Exp $
++ * $Id: mailbox.c,v 1.162 2006/08/04 14:40:54 murch Exp $
+  * Copyright (c) 1998-2003 Carnegie Mellon University.  All rights reserved.
+  *
+  * Redistribution and use in source and binary forms, with or without
+@@ -884,20 +884,20 @@
+ 
+     buf = (unsigned char*) mailbox->index_base + offset;
+ 
+-    record->uid = htonl(*((bit32 *)(buf+OFFSET_UID)));
+-    record->internaldate = htonl(*((bit32 *)(buf+OFFSET_INTERNALDATE)));
+-    record->sentdate = htonl(*((bit32 *)(buf+OFFSET_SENTDATE)));
+-    record->size = htonl(*((bit32 *)(buf+OFFSET_SIZE)));
+-    record->header_size = htonl(*((bit32 *)(buf+OFFSET_HEADER_SIZE)));
+-    record->content_offset = htonl(*((bit32 *)(buf+OFFSET_CONTENT_OFFSET)));
+-    record->cache_offset = htonl(*((bit32 *)(buf+OFFSET_CACHE_OFFSET)));
+-    record->last_updated = htonl(*((bit32 *)(buf+OFFSET_LAST_UPDATED)));
+-    record->system_flags = htonl(*((bit32 *)(buf+OFFSET_SYSTEM_FLAGS)));
++    record->uid = ntohl(*((bit32 *)(buf+OFFSET_UID)));
++    record->internaldate = ntohl(*((bit32 *)(buf+OFFSET_INTERNALDATE)));
++    record->sentdate = ntohl(*((bit32 *)(buf+OFFSET_SENTDATE)));
++    record->size = ntohl(*((bit32 *)(buf+OFFSET_SIZE)));
++    record->header_size = ntohl(*((bit32 *)(buf+OFFSET_HEADER_SIZE)));
++    record->content_offset = ntohl(*((bit32 *)(buf+OFFSET_CONTENT_OFFSET)));
++    record->cache_offset = ntohl(*((bit32 *)(buf+OFFSET_CACHE_OFFSET)));
++    record->last_updated = ntohl(*((bit32 *)(buf+OFFSET_LAST_UPDATED)));
++    record->system_flags = ntohl(*((bit32 *)(buf+OFFSET_SYSTEM_FLAGS)));
+     for (n = 0; n < MAX_USER_FLAGS/32; n++) {
+-	record->user_flags[n] = htonl(*((bit32 *)(buf+OFFSET_USER_FLAGS+4*n)));
++	record->user_flags[n] = ntohl(*((bit32 *)(buf+OFFSET_USER_FLAGS+4*n)));
+     }
+-    record->content_lines = htonl(*((bit32 *)(buf+OFFSET_CONTENT_LINES)));
+-    record->cache_version = htonl(*((bit32 *)(buf+OFFSET_CACHE_VERSION)));
++    record->content_lines = ntohl(*((bit32 *)(buf+OFFSET_CONTENT_LINES)));
++    record->cache_version = ntohl(*((bit32 *)(buf+OFFSET_CACHE_VERSION)));
+     return 0;
+ }
+ 
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/series
+++ cyrus-imapd-2.2-2.2.13/debian/patches/series
@@ -0,0 +1,76 @@
+0001-upstream-fix-segfault.dpatch
+0002-allow_invalid_id_acl_removal.dpatch
+0003-upstream_disallow_userprobes.dpatch
+0004-upstream-fetchnews-timezone-dst-fix.dpatch
+0005-upstream-fix-ctl_mboxlist-dump-undump.dpatch
+0006-upstream-free-backend-fix.dpatch
+0007-upstream-remove-undump-size-limit.dpatch
+0008-upstream-better-message-track-logging.dpatch
+0009-upstream-remove-redundant-wildcard-check.dpatch
+0010-upstream-fix-libRSAglue-linkage.dpatch
+0011-upstream-allow-compile-with-krb5-1.4.3.dpatch
+0012-upstream-sasl-2.2.22-comapatibility-fix.dpatch
+0013-upstream-allow-report-above-4GB-mboxsize.dpatch
+0014-upstream-fix-locks-during-reconstruction.dpatch
+0015-upstream-fix-logic-error-in-imapoptions.dpatch
+0016-upstream-fix-typos.dpatch
+0017-upstream-no-body-empty-string-instead-of-null.dpatch
+0018-upstream-ntohl-instead-of-htonl.dpatch
+# Disabled for bug #400747
+# 0019-upstream-sieve_allowreferrals.dpatch
+0020-upstream-client-literal-prefix.dpatch
+0021-upstream-applied_RFC4314_READ-ONLY_logic.dpatch
+0022-upstream-dont-send-empty-literal-response.dpatch
+0023-sort-illegal-dates-first.dpatch
+0024-upstream-fix-sieve.dpatch
+0025-upstream-fix-cve-2009-3235.dpatch
+0090-fix-casts.dpatch
+01-fix_Makefile.in.dpatch
+02-add_mkinstalldirs.dpatch
+03-fix_docs.dpatch
+04-add_autogen.sh.dpatch
+05-fix_programnames.dpatch
+06-disable_runpath.dpatch
+07-update_aclocal_and_configure.in.dpatch
+08-clean_socket_closes.dpatch
+09-kerberos-ipv4-ipv6-kludge-removal.dpatch
+10-fix_potential_overflows.dpatch
+11-fix_syslog_prefix.dpatch
+12-fix_timeout_handling.dpatch
+13-master_process_handling.dpatch
+14-xmalloc.dpatch
+15-munge_8bit.dpatch
+16-fix_mib.dpatch
+17-fix_tail_syntax_in_xversion.h.dpatch
+18-fix_strlen_return_type.dpatch
+19-fix_tls_ssl.dpatch
+21-fix_config-parsing.dpatch
+22-imapd_index_check.dpatch
+23-configurable_idled.dpatch
+24-configurable-referrals.dpatch
+25-update_install-sh.dpatch
+26-local-getline.dpatch
+30-update_perlcalling.sh.dpatch
+35-masssievec_remove_unused_variable.dpatch
+40-rehash_fix_pathes.dpatch
+45-kolab2-annotations.dpatch
+50-fix-imclient-manpage.dpatch
+61-64bit-quota.dpatch
+65-sieveshell-enhancements.dpatch
+70-fix_readme_link.dpatch
+70-allow-larger-buffers.dpatch
+72-faster-isdigit.dpatch
+75-update-imapd.conf-documentation.dpatch
+77-change-missing-sieve-notice.dpatch
+80-kbsd-no-psstrings.dpatch
+85-fix-option-passing.dpatch
+90-add-sasl-options-docs.dpatch
+# optional patch: Allow upload of mails with "From " headers
+# 82-allow-from_-header.dpatch
+99-berkelydb-4.8.dpatch
+99-update-autoconf.dpatch
+87-STARTTLS_vulnerability_fix.patch
+88-fix_infinite_loop_in_index.c.patch
+CVE-2011-3208.patch
+fix-authentication-bypass-in-nntpd.patch
+CVE-2011-3481.dpatch
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/02-add_mkinstalldirs.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/02-add_mkinstalldirs.dpatch
@@ -0,0 +1,160 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02-add_mkinstalldirs.dpatch by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: add mkinstalldirs
+
+@DPATCH@
+--- /dev/null
++++ b/mkinstalldirs
+@@ -0,0 +1,150 @@
++#! /bin/sh
++# mkinstalldirs --- make directory hierarchy
++
++scriptversion=2005-02-02.21
++
++# Original author: Noah Friedman <friedman@prep.ai.mit.edu>
++# Created: 1993-05-16
++# Public domain.
++#
++# This file is maintained in Automake, please report
++# bugs to <bug-automake@gnu.org> or send patches to
++# <automake-patches@gnu.org>.
++
++errstatus=0
++dirmode=""
++
++usage="\
++Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
++
++Create each directory DIR (with mode MODE, if specified), including all
++leading file name components.
++
++Report bugs to <bug-automake@gnu.org>."
++
++# process command line arguments
++while test $# -gt 0 ; do
++  case $1 in
++    -h | --help | --h*)         # -h for help
++      echo "$usage"
++      exit $?
++      ;;
++    -m)                         # -m PERM arg
++      shift
++      test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
++      dirmode=$1
++      shift
++      ;;
++    --version)
++      echo "$0 $scriptversion"
++      exit $?
++      ;;
++    --)                         # stop option processing
++      shift
++      break
++      ;;
++    -*)                         # unknown option
++      echo "$usage" 1>&2
++      exit 1
++      ;;
++    *)                          # first non-opt arg
++      break
++      ;;
++  esac
++done
++
++for file
++do
++  if test -d "$file"; then
++    shift
++  else
++    break
++  fi
++done
++
++case $# in
++  0) exit 0 ;;
++esac
++
++# Solaris 8's mkdir -p isn't thread-safe.  If you mkdir -p a/b and
++# mkdir -p a/c at the same time, both will detect that a is missing,
++# one will create a, then the other will try to create a and die with
++# a "File exists" error.  This is a problem when calling mkinstalldirs
++# from a parallel make.  We use --version in the probe to restrict
++# ourselves to GNU mkdir, which is thread-safe.
++case $dirmode in
++  '')
++    if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
++      echo "mkdir -p -- $*"
++      exec mkdir -p -- "$@"
++    else
++      # On NextStep and OpenStep, the `mkdir' command does not
++      # recognize any option.  It will interpret all options as
++      # directories to create, and then abort because `.' already
++      # exists.
++      test -d ./-p && rmdir ./-p
++      test -d ./--version && rmdir ./--version
++    fi
++    ;;
++  *)
++    if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
++       test ! -d ./--version; then
++      echo "mkdir -m $dirmode -p -- $*"
++      exec mkdir -m "$dirmode" -p -- "$@"
++    else
++      # Clean up after NextStep and OpenStep mkdir.
++      for d in ./-m ./-p ./--version "./$dirmode";
++      do
++        test -d $d && rmdir $d
++      done
++    fi
++    ;;
++esac
++
++for file
++do
++  set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
++  shift
++
++  pathcomp=
++  for d
++  do
++    pathcomp="$pathcomp$d"
++    case $pathcomp in
++      -*) pathcomp=./$pathcomp ;;
++    esac
++
++    if test ! -d "$pathcomp"; then
++      echo "mkdir $pathcomp"
++
++      mkdir "$pathcomp" || lasterr=$?
++
++      if test ! -d "$pathcomp"; then
++	errstatus=$lasterr
++      else
++	if test ! -z "$dirmode"; then
++	  echo "chmod $dirmode $pathcomp"
++	  lasterr=""
++	  chmod "$dirmode" "$pathcomp" || lasterr=$?
++
++	  if test ! -z "$lasterr"; then
++	    errstatus=$lasterr
++	  fi
++	fi
++      fi
++    fi
++
++    pathcomp="$pathcomp/"
++  done
++done
++
++exit $errstatus
++
++# Local Variables:
++# mode: shell-script
++# sh-indentation: 2
++# eval: (add-hook 'write-file-hooks 'time-stamp)
++# time-stamp-start: "scriptversion="
++# time-stamp-format: "%:y-%02m-%02d.%02H"
++# time-stamp-end: "$"
++# End:
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/80-kbsd-no-psstrings.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/80-kbsd-no-psstrings.dpatch
@@ -0,0 +1,34 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 80-kbsd-no-psstring
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: disable PS_STRINGS for GNU/kFreeBSD
+
+@DPATCH@
+diff -urNad cyrus-imapd-2.2.13/configure.in cyrus-imapd-2.2.13/configure.in
+--- cyrus-imapd-2.2.13/configure.in	2006-09-25 20:13:04.000000000 +0200
++++ cyrus-imapd-2.2.13/configure.in	2006-09-25 20:13:06.102258297 +0200
+@@ -297,16 +297,15 @@
+ fi
+ if test "$spt_type" = ""; then
+ 	AC_MSG_CHECKING(for PS_STRINGS)
+-	AC_CACHE_VAL(cyrus_cv_sys_psstrings, AC_TRY_CPP([
++AC_CACHE_VAL(cyrus_cv_sys_psstrings, AC_COMPILE_IFELSE([
+ #include <machine/vmparam.h>
+ #include <sys/exec.h>
+-#ifndef PS_STRINGS
+-#include </nonexistent>
+-#endif],cyrus_cv_sys_psstrings=yes,cyrus_cv_sys_psstrings=no))
+-	if test $cyrus_cv_sys_psstrings = yes; then
+-		spt_type=SPT_PSSTRINGS
+-	fi
+-	AC_MSG_RESULT($cyrus_cv_sys_psstrings)
++void *p = PS_STRINGS;
++],cyrus_cv_sys_psstrings=yes,cyrus_cv_sys_psstrings=no))
++         if test $cyrus_cv_sys_psstrings = yes; then
++                 spt_type=SPT_PSSTRINGS
++         fi
++         AC_MSG_RESULT($cyrus_cv_sys_psstrings)
+ fi
+ if test "$spt_type" = ""; then
+ 	AC_MSG_CHECKING(for SCO)
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/45-kolab2-annotations.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/45-kolab2-annotations.dpatch
@@ -0,0 +1,155 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 45-kolab2-annotations.dpatch by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Add kolab2 compatible annotation functionality
+
+@DPATCH@
+diff -urNad cyrus-imapd-2.2.13/imap/annotate.c cyrus-imapd-2.2.13/imap/annotate.c
+--- cyrus-imapd-2.2.13/imap/annotate.c	2006-09-26 21:33:43.000000000 +0200
++++ cyrus-imapd-2.2.13/imap/annotate.c	2006-09-26 21:33:53.973964626 +0200
+@@ -1673,6 +1673,11 @@
+     { NULL, 0, ANNOTATION_PROXY_T_INVALID, 0, 0, NULL, NULL }
+ };
+ 
++const struct annotate_st_entry vendor_entry =
++    { NULL, ATTRIB_TYPE_STRING, BACKEND_ONLY,
++      ATTRIB_VALUE_SHARED | ATTRIB_VALUE_PRIV,
++      ACL_ADMIN, annotation_set_todb, NULL };
++
+ int annotatemore_store(char *mailbox,
+ 		       struct entryattlist *l,
+ 		       struct namespace *namespace,
+@@ -1685,6 +1690,7 @@
+     struct attvaluelist *av;
+     struct storedata sdata;
+     const struct annotate_st_entry *entries;
++    struct annotate_st_entry * working_entry;
+     time_t now = time(0);
+ 
+     memset(&sdata, 0, sizeof(struct storedata));
+@@ -1706,37 +1712,55 @@
+     while (e) {
+ 	int entrycount, attribs;
+ 	struct annotate_st_entry_list *nentry = NULL;
++	struct annotate_st_entry *ientry = NULL;
+ 
+ 	/* See if we support this entry */
++	working_entry = NULL;
+ 	for (entrycount = 0;
+ 	     entries[entrycount].name;
+ 	     entrycount++) {
+ 	    if (!strcmp(e->entry, entries[entrycount].name)) {
++	        working_entry = &(entries[entrycount]);
+ 		break;
+ 	    }
+ 	}
+-	if (!entries[entrycount].name) {
+-	    /* unknown annotation */
+-	    return IMAP_PERMISSION_DENIED;
++	if (working_entry==NULL) {
++	    /* test for generic vendor annotation */
++	    if ((strncmp("/vendor/", e->entry, strlen("/vendor/"))==0) &&
++	        (strlen(e->entry)>strlen("/vendor/"))) {
++	      working_entry = &(vendor_entry);
++	    }
++	    else {
++	        /* unknown annotation */
++	        return IMAP_PERMISSION_DENIED;
++	    }
+ 	}
+ 
+ 	/* Add this entry to our list only if it
+ 	   applies to our particular server type */
+-	if (entries[entrycount].proxytype == PROXY_AND_BACKEND
++	if (working_entry->proxytype == PROXY_AND_BACKEND
+ 	    || (proxy_store_func &&
+-		entries[entrycount].proxytype == PROXY_ONLY)
++		working_entry->proxytype == PROXY_ONLY)
+ 	    || (!proxy_store_func &&
+-		entries[entrycount].proxytype == BACKEND_ONLY)) {
++		working_entry->proxytype == BACKEND_ONLY)) {
++            ientry = xzmalloc(sizeof(struct annotate_st_entry));
++            ientry->name = e->entry;
++            ientry->type = working_entry->type;
++            ientry->proxytype = working_entry->proxytype;
++            ientry->attribs = working_entry->attribs;
++            ientry->acl = working_entry->acl;
++            ientry->set = working_entry->set;
++            ientry->rock = working_entry->rock;	
+ 	    nentry = xzmalloc(sizeof(struct annotate_st_entry_list));
+ 	    nentry->next = sdata.entry_list;
+-	    nentry->entry = &(entries[entrycount]);
++	    nentry->entry = ientry;
+ 	    nentry->shared.modifiedsince = now;
+ 	    nentry->priv.modifiedsince = now;
+ 	    sdata.entry_list = nentry;
+ 	}
+ 
+ 	/* See if we are allowed to set the given attributes. */
+-	attribs = entries[entrycount].attribs;
++	attribs = working_entry->attribs;
+ 	av = e->attvalues;
+ 	while (av) {
+ 	    const char *value;
+@@ -1746,7 +1770,7 @@
+ 		    goto cleanup;
+ 		}
+ 		value = annotate_canon_value(av->value,
+-					     entries[entrycount].type);
++					     working_entry->type);
+ 		if (!value) {
+ 		    r = IMAP_ANNOTATION_BADVALUE;
+ 		    goto cleanup;
+@@ -1772,7 +1796,7 @@
+ 		    goto cleanup;
+ 		}
+ 		value = annotate_canon_value(av->value,
+-					     entries[entrycount].type);
++					     working_entry->type);
+ 		if (!value) {
+ 		    r = IMAP_ANNOTATION_BADVALUE;
+ 		    goto cleanup;
+@@ -1874,6 +1898,12 @@
+     /* Free the entry list */
+     while (sdata.entry_list) {
+ 	struct annotate_st_entry_list *freeme = sdata.entry_list;
++	if (freeme != NULL){
++	    struct annotate_st_entry *freeme2 = freeme->entry;
++	    if (freeme2 != NULL) {
++	        free( freeme2 );
++	    }
++	}
+ 	sdata.entry_list = sdata.entry_list->next;
+ 	free(freeme);
+     }
+diff -urNad cyrus-imapd-2.2.13/perl/imap/IMAP/Admin.pm cyrus-imapd-2.2.13/perl/imap/IMAP/Admin.pm
+--- cyrus-imapd-2.2.13/perl/imap/IMAP/Admin.pm	2006-09-25 20:41:19.000000000 +0200
++++ cyrus-imapd-2.2.13/perl/imap/IMAP/Admin.pm	2006-09-26 21:34:36.112138623 +0200
+@@ -784,19 +784,21 @@
+ 		 "news2mail" => "/vendor/cmu/cyrus-imapd/news2mail",
+ 		 "expire" => "/vendor/cmu/cyrus-imapd/expire",
+ 		 "sieve" => "/vendor/cmu/cyrus-imapd/sieve",
+-		 "squat" => "/vendor/cmu/cyrus-imapd/squat" );
++		 "squat" => "/vendor/cmu/cyrus-imapd/squat",
++ 		 "folder-type" => "/vendor/kolab/folder-type",
++ 		 "h-share-uid" => "/vendor/kolab/h-share-uid" );
+ 
+   if(!$self->{support_annotatemore}) {
+     $self->{error} = "Remote does not support ANNOTATEMORE.";
+     return undef;
+   }
+ 
+-  if(!exists($values{$entry})) {
+-    $self->{error} = "Unknown parameter $entry";
++  if(exists($values{$entry})) {
++    $entry = $values{$entry};
++  } else {
++    $self->{error} = "Unknown parameter $entry" unless substr($entry,0,1) eq "/";
+   }
+ 
+-  $entry = $values{$entry};
+-
+   my ($rc, $msg);
+ 
+   $value = undef if($value eq "none");
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/99-update-autoconf.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/99-update-autoconf.dpatch
@@ -0,0 +1,23468 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 99-update-autoconf.dpatch by Ondrej Sury <ondrej@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Update configure and config.h.in according to changes in other patches
+## DP: (64bit-quota and potentially DRAC)
+
+@DPATCH@
+--- a/config.h.in
++++ b/config.h.in
+@@ -85,6 +85,10 @@
+ /* Define to 1 if you have the `daemon' function. */
+ #undef HAVE_DAEMON
+ 
++/* Define to 1 if you have the declaration of `tzname', and to 0 if you don't.
++   */
++#undef HAVE_DECL_TZNAME
++
+ /* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
+    */
+ #undef HAVE_DIRENT_H
+@@ -153,8 +157,8 @@
+ /* Do we have TCP wrappers? */
+ #undef HAVE_LIBWRAP
+ 
+-/* Define to 1 if you support file names longer than 14 characters. */
+-#undef HAVE_LONG_FILE_NAMES
++/* Does the compiler support long long int? */
++#undef HAVE_LONG_LONG_INT
+ 
+ /* Define to 1 if you have the `memmove' function. */
+ #undef HAVE_MEMMOVE
+@@ -310,9 +314,15 @@
+ /* Directiory to use for service binaries */
+ #undef SERVICE_PATH
+ 
+-/* The size of a `long', as computed by sizeof. */
++/* The size of `long', as computed by sizeof. */
+ #undef SIZEOF_LONG
+ 
++/* The size of `long long int', as computed by sizeof. */
++#undef SIZEOF_LONG_LONG_INT
++
++/* The size of `unsigned long long int', as computed by sizeof. */
++#undef SIZEOF_UNSIGNED_LONG_LONG_INT
++
+ /* Do we already have setproctitle? */
+ #undef SPT_TYPE
+ 
+@@ -337,6 +347,10 @@
+ /* Build in PTS support? */
+ #undef WITH_PTS
+ 
++/* Define to 1 if your processor stores words with the most significant byte
++   first (like Motorola and SPARC, unlike Intel and VAX). */
++#undef WORDS_BIGENDIAN
++
+ /* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
+    `char[]'. */
+ #undef YYTEXT_POINTER
+@@ -496,7 +510,11 @@ enum {
+     SQUAT_ENGINE = 1,
+ 
+     /* should we have long LMTP error messages? */
+-    LMTP_LONG_ERROR_MSGS = 1
++    LMTP_LONG_ERROR_MSGS = 1,
++
++    /* default time to wait, in seconds, before giving up
++     * trying to lock something */
++    LOCK_GIVEUP_TIMER_DEFAULT = 100
+ };
+ 
+ #endif /* _CYRUS_IMAPD_CONFIG_H_ */
+--- a/configure
++++ b/configure
+@@ -1,81 +1,415 @@
+ #! /bin/sh
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by GNU Autoconf 2.59.
++# Generated by GNU Autoconf 2.65.
++#
++#
++# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
++# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
++# Inc.
++#
+ #
+-# Copyright (C) 2003 Free Software Foundation, Inc.
+ # This configure script is free software; the Free Software Foundation
+ # gives unlimited permission to copy, distribute and modify it.
+-## --------------------- ##
+-## M4sh Initialization.  ##
+-## --------------------- ##
++## -------------------- ##
++## M4sh Initialization. ##
++## -------------------- ##
+ 
+-# Be Bourne compatible
+-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
++# Be more Bourne compatible
++DUALCASE=1; export DUALCASE # for MKS sh
++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+   emulate sh
+   NULLCMD=:
+-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
++  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+   # is contrary to our usage.  Disable this feature.
+   alias -g '${1+"$@"}'='"$@"'
+-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+-  set -o posix
++  setopt NO_GLOB_SUBST
++else
++  case `(set -o) 2>/dev/null` in #(
++  *posix*) :
++    set -o posix ;; #(
++  *) :
++     ;;
++esac
+ fi
+-DUALCASE=1; export DUALCASE # for MKS sh
+ 
+-# Support unset when possible.
+-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+-  as_unset=unset
+-else
+-  as_unset=false
++
++as_nl='
++'
++export as_nl
++# Printing a long string crashes Solaris 7 /usr/bin/printf.
++as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
++as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
++as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
++# Prefer a ksh shell builtin over an external printf program on Solaris,
++# but without wasting forks for bash or zsh.
++if test -z "$BASH_VERSION$ZSH_VERSION" \
++    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
++  as_echo='print -r --'
++  as_echo_n='print -rn --'
++elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
++  as_echo='printf %s\n'
++  as_echo_n='printf %s'
++else
++  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
++    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
++    as_echo_n='/usr/ucb/echo -n'
++  else
++    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
++    as_echo_n_body='eval
++      arg=$1;
++      case $arg in #(
++      *"$as_nl"*)
++	expr "X$arg" : "X\\(.*\\)$as_nl";
++	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
++      esac;
++      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
++    '
++    export as_echo_n_body
++    as_echo_n='sh -c $as_echo_n_body as_echo'
++  fi
++  export as_echo_body
++  as_echo='sh -c $as_echo_body as_echo'
++fi
++
++# The user is always right.
++if test "${PATH_SEPARATOR+set}" != set; then
++  PATH_SEPARATOR=:
++  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
++    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
++      PATH_SEPARATOR=';'
++  }
+ fi
+ 
+ 
+-# Work around bugs in pre-3.0 UWIN ksh.
+-$as_unset ENV MAIL MAILPATH
++# IFS
++# We need space, tab and new line, in precisely that order.  Quoting is
++# there to prevent editors from complaining about space-tab.
++# (If _AS_PATH_WALK were called with IFS unset, it would disable word
++# splitting by setting IFS to empty value.)
++IFS=" ""	$as_nl"
++
++# Find who we are.  Look in the path if we contain no directory separator.
++case $0 in #((
++  *[\\/]* ) as_myself=$0 ;;
++  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
++  done
++IFS=$as_save_IFS
++
++     ;;
++esac
++# We did not find ourselves, most probably we were run as `sh COMMAND'
++# in which case we are not to be found in the path.
++if test "x$as_myself" = x; then
++  as_myself=$0
++fi
++if test ! -f "$as_myself"; then
++  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
++  exit 1
++fi
++
++# Unset variables that we do not need and which cause bugs (e.g. in
++# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
++# suppresses any "Segmentation fault" message there.  '((' could
++# trigger a bug in pdksh 5.2.14.
++for as_var in BASH_ENV ENV MAIL MAILPATH
++do eval test x\${$as_var+set} = xset \
++  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
++done
+ PS1='$ '
+ PS2='> '
+ PS4='+ '
+ 
+ # NLS nuisances.
+-for as_var in \
+-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
+-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
+-  LC_TELEPHONE LC_TIME
++LC_ALL=C
++export LC_ALL
++LANGUAGE=C
++export LANGUAGE
++
++# CDPATH.
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
++
++if test "x$CONFIG_SHELL" = x; then
++  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
++  emulate sh
++  NULLCMD=:
++  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
++  # is contrary to our usage.  Disable this feature.
++  alias -g '\${1+\"\$@\"}'='\"\$@\"'
++  setopt NO_GLOB_SUBST
++else
++  case \`(set -o) 2>/dev/null\` in #(
++  *posix*) :
++    set -o posix ;; #(
++  *) :
++     ;;
++esac
++fi
++"
++  as_required="as_fn_return () { (exit \$1); }
++as_fn_success () { as_fn_return 0; }
++as_fn_failure () { as_fn_return 1; }
++as_fn_ret_success () { return 0; }
++as_fn_ret_failure () { return 1; }
++
++exitcode=0
++as_fn_success || { exitcode=1; echo as_fn_success failed.; }
++as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
++as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
++as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
++if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
++
++else
++  exitcode=1; echo positional parameters were not saved.
++fi
++test x\$exitcode = x0 || exit 1"
++  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
++  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
++  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
++  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
++test \$(( 1 + 1 )) = 2 || exit 1"
++  if (eval "$as_required") 2>/dev/null; then :
++  as_have_required=yes
++else
++  as_have_required=no
++fi
++  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
++
++else
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++as_found=false
++for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+ do
+-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
+-    eval $as_var=C; export $as_var
+-  else
+-    $as_unset $as_var
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  as_found=:
++  case $as_dir in #(
++	 /*)
++	   for as_base in sh bash ksh sh5; do
++	     # Try only shells that exist, to save several forks.
++	     as_shell=$as_dir/$as_base
++	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
++		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
++  CONFIG_SHELL=$as_shell as_have_required=yes
++		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
++  break 2
++fi
++fi
++	   done;;
++       esac
++  as_found=false
++done
++$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
++	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
++  CONFIG_SHELL=$SHELL as_have_required=yes
++fi; }
++IFS=$as_save_IFS
++
++
++      if test "x$CONFIG_SHELL" != x; then :
++  # We cannot yet assume a decent shell, so we have to provide a
++	# neutralization value for shells without unset; and this also
++	# works around shells that cannot unset nonexistent variables.
++	BASH_ENV=/dev/null
++	ENV=/dev/null
++	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
++	export CONFIG_SHELL
++	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
++fi
++
++    if test x$as_have_required = xno; then :
++  $as_echo "$0: This script requires a shell more modern than all"
++  $as_echo "$0: the shells that I found on your system."
++  if test x${ZSH_VERSION+set} = xset ; then
++    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
++    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
++  else
++    $as_echo "$0: Please tell bug-autoconf@gnu.org about your system,
++$0: including any error possibly output before this
++$0: message. Then install a modern shell, or manually run
++$0: the script under such a shell if you do have one."
+   fi
+-done
++  exit 1
++fi
++fi
++fi
++SHELL=${CONFIG_SHELL-/bin/sh}
++export SHELL
++# Unset more variables known to interfere with behavior of common tools.
++CLICOLOR_FORCE= GREP_OPTIONS=
++unset CLICOLOR_FORCE GREP_OPTIONS
++
++## --------------------- ##
++## M4sh Shell Functions. ##
++## --------------------- ##
++# as_fn_unset VAR
++# ---------------
++# Portably unset VAR.
++as_fn_unset ()
++{
++  { eval $1=; unset $1;}
++}
++as_unset=as_fn_unset
++
++# as_fn_set_status STATUS
++# -----------------------
++# Set $? to STATUS, without forking.
++as_fn_set_status ()
++{
++  return $1
++} # as_fn_set_status
++
++# as_fn_exit STATUS
++# -----------------
++# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
++as_fn_exit ()
++{
++  set +e
++  as_fn_set_status $1
++  exit $1
++} # as_fn_exit
++
++# as_fn_mkdir_p
++# -------------
++# Create "$as_dir" as a directory, including parents if necessary.
++as_fn_mkdir_p ()
++{
++
++  case $as_dir in #(
++  -*) as_dir=./$as_dir;;
++  esac
++  test -d "$as_dir" || eval $as_mkdir_p || {
++    as_dirs=
++    while :; do
++      case $as_dir in #(
++      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
++      *) as_qdir=$as_dir;;
++      esac
++      as_dirs="'$as_qdir' $as_dirs"
++      as_dir=`$as_dirname -- "$as_dir" ||
++$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++	 X"$as_dir" : 'X\(//\)[^/]' \| \
++	 X"$as_dir" : 'X\(//\)$' \| \
++	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
++$as_echo X"$as_dir" |
++    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\/\)[^/].*/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\/\)$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\).*/{
++	    s//\1/
++	    q
++	  }
++	  s/.*/./; q'`
++      test -d "$as_dir" && break
++    done
++    test -z "$as_dirs" || eval "mkdir $as_dirs"
++  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
++
++
++} # as_fn_mkdir_p
++# as_fn_append VAR VALUE
++# ----------------------
++# Append the text in VALUE to the end of the definition contained in VAR. Take
++# advantage of any shell optimizations that allow amortized linear growth over
++# repeated appends, instead of the typical quadratic growth present in naive
++# implementations.
++if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
++  eval 'as_fn_append ()
++  {
++    eval $1+=\$2
++  }'
++else
++  as_fn_append ()
++  {
++    eval $1=\$$1\$2
++  }
++fi # as_fn_append
++
++# as_fn_arith ARG...
++# ------------------
++# Perform arithmetic evaluation on the ARGs, and store the result in the
++# global $as_val. Take advantage of shells that can avoid forks. The arguments
++# must be portable across $(()) and expr.
++if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
++  eval 'as_fn_arith ()
++  {
++    as_val=$(( $* ))
++  }'
++else
++  as_fn_arith ()
++  {
++    as_val=`expr "$@" || test $? -eq 1`
++  }
++fi # as_fn_arith
+ 
+-# Required to use basename.
+-if expr a : '\(a\)' >/dev/null 2>&1; then
++
++# as_fn_error ERROR [LINENO LOG_FD]
++# ---------------------------------
++# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
++# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
++# script with status $?, using 1 if that was 0.
++as_fn_error ()
++{
++  as_status=$?; test $as_status -eq 0 && as_status=1
++  if test "$3"; then
++    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
++  fi
++  $as_echo "$as_me: error: $1" >&2
++  as_fn_exit $as_status
++} # as_fn_error
++
++if expr a : '\(a\)' >/dev/null 2>&1 &&
++   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+   as_expr=expr
+ else
+   as_expr=false
+ fi
+ 
+-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
++if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+   as_basename=basename
+ else
+   as_basename=false
+ fi
+ 
++if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
++  as_dirname=dirname
++else
++  as_dirname=false
++fi
+ 
+-# Name of the executable.
+-as_me=`$as_basename "$0" ||
++as_me=`$as_basename -- "$0" ||
+ $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+ 	 X"$0" : 'X\(//\)$' \| \
+-	 X"$0" : 'X\(/\)$' \| \
+-	 .     : '\(.\)' 2>/dev/null ||
+-echo X/"$0" |
+-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
+-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
+-  	  /^X\/\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`
++	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
++$as_echo X/"$0" |
++    sed '/^.*\/\([^/][^/]*\)\/*$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\/\(\/\/\)$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\/\(\/\).*/{
++	    s//\1/
++	    q
++	  }
++	  s/.*/./; q'`
+ 
+-
+-# PATH needs CR, and LINENO needs CR and PATH.
+ # Avoid depending upon Character Ranges.
+ as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+ as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+@@ -83,146 +417,107 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTE
+ as_cr_digits='0123456789'
+ as_cr_alnum=$as_cr_Letters$as_cr_digits
+ 
+-# The user is always right.
+-if test "${PATH_SEPARATOR+set}" != set; then
+-  echo "#! /bin/sh" >conf$$.sh
+-  echo  "exit 0"   >>conf$$.sh
+-  chmod +x conf$$.sh
+-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+-    PATH_SEPARATOR=';'
+-  else
+-    PATH_SEPARATOR=:
+-  fi
+-  rm -f conf$$.sh
+-fi
+-
+-
+-  as_lineno_1=$LINENO
+-  as_lineno_2=$LINENO
+-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+-  test "x$as_lineno_1" != "x$as_lineno_2" &&
+-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
+-  # Find who we are.  Look in the path if we contain no path at all
+-  # relative or not.
+-  case $0 in
+-    *[\\/]* ) as_myself=$0 ;;
+-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+-done
+-
+-       ;;
+-  esac
+-  # We did not find ourselves, most probably we were run as `sh COMMAND'
+-  # in which case we are not to be found in the path.
+-  if test "x$as_myself" = x; then
+-    as_myself=$0
+-  fi
+-  if test ! -f "$as_myself"; then
+-    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
+-   { (exit 1); exit 1; }; }
+-  fi
+-  case $CONFIG_SHELL in
+-  '')
+-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for as_base in sh bash ksh sh5; do
+-	 case $as_dir in
+-	 /*)
+-	   if ("$as_dir/$as_base" -c '
+-  as_lineno_1=$LINENO
+-  as_lineno_2=$LINENO
+-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+-  test "x$as_lineno_1" != "x$as_lineno_2" &&
+-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
+-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
+-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
+-	     CONFIG_SHELL=$as_dir/$as_base
+-	     export CONFIG_SHELL
+-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
+-	   fi;;
+-	 esac
+-       done
+-done
+-;;
+-  esac
+ 
+-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+-  # uniformly replaced by the line number.  The first 'sed' inserts a
+-  # line-number line before each line; the second 'sed' does the real
+-  # work.  The second script uses 'N' to pair each line-number line
+-  # with the numbered line, and appends trailing '-' during
+-  # substitution so that $LINENO is not a special case at line end.
+-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
+-  sed '=' <$as_myself |
++  as_lineno_1=$LINENO as_lineno_1a=$LINENO
++  as_lineno_2=$LINENO as_lineno_2a=$LINENO
++  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
++  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
++  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
++  sed -n '
++    p
++    /[$]LINENO/=
++  ' <$as_myself |
+     sed '
++      s/[$]LINENO.*/&-/
++      t lineno
++      b
++      :lineno
+       N
+-      s,$,-,
+-      : loop
+-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
++      :loop
++      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+       t loop
+-      s,-$,,
+-      s,^['$as_cr_digits']*\n,,
++      s/-\n.*//
+     ' >$as_me.lineno &&
+-  chmod +x $as_me.lineno ||
+-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+-   { (exit 1); exit 1; }; }
++  chmod +x "$as_me.lineno" ||
++    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+ 
+   # Don't try to exec as it changes $[0], causing all sort of problems
+   # (the dirname of $[0] is not the place where we might find the
+-  # original and so on.  Autoconf is especially sensible to this).
+-  . ./$as_me.lineno
++  # original and so on.  Autoconf is especially sensitive to this).
++  . "./$as_me.lineno"
+   # Exit status is that of the last command.
+   exit
+ }
+ 
+-
+-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
+-  *c*,-n*) ECHO_N= ECHO_C='
+-' ECHO_T='	' ;;
+-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
+-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
++ECHO_C= ECHO_N= ECHO_T=
++case `echo -n x` in #(((((
++-n*)
++  case `echo 'xy\c'` in
++  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
++  xy)  ECHO_C='\c';;
++  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
++       ECHO_T='	';;
++  esac;;
++*)
++  ECHO_N='-n';;
+ esac
+ 
+-if expr a : '\(a\)' >/dev/null 2>&1; then
+-  as_expr=expr
++rm -f conf$$ conf$$.exe conf$$.file
++if test -d conf$$.dir; then
++  rm -f conf$$.dir/conf$$.file
+ else
+-  as_expr=false
++  rm -f conf$$.dir
++  mkdir conf$$.dir 2>/dev/null
+ fi
+-
+-rm -f conf$$ conf$$.exe conf$$.file
+-echo >conf$$.file
+-if ln -s conf$$.file conf$$ 2>/dev/null; then
+-  # We could just check for DJGPP; but this test a) works b) is more generic
+-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
+-  if test -f conf$$.exe; then
+-    # Don't use ln at all; we don't have any links
+-    as_ln_s='cp -p'
+-  else
++if (echo >conf$$.file) 2>/dev/null; then
++  if ln -s conf$$.file conf$$ 2>/dev/null; then
+     as_ln_s='ln -s'
++    # ... but there are two gotchas:
++    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
++    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
++    # In both cases, we have to default to `cp -p'.
++    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
++      as_ln_s='cp -p'
++  elif ln conf$$.file conf$$ 2>/dev/null; then
++    as_ln_s=ln
++  else
++    as_ln_s='cp -p'
+   fi
+-elif ln conf$$.file conf$$ 2>/dev/null; then
+-  as_ln_s=ln
+ else
+   as_ln_s='cp -p'
+ fi
+-rm -f conf$$ conf$$.exe conf$$.file
++rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
++rmdir conf$$.dir 2>/dev/null
+ 
+ if mkdir -p . 2>/dev/null; then
+-  as_mkdir_p=:
++  as_mkdir_p='mkdir -p "$as_dir"'
+ else
+   test -d ./-p && rmdir ./-p
+   as_mkdir_p=false
+ fi
+ 
+-as_executable_p="test -f"
++if test -x / >/dev/null 2>&1; then
++  as_test_x='test -x'
++else
++  if ls -dL / >/dev/null 2>&1; then
++    as_ls_L_option=L
++  else
++    as_ls_L_option=
++  fi
++  as_test_x='
++    eval sh -c '\''
++      if test -d "$1"; then
++	test -d "$1/.";
++      else
++	case $1 in #(
++	-*)set "./$1";;
++	esac;
++	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
++	???[sx]*):;;*)false;;esac;fi
++    '\'' sh
++  '
++fi
++as_executable_p=$as_test_x
+ 
+ # Sed expression to map a string onto a valid CPP name.
+ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+@@ -231,38 +526,25 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P
+ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+ 
+ 
+-# IFS
+-# We need space, tab and new line, in precisely that order.
+-as_nl='
+-'
+-IFS=" 	$as_nl"
+-
+-# CDPATH.
+-$as_unset CDPATH
+-
++test -n "$DJDIR" || exec 7<&0 </dev/null
++exec 6>&1
+ 
+ # Name of the host.
+ # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+ # so uname gets run too.
+ ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+ 
+-exec 6>&1
+-
+ #
+ # Initializations.
+ #
+ ac_default_prefix=/usr/local
++ac_clean_files=
+ ac_config_libobj_dir=.
++LIBOBJS=
+ cross_compiling=no
+ subdirs=
+ MFLAGS=
+ MAKEFLAGS=
+-SHELL=${CONFIG_SHELL-/bin/sh}
+-
+-# Maximum number of lines to put in a shell here document.
+-# This variable seems obsolete.  It should probably be removed, and
+-# only ac_max_sed_lines should be used.
+-: ${ac_max_here_lines=38}
+ 
+ # Identity of this package.
+ PACKAGE_NAME=
+@@ -270,51 +552,239 @@ PACKAGE_TARNAME=
+ PACKAGE_VERSION=
+ PACKAGE_STRING=
+ PACKAGE_BUGREPORT=
++PACKAGE_URL=
+ 
+ ac_unique_file="imap/imapd.c"
+ # Factoring default headers for most tests.
+ ac_includes_default="\
+ #include <stdio.h>
+-#if HAVE_SYS_TYPES_H
++#ifdef HAVE_SYS_TYPES_H
+ # include <sys/types.h>
+ #endif
+-#if HAVE_SYS_STAT_H
++#ifdef HAVE_SYS_STAT_H
+ # include <sys/stat.h>
+ #endif
+-#if STDC_HEADERS
++#ifdef STDC_HEADERS
+ # include <stdlib.h>
+ # include <stddef.h>
+ #else
+-# if HAVE_STDLIB_H
++# ifdef HAVE_STDLIB_H
+ #  include <stdlib.h>
+ # endif
+ #endif
+-#if HAVE_STRING_H
+-# if !STDC_HEADERS && HAVE_MEMORY_H
++#ifdef HAVE_STRING_H
++# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
+ #  include <memory.h>
+ # endif
+ # include <string.h>
+ #endif
+-#if HAVE_STRINGS_H
++#ifdef HAVE_STRINGS_H
+ # include <strings.h>
+ #endif
+-#if HAVE_INTTYPES_H
++#ifdef HAVE_INTTYPES_H
+ # include <inttypes.h>
+-#else
+-# if HAVE_STDINT_H
+-#  include <stdint.h>
+-# endif
+ #endif
+-#if HAVE_UNISTD_H
++#ifdef HAVE_STDINT_H
++# include <stdint.h>
++#endif
++#ifdef HAVE_UNISTD_H
+ # include <unistd.h>
+ #endif"
+ 
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os MAKEDEPEND cyrus_prefix service_path cyrus_user cyrus_group CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT RANLIB ac_ct_RANLIB SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CPP EGREP AWK LIBOBJS LIB_SOCKET IPV6_OBJS PRE_SUBDIRS EXTRA_SUBDIRS DEPLIBS LOCALDEFS BDB_INC BDB_LIB CYRUSDB_OBJS SIEVE_OBJS SIEVE_LIBS SIEVE_CPPFLAGS YACC LEX LEXLIB LEX_OUTPUT_ROOT SIEVE_SUBDIRS WITH_NONBLOCK WITH_GMTOFF WITH_MAP WITH_LOCK cyrus_sigveclib AFS_LIBS AFS_LDFLAGS LDAP_CPPFLAGS LDAP_LDFLAGS LDAP_LIBS SERVER_SUBDIRS OPENSSL_INC OPENSSL_LIB ZEPHYR_LIBS ZEPHYR_CPPFLAGS WITH_IDLE IMAP_PROGS COMPILE_ET COM_ERR_LIBS COM_ERR_LDFLAGS COM_ERR_CPPFLAGS LIB_CRYPT GSSAPI_LIBS GSSAPIBASE_LIBS LIB_DYN_SASL DYNSASLFLAGS LIB_SASL SASLFLAGS PERL PERL_CCCDLFLAGS MD5OBJ SNMP_SUBDIRS CMU_LIB_SUBDIR LIB_WRAP SNMP_CONFIG LIB_UCDSNMP LIB_RT IMAP_COM_ERR_LIBS IMAP_LIBS PERL_SUBDIRS PERL_DEPSUBDIRS LTLIBOBJS'
++ac_subst_vars='LTLIBOBJS
++PERL_DEPSUBDIRS
++PERL_SUBDIRS
++IMAP_LIBS
++IMAP_COM_ERR_LIBS
++LIB_RT
++LIB_UCDSNMP
++SNMP_CONFIG
++LIB_WRAP
++CMU_LIB_SUBDIR
++SNMP_SUBDIRS
++MD5OBJ
++PERL_CCCDLFLAGS
++PERL
++SASLFLAGS
++LIB_SASL
++DYNSASLFLAGS
++LIB_DYN_SASL
++GSSAPIBASE_LIBS
++GSSAPI_LIBS
++LIB_CRYPT
++COM_ERR_CPPFLAGS
++COM_ERR_LDFLAGS
++COM_ERR_LIBS
++COMPILE_ET
++IMAP_PROGS
++WITH_IDLE
++ZEPHYR_CPPFLAGS
++ZEPHYR_LIBS
++OPENSSL_LIB
++OPENSSL_INC
++SERVER_SUBDIRS
++LDAP_LIBS
++LDAP_LDFLAGS
++LDAP_CPPFLAGS
++AFS_LDFLAGS
++AFS_LIBS
++cyrus_sigveclib
++WITH_LOCK
++WITH_MAP
++WITH_GMTOFF
++WITH_NONBLOCK
++SIEVE_SUBDIRS
++LEXLIB
++LEX_OUTPUT_ROOT
++LEX
++YFLAGS
++YACC
++SIEVE_CPPFLAGS
++SIEVE_LIBS
++SIEVE_OBJS
++CYRUSDB_OBJS
++BDB_LIB
++BDB_INC
++LOCALDEFS
++DEPLIBS
++EXTRA_SUBDIRS
++PRE_SUBDIRS
++IPV6_OBJS
++LIB_SOCKET
++LIBOBJS
++AWK
++EGREP
++GREP
++CPP
++INSTALL_DATA
++INSTALL_SCRIPT
++INSTALL_PROGRAM
++SET_MAKE
++RANLIB
++OBJEXT
++EXEEXT
++ac_ct_CC
++CPPFLAGS
++LDFLAGS
++CFLAGS
++CC
++cyrus_group
++cyrus_user
++service_path
++cyrus_prefix
++MAKEDEPEND
++WARNERROR
++host_os
++host_vendor
++host_cpu
++host
++build_os
++build_vendor
++build_cpu
++build
++target_alias
++host_alias
++build_alias
++LIBS
++ECHO_T
++ECHO_N
++ECHO_C
++DEFS
++mandir
++localedir
++libdir
++psdir
++pdfdir
++dvidir
++htmldir
++infodir
++docdir
++oldincludedir
++includedir
++localstatedir
++sharedstatedir
++sysconfdir
++datadir
++datarootdir
++libexecdir
++sbindir
++bindir
++program_transform_name
++prefix
++exec_prefix
++PACKAGE_URL
++PACKAGE_BUGREPORT
++PACKAGE_STRING
++PACKAGE_VERSION
++PACKAGE_TARNAME
++PACKAGE_NAME
++PATH_SEPARATOR
++SHELL'
+ ac_subst_files=''
++ac_user_opts='
++enable_option_checking
++enable_warnings_are_errors
++with_extraident
++with_login
++with_cyrus_prefix
++with_service_path
++with_cyrus_user
++with_cyrus_group
++with_bdb
++with_dbdir
++with_bdb_libdir
++with_bdb_incdir
++enable_sieve
++with_lock
++with_afs
++with_ldap
++enable_krb5afspts
++enable_server
++with_krb
++with_krbimpl
++enable_statickrb
++with_krbdes
++with_openssl
++with_egd_socket
++with_zephyr
++with_pidfile
++with_idle
++enable_nntp
++enable_murder
++with_com_err
++with_syslogfacility
++enable_cmulocal
++enable_oldsievename
++enable_listext
++enable_netscapehack
++enable_gssapi
++with_gss_impl
++with_sasl
++with_staticsasl
++with_perl
++with_lib_subdir
++with_libwrap
++with_snmp
++with_ucdsnmp
++'
++      ac_precious_vars='build_alias
++host_alias
++target_alias
++CC
++CFLAGS
++LDFLAGS
++LIBS
++CPPFLAGS
++CPP
++YACC
++YFLAGS'
++
+ 
+ # Initialize some variables set by options.
+ ac_init_help=
+ ac_init_version=false
++ac_unrecognized_opts=
++ac_unrecognized_sep=
+ # The variables have the same names as the options, with
+ # dashes changed to underlines.
+ cache_file=/dev/null
+@@ -337,34 +807,48 @@ x_libraries=NONE
+ # and all the variables that are supposed to be based on exec_prefix
+ # by default will actually change.
+ # Use braces instead of parens because sh, perl, etc. also accept them.
++# (The list follows the same order as the GNU Coding Standards.)
+ bindir='${exec_prefix}/bin'
+ sbindir='${exec_prefix}/sbin'
+ libexecdir='${exec_prefix}/libexec'
+-datadir='${prefix}/share'
++datarootdir='${prefix}/share'
++datadir='${datarootdir}'
+ sysconfdir='${prefix}/etc'
+ sharedstatedir='${prefix}/com'
+ localstatedir='${prefix}/var'
+-libdir='${exec_prefix}/lib'
+ includedir='${prefix}/include'
+ oldincludedir='/usr/include'
+-infodir='${prefix}/info'
+-mandir='${prefix}/man'
++docdir='${datarootdir}/doc/${PACKAGE}'
++infodir='${datarootdir}/info'
++htmldir='${docdir}'
++dvidir='${docdir}'
++pdfdir='${docdir}'
++psdir='${docdir}'
++libdir='${exec_prefix}/lib'
++localedir='${datarootdir}/locale'
++mandir='${datarootdir}/man'
+ 
+ ac_prev=
++ac_dashdash=
+ for ac_option
+ do
+   # If the previous option needs an argument, assign it.
+   if test -n "$ac_prev"; then
+-    eval "$ac_prev=\$ac_option"
++    eval $ac_prev=\$ac_option
+     ac_prev=
+     continue
+   fi
+ 
+-  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
++  case $ac_option in
++  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
++  *)	ac_optarg=yes ;;
++  esac
+ 
+   # Accept the important Cygnus configure options, so we can diagnose typos.
+ 
+-  case $ac_option in
++  case $ac_dashdash$ac_option in
++  --)
++    ac_dashdash=yes ;;
+ 
+   -bindir | --bindir | --bindi | --bind | --bin | --bi)
+     ac_prev=bindir ;;
+@@ -386,33 +870,59 @@ do
+   --config-cache | -C)
+     cache_file=config.cache ;;
+ 
+-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
++  -datadir | --datadir | --datadi | --datad)
+     ac_prev=datadir ;;
+-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
+-  | --da=*)
++  -datadir=* | --datadir=* | --datadi=* | --datad=*)
+     datadir=$ac_optarg ;;
+ 
++  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
++  | --dataroo | --dataro | --datar)
++    ac_prev=datarootdir ;;
++  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
++  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
++    datarootdir=$ac_optarg ;;
++
+   -disable-* | --disable-*)
+-    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
++    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+     # Reject names that are not valid shell variable names.
+-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+-   { (exit 1); exit 1; }; }
+-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
+-    eval "enable_$ac_feature=no" ;;
++    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
++      as_fn_error "invalid feature name: $ac_useropt"
++    ac_useropt_orig=$ac_useropt
++    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
++    case $ac_user_opts in
++      *"
++"enable_$ac_useropt"
++"*) ;;
++      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
++	 ac_unrecognized_sep=', ';;
++    esac
++    eval enable_$ac_useropt=no ;;
++
++  -docdir | --docdir | --docdi | --doc | --do)
++    ac_prev=docdir ;;
++  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
++    docdir=$ac_optarg ;;
++
++  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
++    ac_prev=dvidir ;;
++  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
++    dvidir=$ac_optarg ;;
+ 
+   -enable-* | --enable-*)
+-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
++    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+     # Reject names that are not valid shell variable names.
+-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+-   { (exit 1); exit 1; }; }
+-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
+-    case $ac_option in
+-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
+-      *) ac_optarg=yes ;;
++    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
++      as_fn_error "invalid feature name: $ac_useropt"
++    ac_useropt_orig=$ac_useropt
++    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
++    case $ac_user_opts in
++      *"
++"enable_$ac_useropt"
++"*) ;;
++      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
++	 ac_unrecognized_sep=', ';;
+     esac
+-    eval "enable_$ac_feature='$ac_optarg'" ;;
++    eval enable_$ac_useropt=\$ac_optarg ;;
+ 
+   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
+   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
+@@ -439,6 +949,12 @@ do
+   -host=* | --host=* | --hos=* | --ho=*)
+     host_alias=$ac_optarg ;;
+ 
++  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
++    ac_prev=htmldir ;;
++  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
++  | --ht=*)
++    htmldir=$ac_optarg ;;
++
+   -includedir | --includedir | --includedi | --included | --include \
+   | --includ | --inclu | --incl | --inc)
+     ac_prev=includedir ;;
+@@ -463,13 +979,16 @@ do
+   | --libexe=* | --libex=* | --libe=*)
+     libexecdir=$ac_optarg ;;
+ 
++  -localedir | --localedir | --localedi | --localed | --locale)
++    ac_prev=localedir ;;
++  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
++    localedir=$ac_optarg ;;
++
+   -localstatedir | --localstatedir | --localstatedi | --localstated \
+-  | --localstate | --localstat | --localsta | --localst \
+-  | --locals | --local | --loca | --loc | --lo)
++  | --localstate | --localstat | --localsta | --localst | --locals)
+     ac_prev=localstatedir ;;
+   -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
+-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
+-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
++  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
+     localstatedir=$ac_optarg ;;
+ 
+   -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
+@@ -534,6 +1053,16 @@ do
+   | --progr-tra=* | --program-tr=* | --program-t=*)
+     program_transform_name=$ac_optarg ;;
+ 
++  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
++    ac_prev=pdfdir ;;
++  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
++    pdfdir=$ac_optarg ;;
++
++  -psdir | --psdir | --psdi | --psd | --ps)
++    ac_prev=psdir ;;
++  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
++    psdir=$ac_optarg ;;
++
+   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+   | -silent | --silent | --silen | --sile | --sil)
+     silent=yes ;;
+@@ -584,26 +1113,36 @@ do
+     ac_init_version=: ;;
+ 
+   -with-* | --with-*)
+-    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
++    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+     # Reject names that are not valid shell variable names.
+-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+-      { echo "$as_me: error: invalid package name: $ac_package" >&2
+-   { (exit 1); exit 1; }; }
+-    ac_package=`echo $ac_package| sed 's/-/_/g'`
+-    case $ac_option in
+-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
+-      *) ac_optarg=yes ;;
++    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
++      as_fn_error "invalid package name: $ac_useropt"
++    ac_useropt_orig=$ac_useropt
++    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
++    case $ac_user_opts in
++      *"
++"with_$ac_useropt"
++"*) ;;
++      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
++	 ac_unrecognized_sep=', ';;
+     esac
+-    eval "with_$ac_package='$ac_optarg'" ;;
++    eval with_$ac_useropt=\$ac_optarg ;;
+ 
+   -without-* | --without-*)
+-    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
++    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+     # Reject names that are not valid shell variable names.
+-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+-      { echo "$as_me: error: invalid package name: $ac_package" >&2
+-   { (exit 1); exit 1; }; }
+-    ac_package=`echo $ac_package | sed 's/-/_/g'`
+-    eval "with_$ac_package=no" ;;
++    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
++      as_fn_error "invalid package name: $ac_useropt"
++    ac_useropt_orig=$ac_useropt
++    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
++    case $ac_user_opts in
++      *"
++"with_$ac_useropt"
++"*) ;;
++      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
++	 ac_unrecognized_sep=', ';;
++    esac
++    eval with_$ac_useropt=no ;;
+ 
+   --x)
+     # Obsolete; use --with-x.
+@@ -623,26 +1162,25 @@ do
+   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
+     x_libraries=$ac_optarg ;;
+ 
+-  -*) { echo "$as_me: error: unrecognized option: $ac_option
+-Try \`$0 --help' for more information." >&2
+-   { (exit 1); exit 1; }; }
++  -*) as_fn_error "unrecognized option: \`$ac_option'
++Try \`$0 --help' for more information."
+     ;;
+ 
+   *=*)
+     ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
+     # Reject names that are not valid shell variable names.
+-    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
+-      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+-   { (exit 1); exit 1; }; }
+-    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
+-    eval "$ac_envvar='$ac_optarg'"
++    case $ac_envvar in #(
++      '' | [0-9]* | *[!_$as_cr_alnum]* )
++      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
++    esac
++    eval $ac_envvar=\$ac_optarg
+     export $ac_envvar ;;
+ 
+   *)
+     # FIXME: should be removed in autoconf 3.0.
+-    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
++    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+-      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
++      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+     : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+     ;;
+ 
+@@ -651,31 +1189,36 @@ done
+ 
+ if test -n "$ac_prev"; then
+   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+-  { echo "$as_me: error: missing argument to $ac_option" >&2
+-   { (exit 1); exit 1; }; }
++  as_fn_error "missing argument to $ac_option"
+ fi
+ 
+-# Be sure to have absolute paths.
+-for ac_var in exec_prefix prefix
+-do
+-  eval ac_val=$`echo $ac_var`
+-  case $ac_val in
+-    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
+-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+-   { (exit 1); exit 1; }; };;
++if test -n "$ac_unrecognized_opts"; then
++  case $enable_option_checking in
++    no) ;;
++    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
++    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+   esac
+-done
++fi
+ 
+-# Be sure to have absolute paths.
+-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
+-	      localstatedir libdir includedir oldincludedir infodir mandir
++# Check all directory arguments for consistency.
++for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
++		datadir sysconfdir sharedstatedir localstatedir includedir \
++		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
++		libdir localedir mandir
+ do
+-  eval ac_val=$`echo $ac_var`
++  eval ac_val=\$$ac_var
++  # Remove trailing slashes.
++  case $ac_val in
++    */ )
++      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
++      eval $ac_var=\$ac_val;;
++  esac
++  # Be sure to have absolute directory names.
+   case $ac_val in
+-    [\\/$]* | ?:[\\/]* ) ;;
+-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+-   { (exit 1); exit 1; }; };;
++    [\\/$]* | ?:[\\/]* )  continue;;
++    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
+   esac
++  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
+ done
+ 
+ # There might be people who depend on the old broken behavior: `$host'
+@@ -689,7 +1232,7 @@ target=$target_alias
+ if test "x$host_alias" != x; then
+   if test "x$build_alias" = x; then
+     cross_compiling=maybe
+-    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
++    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+     If a cross compiler is detected then cross compile mode will be used." >&2
+   elif test "x$build_alias" != "x$host_alias"; then
+     cross_compiling=yes
+@@ -702,74 +1245,72 @@ test -n "$host_alias" && ac_tool_prefix=
+ test "$silent" = yes && exec 6>/dev/null
+ 
+ 
++ac_pwd=`pwd` && test -n "$ac_pwd" &&
++ac_ls_di=`ls -di .` &&
++ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
++  as_fn_error "working directory cannot be determined"
++test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
++  as_fn_error "pwd does not report name of working directory"
++
++
+ # Find the source files, if location was not specified.
+ if test -z "$srcdir"; then
+   ac_srcdir_defaulted=yes
+-  # Try the directory containing this script, then its parent.
+-  ac_confdir=`(dirname "$0") 2>/dev/null ||
+-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+-	 X"$0" : 'X\(//\)[^/]' \| \
+-	 X"$0" : 'X\(//\)$' \| \
+-	 X"$0" : 'X\(/\)' \| \
+-	 .     : '\(.\)' 2>/dev/null ||
+-echo X"$0" |
+-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+-  	  /^X\(\/\/\)$/{ s//\1/; q; }
+-  	  /^X\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`
++  # Try the directory containing this script, then the parent directory.
++  ac_confdir=`$as_dirname -- "$as_myself" ||
++$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++	 X"$as_myself" : 'X\(//\)[^/]' \| \
++	 X"$as_myself" : 'X\(//\)$' \| \
++	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
++$as_echo X"$as_myself" |
++    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\/\)[^/].*/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\/\)$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\).*/{
++	    s//\1/
++	    q
++	  }
++	  s/.*/./; q'`
+   srcdir=$ac_confdir
+-  if test ! -r $srcdir/$ac_unique_file; then
++  if test ! -r "$srcdir/$ac_unique_file"; then
+     srcdir=..
+   fi
+ else
+   ac_srcdir_defaulted=no
+ fi
+-if test ! -r $srcdir/$ac_unique_file; then
+-  if test "$ac_srcdir_defaulted" = yes; then
+-    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
+-   { (exit 1); exit 1; }; }
+-  else
+-    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+-   { (exit 1); exit 1; }; }
+-  fi
+-fi
+-(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
+-  { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
+-   { (exit 1); exit 1; }; }
+-srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
+-ac_env_build_alias_set=${build_alias+set}
+-ac_env_build_alias_value=$build_alias
+-ac_cv_env_build_alias_set=${build_alias+set}
+-ac_cv_env_build_alias_value=$build_alias
+-ac_env_host_alias_set=${host_alias+set}
+-ac_env_host_alias_value=$host_alias
+-ac_cv_env_host_alias_set=${host_alias+set}
+-ac_cv_env_host_alias_value=$host_alias
+-ac_env_target_alias_set=${target_alias+set}
+-ac_env_target_alias_value=$target_alias
+-ac_cv_env_target_alias_set=${target_alias+set}
+-ac_cv_env_target_alias_value=$target_alias
+-ac_env_CC_set=${CC+set}
+-ac_env_CC_value=$CC
+-ac_cv_env_CC_set=${CC+set}
+-ac_cv_env_CC_value=$CC
+-ac_env_CFLAGS_set=${CFLAGS+set}
+-ac_env_CFLAGS_value=$CFLAGS
+-ac_cv_env_CFLAGS_set=${CFLAGS+set}
+-ac_cv_env_CFLAGS_value=$CFLAGS
+-ac_env_LDFLAGS_set=${LDFLAGS+set}
+-ac_env_LDFLAGS_value=$LDFLAGS
+-ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
+-ac_cv_env_LDFLAGS_value=$LDFLAGS
+-ac_env_CPPFLAGS_set=${CPPFLAGS+set}
+-ac_env_CPPFLAGS_value=$CPPFLAGS
+-ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
+-ac_cv_env_CPPFLAGS_value=$CPPFLAGS
+-ac_env_CPP_set=${CPP+set}
+-ac_env_CPP_value=$CPP
+-ac_cv_env_CPP_set=${CPP+set}
+-ac_cv_env_CPP_value=$CPP
++if test ! -r "$srcdir/$ac_unique_file"; then
++  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
++  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
++fi
++ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
++ac_abs_confdir=`(
++	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
++	pwd)`
++# When building in place, set srcdir=.
++if test "$ac_abs_confdir" = "$ac_pwd"; then
++  srcdir=.
++fi
++# Remove unnecessary trailing slashes from srcdir.
++# Double slashes in file names in object file debugging info
++# mess up M-x gdb in Emacs.
++case $srcdir in
++*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
++esac
++for ac_var in $ac_precious_vars; do
++  eval ac_env_${ac_var}_set=\${${ac_var}+set}
++  eval ac_env_${ac_var}_value=\$${ac_var}
++  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
++  eval ac_cv_env_${ac_var}_value=\$${ac_var}
++done
+ 
+ #
+ # Report the --help message.
+@@ -798,14 +1339,11 @@ Configuration:
+   -n, --no-create         do not create output files
+       --srcdir=DIR        find the sources in DIR [configure dir or \`..']
+ 
+-_ACEOF
+-
+-  cat <<_ACEOF
+ Installation directories:
+   --prefix=PREFIX         install architecture-independent files in PREFIX
+-			  [$ac_default_prefix]
++                          [$ac_default_prefix]
+   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
+-			  [PREFIX]
++                          [PREFIX]
+ 
+ By default, \`make install' will install all the files in
+ \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
+@@ -815,18 +1353,25 @@ for instance \`--prefix=\$HOME'.
+ For better control, use the options below.
+ 
+ Fine tuning of the installation directories:
+-  --bindir=DIR           user executables [EPREFIX/bin]
+-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
+-  --libexecdir=DIR       program executables [EPREFIX/libexec]
+-  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
+-  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
+-  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
+-  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
+-  --libdir=DIR           object code libraries [EPREFIX/lib]
+-  --includedir=DIR       C header files [PREFIX/include]
+-  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
+-  --infodir=DIR          info documentation [PREFIX/info]
+-  --mandir=DIR           man documentation [PREFIX/man]
++  --bindir=DIR            user executables [EPREFIX/bin]
++  --sbindir=DIR           system admin executables [EPREFIX/sbin]
++  --libexecdir=DIR        program executables [EPREFIX/libexec]
++  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
++  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
++  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
++  --libdir=DIR            object code libraries [EPREFIX/lib]
++  --includedir=DIR        C header files [PREFIX/include]
++  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
++  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
++  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
++  --infodir=DIR           info documentation [DATAROOTDIR/info]
++  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
++  --mandir=DIR            man documentation [DATAROOTDIR/man]
++  --docdir=DIR            documentation root [DATAROOTDIR/doc/PACKAGE]
++  --htmldir=DIR           html documentation [DOCDIR]
++  --dvidir=DIR            dvi documentation [DOCDIR]
++  --pdfdir=DIR            pdf documentation [DOCDIR]
++  --psdir=DIR             ps documentation [DOCDIR]
+ _ACEOF
+ 
+   cat <<\_ACEOF
+@@ -842,8 +1387,10 @@ if test -n "$ac_init_help"; then
+   cat <<\_ACEOF
+ 
+ Optional Features:
++  --disable-option-checking  ignore unrecognized --enable/--with options
+   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
++  --enable-warnings-are-errors   add -Werror to most gcc calls
+   --disable-sieve         disable Sieve support
+   --enable-krb5afspts     compile afskrb PTS module with krb5 support
+   --disable-server        disable compiling servers
+@@ -899,148 +1446,750 @@ Some influential environment variables:
+   CFLAGS      C compiler flags
+   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
+               nonstandard directory <lib dir>
+-  CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
+-              headers in a nonstandard directory <include dir>
++  LIBS        libraries to pass to the linker, e.g. -l<library>
++  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
++              you have headers in a nonstandard directory <include dir>
+   CPP         C preprocessor
++  YACC        The `Yet Another C Compiler' implementation to use. Defaults to
++              the first program found out of: `bison -y', `byacc', `yacc'.
++  YFLAGS      The list of arguments that will be passed by default to $YACC.
++              This script will default YFLAGS to the empty string to avoid a
++              default value of `-d' given by some make applications.
+ 
+ Use these variables to override the choices made by `configure' or to help
+ it to find libraries and programs with nonstandard names/locations.
+ 
++Report bugs to the package provider.
+ _ACEOF
++ac_status=$?
+ fi
+ 
+ if test "$ac_init_help" = "recursive"; then
+   # If there are subdirs, report their specific --help.
+-  ac_popdir=`pwd`
+   for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
+-    test -d $ac_dir || continue
++    test -d "$ac_dir" ||
++      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
++      continue
+     ac_builddir=.
+ 
+-if test "$ac_dir" != .; then
+-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+-  # A "../" for each directory in $ac_dir_suffix.
+-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+-else
+-  ac_dir_suffix= ac_top_builddir=
+-fi
++case "$ac_dir" in
++.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
++*)
++  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
++  # A ".." for each directory in $ac_dir_suffix.
++  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
++  case $ac_top_builddir_sub in
++  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
++  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
++  esac ;;
++esac
++ac_abs_top_builddir=$ac_pwd
++ac_abs_builddir=$ac_pwd$ac_dir_suffix
++# for backward compatibility:
++ac_top_builddir=$ac_top_build_prefix
+ 
+ case $srcdir in
+-  .)  # No --srcdir option.  We are building in place.
++  .)  # We are building in place.
+     ac_srcdir=.
+-    if test -z "$ac_top_builddir"; then
+-       ac_top_srcdir=.
+-    else
+-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+-    fi ;;
+-  [\\/]* | ?:[\\/]* )  # Absolute path.
++    ac_top_srcdir=$ac_top_builddir_sub
++    ac_abs_top_srcdir=$ac_pwd ;;
++  [\\/]* | ?:[\\/]* )  # Absolute name.
+     ac_srcdir=$srcdir$ac_dir_suffix;
+-    ac_top_srcdir=$srcdir ;;
+-  *) # Relative path.
+-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
+-esac
+-
+-# Do not use `cd foo && pwd` to compute absolute paths, because
+-# the directories may not exist.
+-case `pwd` in
+-.) ac_abs_builddir="$ac_dir";;
+-*)
+-  case "$ac_dir" in
+-  .) ac_abs_builddir=`pwd`;;
+-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
+-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
+-  esac;;
+-esac
+-case $ac_abs_builddir in
+-.) ac_abs_top_builddir=${ac_top_builddir}.;;
+-*)
+-  case ${ac_top_builddir}. in
+-  .) ac_abs_top_builddir=$ac_abs_builddir;;
+-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
+-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
+-  esac;;
+-esac
+-case $ac_abs_builddir in
+-.) ac_abs_srcdir=$ac_srcdir;;
+-*)
+-  case $ac_srcdir in
+-  .) ac_abs_srcdir=$ac_abs_builddir;;
+-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
+-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
+-  esac;;
+-esac
+-case $ac_abs_builddir in
+-.) ac_abs_top_srcdir=$ac_top_srcdir;;
+-*)
+-  case $ac_top_srcdir in
+-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
+-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
+-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
+-  esac;;
+-esac
+-
+-    cd $ac_dir
+-    # Check for guested configure; otherwise get Cygnus style configure.
+-    if test -f $ac_srcdir/configure.gnu; then
+-      echo
+-      $SHELL $ac_srcdir/configure.gnu  --help=recursive
+-    elif test -f $ac_srcdir/configure; then
+-      echo
+-      $SHELL $ac_srcdir/configure  --help=recursive
+-    elif test -f $ac_srcdir/configure.ac ||
+-	   test -f $ac_srcdir/configure.in; then
+-      echo
+-      $ac_configure --help
++    ac_top_srcdir=$srcdir
++    ac_abs_top_srcdir=$srcdir ;;
++  *) # Relative name.
++    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
++    ac_top_srcdir=$ac_top_build_prefix$srcdir
++    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
++esac
++ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
++
++    cd "$ac_dir" || { ac_status=$?; continue; }
++    # Check for guested configure.
++    if test -f "$ac_srcdir/configure.gnu"; then
++      echo &&
++      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
++    elif test -f "$ac_srcdir/configure"; then
++      echo &&
++      $SHELL "$ac_srcdir/configure" --help=recursive
+     else
+-      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+-    fi
+-    cd $ac_popdir
++      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
++    fi || ac_status=$?
++    cd "$ac_pwd" || { ac_status=$?; break; }
+   done
+ fi
+ 
+-test -n "$ac_init_help" && exit 0
++test -n "$ac_init_help" && exit $ac_status
+ if $ac_init_version; then
+   cat <<\_ACEOF
++configure
++generated by GNU Autoconf 2.65
+ 
+-Copyright (C) 2003 Free Software Foundation, Inc.
++Copyright (C) 2009 Free Software Foundation, Inc.
+ This configure script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it.
+ _ACEOF
+-  exit 0
++  exit
+ fi
+-exec 5>config.log
+-cat >&5 <<_ACEOF
+-This file contains any messages produced by compilers while
+-running configure, to aid debugging if configure makes a mistake.
+ 
+-It was created by $as_me, which was
+-generated by GNU Autoconf 2.59.  Invocation command line was
++## ------------------------ ##
++## Autoconf initialization. ##
++## ------------------------ ##
++
++# ac_fn_c_try_compile LINENO
++# --------------------------
++# Try to compile conftest.$ac_ext, and return whether this succeeded.
++ac_fn_c_try_compile ()
++{
++  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++  rm -f conftest.$ac_objext
++  if { { ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++  (eval "$ac_compile") 2>conftest.err
++  ac_status=$?
++  if test -s conftest.err; then
++    grep -v '^ *+' conftest.err >conftest.er1
++    cat conftest.er1 >&5
++    mv -f conftest.er1 conftest.err
++  fi
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then :
++  ac_retval=0
++else
++  $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-  $ $0 $@
++	ac_retval=1
++fi
++  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++  as_fn_set_status $ac_retval
+ 
+-_ACEOF
++} # ac_fn_c_try_compile
++
++# ac_fn_c_try_cpp LINENO
++# ----------------------
++# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
++ac_fn_c_try_cpp ()
+ {
+-cat <<_ASUNAME
+-## --------- ##
+-## Platform. ##
+-## --------- ##
++  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++  if { { ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
++  ac_status=$?
++  if test -s conftest.err; then
++    grep -v '^ *+' conftest.err >conftest.er1
++    cat conftest.er1 >&5
++    mv -f conftest.er1 conftest.err
++  fi
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then :
++  ac_retval=0
++else
++  $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++    ac_retval=1
++fi
++  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++  as_fn_set_status $ac_retval
++
++} # ac_fn_c_try_cpp
++
++# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
++# -------------------------------------------------------
++# Tests whether HEADER exists, giving a warning if it cannot be compiled using
++# the include files in INCLUDES and setting the cache variable VAR
++# accordingly.
++ac_fn_c_check_header_mongrel ()
++{
++  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++  if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
++$as_echo_n "checking for $2... " >&6; }
++if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++  $as_echo_n "(cached) " >&6
++fi
++eval ac_res=\$$3
++	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
++$as_echo "$ac_res" >&6; }
++else
++  # Is the header compilable?
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
++$as_echo_n "checking $2 usability... " >&6; }
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++$4
++#include <$2>
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++  ac_header_compiler=yes
++else
++  ac_header_compiler=no
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
++$as_echo "$ac_header_compiler" >&6; }
+ 
+-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
+-uname -m = `(uname -m) 2>/dev/null || echo unknown`
+-uname -r = `(uname -r) 2>/dev/null || echo unknown`
+-uname -s = `(uname -s) 2>/dev/null || echo unknown`
+-uname -v = `(uname -v) 2>/dev/null || echo unknown`
++# Is the header present?
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
++$as_echo_n "checking $2 presence... " >&6; }
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <$2>
++_ACEOF
++if ac_fn_c_try_cpp "$LINENO"; then :
++  ac_header_preproc=yes
++else
++  ac_header_preproc=no
++fi
++rm -f conftest.err conftest.$ac_ext
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
++$as_echo "$ac_header_preproc" >&6; }
+ 
+-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
+-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
++# So?  What about this header?
++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
++  yes:no: )
++    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
++$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
++$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
++    ;;
++  no:yes:* )
++    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
++$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
++    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
++$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
++    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
++$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
++    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
++$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
++$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
++    ;;
++esac
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
++$as_echo_n "checking for $2... " >&6; }
++if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++  $as_echo_n "(cached) " >&6
++else
++  eval "$3=\$ac_header_compiler"
++fi
++eval ac_res=\$$3
++	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
++$as_echo "$ac_res" >&6; }
++fi
++  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ 
+-/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
+-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
+-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
+-hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
+-/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
+-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
+-/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
++} # ac_fn_c_check_header_mongrel
++
++# ac_fn_c_try_run LINENO
++# ----------------------
++# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
++# that executables *can* be run.
++ac_fn_c_try_run ()
++{
++  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++  if { { ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++  (eval "$ac_link") 2>&5
++  ac_status=$?
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
++  { { case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++  (eval "$ac_try") 2>&5
++  ac_status=$?
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; }; then :
++  ac_retval=0
++else
++  $as_echo "$as_me: program exited with status $ac_status" >&5
++       $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++       ac_retval=$ac_status
++fi
++  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
++  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++  as_fn_set_status $ac_retval
++
++} # ac_fn_c_try_run
++
++# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
++# -------------------------------------------------------
++# Tests whether HEADER exists and can be compiled using the include files in
++# INCLUDES, setting the cache variable VAR accordingly.
++ac_fn_c_check_header_compile ()
++{
++  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
++$as_echo_n "checking for $2... " >&6; }
++if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++  $as_echo_n "(cached) " >&6
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++$4
++#include <$2>
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++  eval "$3=yes"
++else
++  eval "$3=no"
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++eval ac_res=\$$3
++	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
++$as_echo "$ac_res" >&6; }
++  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++
++} # ac_fn_c_check_header_compile
++
++# ac_fn_c_try_link LINENO
++# -----------------------
++# Try to link conftest.$ac_ext, and return whether this succeeded.
++ac_fn_c_try_link ()
++{
++  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++  rm -f conftest.$ac_objext conftest$ac_exeext
++  if { { ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++  (eval "$ac_link") 2>conftest.err
++  ac_status=$?
++  if test -s conftest.err; then
++    grep -v '^ *+' conftest.err >conftest.er1
++    cat conftest.er1 >&5
++    mv -f conftest.er1 conftest.err
++  fi
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext && {
++	 test "$cross_compiling" = yes ||
++	 $as_test_x conftest$ac_exeext
++       }; then :
++  ac_retval=0
++else
++  $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	ac_retval=1
++fi
++  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
++  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
++  # interfere with the next link command; also delete a directory that is
++  # left behind by Apple's compiler.  We do this before executing the actions.
++  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
++  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++  as_fn_set_status $ac_retval
++
++} # ac_fn_c_try_link
++
++# ac_fn_c_compute_int LINENO EXPR VAR INCLUDES
++# --------------------------------------------
++# Tries to find the compile-time value of EXPR in a program that includes
++# INCLUDES, setting VAR accordingly. Returns whether the value could be
++# computed
++ac_fn_c_compute_int ()
++{
++  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++  if test "$cross_compiling" = yes; then
++    # Depending upon the size, compute the lo and hi bounds.
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++$4
++int
++main ()
++{
++static int test_array [1 - 2 * !(($2) >= 0)];
++test_array [0] = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++  ac_lo=0 ac_mid=0
++  while :; do
++    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++$4
++int
++main ()
++{
++static int test_array [1 - 2 * !(($2) <= $ac_mid)];
++test_array [0] = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++  ac_hi=$ac_mid; break
++else
++  as_fn_arith $ac_mid + 1 && ac_lo=$as_val
++			if test $ac_lo -le $ac_mid; then
++			  ac_lo= ac_hi=
++			  break
++			fi
++			as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++  done
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++$4
++int
++main ()
++{
++static int test_array [1 - 2 * !(($2) < 0)];
++test_array [0] = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++  ac_hi=-1 ac_mid=-1
++  while :; do
++    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++$4
++int
++main ()
++{
++static int test_array [1 - 2 * !(($2) >= $ac_mid)];
++test_array [0] = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++  ac_lo=$ac_mid; break
++else
++  as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val
++			if test $ac_mid -le $ac_hi; then
++			  ac_lo= ac_hi=
++			  break
++			fi
++			as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++  done
++else
++  ac_lo= ac_hi=
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++# Binary search between lo and hi bounds.
++while test "x$ac_lo" != "x$ac_hi"; do
++  as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++$4
++int
++main ()
++{
++static int test_array [1 - 2 * !(($2) <= $ac_mid)];
++test_array [0] = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++  ac_hi=$ac_mid
++else
++  as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++done
++case $ac_lo in #((
++?*) eval "$3=\$ac_lo"; ac_retval=0 ;;
++'') ac_retval=1 ;;
++esac
++  else
++    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++$4
++static long int longval () { return $2; }
++static unsigned long int ulongval () { return $2; }
++#include <stdio.h>
++#include <stdlib.h>
++int
++main ()
++{
++
++  FILE *f = fopen ("conftest.val", "w");
++  if (! f)
++    return 1;
++  if (($2) < 0)
++    {
++      long int i = longval ();
++      if (i != ($2))
++	return 1;
++      fprintf (f, "%ld", i);
++    }
++  else
++    {
++      unsigned long int i = ulongval ();
++      if (i != ($2))
++	return 1;
++      fprintf (f, "%lu", i);
++    }
++  /* Do not output a trailing newline, as this causes \r\n confusion
++     on some platforms.  */
++  return ferror (f) || fclose (f) != 0;
++
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_run "$LINENO"; then :
++  echo >>conftest.val; read $3 <conftest.val; ac_retval=0
++else
++  ac_retval=1
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++  conftest.$ac_objext conftest.beam conftest.$ac_ext
++rm -f conftest.val
++
++  fi
++  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++  as_fn_set_status $ac_retval
++
++} # ac_fn_c_compute_int
++
++# ac_fn_c_check_func LINENO FUNC VAR
++# ----------------------------------
++# Tests whether FUNC exists, setting the cache variable VAR accordingly
++ac_fn_c_check_func ()
++{
++  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
++$as_echo_n "checking for $2... " >&6; }
++if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++  $as_echo_n "(cached) " >&6
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define $2 innocuous_$2
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $2 (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $2
++
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char $2 ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined __stub_$2 || defined __stub___$2
++choke me
++#endif
++
++int
++main ()
++{
++return $2 ();
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
++  eval "$3=yes"
++else
++  eval "$3=no"
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++fi
++eval ac_res=\$$3
++	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
++$as_echo "$ac_res" >&6; }
++  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++
++} # ac_fn_c_check_func
++
++# ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES
++# ----------------------------------------------------
++# Tries to find if the field MEMBER exists in type AGGR, after including
++# INCLUDES, setting cache variable VAR accordingly.
++ac_fn_c_check_member ()
++{
++  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
++$as_echo_n "checking for $2.$3... " >&6; }
++if { as_var=$4; eval "test \"\${$as_var+set}\" = set"; }; then :
++  $as_echo_n "(cached) " >&6
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++$5
++int
++main ()
++{
++static $2 ac_aggr;
++if (ac_aggr.$3)
++return 0;
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++  eval "$4=yes"
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++$5
++int
++main ()
++{
++static $2 ac_aggr;
++if (sizeof ac_aggr.$3)
++return 0;
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++  eval "$4=yes"
++else
++  eval "$4=no"
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++eval ac_res=\$$4
++	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
++$as_echo "$ac_res" >&6; }
++  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++
++} # ac_fn_c_check_member
++
++# ac_fn_c_check_decl LINENO SYMBOL VAR
++# ------------------------------------
++# Tests whether SYMBOL is declared, setting cache variable VAR accordingly.
++ac_fn_c_check_decl ()
++{
++  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $2 is declared" >&5
++$as_echo_n "checking whether $2 is declared... " >&6; }
++if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++  $as_echo_n "(cached) " >&6
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++$4
++int
++main ()
++{
++#ifndef $2
++  (void) $2;
++#endif
++
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++  eval "$3=yes"
++else
++  eval "$3=no"
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++eval ac_res=\$$3
++	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
++$as_echo "$ac_res" >&6; }
++  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++
++} # ac_fn_c_check_decl
++cat >config.log <<_ACEOF
++This file contains any messages produced by compilers while
++running configure, to aid debugging if configure makes a mistake.
++
++It was created by $as_me, which was
++generated by GNU Autoconf 2.65.  Invocation command line was
++
++  $ $0 $@
++
++_ACEOF
++exec 5>>config.log
++{
++cat <<_ASUNAME
++## --------- ##
++## Platform. ##
++## --------- ##
++
++hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
++uname -m = `(uname -m) 2>/dev/null || echo unknown`
++uname -r = `(uname -r) 2>/dev/null || echo unknown`
++uname -s = `(uname -s) 2>/dev/null || echo unknown`
++uname -v = `(uname -v) 2>/dev/null || echo unknown`
++
++/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
++/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
++
++/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
++/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
++/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
++/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
++/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
++/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
++/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
+ 
+ _ASUNAME
+ 
+@@ -1049,8 +2198,9 @@ for as_dir in $PATH
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  echo "PATH: $as_dir"
+-done
++    $as_echo "PATH: $as_dir"
++  done
++IFS=$as_save_IFS
+ 
+ } >&5
+ 
+@@ -1072,7 +2222,6 @@ _ACEOF
+ ac_configure_args=
+ ac_configure_args0=
+ ac_configure_args1=
+-ac_sep=
+ ac_must_keep_next=false
+ for ac_pass in 1 2
+ do
+@@ -1083,13 +2232,13 @@ do
+     -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+     | -silent | --silent | --silen | --sile | --sil)
+       continue ;;
+-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
+-      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
++    *\'*)
++      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+     esac
+     case $ac_pass in
+-    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
++    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
+     2)
+-      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
++      as_fn_append ac_configure_args1 " '$ac_arg'"
+       if test $ac_must_keep_next = true; then
+ 	ac_must_keep_next=false # Got value, back to normal.
+       else
+@@ -1105,21 +2254,19 @@ do
+ 	  -* ) ac_must_keep_next=true ;;
+ 	esac
+       fi
+-      ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
+-      # Get rid of the leading space.
+-      ac_sep=" "
++      as_fn_append ac_configure_args " '$ac_arg'"
+       ;;
+     esac
+   done
+ done
+-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
+-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
++{ ac_configure_args0=; unset ac_configure_args0;}
++{ ac_configure_args1=; unset ac_configure_args1;}
+ 
+ # When interrupted or exit'd, cleanup temporary files, and complete
+ # config.log.  We remove comments because anyway the quotes in there
+ # would cause problems or look ugly.
+-# WARNING: Be sure not to use single quotes in there, as some shells,
+-# such as our DU 5.0 friend, will then `close' the trap.
++# WARNING: Use '\'' to represent an apostrophe within the trap.
++# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
+ trap 'exit_status=$?
+   # Save into config.log some information that might help in debugging.
+   {
+@@ -1132,20 +2279,35 @@ trap 'exit_status=$?
+ _ASBOX
+     echo
+     # The following way of writing the cache mishandles newlines in values,
+-{
++(
++  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
++    eval ac_val=\$$ac_var
++    case $ac_val in #(
++    *${as_nl}*)
++      case $ac_var in #(
++      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
++      esac
++      case $ac_var in #(
++      _ | IFS | as_nl) ;; #(
++      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
++      *) { eval $ac_var=; unset $ac_var;} ;;
++      esac ;;
++    esac
++  done
+   (set) 2>&1 |
+-    case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
+-    *ac_space=\ *)
++    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
++    *${as_nl}ac_space=\ *)
+       sed -n \
+-	"s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
+-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
+-      ;;
++	"s/'\''/'\''\\\\'\'''\''/g;
++	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
++      ;; #(
+     *)
+-      sed -n \
+-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
++      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+       ;;
+-    esac;
+-}
++    esac |
++    sort
++)
+     echo
+ 
+     cat <<\_ASBOX
+@@ -1156,22 +2318,28 @@ _ASBOX
+     echo
+     for ac_var in $ac_subst_vars
+     do
+-      eval ac_val=$`echo $ac_var`
+-      echo "$ac_var='"'"'$ac_val'"'"'"
++      eval ac_val=\$$ac_var
++      case $ac_val in
++      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
++      esac
++      $as_echo "$ac_var='\''$ac_val'\''"
+     done | sort
+     echo
+ 
+     if test -n "$ac_subst_files"; then
+       cat <<\_ASBOX
+-## ------------- ##
+-## Output files. ##
+-## ------------- ##
++## ------------------- ##
++## File substitutions. ##
++## ------------------- ##
+ _ASBOX
+       echo
+       for ac_var in $ac_subst_files
+       do
+-	eval ac_val=$`echo $ac_var`
+-	echo "$ac_var='"'"'$ac_val'"'"'"
++	eval ac_val=\$$ac_var
++	case $ac_val in
++	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
++	esac
++	$as_echo "$ac_var='\''$ac_val'\''"
+       done | sort
+       echo
+     fi
+@@ -1183,26 +2351,26 @@ _ASBOX
+ ## ----------- ##
+ _ASBOX
+       echo
+-      sed "/^$/d" confdefs.h | sort
++      cat confdefs.h
+       echo
+     fi
+     test "$ac_signal" != 0 &&
+-      echo "$as_me: caught signal $ac_signal"
+-    echo "$as_me: exit $exit_status"
++      $as_echo "$as_me: caught signal $ac_signal"
++    $as_echo "$as_me: exit $exit_status"
+   } >&5
+-  rm -f core *.core &&
+-  rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
++  rm -f core *.core core.conftest.* &&
++    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
+     exit $exit_status
+-     ' 0
++' 0
+ for ac_signal in 1 2 13 15; do
+-  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
++  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
+ done
+ ac_signal=0
+ 
+ # confdefs.h avoids OS command line length limits that DEFS can exceed.
+-rm -rf conftest* confdefs.h
+-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
+-echo >confdefs.h
++rm -f -r conftest* confdefs.h
++
++$as_echo "/* confdefs.h */" > confdefs.h
+ 
+ # Predefined preprocessor variables.
+ 
+@@ -1210,112 +2378,128 @@ cat >>confdefs.h <<_ACEOF
+ #define PACKAGE_NAME "$PACKAGE_NAME"
+ _ACEOF
+ 
+-
+ cat >>confdefs.h <<_ACEOF
+ #define PACKAGE_TARNAME "$PACKAGE_TARNAME"
+ _ACEOF
+ 
+-
+ cat >>confdefs.h <<_ACEOF
+ #define PACKAGE_VERSION "$PACKAGE_VERSION"
+ _ACEOF
+ 
+-
+ cat >>confdefs.h <<_ACEOF
+ #define PACKAGE_STRING "$PACKAGE_STRING"
+ _ACEOF
+ 
+-
+ cat >>confdefs.h <<_ACEOF
+ #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
+ _ACEOF
+ 
++cat >>confdefs.h <<_ACEOF
++#define PACKAGE_URL "$PACKAGE_URL"
++_ACEOF
++
+ 
+ # Let the site file select an alternate cache file if it wants to.
+-# Prefer explicitly selected file to automatically selected ones.
+-if test -z "$CONFIG_SITE"; then
+-  if test "x$prefix" != xNONE; then
+-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+-  else
+-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+-  fi
+-fi
+-for ac_site_file in $CONFIG_SITE; do
+-  if test -r "$ac_site_file"; then
+-    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+-echo "$as_me: loading site script $ac_site_file" >&6;}
++# Prefer an explicitly selected file to automatically selected ones.
++ac_site_file1=NONE
++ac_site_file2=NONE
++if test -n "$CONFIG_SITE"; then
++  ac_site_file1=$CONFIG_SITE
++elif test "x$prefix" != xNONE; then
++  ac_site_file1=$prefix/share/config.site
++  ac_site_file2=$prefix/etc/config.site
++else
++  ac_site_file1=$ac_default_prefix/share/config.site
++  ac_site_file2=$ac_default_prefix/etc/config.site
++fi
++for ac_site_file in "$ac_site_file1" "$ac_site_file2"
++do
++  test "x$ac_site_file" = xNONE && continue
++  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
++    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
++$as_echo "$as_me: loading site script $ac_site_file" >&6;}
+     sed 's/^/| /' "$ac_site_file" >&5
+     . "$ac_site_file"
+   fi
+ done
+ 
+ if test -r "$cache_file"; then
+-  # Some versions of bash will fail to source /dev/null (special
+-  # files actually), so we avoid doing that.
+-  if test -f "$cache_file"; then
+-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
+-echo "$as_me: loading cache $cache_file" >&6;}
++  # Some versions of bash will fail to source /dev/null (special files
++  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
++  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
++    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
++$as_echo "$as_me: loading cache $cache_file" >&6;}
+     case $cache_file in
+-      [\\/]* | ?:[\\/]* ) . $cache_file;;
+-      *)                      . ./$cache_file;;
++      [\\/]* | ?:[\\/]* ) . "$cache_file";;
++      *)                      . "./$cache_file";;
+     esac
+   fi
+ else
+-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
+-echo "$as_me: creating cache $cache_file" >&6;}
++  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
++$as_echo "$as_me: creating cache $cache_file" >&6;}
+   >$cache_file
+ fi
+ 
+ # Check that the precious variables saved in the cache have kept the same
+ # value.
+ ac_cache_corrupted=false
+-for ac_var in `(set) 2>&1 |
+-	       sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
++for ac_var in $ac_precious_vars; do
+   eval ac_old_set=\$ac_cv_env_${ac_var}_set
+   eval ac_new_set=\$ac_env_${ac_var}_set
+-  eval ac_old_val="\$ac_cv_env_${ac_var}_value"
+-  eval ac_new_val="\$ac_env_${ac_var}_value"
++  eval ac_old_val=\$ac_cv_env_${ac_var}_value
++  eval ac_new_val=\$ac_env_${ac_var}_value
+   case $ac_old_set,$ac_new_set in
+     set,)
+-      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
++      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
++$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+       ac_cache_corrupted=: ;;
+     ,set)
+-      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
+-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
++      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
++$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+       ac_cache_corrupted=: ;;
+     ,);;
+     *)
+       if test "x$ac_old_val" != "x$ac_new_val"; then
+-	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+-	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
+-echo "$as_me:   former value:  $ac_old_val" >&2;}
+-	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
+-echo "$as_me:   current value: $ac_new_val" >&2;}
+-	ac_cache_corrupted=:
++	# differences in whitespace do not lead to failure.
++	ac_old_val_w=`echo x $ac_old_val`
++	ac_new_val_w=`echo x $ac_new_val`
++	if test "$ac_old_val_w" != "$ac_new_val_w"; then
++	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
++$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
++	  ac_cache_corrupted=:
++	else
++	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
++$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
++	  eval $ac_var=\$ac_old_val
++	fi
++	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
++$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
++	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
++$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
+       fi;;
+   esac
+   # Pass precious variables to config.status.
+   if test "$ac_new_set" = set; then
+     case $ac_new_val in
+-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
+-      ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
++    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+     *) ac_arg=$ac_var=$ac_new_val ;;
+     esac
+     case " $ac_configure_args " in
+       *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
+-      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
++      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
+     esac
+   fi
+ done
+ if $ac_cache_corrupted; then
+-  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
+-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+-  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
++  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
++$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
++  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
++fi
++## -------------------- ##
++## Main body of script. ##
++## -------------------- ##
+ 
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -1325,122 +2509,128 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+ 
+ 
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-          ac_config_headers="$ac_config_headers config.h"
++ac_config_headers="$ac_config_headers config.h"
+ 
+ ac_aux_dir=
+-for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
+-  if test -f $ac_dir/install-sh; then
+-    ac_aux_dir=$ac_dir
+-    ac_install_sh="$ac_aux_dir/install-sh -c"
+-    break
+-  elif test -f $ac_dir/install.sh; then
+-    ac_aux_dir=$ac_dir
+-    ac_install_sh="$ac_aux_dir/install.sh -c"
+-    break
+-  elif test -f $ac_dir/shtool; then
+-    ac_aux_dir=$ac_dir
+-    ac_install_sh="$ac_aux_dir/shtool install -c"
+-    break
+-  fi
++for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
++  for ac_t in install-sh install.sh shtool; do
++    if test -f "$ac_dir/$ac_t"; then
++      ac_aux_dir=$ac_dir
++      ac_install_sh="$ac_aux_dir/$ac_t -c"
++      break 2
++    fi
++  done
+ done
+ if test -z "$ac_aux_dir"; then
+-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+-echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
+-ac_config_guess="$SHELL $ac_aux_dir/config.guess"
+-ac_config_sub="$SHELL $ac_aux_dir/config.sub"
+-ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
++  as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
++fi
++
++# These three variables are undocumented and unsupported,
++# and are intended to be withdrawn in a future Autoconf release.
++# They can cause serious problems if a builder's source tree is in a directory
++# whose full name contains unusual characters.
++ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
++ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
++ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
++
+ 
+ # Make sure we can run config.sub.
+-$ac_config_sub sun4 >/dev/null 2>&1 ||
+-  { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
+-echo "$as_me: error: cannot run $ac_config_sub" >&2;}
+-   { (exit 1); exit 1; }; }
+-
+-echo "$as_me:$LINENO: checking build system type" >&5
+-echo $ECHO_N "checking build system type... $ECHO_C" >&6
+-if test "${ac_cv_build+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_cv_build_alias=$build_alias
+-test -z "$ac_cv_build_alias" &&
+-  ac_cv_build_alias=`$ac_config_guess`
+-test -z "$ac_cv_build_alias" &&
+-  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
+-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+-   { (exit 1); exit 1; }; }
+-ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
+-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
+-echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
+-   { (exit 1); exit 1; }; }
++$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
++  as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+ 
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+-echo "${ECHO_T}$ac_cv_build" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
++$as_echo_n "checking build system type... " >&6; }
++if test "${ac_cv_build+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  ac_build_alias=$build_alias
++test "x$ac_build_alias" = x &&
++  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
++test "x$ac_build_alias" = x &&
++  as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
++ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
++  as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
++
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
++$as_echo "$ac_cv_build" >&6; }
++case $ac_cv_build in
++*-*-*) ;;
++*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
++esac
+ build=$ac_cv_build
+-build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+-build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+-build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+-
+-
+-echo "$as_me:$LINENO: checking host system type" >&5
+-echo $ECHO_N "checking host system type... $ECHO_C" >&6
+-if test "${ac_cv_host+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_cv_host_alias=$host_alias
+-test -z "$ac_cv_host_alias" &&
+-  ac_cv_host_alias=$ac_cv_build_alias
+-ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
+-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+-echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
+-   { (exit 1); exit 1; }; }
++ac_save_IFS=$IFS; IFS='-'
++set x $ac_cv_build
++shift
++build_cpu=$1
++build_vendor=$2
++shift; shift
++# Remember, the first character of IFS is used to create $*,
++# except with old shells:
++build_os=$*
++IFS=$ac_save_IFS
++case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
++
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
++$as_echo_n "checking host system type... " >&6; }
++if test "${ac_cv_host+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  if test "x$host_alias" = x; then
++  ac_cv_host=$ac_cv_build
++else
++  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
++    as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
++fi
+ 
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+-echo "${ECHO_T}$ac_cv_host" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
++$as_echo "$ac_cv_host" >&6; }
++case $ac_cv_host in
++*-*-*) ;;
++*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
++esac
+ host=$ac_cv_host
+-host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+-host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+-host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
++ac_save_IFS=$IFS; IFS='-'
++set x $ac_cv_host
++shift
++host_cpu=$1
++host_vendor=$2
++shift; shift
++# Remember, the first character of IFS is used to create $*,
++# except with old shells:
++host_os=$*
++IFS=$ac_save_IFS
++case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
++
+ 
+ 
++WARNERROR=-W
++# Check whether --enable-warnings-are-errors was given.
++if test "${enable_warnings_are_errors+set}" = set; then :
++  enableval=$enable_warnings_are_errors;  if test "$enableval" != "no" ; then WARNERROR=-Werror ; fi
++fi
++
+ 
+ 
+-# Check whether --with-extraident or --without-extraident was given.
+-if test "${with_extraident+set}" = set; then
+-  withval="$with_extraident"
+ 
++# Check whether --with-extraident was given.
++if test "${with_extraident+set}" = set; then :
++  withval=$with_extraident;
+ cat >>confdefs.h <<_ACEOF
+ #define EXTRA_IDENT "$withval"
+ _ACEOF
+ 
+-fi;
++fi
++
+ 
+ # Extract the first word of "makedepend", so it can be a program name with args.
+ set dummy makedepend; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_MAKEDEPEND+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_MAKEDEPEND+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
+   if test -n "$MAKEDEPEND"; then
+   ac_cv_prog_MAKEDEPEND="$MAKEDEPEND" # Let the user override the test.
+@@ -1450,51 +2640,50 @@ for as_dir in $PATH
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_MAKEDEPEND="makedepend"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
++IFS=$as_save_IFS
+ 
+   test -z "$ac_cv_prog_MAKEDEPEND" && ac_cv_prog_MAKEDEPEND="`cd ${srcdir};pwd`/tools/not-mkdep"
+ fi
+ fi
+ MAKEDEPEND=$ac_cv_prog_MAKEDEPEND
+ if test -n "$MAKEDEPEND"; then
+-  echo "$as_me:$LINENO: result: $MAKEDEPEND" >&5
+-echo "${ECHO_T}$MAKEDEPEND" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKEDEPEND" >&5
++$as_echo "$MAKEDEPEND" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+ 
++
+ if test "$MAKEDEPEND" != "makedepend"; then
+-        { echo "$as_me:$LINENO: WARNING: Makedepend is not installed on this system.  You should compile and install the version from the makedepend subdirectory." >&5
+-echo "$as_me: WARNING: Makedepend is not installed on this system.  You should compile and install the version from the makedepend subdirectory." >&2;}
++        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Makedepend is not installed on this system.  You should compile and install the version from the makedepend subdirectory." >&5
++$as_echo "$as_me: WARNING: Makedepend is not installed on this system.  You should compile and install the version from the makedepend subdirectory." >&2;}
++fi
++
++
++# Check whether --with-login was given.
++if test "${with_login+set}" = set; then :
++  withval=$with_login; as_fn_error "--with-login is no longer supported.
++Configure SASL appropriately instead." "$LINENO" 5
+ fi
+ 
+ 
+-# Check whether --with-login or --without-login was given.
+-if test "${with_login+set}" = set; then
+-  withval="$with_login"
+-  { { echo "$as_me:$LINENO: error: --with-login is no longer supported.
+-Configure SASL appropriately instead." >&5
+-echo "$as_me: error: --with-login is no longer supported.
+-Configure SASL appropriately instead." >&2;}
+-   { (exit 1); exit 1; }; }
+-fi;
+-
+-
+-# Check whether --with-cyrus-prefix or --without-cyrus-prefix was given.
+-if test "${with_cyrus_prefix+set}" = set; then
+-  withval="$with_cyrus_prefix"
+-  cyrus_prefix="$withval"
++
++# Check whether --with-cyrus-prefix was given.
++if test "${with_cyrus_prefix+set}" = set; then :
++  withval=$with_cyrus_prefix; cyrus_prefix="$withval"
+ else
+   cyrus_prefix="/usr/cyrus"
+-fi;
++fi
++
+ 
+ 
+ cat >>confdefs.h <<_ACEOF
+@@ -1502,13 +2691,13 @@ cat >>confdefs.h <<_ACEOF
+ _ACEOF
+ 
+ 
+-# Check whether --with-service-path or --without-service-path was given.
+-if test "${with_service_path+set}" = set; then
+-  withval="$with_service_path"
+-  service_path="$withval"
++# Check whether --with-service-path was given.
++if test "${with_service_path+set}" = set; then :
++  withval=$with_service_path; service_path="$withval"
+ else
+   service_path="$cyrus_prefix/bin"
+-fi;
++fi
++
+ 
+ 
+ cat >>confdefs.h <<_ACEOF
+@@ -1516,13 +2705,13 @@ cat >>confdefs.h <<_ACEOF
+ _ACEOF
+ 
+ 
+-# Check whether --with-cyrus-user or --without-cyrus-user was given.
+-if test "${with_cyrus_user+set}" = set; then
+-  withval="$with_cyrus_user"
+-  cyrus_user="$withval"
++# Check whether --with-cyrus-user was given.
++if test "${with_cyrus_user+set}" = set; then :
++  withval=$with_cyrus_user; cyrus_user="$withval"
+ else
+   cyrus_user="cyrus"
+-fi;
++fi
++
+ 
+ 
+ cat >>confdefs.h <<_ACEOF
+@@ -1530,13 +2719,13 @@ cat >>confdefs.h <<_ACEOF
+ _ACEOF
+ 
+ 
+-# Check whether --with-cyrus-group or --without-cyrus-group was given.
+-if test "${with_cyrus_group+set}" = set; then
+-  withval="$with_cyrus_group"
+-  cyrus_group="$withval"
++# Check whether --with-cyrus-group was given.
++if test "${with_cyrus_group+set}" = set; then :
++  withval=$with_cyrus_group; cyrus_group="$withval"
+ else
+   cyrus_group="mail"
+-fi;
++fi
++
+ 
+ 
+ if test $sysconfdir = '${prefix}/etc'; then
+@@ -1556,10 +2745,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}gcc; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_CC+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_CC+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
+   if test -n "$CC"; then
+   ac_cv_prog_CC="$CC" # Let the user override the test.
+@@ -1569,35 +2758,37 @@ for as_dir in $PATH
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_CC="${ac_tool_prefix}gcc"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
++IFS=$as_save_IFS
+ 
+ fi
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "$as_me:$LINENO: result: $CC" >&5
+-echo "${ECHO_T}$CC" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
++$as_echo "$CC" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+ 
++
+ fi
+ if test -z "$ac_cv_prog_CC"; then
+   ac_ct_CC=$CC
+   # Extract the first word of "gcc", so it can be a program name with args.
+ set dummy gcc; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_CC"; then
+   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+@@ -1607,39 +2798,50 @@ for as_dir in $PATH
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_CC="gcc"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
++IFS=$as_save_IFS
+ 
+ fi
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+-echo "${ECHO_T}$ac_ct_CC" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
++$as_echo "$ac_ct_CC" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+ 
+-  CC=$ac_ct_CC
++  if test "x$ac_ct_CC" = x; then
++    CC=""
++  else
++    case $cross_compiling:$ac_tool_warned in
++yes:)
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++ac_tool_warned=yes ;;
++esac
++    CC=$ac_ct_CC
++  fi
+ else
+   CC="$ac_cv_prog_CC"
+ fi
+ 
+ if test -z "$CC"; then
+-  if test -n "$ac_tool_prefix"; then
+-  # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
++          if test -n "$ac_tool_prefix"; then
++    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}cc; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_CC+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_CC+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
+   if test -n "$CC"; then
+   ac_cv_prog_CC="$CC" # Let the user override the test.
+@@ -1649,77 +2851,37 @@ for as_dir in $PATH
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_CC="${ac_tool_prefix}cc"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
++IFS=$as_save_IFS
+ 
+ fi
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "$as_me:$LINENO: result: $CC" >&5
+-echo "${ECHO_T}$CC" >&6
+-else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+-
+-fi
+-if test -z "$ac_cv_prog_CC"; then
+-  ac_ct_CC=$CC
+-  # Extract the first word of "cc", so it can be a program name with args.
+-set dummy cc; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  if test -n "$ac_ct_CC"; then
+-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_ac_ct_CC="cc"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-done
+-
+-fi
+-fi
+-ac_ct_CC=$ac_cv_prog_ac_ct_CC
+-if test -n "$ac_ct_CC"; then
+-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+-echo "${ECHO_T}$ac_ct_CC" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
++$as_echo "$CC" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+ 
+-  CC=$ac_ct_CC
+-else
+-  CC="$ac_cv_prog_CC"
+-fi
+ 
++  fi
+ fi
+ if test -z "$CC"; then
+   # Extract the first word of "cc", so it can be a program name with args.
+ set dummy cc; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_CC+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_CC+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
+   if test -n "$CC"; then
+   ac_cv_prog_CC="$CC" # Let the user override the test.
+@@ -1730,18 +2892,19 @@ for as_dir in $PATH
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+        ac_prog_rejected=yes
+        continue
+      fi
+     ac_cv_prog_CC="cc"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
++IFS=$as_save_IFS
+ 
+ if test $ac_prog_rejected = yes; then
+   # We found a bogon in the path, so make sure we never use it.
+@@ -1759,24 +2922,25 @@ fi
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "$as_me:$LINENO: result: $CC" >&5
+-echo "${ECHO_T}$CC" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
++$as_echo "$CC" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+ 
++
+ fi
+ if test -z "$CC"; then
+   if test -n "$ac_tool_prefix"; then
+-  for ac_prog in cl
++  for ac_prog in cl.exe
+   do
+     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_CC+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_CC+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
+   if test -n "$CC"; then
+   ac_cv_prog_CC="$CC" # Let the user override the test.
+@@ -1786,39 +2950,41 @@ for as_dir in $PATH
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
++IFS=$as_save_IFS
+ 
+ fi
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "$as_me:$LINENO: result: $CC" >&5
+-echo "${ECHO_T}$CC" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
++$as_echo "$CC" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+ 
++
+     test -n "$CC" && break
+   done
+ fi
+ if test -z "$CC"; then
+   ac_ct_CC=$CC
+-  for ac_prog in cl
++  for ac_prog in cl.exe
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_CC"; then
+   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+@@ -1828,66 +2994,78 @@ for as_dir in $PATH
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_CC="$ac_prog"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
++IFS=$as_save_IFS
+ 
+ fi
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+-echo "${ECHO_T}$ac_ct_CC" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
++$as_echo "$ac_ct_CC" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+ 
++
+   test -n "$ac_ct_CC" && break
+ done
+ 
+-  CC=$ac_ct_CC
++  if test "x$ac_ct_CC" = x; then
++    CC=""
++  else
++    case $cross_compiling:$ac_tool_warned in
++yes:)
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++ac_tool_warned=yes ;;
++esac
++    CC=$ac_ct_CC
++  fi
+ fi
+ 
+ fi
+ 
+ 
+-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: no acceptable C compiler found in \$PATH
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
++test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error "no acceptable C compiler found in \$PATH
++See \`config.log' for more details." "$LINENO" 5; }
+ 
+ # Provide some information about the compiler.
+-echo "$as_me:$LINENO:" \
+-     "checking for C compiler version" >&5
+-ac_compiler=`set X $ac_compile; echo $2`
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
+-  (eval $ac_compiler --version </dev/null >&5) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
+-  (eval $ac_compiler -v </dev/null >&5) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
+-  (eval $ac_compiler -V </dev/null >&5) 2>&5
++$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
++set X $ac_compile
++ac_compiler=$2
++for ac_option in --version -v -V -qversion; do
++  { { ac_try="$ac_compiler $ac_option >&5"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+   ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }
++  if test -s conftest.err; then
++    sed '10a\
++... rest of stderr output deleted ...
++         10q' conftest.err >conftest.er1
++    cat conftest.er1 >&5
++  fi
++  rm -f conftest.er1 conftest.err
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }
++done
+ 
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ int
+@@ -1899,112 +3077,109 @@ main ()
+ }
+ _ACEOF
+ ac_clean_files_save=$ac_clean_files
+-ac_clean_files="$ac_clean_files a.out a.exe b.out"
++ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
+ # Try to create an executable without -o first, disregard a.out.
+ # It will help us diagnose broken compilers, and finding out an intuition
+ # of exeext.
+-echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
+-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+-if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
+-  (eval $ac_link_default) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-  # Find the output, starting from the most likely.  This scheme is
+-# not robust to junk in `.', hence go to wildcards (a.*) only as a last
+-# resort.
+-
+-# Be careful to initialize this variable, since it used to be cached.
+-# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
+-ac_cv_exeext=
+-# b.out is created by i960 compilers.
+-for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
++$as_echo_n "checking whether the C compiler works... " >&6; }
++ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
++
++# The possible output files:
++ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
++
++ac_rmfiles=
++for ac_file in $ac_files
++do
++  case $ac_file in
++    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
++    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
++  esac
++done
++rm -f $ac_rmfiles
++
++if { { ac_try="$ac_link_default"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++  (eval "$ac_link_default") 2>&5
++  ac_status=$?
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then :
++  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
++# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
++# in a Makefile.  We should not override ac_cv_exeext if it was cached,
++# so that the user can short-circuit this test for compilers unknown to
++# Autoconf.
++for ac_file in $ac_files ''
+ do
+   test -f "$ac_file" || continue
+   case $ac_file in
+-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
+-	;;
+-    conftest.$ac_ext )
+-	# This is the source file.
++    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
+ 	;;
+     [ab].out )
+ 	# We found the default executable, but exeext='' is most
+ 	# certainly right.
+ 	break;;
+     *.* )
+-	ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+-	# FIXME: I believe we export ac_cv_exeext for Libtool,
+-	# but it would be cool to find out if it's true.  Does anybody
+-	# maintain Libtool? --akim.
+-	export ac_cv_exeext
++	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
++	then :; else
++	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
++	fi
++	# We set ac_cv_exeext here because the later test for it is not
++	# safe: cross compilers may not add the suffix if given an `-o'
++	# argument, so we may need to know it at that point already.
++	# Even if this section looks crufty: it has the advantage of
++	# actually working.
+ 	break;;
+     * )
+ 	break;;
+   esac
+ done
++test "$ac_cv_exeext" = no && ac_cv_exeext=
++
+ else
+-  echo "$as_me: failed program was:" >&5
++  ac_file=''
++fi
++if test -z "$ac_file"; then :
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++$as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: C compiler cannot create executables
+-See \`config.log' for more details." >&2;}
+-   { (exit 77); exit 77; }; }
++{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ as_fn_set_status 77
++as_fn_error "C compiler cannot create executables
++See \`config.log' for more details." "$LINENO" 5; }; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
+ fi
+-
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
++$as_echo_n "checking for C compiler default output file name... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
++$as_echo "$ac_file" >&6; }
+ ac_exeext=$ac_cv_exeext
+-echo "$as_me:$LINENO: result: $ac_file" >&5
+-echo "${ECHO_T}$ac_file" >&6
+-
+-# Check the compiler produces executables we can run.  If not, either
+-# the compiler is broken, or we cross compile.
+-echo "$as_me:$LINENO: checking whether the C compiler works" >&5
+-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
+-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
+-# If not cross compiling, check that we can run a simple program.
+-if test "$cross_compiling" != yes; then
+-  if { ac_try='./$ac_file'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-    cross_compiling=no
+-  else
+-    if test "$cross_compiling" = maybe; then
+-	cross_compiling=yes
+-    else
+-	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
+-If you meant to cross compile, use \`--host'.
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot run C compiled programs.
+-If you meant to cross compile, use \`--host'.
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-    fi
+-  fi
+-fi
+-echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+ 
+-rm -f a.out a.exe conftest$ac_cv_exeext b.out
++rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
+ ac_clean_files=$ac_clean_files_save
+-# Check the compiler produces executables we can run.  If not, either
+-# the compiler is broken, or we cross compile.
+-echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
+-echo "$as_me:$LINENO: result: $cross_compiling" >&5
+-echo "${ECHO_T}$cross_compiling" >&6
+-
+-echo "$as_me:$LINENO: checking for suffix of executables" >&5
+-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
++$as_echo_n "checking for suffix of executables... " >&6; }
++if { { ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++  (eval "$ac_link") 2>&5
+   ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then :
+   # If both `conftest.exe' and `conftest' are `present' (well, observable)
+ # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
+ # work properly (i.e., refer to `conftest.exe'), while it won't with
+@@ -2012,38 +3187,90 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ for ac_file in conftest.exe conftest conftest.*; do
+   test -f "$ac_file" || continue
+   case $ac_file in
+-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
++    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+-	  export ac_cv_exeext
+ 	  break;;
+     * ) break;;
+   esac
+ done
+ else
+-  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
+-
+-rm -f conftest$ac_cv_exeext
+-echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+-echo "${ECHO_T}$ac_cv_exeext" >&6
++  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error "cannot compute suffix of executables: cannot compile and link
++See \`config.log' for more details." "$LINENO" 5; }
++fi
++rm -f conftest conftest$ac_cv_exeext
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
++$as_echo "$ac_cv_exeext" >&6; }
+ 
+ rm -f conftest.$ac_ext
+ EXEEXT=$ac_cv_exeext
+ ac_exeext=$EXEEXT
+-echo "$as_me:$LINENO: checking for suffix of object files" >&5
+-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
+-if test "${ac_cv_objext+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <stdio.h>
++int
++main ()
++{
++FILE *f = fopen ("conftest.out", "w");
++ return ferror (f) || fclose (f) != 0;
++
++  ;
++  return 0;
++}
+ _ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++ac_clean_files="$ac_clean_files conftest.out"
++# Check that the compiler produces executables we can run.  If not, either
++# the compiler is broken, or we cross compile.
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
++$as_echo_n "checking whether we are cross compiling... " >&6; }
++if test "$cross_compiling" != yes; then
++  { { ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++  (eval "$ac_link") 2>&5
++  ac_status=$?
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }
++  if { ac_try='./conftest$ac_cv_exeext'
++  { { case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++  (eval "$ac_try") 2>&5
++  ac_status=$?
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; }; then
++    cross_compiling=no
++  else
++    if test "$cross_compiling" = maybe; then
++	cross_compiling=yes
++    else
++	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error "cannot run C compiled programs.
++If you meant to cross compile, use \`--host'.
++See \`config.log' for more details." "$LINENO" 5; }
++    fi
++  fi
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
++$as_echo "$cross_compiling" >&6; }
++
++rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
++ac_clean_files=$ac_clean_files_save
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
++$as_echo_n "checking for suffix of object files... " >&6; }
++if test "${ac_cv_objext+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ int
+@@ -2055,45 +3282,46 @@ main ()
+ }
+ _ACEOF
+ rm -f conftest.o conftest.obj
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-  for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
++if { { ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++  (eval "$ac_compile") 2>&5
++  ac_status=$?
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then :
++  for ac_file in conftest.o conftest.obj conftest.*; do
++  test -f "$ac_file" || continue;
+   case $ac_file in
+-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
++    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
+     *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
+        break;;
+   esac
+ done
+ else
+-  echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute suffix of object files: cannot compile
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
++{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error "cannot compute suffix of object files: cannot compile
++See \`config.log' for more details." "$LINENO" 5; }
+ fi
+-
+ rm -f conftest.$ac_cv_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+-echo "${ECHO_T}$ac_cv_objext" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
++$as_echo "$ac_cv_objext" >&6; }
+ OBJEXT=$ac_cv_objext
+ ac_objext=$OBJEXT
+-echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
+-if test "${ac_cv_c_compiler_gnu+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
++$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
++if test "${ac_cv_c_compiler_gnu+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ int
+@@ -2107,55 +3335,34 @@ main ()
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++if ac_fn_c_try_compile "$LINENO"; then :
+   ac_compiler_gnu=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_compiler_gnu=no
++  ac_compiler_gnu=no
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cv_c_compiler_gnu=$ac_compiler_gnu
+ 
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
+-GCC=`test $ac_compiler_gnu = yes && echo yes`
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
++$as_echo "$ac_cv_c_compiler_gnu" >&6; }
++if test $ac_compiler_gnu = yes; then
++  GCC=yes
++else
++  GCC=
++fi
+ ac_test_CFLAGS=${CFLAGS+set}
+ ac_save_CFLAGS=$CFLAGS
+-CFLAGS="-g"
+-echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
+-if test "${ac_cv_prog_cc_g+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
++$as_echo_n "checking whether $CC accepts -g... " >&6; }
++if test "${ac_cv_prog_cc_g+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  ac_save_c_werror_flag=$ac_c_werror_flag
++   ac_c_werror_flag=yes
++   ac_cv_prog_cc_g=no
++   CFLAGS="-g"
++   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ int
+@@ -2166,39 +3373,49 @@ main ()
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++if ac_fn_c_try_compile "$LINENO"; then :
+   ac_cv_prog_cc_g=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++  CFLAGS=""
++      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++
++int
++main ()
++{
+ 
+-ac_cv_prog_cc_g=no
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++
++else
++  ac_c_werror_flag=$ac_save_c_werror_flag
++	 CFLAGS="-g"
++	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++  ac_cv_prog_cc_g=yes
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++   ac_c_werror_flag=$ac_save_c_werror_flag
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
++$as_echo "$ac_cv_prog_cc_g" >&6; }
+ if test "$ac_test_CFLAGS" = set; then
+   CFLAGS=$ac_save_CFLAGS
+ elif test $ac_cv_prog_cc_g = yes; then
+@@ -2214,18 +3431,14 @@ else
+     CFLAGS=
+   fi
+ fi
+-echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
+-echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
+-if test "${ac_cv_prog_cc_stdc+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
++$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
++if test "${ac_cv_prog_cc_c89+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
+-  ac_cv_prog_cc_stdc=no
++  ac_cv_prog_cc_c89=no
+ ac_save_CC=$CC
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include <stdarg.h>
+ #include <stdio.h>
+@@ -2253,12 +3466,17 @@ static char *f (char * (*g) (char **, in
+ /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
+    function prototypes and stuff, but not '\xHH' hex character constants.
+    These don't provoke an error unfortunately, instead are silently treated
+-   as 'x'.  The following induces an error, until -std1 is added to get
++   as 'x'.  The following induces an error, until -std is added to get
+    proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
+    array size at least.  It's necessary to write '\x00'==0 to get something
+-   that's true only with -std1.  */
++   that's true only with -std.  */
+ int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+ 
++/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
++   inside strings and character constants.  */
++#define FOO(x) 'x'
++int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
++
+ int test (int i, double x);
+ struct s1 {int (*f) (int a);};
+ struct s2 {int (*f) (double a);};
+@@ -2273,205 +3491,37 @@ return f (e, argv, 0) != argv[0]  ||  f 
+   return 0;
+ }
+ _ACEOF
+-# Don't try gcc -ansi; that turns off useful extensions and
+-# breaks some systems' header files.
+-# AIX			-qlanglvl=ansi
+-# Ultrix and OSF/1	-std1
+-# HP-UX 10.20 and later	-Ae
+-# HP-UX older versions	-Aa -D_HPUX_SOURCE
+-# SVR4			-Xc -D__EXTENSIONS__
+-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
++for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
++	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+ do
+   CC="$ac_save_CC $ac_arg"
+-  rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_prog_cc_stdc=$ac_arg
+-break
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
++  if ac_fn_c_try_compile "$LINENO"; then :
++  ac_cv_prog_cc_c89=$ac_arg
+ fi
+-rm -f conftest.err conftest.$ac_objext
++rm -f core conftest.err conftest.$ac_objext
++  test "x$ac_cv_prog_cc_c89" != "xno" && break
+ done
+-rm -f conftest.$ac_ext conftest.$ac_objext
++rm -f conftest.$ac_ext
+ CC=$ac_save_CC
+ 
+ fi
+-
+-case "x$ac_cv_prog_cc_stdc" in
+-  x|xno)
+-    echo "$as_me:$LINENO: result: none needed" >&5
+-echo "${ECHO_T}none needed" >&6 ;;
++# AC_CACHE_VAL
++case "x$ac_cv_prog_cc_c89" in
++  x)
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
++$as_echo "none needed" >&6; } ;;
++  xno)
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
++$as_echo "unsupported" >&6; } ;;
+   *)
+-    echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
+-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
+-    CC="$CC $ac_cv_prog_cc_stdc" ;;
++    CC="$CC $ac_cv_prog_cc_c89"
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
++$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
+ esac
++if test "x$ac_cv_prog_cc_c89" != xno; then :
+ 
+-# Some people use a C++ compiler to compile C.  Since we use `exit',
+-# in C++ we need to declare it.  In case someone uses the same compiler
+-# for both compiling C and C++ we need to have the C++ compiler decide
+-# the declaration of exit, since it's the most demanding environment.
+-cat >conftest.$ac_ext <<_ACEOF
+-#ifndef __cplusplus
+-  choke me
+-#endif
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  for ac_declaration in \
+-   '' \
+-   'extern "C" void std::exit (int) throw (); using std::exit;' \
+-   'extern "C" void std::exit (int); using std::exit;' \
+-   'extern "C" void exit (int) throw ();' \
+-   'extern "C" void exit (int);' \
+-   'void exit (int);'
+-do
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_declaration
+-#include <stdlib.h>
+-int
+-main ()
+-{
+-exit (42);
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  :
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-continue
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_declaration
+-int
+-main ()
+-{
+-exit (42);
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  break
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-done
+-rm -f conftest*
+-if test -n "$ac_declaration"; then
+-  echo '#ifdef __cplusplus' >>confdefs.h
+-  echo $ac_declaration      >>confdefs.h
+-  echo '#endif'             >>confdefs.h
+ fi
+ 
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -2481,10 +3531,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_RANLIB+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_RANLIB+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
+   if test -n "$RANLIB"; then
+   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+@@ -2494,35 +3544,37 @@ for as_dir in $PATH
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
++IFS=$as_save_IFS
+ 
+ fi
+ fi
+ RANLIB=$ac_cv_prog_RANLIB
+ if test -n "$RANLIB"; then
+-  echo "$as_me:$LINENO: result: $RANLIB" >&5
+-echo "${ECHO_T}$RANLIB" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
++$as_echo "$RANLIB" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+ 
++
+ fi
+ if test -z "$ac_cv_prog_RANLIB"; then
+   ac_ct_RANLIB=$RANLIB
+   # Extract the first word of "ranlib", so it can be a program name with args.
+ set dummy ranlib; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_RANLIB"; then
+   ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
+@@ -2532,58 +3584,70 @@ for as_dir in $PATH
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_RANLIB="ranlib"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
++IFS=$as_save_IFS
+ 
+-  test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
+ fi
+ fi
+ ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+ if test -n "$ac_ct_RANLIB"; then
+-  echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
+-echo "${ECHO_T}$ac_ct_RANLIB" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
++$as_echo "$ac_ct_RANLIB" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+ 
+-  RANLIB=$ac_ct_RANLIB
++  if test "x$ac_ct_RANLIB" = x; then
++    RANLIB=":"
++  else
++    case $cross_compiling:$ac_tool_warned in
++yes:)
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++ac_tool_warned=yes ;;
++esac
++    RANLIB=$ac_ct_RANLIB
++  fi
+ else
+   RANLIB="$ac_cv_prog_RANLIB"
+ fi
+ 
+-echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
+-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
+-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
++$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
++set x ${MAKE-make}
++ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
++if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
++  $as_echo_n "(cached) " >&6
+ else
+   cat >conftest.make <<\_ACEOF
++SHELL = /bin/sh
+ all:
+-	@echo 'ac_maketemp="$(MAKE)"'
++	@echo '@@@%%%=$(MAKE)=@@@%%%'
+ _ACEOF
+ # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+-eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
+-if test -n "$ac_maketemp"; then
+-  eval ac_cv_prog_make_${ac_make}_set=yes
+-else
+-  eval ac_cv_prog_make_${ac_make}_set=no
+-fi
++case `${MAKE-make} -f conftest.make 2>/dev/null` in
++  *@@@%%%=?*=@@@%%%*)
++    eval ac_cv_prog_make_${ac_make}_set=yes;;
++  *)
++    eval ac_cv_prog_make_${ac_make}_set=no;;
++esac
+ rm -f conftest.make
+ fi
+-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
+-  echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
+   SET_MAKE=
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+   SET_MAKE="MAKE=${MAKE-make}"
+ fi
+ 
+@@ -2600,22 +3664,23 @@ fi
+ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+ # OS/2's system install, which has a completely different semantic
+ # ./install, which can be erroneously created by make from ./install.sh.
+-echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
++# Reject install programs that cannot install multiple files.
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
++$as_echo_n "checking for a BSD-compatible install... " >&6; }
+ if test -z "$INSTALL"; then
+-if test "${ac_cv_path_install+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++if test "${ac_cv_path_install+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
+   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  # Account for people who put trailing slashes in PATH elements.
+-case $as_dir/ in
+-  ./ | .// | /cC/* | \
++    # Account for people who put trailing slashes in PATH elements.
++case $as_dir/ in #((
++  ./ | .// | /[cC]/* | \
+   /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
+-  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
++  ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
+   /usr/ucb/* ) ;;
+   *)
+     # OSF1 and SCO ODT 3.0 have their own names for install.
+@@ -2623,7 +3688,7 @@ case $as_dir/ in
+     # by default.
+     for ac_prog in ginstall scoinst install; do
+       for ac_exec_ext in '' $ac_executable_extensions; do
+-	if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
++	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+ 	  if test $ac_prog = install &&
+ 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+ 	    # AIX install.  It has an incompatible calling convention.
+@@ -2633,30 +3698,43 @@ case $as_dir/ in
+ 	    # program-specific install script used by HP pwplus--don't use.
+ 	    :
+ 	  else
+-	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+-	    break 3
++	    rm -rf conftest.one conftest.two conftest.dir
++	    echo one > conftest.one
++	    echo two > conftest.two
++	    mkdir conftest.dir
++	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
++	      test -s conftest.one && test -s conftest.two &&
++	      test -s conftest.dir/conftest.one &&
++	      test -s conftest.dir/conftest.two
++	    then
++	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
++	      break 3
++	    fi
+ 	  fi
+ 	fi
+       done
+     done
+     ;;
+ esac
+-done
+ 
++  done
++IFS=$as_save_IFS
++
++rm -rf conftest.one conftest.two conftest.dir
+ 
+ fi
+   if test "${ac_cv_path_install+set}" = set; then
+     INSTALL=$ac_cv_path_install
+   else
+-    # As a last resort, use the slow shell script.  We don't cache a
+-    # path for INSTALL within a source directory, because that will
++    # As a last resort, use the slow shell script.  Don't cache a
++    # value for INSTALL within a source directory, because that will
+     # break other packages using the cache if that directory is
+-    # removed, or if the path is relative.
++    # removed, or if the value is a relative name.
+     INSTALL=$ac_install_sh
+   fi
+ fi
+-echo "$as_me:$LINENO: result: $INSTALL" >&5
+-echo "${ECHO_T}$INSTALL" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
++$as_echo "$INSTALL" >&6; }
+ 
+ # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+ # It thinks the first close brace ends the variable substitution.
+@@ -2672,15 +3750,15 @@ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
++$as_echo_n "checking how to run the C preprocessor... " >&6; }
+ # On Suns, sometimes $CPP names a directory.
+ if test -n "$CPP" && test -d "$CPP"; then
+   CPP=
+ fi
+ if test -z "$CPP"; then
+-  if test "${ac_cv_prog_CPP+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  if test "${ac_cv_prog_CPP+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
+       # Double quotes because CPP needs to be expanded
+     for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+@@ -2694,11 +3772,7 @@ do
+   # <limits.h> exists even on freestanding compilers.
+   # On the NeXT, cc -E runs the code through the compiler's parser,
+   # not just through cpp. "Syntax error" is here to catch this case.
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #ifdef __STDC__
+ # include <limits.h>
+@@ -2707,68 +3781,24 @@ cat >>conftest.$ac_ext <<_ACEOF
+ #endif
+ 		     Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
+-  :
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++if ac_fn_c_try_cpp "$LINENO"; then :
+ 
++else
+   # Broken: fails on valid input.
+ continue
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ 
+-  # OK, works on sane cases.  Now check whether non-existent headers
++  # OK, works on sane cases.  Now check whether nonexistent headers
+   # can be detected and how.
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++if ac_fn_c_try_cpp "$LINENO"; then :
+   # Broken: success on invalid input.
+ continue
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+   # Passes both tests.
+ ac_preproc_ok=:
+ break
+@@ -2778,7 +3808,7 @@ rm -f conftest.err conftest.$ac_ext
+ done
+ # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+ rm -f conftest.err conftest.$ac_ext
+-if $ac_preproc_ok; then
++if $ac_preproc_ok; then :
+   break
+ fi
+ 
+@@ -2790,8 +3820,8 @@ fi
+ else
+   ac_cv_prog_CPP=$CPP
+ fi
+-echo "$as_me:$LINENO: result: $CPP" >&5
+-echo "${ECHO_T}$CPP" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
++$as_echo "$CPP" >&6; }
+ ac_preproc_ok=false
+ for ac_c_preproc_warn_flag in '' yes
+ do
+@@ -2801,11 +3831,7 @@ do
+   # <limits.h> exists even on freestanding compilers.
+   # On the NeXT, cc -E runs the code through the compiler's parser,
+   # not just through cpp. "Syntax error" is here to catch this case.
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #ifdef __STDC__
+ # include <limits.h>
+@@ -2814,68 +3840,24 @@ cat >>conftest.$ac_ext <<_ACEOF
+ #endif
+ 		     Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
+-  :
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++if ac_fn_c_try_cpp "$LINENO"; then :
+ 
++else
+   # Broken: fails on valid input.
+ continue
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ 
+-  # OK, works on sane cases.  Now check whether non-existent headers
++  # OK, works on sane cases.  Now check whether nonexistent headers
+   # can be detected and how.
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++if ac_fn_c_try_cpp "$LINENO"; then :
+   # Broken: success on invalid input.
+ continue
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+   # Passes both tests.
+ ac_preproc_ok=:
+ break
+@@ -2885,14 +3867,13 @@ rm -f conftest.err conftest.$ac_ext
+ done
+ # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+ rm -f conftest.err conftest.$ac_ext
+-if $ac_preproc_ok; then
+-  :
++if $ac_preproc_ok; then :
++
+ else
+-  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
++  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error "C preprocessor \"$CPP\" fails sanity check
++See \`config.log' for more details." "$LINENO" 5; }
+ fi
+ 
+ ac_ext=c
+@@ -2902,257 +3883,464 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+ 
+-echo "$as_me:$LINENO: checking for egrep" >&5
+-echo $ECHO_N "checking for egrep... $ECHO_C" >&6
+-if test "${ac_cv_prog_egrep+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  if echo a | (grep -E '(a|b)') >/dev/null 2>&1
+-    then ac_cv_prog_egrep='grep -E'
+-    else ac_cv_prog_egrep='egrep'
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
++$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
++if test "${ac_cv_path_GREP+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  if test -z "$GREP"; then
++  ac_path_GREP_found=false
++  # Loop through the user's path and test for each of PROGNAME-LIST
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++    for ac_prog in grep ggrep; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
++      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
++      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
++# Check for GNU ac_path_GREP and select it if it is found.
++  # Check for GNU $ac_path_GREP
++case `"$ac_path_GREP" --version 2>&1` in
++*GNU*)
++  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
++*)
++  ac_count=0
++  $as_echo_n 0123456789 >"conftest.in"
++  while :
++  do
++    cat "conftest.in" "conftest.in" >"conftest.tmp"
++    mv "conftest.tmp" "conftest.in"
++    cp "conftest.in" "conftest.nl"
++    $as_echo 'GREP' >> "conftest.nl"
++    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
++    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
++    as_fn_arith $ac_count + 1 && ac_count=$as_val
++    if test $ac_count -gt ${ac_path_GREP_max-0}; then
++      # Best one so far, save it but keep looking for a better one
++      ac_cv_path_GREP="$ac_path_GREP"
++      ac_path_GREP_max=$ac_count
+     fi
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
+-echo "${ECHO_T}$ac_cv_prog_egrep" >&6
+- EGREP=$ac_cv_prog_egrep
++    # 10*(2^10) chars as input seems more than enough
++    test $ac_count -gt 10 && break
++  done
++  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
++esac
+ 
++      $ac_path_GREP_found && break 3
++    done
++  done
++  done
++IFS=$as_save_IFS
++  if test -z "$ac_cv_path_GREP"; then
++    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
++  fi
++else
++  ac_cv_path_GREP=$GREP
++fi
+ 
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
++$as_echo "$ac_cv_path_GREP" >&6; }
++ GREP="$ac_cv_path_GREP"
+ 
+-echo "$as_me:$LINENO: checking for AIX" >&5
+-echo $ECHO_N "checking for AIX... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#ifdef _AIX
+-  yes
+-#endif
+ 
+-_ACEOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  $EGREP "yes" >/dev/null 2>&1; then
+-  echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+-cat >>confdefs.h <<\_ACEOF
+-#define _ALL_SOURCE 1
+-_ACEOF
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
++$as_echo_n "checking for egrep... " >&6; }
++if test "${ac_cv_path_EGREP+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
++   then ac_cv_path_EGREP="$GREP -E"
++   else
++     if test -z "$EGREP"; then
++  ac_path_EGREP_found=false
++  # Loop through the user's path and test for each of PROGNAME-LIST
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++    for ac_prog in egrep; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
++      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
++      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
++# Check for GNU ac_path_EGREP and select it if it is found.
++  # Check for GNU $ac_path_EGREP
++case `"$ac_path_EGREP" --version 2>&1` in
++*GNU*)
++  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
++*)
++  ac_count=0
++  $as_echo_n 0123456789 >"conftest.in"
++  while :
++  do
++    cat "conftest.in" "conftest.in" >"conftest.tmp"
++    mv "conftest.tmp" "conftest.in"
++    cp "conftest.in" "conftest.nl"
++    $as_echo 'EGREP' >> "conftest.nl"
++    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
++    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
++    as_fn_arith $ac_count + 1 && ac_count=$as_val
++    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
++      # Best one so far, save it but keep looking for a better one
++      ac_cv_path_EGREP="$ac_path_EGREP"
++      ac_path_EGREP_max=$ac_count
++    fi
++    # 10*(2^10) chars as input seems more than enough
++    test $ac_count -gt 10 && break
++  done
++  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
++esac
+ 
++      $ac_path_EGREP_found && break 3
++    done
++  done
++  done
++IFS=$as_save_IFS
++  if test -z "$ac_cv_path_EGREP"; then
++    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
++  fi
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  ac_cv_path_EGREP=$EGREP
+ fi
+-rm -f conftest*
++
++   fi
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
++$as_echo "$ac_cv_path_EGREP" >&6; }
++ EGREP="$ac_cv_path_EGREP"
+ 
+ 
+-echo "$as_me:$LINENO: checking for library containing strerror" >&5
+-echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6
+-if test "${ac_cv_search_strerror+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
++$as_echo_n "checking for ANSI C header files... " >&6; }
++if test "${ac_cv_header_stdc+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
+-  ac_func_search_save_LIBS=$LIBS
+-ac_cv_search_strerror=no
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
++#include <stdlib.h>
++#include <stdarg.h>
++#include <string.h>
++#include <float.h>
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char strerror ();
+ int
+ main ()
+ {
+-strerror ();
++
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_search_strerror="none required"
++if ac_fn_c_try_compile "$LINENO"; then :
++  ac_cv_header_stdc=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
++  ac_cv_header_stdc=no
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-if test "$ac_cv_search_strerror" = no; then
+-  for ac_lib in cposix; do
+-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+-    cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++
++if test $ac_cv_header_stdc = yes; then
++  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <string.h>
++
+ _ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "memchr" >/dev/null 2>&1; then :
++
++else
++  ac_cv_header_stdc=no
++fi
++rm -f conftest*
++
++fi
++
++if test $ac_cv_header_stdc = yes; then
++  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
++#include <stdlib.h>
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "free" >/dev/null 2>&1; then :
++
++else
++  ac_cv_header_stdc=no
++fi
++rm -f conftest*
++
++fi
++
++if test $ac_cv_header_stdc = yes; then
++  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
++  if test "$cross_compiling" = yes; then :
++  :
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <ctype.h>
++#include <stdlib.h>
++#if ((' ' & 0x0FF) == 0x020)
++# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
++# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
++#else
++# define ISLOWER(c) \
++		   (('a' <= (c) && (c) <= 'i') \
++		     || ('j' <= (c) && (c) <= 'r') \
++		     || ('s' <= (c) && (c) <= 'z'))
++# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char strerror ();
++
++#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+ int
+ main ()
+ {
+-strerror ();
+-  ;
++  int i;
++  for (i = 0; i < 256; i++)
++    if (XOR (islower (i), ISLOWER (i))
++	|| toupper (i) != TOUPPER (i))
++      return 2;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_search_strerror="-l$ac_lib"
+-break
++if ac_fn_c_try_run "$LINENO"; then :
++
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++  ac_cv_header_stdc=no
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++  conftest.$ac_objext conftest.beam conftest.$ac_ext
++fi
+ 
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-  done
+ fi
+-LIBS=$ac_func_search_save_LIBS
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
++$as_echo "$ac_cv_header_stdc" >&6; }
++if test $ac_cv_header_stdc = yes; then
++
++$as_echo "#define STDC_HEADERS 1" >>confdefs.h
++
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5
+-echo "${ECHO_T}$ac_cv_search_strerror" >&6
+-if test "$ac_cv_search_strerror" != no; then
+-  test "$ac_cv_search_strerror" = "none required" || LIBS="$ac_cv_search_strerror $LIBS"
++
++# On IRIX 5.3, sys/types and inttypes.h are conflicting.
++for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
++		  inttypes.h stdint.h unistd.h
++do :
++  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
++"
++eval as_val=\$$as_ac_Header
++   if test "x$as_val" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
+ 
+ fi
+ 
+-for ac_prog in gawk mawk nawk awk
+-do
+-  # Extract the first word of "$ac_prog", so it can be a program name with args.
+-set dummy $ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_AWK+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  if test -n "$AWK"; then
+-  ac_cv_prog_AWK="$AWK" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_AWK="$ac_prog"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+ done
+ 
+-fi
+-fi
+-AWK=$ac_cv_prog_AWK
+-if test -n "$AWK"; then
+-  echo "$as_me:$LINENO: result: $AWK" >&5
+-echo "${ECHO_T}$AWK" >&6
++
++
++  ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default"
++if test "x$ac_cv_header_minix_config_h" = x""yes; then :
++  MINIX=yes
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  MINIX=
+ fi
+ 
+-  test -n "$AWK" && break
+-done
+ 
+-echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
+-echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
+-if test "${ac_cv_c_const+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  if test "$MINIX" = yes; then
++
++$as_echo "#define _POSIX_SOURCE 1" >>confdefs.h
++
++
++$as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h
++
++
++$as_echo "#define _MINIX 1" >>confdefs.h
++
++  fi
++
++
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
++$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
++if test "${ac_cv_safe_to_define___extensions__+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
++#	  define __EXTENSIONS__ 1
++	  $ac_includes_default
+ int
+ main ()
+ {
+-/* FIXME: Include the comments suggested by Paul. */
+-#ifndef __cplusplus
+-  /* Ultrix mips cc rejects this.  */
+-  typedef int charset[2];
+-  const charset x;
+-  /* SunOS 4.1.1 cc rejects this.  */
+-  char const *const *ccp;
+-  char **p;
+-  /* NEC SVR4.0.2 mips cc rejects this.  */
+-  struct point {int x, y;};
+-  static struct point const zero = {0,0};
+-  /* AIX XL C 1.02.0.0 rejects this.
+-     It does not let you subtract one const X* pointer from another in
+-     an arm of an if-expression whose if-part is not a constant
+-     expression */
+-  const char *g = "string";
+-  ccp = &g + (g ? g-g : 0);
++
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++  ac_cv_safe_to_define___extensions__=yes
++else
++  ac_cv_safe_to_define___extensions__=no
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
++$as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
++  test $ac_cv_safe_to_define___extensions__ = yes &&
++    $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h
++
++  $as_echo "#define _ALL_SOURCE 1" >>confdefs.h
++
++  $as_echo "#define _GNU_SOURCE 1" >>confdefs.h
++
++  $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
++
++  $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h
++
++
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5
++$as_echo_n "checking for library containing strerror... " >&6; }
++if test "${ac_cv_search_strerror+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  ac_func_search_save_LIBS=$LIBS
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char strerror ();
++int
++main ()
++{
++return strerror ();
++  ;
++  return 0;
++}
++_ACEOF
++for ac_lib in '' cposix; do
++  if test -z "$ac_lib"; then
++    ac_res="none required"
++  else
++    ac_res=-l$ac_lib
++    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
++  fi
++  if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_search_strerror=$ac_res
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext
++  if test "${ac_cv_search_strerror+set}" = set; then :
++  break
++fi
++done
++if test "${ac_cv_search_strerror+set}" = set; then :
++
++else
++  ac_cv_search_strerror=no
++fi
++rm conftest.$ac_ext
++LIBS=$ac_func_search_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_strerror" >&5
++$as_echo "$ac_cv_search_strerror" >&6; }
++ac_res=$ac_cv_search_strerror
++if test "$ac_res" != no; then :
++  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
++
++fi
++
++for ac_prog in gawk mawk nawk awk
++do
++  # Extract the first word of "$ac_prog", so it can be a program name with args.
++set dummy $ac_prog; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_AWK+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  if test -n "$AWK"; then
++  ac_cv_prog_AWK="$AWK" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_AWK="$ac_prog"
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++  done
++IFS=$as_save_IFS
++
++fi
++fi
++AWK=$ac_cv_prog_AWK
++if test -n "$AWK"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
++$as_echo "$AWK" >&6; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++
++  test -n "$AWK" && break
++done
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
++$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
++if test "${ac_cv_c_const+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++
++int
++main ()
++{
++/* FIXME: Include the comments suggested by Paul. */
++#ifndef __cplusplus
++  /* Ultrix mips cc rejects this.  */
++  typedef int charset[2];
++  const charset cs;
++  /* SunOS 4.1.1 cc rejects this.  */
++  char const *const *pcpcc;
++  char **ppc;
++  /* NEC SVR4.0.2 mips cc rejects this.  */
++  struct point {int x, y;};
++  static struct point const zero = {0,0};
++  /* AIX XL C 1.02.0.0 rejects this.
++     It does not let you subtract one const X* pointer from another in
++     an arm of an if-expression whose if-part is not a constant
++     expression */
++  const char *g = "string";
++  pcpcc = &g + (g ? g-g : 0);
+   /* HPUX 7.0 cc rejects these. */
+-  ++ccp;
+-  p = (char**) ccp;
+-  ccp = (char const *const *) p;
++  ++pcpcc;
++  ppc = (char**) pcpcc;
++  pcpcc = (char const *const *) ppc;
+   { /* SCO 3.2v4 cc rejects this.  */
+     char *t;
+     char const *s = 0 ? (char *) 0 : (char const *) 0;
+ 
+     *t++ = 0;
++    if (s) return 0;
+   }
+   { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
+     int x[] = {25, 17};
+@@ -3171,120 +4359,38 @@ main ()
+   }
+   { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
+     const int foo = 10;
++    if (!foo) return 0;
+   }
++  return !cs[0] && !zero.x;
+ #endif
+ 
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++if ac_fn_c_try_compile "$LINENO"; then :
+   ac_cv_c_const=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_c_const=no
++  ac_cv_c_const=no
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
+-echo "${ECHO_T}$ac_cv_c_const" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
++$as_echo "$ac_cv_c_const" >&6; }
+ if test $ac_cv_c_const = no; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define const
+-_ACEOF
+-
+-fi
+-
+-echo "$as_me:$LINENO: checking for long file names" >&5
+-echo $ECHO_N "checking for long file names... $ECHO_C" >&6
+-if test "${ac_cv_sys_long_file_names+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_cv_sys_long_file_names=yes
+-# Test for long file names in all the places we know might matter:
+-#      .		the current directory, where building will happen
+-#      $prefix/lib	where we will be installing things
+-#      $exec_prefix/lib	likewise
+-# eval it to expand exec_prefix.
+-#      $TMPDIR		if set, where it might want to write temporary files
+-# if $TMPDIR is not set:
+-#      /tmp		where it might want to write temporary files
+-#      /var/tmp		likewise
+-#      /usr/tmp		likewise
+-if test -n "$TMPDIR" && test -d "$TMPDIR" && test -w "$TMPDIR"; then
+-  ac_tmpdirs=$TMPDIR
+-else
+-  ac_tmpdirs='/tmp /var/tmp /usr/tmp'
+-fi
+-for ac_dir in  . $ac_tmpdirs `eval echo $prefix/lib $exec_prefix/lib` ; do
+-  test -d $ac_dir || continue
+-  test -w $ac_dir || continue # It is less confusing to not echo anything here.
+-  ac_xdir=$ac_dir/cf$$
+-  (umask 077 && mkdir $ac_xdir 2>/dev/null) || continue
+-  ac_tf1=$ac_xdir/conftest9012345
+-  ac_tf2=$ac_xdir/conftest9012346
+-  (echo 1 >$ac_tf1) 2>/dev/null
+-  (echo 2 >$ac_tf2) 2>/dev/null
+-  ac_val=`cat $ac_tf1 2>/dev/null`
+-  if test ! -f $ac_tf1 || test "$ac_val" != 1; then
+-    ac_cv_sys_long_file_names=no
+-    rm -rf $ac_xdir 2>/dev/null
+-    break
+-  fi
+-  rm -rf $ac_xdir 2>/dev/null
+-done
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_sys_long_file_names" >&5
+-echo "${ECHO_T}$ac_cv_sys_long_file_names" >&6
+-if test $ac_cv_sys_long_file_names = yes; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_LONG_FILE_NAMES 1
+-_ACEOF
++$as_echo "#define const /**/" >>confdefs.h
+ 
+ fi
+ 
+-if test $ac_cv_sys_long_file_names = no; then
+-	{ { echo "$as_me:$LINENO: error: The Cyrus IMAPD requires support for long file names" >&5
+-echo "$as_me: error: The Cyrus IMAPD requires support for long file names" >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
+-echo "$as_me:$LINENO: checking for inline" >&5
+-echo $ECHO_N "checking for inline... $ECHO_C" >&6
+-if test "${ac_cv_c_inline+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
++$as_echo_n "checking for inline... " >&6; }
++if test "${ac_cv_c_inline+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
+   ac_cv_c_inline=no
+ for ac_kw in inline __inline__ __inline; do
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #ifndef __cplusplus
+ typedef int foo_t;
+@@ -3293,41 +4399,16 @@ $ac_kw foo_t foo () {return 0; }
+ #endif
+ 
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_c_inline=$ac_kw; break
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
++if ac_fn_c_try_compile "$LINENO"; then :
++  ac_cv_c_inline=$ac_kw
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++  test "$ac_cv_c_inline" != no && break
+ done
+ 
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
+-echo "${ECHO_T}$ac_cv_c_inline" >&6
+-
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
++$as_echo "$ac_cv_c_inline" >&6; }
+ 
+ case $ac_cv_c_inline in
+   inline | yes) ;;
+@@ -3345,18 +4426,313 @@ _ACEOF
+ esac
+ 
+ 
++# The cast to long int works around a bug in the HP C Compiler
++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++# This bug is HP SR number 8606223364.
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long int" >&5
++$as_echo_n "checking size of long long int... " >&6; }
++if test "${ac_cv_sizeof_long_long_int+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long int))" "ac_cv_sizeof_long_long_int"        "$ac_includes_default"; then :
++
++else
++  if test "$ac_cv_type_long_long_int" = yes; then
++     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ as_fn_set_status 77
++as_fn_error "cannot compute sizeof (long long int)
++See \`config.log' for more details." "$LINENO" 5; }; }
++   else
++     ac_cv_sizeof_long_long_int=0
++   fi
++fi
++
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_long_int" >&5
++$as_echo "$ac_cv_sizeof_long_long_int" >&6; }
++
++
++
++cat >>confdefs.h <<_ACEOF
++#define SIZEOF_LONG_LONG_INT $ac_cv_sizeof_long_long_int
++_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
++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++# This bug is HP SR number 8606223364.
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of unsigned long long int" >&5
++$as_echo_n "checking size of unsigned long long int... " >&6; }
++if test "${ac_cv_sizeof_unsigned_long_long_int+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (unsigned long long int))" "ac_cv_sizeof_unsigned_long_long_int"        "$ac_includes_default"; then :
++
++else
++  if test "$ac_cv_type_unsigned_long_long_int" = yes; then
++     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ as_fn_set_status 77
++as_fn_error "cannot compute sizeof (unsigned long long int)
++See \`config.log' for more details." "$LINENO" 5; }; }
++   else
++     ac_cv_sizeof_unsigned_long_long_int=0
++   fi
++fi
++
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_unsigned_long_long_int" >&5
++$as_echo "$ac_cv_sizeof_unsigned_long_long_int" >&6; }
++
++
++
++cat >>confdefs.h <<_ACEOF
++#define SIZEOF_UNSIGNED_LONG_LONG_INT $ac_cv_sizeof_unsigned_long_long_int
++_ACEOF
++
++
++if test "$ac_cv_sizeof_long_long_int" -eq 8 -a \
++        "$ac_cv_sizeof_unsigned_long_long_int" -eq 8; then
++
++$as_echo "#define HAVE_LONG_LONG_INT /**/" >>confdefs.h
++
++   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
++$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
++if test "${ac_cv_c_bigendian+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  ac_cv_c_bigendian=unknown
++    # See if we're dealing with a universal compiler.
++    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#ifndef __APPLE_CC__
++	       not a universal capable compiler
++	     #endif
++	     typedef int dummy;
++
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++
++	# Check for potential -arch flags.  It is not universal unless
++	# there are at least two -arch flags with different values.
++	ac_arch=
++	ac_prev=
++	for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
++	 if test -n "$ac_prev"; then
++	   case $ac_word in
++	     i?86 | x86_64 | ppc | ppc64)
++	       if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
++		 ac_arch=$ac_word
++	       else
++		 ac_cv_c_bigendian=universal
++		 break
++	       fi
++	       ;;
++	   esac
++	   ac_prev=
++	 elif test "x$ac_word" = "x-arch"; then
++	   ac_prev=arch
++	 fi
++       done
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++    if test $ac_cv_c_bigendian = unknown; then
++      # See if sys/param.h defines the BYTE_ORDER macro.
++      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <sys/types.h>
++	     #include <sys/param.h>
++
++int
++main ()
++{
++#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
++		     && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
++		     && LITTLE_ENDIAN)
++	      bogus endian macros
++	     #endif
++
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++  # It does; now see whether it defined to BIG_ENDIAN or not.
++	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <sys/types.h>
++		#include <sys/param.h>
++
++int
++main ()
++{
++#if BYTE_ORDER != BIG_ENDIAN
++		 not big endian
++		#endif
++
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++  ac_cv_c_bigendian=yes
++else
++  ac_cv_c_bigendian=no
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++    fi
++    if test $ac_cv_c_bigendian = unknown; then
++      # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
++      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <limits.h>
++
++int
++main ()
++{
++#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
++	      bogus endian macros
++	     #endif
++
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++  # It does; now see whether it defined to _BIG_ENDIAN or not.
++	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <limits.h>
++
++int
++main ()
++{
++#ifndef _BIG_ENDIAN
++		 not big endian
++		#endif
++
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++  ac_cv_c_bigendian=yes
++else
++  ac_cv_c_bigendian=no
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++    fi
++    if test $ac_cv_c_bigendian = unknown; then
++      # Compile a test program.
++      if test "$cross_compiling" = yes; then :
++  # Try to guess by grepping values from an object file.
++	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++short int ascii_mm[] =
++		  { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
++		short int ascii_ii[] =
++		  { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
++		int use_ascii (int i) {
++		  return ascii_mm[i] + ascii_ii[i];
++		}
++		short int ebcdic_ii[] =
++		  { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
++		short int ebcdic_mm[] =
++		  { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
++		int use_ebcdic (int i) {
++		  return ebcdic_mm[i] + ebcdic_ii[i];
++		}
++		extern int foo;
+ 
+-echo "$as_me:$LINENO: checking for __attribute__" >&5
+-echo $ECHO_N "checking for __attribute__... $ECHO_C" >&6
+-if test "${ac_cv___attribute__+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++int
++main ()
++{
++return use_ascii (foo) == use_ebcdic (foo);
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++  if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
++	      ac_cv_c_bigendian=yes
++	    fi
++	    if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
++	      if test "$ac_cv_c_bigendian" = unknown; then
++		ac_cv_c_bigendian=no
++	      else
++		# finding both strings is unlikely to happen, but who knows?
++		ac_cv_c_bigendian=unknown
++	      fi
++	    fi
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
+ 
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
++	     /* Are we little or big endian?  From Harbison&Steele.  */
++	     union
++	     {
++	       long int l;
++	       char c[sizeof (long int)];
++	     } u;
++	     u.l = 1;
++	     return u.c[sizeof (long int) - 1] == 1;
++
++  ;
++  return 0;
++}
+ _ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++if ac_fn_c_try_run "$LINENO"; then :
++  ac_cv_c_bigendian=no
++else
++  ac_cv_c_bigendian=yes
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++  conftest.$ac_objext conftest.beam conftest.$ac_ext
++fi
++
++    fi
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
++$as_echo "$ac_cv_c_bigendian" >&6; }
++ case $ac_cv_c_bigendian in #(
++   yes)
++     $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h
++;; #(
++   no)
++      ;; #(
++   universal)
++
++$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
++
++     ;; #(
++   *)
++     as_fn_error "unknown endianness
++ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
++ esac
++
++fi
++
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __attribute__" >&5
++$as_echo_n "checking for __attribute__... " >&6; }
++if test "${ac_cv___attribute__+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ #include <stdlib.h>
+@@ -3377,62 +4753,32 @@ foo(void)
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++if ac_fn_c_try_compile "$LINENO"; then :
+   ac_cv___attribute__=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv___attribute__=no
++  ac_cv___attribute__=no
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ 
+ if test "$ac_cv___attribute__" = "yes"; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE___ATTRIBUTE__ 1
+-_ACEOF
++$as_echo "#define HAVE___ATTRIBUTE__ 1" >>confdefs.h
+ 
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv___attribute__" >&5
+-echo "${ECHO_T}$ac_cv___attribute__" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv___attribute__" >&5
++$as_echo "$ac_cv___attribute__" >&6; }
+ 
+ 
+-echo "$as_me:$LINENO: checking if compiler supports -fPIC" >&5
+-echo $ECHO_N "checking if compiler supports -fPIC... $ECHO_C" >&6
+-if test "${ac_cv_fpic+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler supports -fPIC" >&5
++$as_echo_n "checking if compiler supports -fPIC... " >&6; }
++if test "${ac_cv_fpic+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
+ 
+ save_CFLAGS=$CFLAGS
+ CFLAGS="${CFLAGS} -fPIC"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ #include <stdlib.h>
+@@ -3451,36 +4797,12 @@ foo(void)
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++if ac_fn_c_try_compile "$LINENO"; then :
+   ac_cv_fpic=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_fpic=no
++  ac_cv_fpic=no
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ CFLAGS=$save_CFLAGS
+ 
+ fi
+@@ -3490,6332 +4812,1890 @@ if test "$ac_cv_fpic" = "yes"; then
+ else
+     FPIC_CFLAGS=""
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_fpic" >&5
+-echo "${ECHO_T}$ac_cv_fpic" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_fpic" >&5
++$as_echo "$ac_cv_fpic" >&6; }
+ 
+ 
+-echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
+-if test "${ac_cv_header_stdc+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++# The cast to long int works around a bug in the HP C Compiler
++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++# This bug is HP SR number 8606223364.
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
++$as_echo_n "checking size of long... " >&6; }
++if test "${ac_cv_sizeof_long+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <stdlib.h>
+-#include <stdarg.h>
+-#include <string.h>
+-#include <float.h>
+-
+-int
+-main ()
+-{
++  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"; then :
+ 
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_header_stdc=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++  if test "$ac_cv_type_long" = yes; then
++     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ as_fn_set_status 77
++as_fn_error "cannot compute sizeof (long)
++See \`config.log' for more details." "$LINENO" 5; }; }
++   else
++     ac_cv_sizeof_long=0
++   fi
++fi
+ 
+-ac_cv_header_stdc=no
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
++$as_echo "$ac_cv_sizeof_long" >&6; }
+ 
+-if test $ac_cv_header_stdc = yes; then
+-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
++
++
++cat >>confdefs.h <<_ACEOF
++#define SIZEOF_LONG $ac_cv_sizeof_long
+ _ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <string.h>
+ 
++
++
++
++   # CMU GUESS RUNPATH SWITCH
++    andrew_runpath_switch="none"
++
++
++for ac_header in unistd.h sys/select.h sys/param.h stdarg.h
++do :
++  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++   if test "x$as_val" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  $EGREP "memchr" >/dev/null 2>&1; then
+-  :
+-else
+-  ac_cv_header_stdc=no
+-fi
+-rm -f conftest*
+ 
+ fi
+ 
+-if test $ac_cv_header_stdc = yes; then
+-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <stdlib.h>
++done
+ 
++for ac_func in memmove strcasecmp ftruncate strerror
++do :
++  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++   if test "x$as_val" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  $EGREP "free" >/dev/null 2>&1; then
+-  :
++
+ else
+-  ac_cv_header_stdc=no
++  case " $LIBOBJS " in
++  *" $ac_func.$ac_objext "* ) ;;
++  *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext"
++ ;;
++esac
++
+ fi
+-rm -f conftest*
++done
++
++
++for ac_func in strlcat strlcpy
++do :
++  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++   if test "x$as_val" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
+ 
+ fi
++done
+ 
+-if test $ac_cv_header_stdc = yes; then
+-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+-  if test "$cross_compiling" = yes; then
+-  :
++ac_header_dirent=no
++for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
++  as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5
++$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then :
++  $as_echo_n "(cached) " >&6
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+-#include <ctype.h>
+-#if ((' ' & 0x0FF) == 0x020)
+-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+-#else
+-# define ISLOWER(c) \
+-		   (('a' <= (c) && (c) <= 'i') \
+-		     || ('j' <= (c) && (c) <= 'r') \
+-		     || ('s' <= (c) && (c) <= 'z'))
+-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+-#endif
++#include <sys/types.h>
++#include <$ac_hdr>
+ 
+-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+ int
+ main ()
+ {
+-  int i;
+-  for (i = 0; i < 256; i++)
+-    if (XOR (islower (i), ISLOWER (i))
+-	|| toupper (i) != TOUPPER (i))
+-      exit(2);
+-  exit (0);
++if ((DIR *) 0)
++return 0;
++  ;
++  return 0;
+ }
+ _ACEOF
+-rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  :
++if ac_fn_c_try_compile "$LINENO"; then :
++  eval "$as_ac_Header=yes"
+ else
+-  echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-( exit $ac_status )
+-ac_cv_header_stdc=no
++  eval "$as_ac_Header=no"
+ fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-fi
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+-echo "${ECHO_T}$ac_cv_header_stdc" >&6
+-if test $ac_cv_header_stdc = yes; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define STDC_HEADERS 1
++eval ac_res=\$$as_ac_Header
++	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
++$as_echo "$ac_res" >&6; }
++eval as_val=\$$as_ac_Header
++   if test "x$as_val" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
+ _ACEOF
+ 
++ac_header_dirent=$ac_hdr; break
+ fi
+ 
+-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+-		  inttypes.h stdint.h unistd.h
+-do
+-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++done
++# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
++if test $ac_header_dirent = dirent.h; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
++$as_echo_n "checking for library containing opendir... " >&6; }
++if test "${ac_cv_search_opendir+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  ac_func_search_save_LIBS=$LIBS
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+-$ac_includes_default
+ 
+-#include <$ac_header>
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char opendir ();
++int
++main ()
++{
++return opendir ();
++  ;
++  return 0;
++}
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  eval "$as_ac_Header=yes"
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-eval "$as_ac_Header=no"
++for ac_lib in '' dir; do
++  if test -z "$ac_lib"; then
++    ac_res="none required"
++  else
++    ac_res=-l$ac_lib
++    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
++  fi
++  if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_search_opendir=$ac_res
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext
++  if test "${ac_cv_search_opendir+set}" = set; then :
++  break
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+-  cat >>confdefs.h <<_ACEOF
+-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+-_ACEOF
++done
++if test "${ac_cv_search_opendir+set}" = set; then :
+ 
++else
++  ac_cv_search_opendir=no
+ fi
++rm conftest.$ac_ext
++LIBS=$ac_func_search_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5
++$as_echo "$ac_cv_search_opendir" >&6; }
++ac_res=$ac_cv_search_opendir
++if test "$ac_res" != no; then :
++  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+ 
+-done
+-
++fi
+ 
+-echo "$as_me:$LINENO: checking for long" >&5
+-echo $ECHO_N "checking for long... $ECHO_C" >&6
+-if test "${ac_cv_type_long+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
++$as_echo_n "checking for library containing opendir... " >&6; }
++if test "${ac_cv_search_opendir+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  ac_func_search_save_LIBS=$LIBS
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+-$ac_includes_default
++
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char opendir ();
+ int
+ main ()
+ {
+-if ((long *) 0)
+-  return 0;
+-if (sizeof (long))
+-  return 0;
++return opendir ();
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_type_long=yes
++for ac_lib in '' x; do
++  if test -z "$ac_lib"; then
++    ac_res="none required"
++  else
++    ac_res=-l$ac_lib
++    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
++  fi
++  if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_search_opendir=$ac_res
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext
++  if test "${ac_cv_search_opendir+set}" = set; then :
++  break
++fi
++done
++if test "${ac_cv_search_opendir+set}" = set; then :
++
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++  ac_cv_search_opendir=no
++fi
++rm conftest.$ac_ext
++LIBS=$ac_func_search_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5
++$as_echo "$ac_cv_search_opendir" >&6; }
++ac_res=$ac_cv_search_opendir
++if test "$ac_res" != no; then :
++  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+ 
+-ac_cv_type_long=no
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
+-echo "${ECHO_T}$ac_cv_type_long" >&6
+ 
+-echo "$as_me:$LINENO: checking size of long" >&5
+-echo $ECHO_N "checking size of long... $ECHO_C" >&6
+-if test "${ac_cv_sizeof_long+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++
++
++	save_LIBS="$LIBS"
++	LIB_SOCKET=""
++	ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect"
++if test "x$ac_cv_func_connect" = x""yes; then :
++  :
+ else
+-  if test "$ac_cv_type_long" = yes; then
+-  # The cast to unsigned long works around a bug in the HP C Compiler
+-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+-  # This bug is HP SR number 8606223364.
+-  if test "$cross_compiling" = yes; then
+-  # Depending upon the size, compute the lo and hi bounds.
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
++$as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
++if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lnsl  $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+-$ac_includes_default
++
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char gethostbyname ();
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (long))) >= 0)];
+-test_array [0] = 0
+-
++return gethostbyname ();
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_lo=0 ac_mid=0
+-  while :; do
+-    cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_lib_nsl_gethostbyname=yes
++else
++  ac_cv_lib_nsl_gethostbyname=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5
++$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
++if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then :
++  LIB_SOCKET="-lnsl $LIB_SOCKET"
++fi
++
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5
++$as_echo_n "checking for connect in -lsocket... " >&6; }
++if test "${ac_cv_lib_socket_connect+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lsocket  $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+-$ac_includes_default
++
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char connect ();
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
+-test_array [0] = 0
+-
++return connect ();
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_hi=$ac_mid; break
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_lib_socket_connect=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++  ac_cv_lib_socket_connect=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5
++$as_echo "$ac_cv_lib_socket_connect" >&6; }
++if test "x$ac_cv_lib_socket_connect" = x""yes; then :
++  LIB_SOCKET="-lsocket $LIB_SOCKET"
++fi
++
+ 
+-ac_lo=`expr $ac_mid + 1`
+-		    if test $ac_lo -le $ac_mid; then
+-		      ac_lo= ac_hi=
+-		      break
+-		    fi
+-		    ac_mid=`expr 2 '*' $ac_mid + 1`
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-  done
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++	LIBS="$LIB_SOCKET $save_LIBS"
++	ac_fn_c_check_func "$LINENO" "res_search" "ac_cv_func_res_search"
++if test "x$ac_cv_func_res_search" = x""yes; then :
++  :
++else
++  LIBS="-lresolv $LIB_SOCKET $save_LIBS"
++		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+-$ac_includes_default
++
++#include <sys/types.h>
++#include <netinet/in.h>
++#include <arpa/nameser.h>
++#ifdef HAVE_ARPA_NAMESER_COMPAT_H
++#include <arpa/nameser_compat.h>
++#endif
++#include <resolv.h>
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (long))) < 0)];
+-test_array [0] = 0
++
++const char host[12]="openafs.org";
++u_char ans[1024];
++res_search( host, C_IN, T_MX, (u_char *)&ans, sizeof(ans));
++return 0;
+ 
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_hi=-1 ac_mid=-1
+-  while :; do
+-    cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(((long) (sizeof (long))) >= $ac_mid)];
+-test_array [0] = 0
++if ac_fn_c_try_link "$LINENO"; then :
++  LIB_SOCKET="-lresolv $LIB_SOCKET"
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ 
+-  ;
+-  return 0;
+-}
++fi
++
++	LIBS="$LIB_SOCKET $save_LIBS"
++	for ac_func in dn_expand dns_lookup
++do :
++  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++   if test "x$as_val" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_lo=$ac_mid; break
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_hi=`expr '(' $ac_mid ')' - 1`
+-		       if test $ac_mid -le $ac_hi; then
+-			 ac_lo= ac_hi=
+-			 break
+-		       fi
+-		       ac_mid=`expr 2 '*' $ac_mid`
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-  done
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++done
+ 
+-ac_lo= ac_hi=
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-# Binary search between lo and hi bounds.
+-while test "x$ac_lo" != "x$ac_hi"; do
+-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++	LIBS="$save_LIBS"
++
++
++LIBS="$LIBS ${LIB_SOCKET}"
++
++cyrus_cv_getaddrinfo=yes
++
++ac_fn_c_check_func "$LINENO" "getaddrinfo" "ac_cv_func_getaddrinfo"
++if test "x$ac_cv_func_getaddrinfo" = x""yes; then :
++    ac_cv_lib_socket_getaddrinfo=no
++  ac_cv_lib_inet6_getaddrinfo=no
++
++else
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getaddrinfo in -lsocket" >&5
++$as_echo_n "checking for getaddrinfo in -lsocket... " >&6; }
++if test "${ac_cv_lib_socket_getaddrinfo+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lsocket  $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+-$ac_includes_default
++
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char getaddrinfo ();
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
+-test_array [0] = 0
+-
++return getaddrinfo ();
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_hi=$ac_mid
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_lib_socket_getaddrinfo=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_lo=`expr '(' $ac_mid ')' + 1`
++  ac_cv_lib_socket_getaddrinfo=no
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-done
+-case $ac_lo in
+-?*) ac_cv_sizeof_long=$ac_lo;;
+-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (long), 77
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; } ;;
+-esac
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_getaddrinfo" >&5
++$as_echo "$ac_cv_lib_socket_getaddrinfo" >&6; }
++if test "x$ac_cv_lib_socket_getaddrinfo" = x""yes; then :
++      LIBS="$LIBS -lsocket"
++    ac_cv_lib_inet6_getaddrinfo=no
++
+ else
+-  if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
++      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether your system has IPv6 directory" >&5
++$as_echo_n "checking whether your system has IPv6 directory... " >&6; }
++    if test "${ipv6_cv_dir+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++        for ipv6_cv_dir in /usr/local/v6 /usr/inet6 no; do
++	if test $ipv6_cv_dir = no -o -d $ipv6_cv_dir; then
++	  break
++	fi
++      done
++fi
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ipv6_cv_dir" >&5
++$as_echo "$ipv6_cv_dir" >&6; }
++    if test $ipv6_cv_dir = no; then
++      ac_cv_lib_inet6_getaddrinfo=no
++    else
++      if test x$ipv6_libinet6 = x; then
++	ipv6_libinet6=no
++	SAVELDFLAGS="$LDFLAGS"
++	LDFLAGS="$LDFLAGS -L$ipv6_cv_dir/lib"
++      fi
++      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getaddrinfo in -linet6" >&5
++$as_echo_n "checking for getaddrinfo in -linet6... " >&6; }
++if test "${ac_cv_lib_inet6_getaddrinfo+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-linet6  $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+-$ac_includes_default
+-long longval () { return (long) (sizeof (long)); }
+-unsigned long ulongval () { return (long) (sizeof (long)); }
+-#include <stdio.h>
+-#include <stdlib.h>
++
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char getaddrinfo ();
+ int
+ main ()
+ {
+-
+-  FILE *f = fopen ("conftest.val", "w");
+-  if (! f)
+-    exit (1);
+-  if (((long) (sizeof (long))) < 0)
+-    {
+-      long i = longval ();
+-      if (i != ((long) (sizeof (long))))
+-	exit (1);
+-      fprintf (f, "%ld\n", i);
+-    }
+-  else
+-    {
+-      unsigned long i = ulongval ();
+-      if (i != ((long) (sizeof (long))))
+-	exit (1);
+-      fprintf (f, "%lu\n", i);
+-    }
+-  exit (ferror (f) || fclose (f) != 0);
+-
++return getaddrinfo ();
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_sizeof_long=`cat conftest.val`
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_lib_inet6_getaddrinfo=yes
+ else
+-  echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-( exit $ac_status )
+-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (long), 77
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
++  ac_cv_lib_inet6_getaddrinfo=no
+ fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
+ fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_inet6_getaddrinfo" >&5
++$as_echo "$ac_cv_lib_inet6_getaddrinfo" >&6; }
++if test "x$ac_cv_lib_inet6_getaddrinfo" = x""yes; then :
++  	if test $ipv6_libinet6 = no; then
++	  ipv6_libinet6=yes
++	  LIBS="$LIBS -linet6"
++	fi
+ fi
+-rm -f conftest.val
+-else
+-  ac_cv_sizeof_long=0
++      if test $ipv6_libinet6 = no; then
++	LDFLAGS="$SAVELDFLAGS"
++      fi
++    fi
+ fi
++
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
+-echo "${ECHO_T}$ac_cv_sizeof_long" >&6
+-cat >>confdefs.h <<_ACEOF
+-#define SIZEOF_LONG $ac_cv_sizeof_long
++ipv6_cv_getaddrinfo=no
++if test $ac_cv_func_getaddrinfo = yes -o $ac_cv_lib_socket_getaddrinfo = yes \
++     -o $ac_cv_lib_inet6_getaddrinfo = yes
++then
++  ipv6_cv_getaddrinfo=yes
++fi
++if test $ipv6_cv_getaddrinfo = no; then
++  if test getaddrinfo = getaddrinfo; then
++    for ipv6_cv_pfx in o n; do
++      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <netdb.h>
++
+ _ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "${ipv6_cv_pfx}getaddrinfo" >/dev/null 2>&1; then :
++  as_ac_var=`$as_echo "ac_cv_func_${ipv6_cv_pfx}getaddrinfo" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "${ipv6_cv_pfx}getaddrinfo" "$as_ac_var"
++eval as_val=\$$as_ac_var
++   if test "x$as_val" = x""yes; then :
+ 
++fi
+ 
++fi
++rm -f conftest*
+ 
++      if eval test X\$ac_cv_func_${ipv6_cv_pfx}getaddrinfo = Xyes; then
+ 
+-   # CMU GUESS RUNPATH SWITCH
+-  echo "$as_me:$LINENO: checking for runpath switch" >&5
+-echo $ECHO_N "checking for runpath switch... $ECHO_C" >&6
+-if test "${andrew_runpath_switch+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
++$as_echo "#define HAVE_GETADDRINFO /**/" >>confdefs.h
+ 
+-    # first, try -R
+-    SAVE_LDFLAGS="${LDFLAGS}"
+-    LDFLAGS="-R /usr/lib"
+-    cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++        ipv6_cv_getaddrinfo=yes
++        break
++      fi
++    done
++  fi
++fi
++if test $ipv6_cv_getaddrinfo = yes; then
++
++ac_fn_c_check_func "$LINENO" "gai_strerror" "ac_cv_func_gai_strerror"
++if test "x$ac_cv_func_gai_strerror" = x""yes; then :
++    ac_cv_lib_socket_gai_strerror=no
++  ac_cv_lib_inet6_gai_strerror=no
++
++else
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gai_strerror in -lsocket" >&5
++$as_echo_n "checking for gai_strerror in -lsocket... " >&6; }
++if test "${ac_cv_lib_socket_gai_strerror+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lsocket  $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char gai_strerror ();
+ int
+ main ()
+ {
+-
++return gai_strerror ();
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  andrew_runpath_switch="-R"
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_lib_socket_gai_strerror=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
++  ac_cv_lib_socket_gai_strerror=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_gai_strerror" >&5
++$as_echo "$ac_cv_lib_socket_gai_strerror" >&6; }
++if test "x$ac_cv_lib_socket_gai_strerror" = x""yes; then :
++      LIBS="$LIBS -lsocket"
++    ac_cv_lib_inet6_gai_strerror=no
+ 
+-  	LDFLAGS="-Wl,-rpath,/usr/lib"
+-    cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++else
++      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether your system has IPv6 directory" >&5
++$as_echo_n "checking whether your system has IPv6 directory... " >&6; }
++    if test "${ipv6_cv_dir+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++        for ipv6_cv_dir in /usr/local/v6 /usr/inet6 no; do
++	if test $ipv6_cv_dir = no -o -d $ipv6_cv_dir; then
++	  break
++	fi
++      done
++fi
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ipv6_cv_dir" >&5
++$as_echo "$ipv6_cv_dir" >&6; }
++    if test $ipv6_cv_dir = no; then
++      ac_cv_lib_inet6_gai_strerror=no
++    else
++      if test x$ipv6_libinet6 = x; then
++	ipv6_libinet6=no
++	SAVELDFLAGS="$LDFLAGS"
++	LDFLAGS="$LDFLAGS -L$ipv6_cv_dir/lib"
++      fi
++      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gai_strerror in -linet6" >&5
++$as_echo_n "checking for gai_strerror in -linet6... " >&6; }
++if test "${ac_cv_lib_inet6_gai_strerror+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-linet6  $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char gai_strerror ();
+ int
+ main ()
+ {
+-
++return gai_strerror ();
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  andrew_runpath_switch="-Wl,-rpath,"
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_lib_inet6_gai_strerror=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++  ac_cv_lib_inet6_gai_strerror=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_inet6_gai_strerror" >&5
++$as_echo "$ac_cv_lib_inet6_gai_strerror" >&6; }
++if test "x$ac_cv_lib_inet6_gai_strerror" = x""yes; then :
++  	if test $ipv6_libinet6 = no; then
++	  ipv6_libinet6=yes
++	  LIBS="$LIBS -linet6"
++	fi
++fi
++      if test $ipv6_libinet6 = no; then
++	LDFLAGS="$SAVELDFLAGS"
++      fi
++    fi
++fi
+ 
+-andrew_runpath_switch="none"
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
++ipv6_cv_gai_strerror=no
++if test $ac_cv_func_gai_strerror = yes -o $ac_cv_lib_socket_gai_strerror = yes \
++     -o $ac_cv_lib_inet6_gai_strerror = yes
++then
++  ipv6_cv_gai_strerror=yes
++fi
++if test $ipv6_cv_gai_strerror = no; then
++  if test gai_strerror = getaddrinfo; then
++    for ipv6_cv_pfx in o n; do
++      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <netdb.h>
++
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "${ipv6_cv_pfx}gai_strerror" >/dev/null 2>&1; then :
++  as_ac_var=`$as_echo "ac_cv_func_${ipv6_cv_pfx}gai_strerror" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "${ipv6_cv_pfx}gai_strerror" "$as_ac_var"
++eval as_val=\$$as_ac_var
++   if test "x$as_val" = x""yes; then :
+ 
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-  LDFLAGS="${SAVE_LDFLAGS}"
+ 
+ fi
+-echo "$as_me:$LINENO: result: $andrew_runpath_switch" >&5
+-echo "${ECHO_T}$andrew_runpath_switch" >&6
++rm -f conftest*
+ 
++      if eval test X\$ac_cv_func_${ipv6_cv_pfx}gai_strerror = Xyes; then
+ 
++$as_echo "#define HAVE_GETADDRINFO /**/" >>confdefs.h
+ 
++        ipv6_cv_gai_strerror=yes
++        break
++      fi
++    done
++  fi
++fi
++if test $ipv6_cv_gai_strerror = yes; then
+ 
++$as_echo "#define HAVE_GETADDRINFO /**/" >>confdefs.h
+ 
+-for ac_header in unistd.h sys/select.h sys/param.h stdarg.h
+-do
+-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cyrus_cv_getaddrinfo=no
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ else
+-  # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-#include <$ac_header>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_header_compiler=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++  cyrus_cv_getaddrinfo=no
++fi
+ 
+-ac_header_compiler=no
++if test $cyrus_cv_getaddrinfo = no; then
++	IPV6_OBJS="getaddrinfo.o"
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
+ 
+-# Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <$ac_header>
+-_ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
++cyrus_cv_getnameinfo=yes
++
++ac_fn_c_check_func "$LINENO" "getnameinfo" "ac_cv_func_getnameinfo"
++if test "x$ac_cv_func_getnameinfo" = x""yes; then :
++    ac_cv_lib_socket_getnameinfo=no
++  ac_cv_lib_inet6_getnameinfo=no
++
+ else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
+-  ac_header_preproc=yes
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getnameinfo in -lsocket" >&5
++$as_echo_n "checking for getnameinfo in -lsocket... " >&6; }
++if test "${ac_cv_lib_socket_getnameinfo+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-  ac_header_preproc=no
+-fi
+-rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lsocket  $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
+ 
+-# So?  What about this header?
+-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+-  yes:no: )
+-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char getnameinfo ();
++int
++main ()
++{
++return getnameinfo ();
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_lib_socket_getnameinfo=yes
+ else
+-  eval "$as_ac_Header=\$ac_header_preproc"
++  ac_cv_lib_socket_getnameinfo=no
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+-
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
+ fi
+-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+-  cat >>confdefs.h <<_ACEOF
+-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+-_ACEOF
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_getnameinfo" >&5
++$as_echo "$ac_cv_lib_socket_getnameinfo" >&6; }
++if test "x$ac_cv_lib_socket_getnameinfo" = x""yes; then :
++      LIBS="$LIBS -lsocket"
++    ac_cv_lib_inet6_getnameinfo=no
+ 
++else
++      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether your system has IPv6 directory" >&5
++$as_echo_n "checking whether your system has IPv6 directory... " >&6; }
++    if test "${ipv6_cv_dir+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++        for ipv6_cv_dir in /usr/local/v6 /usr/inet6 no; do
++	if test $ipv6_cv_dir = no -o -d $ipv6_cv_dir; then
++	  break
++	fi
++      done
+ fi
+-
+-done
+-
+-
+-
+-
+-
+-for ac_func in memmove strcasecmp ftruncate strerror
+-do
+-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ipv6_cv_dir" >&5
++$as_echo "$ipv6_cv_dir" >&6; }
++    if test $ipv6_cv_dir = no; then
++      ac_cv_lib_inet6_getnameinfo=no
++    else
++      if test x$ipv6_libinet6 = x; then
++	ipv6_libinet6=no
++	SAVELDFLAGS="$LDFLAGS"
++	LDFLAGS="$LDFLAGS -L$ipv6_cv_dir/lib"
++      fi
++      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getnameinfo in -linet6" >&5
++$as_echo_n "checking for getnameinfo in -linet6... " >&6; }
++if test "${ac_cv_lib_inet6_getnameinfo+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-linet6  $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+ 
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $ac_func
+-
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-{
+-#endif
+-/* We use char because int might match the return type of a gcc2
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
+    builtin and then its argument prototype would still apply.  */
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+-choke me
+-#else
+-char (*f) () = $ac_func;
+-#endif
+ #ifdef __cplusplus
+-}
++extern "C"
+ #endif
+-
++char getnameinfo ();
+ int
+ main ()
+ {
+-return f != $ac_func;
++return getnameinfo ();
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  eval "$as_ac_var=yes"
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_lib_inet6_getnameinfo=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++  ac_cv_lib_inet6_getnameinfo=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_inet6_getnameinfo" >&5
++$as_echo "$ac_cv_lib_inet6_getnameinfo" >&6; }
++if test "x$ac_cv_lib_inet6_getnameinfo" = x""yes; then :
++  	if test $ipv6_libinet6 = no; then
++	  ipv6_libinet6=yes
++	  LIBS="$LIBS -linet6"
++	fi
++fi
++      if test $ipv6_libinet6 = no; then
++	LDFLAGS="$SAVELDFLAGS"
++      fi
++    fi
++fi
+ 
+-eval "$as_ac_var=no"
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
++ipv6_cv_getnameinfo=no
++if test $ac_cv_func_getnameinfo = yes -o $ac_cv_lib_socket_getnameinfo = yes \
++     -o $ac_cv_lib_inet6_getnameinfo = yes
++then
++  ipv6_cv_getnameinfo=yes
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+-if test `eval echo '${'$as_ac_var'}'` = yes; then
+-  cat >>confdefs.h <<_ACEOF
+-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-_ACEOF
++if test $ipv6_cv_getnameinfo = no; then
++  if test getnameinfo = getaddrinfo; then
++    for ipv6_cv_pfx in o n; do
++      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <netdb.h>
+ 
+-else
+-  case $LIBOBJS in
+-    "$ac_func.$ac_objext"   | \
+-  *" $ac_func.$ac_objext"   | \
+-    "$ac_func.$ac_objext "* | \
+-  *" $ac_func.$ac_objext "* ) ;;
+-  *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" ;;
+-esac
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "${ipv6_cv_pfx}getnameinfo" >/dev/null 2>&1; then :
++  as_ac_var=`$as_echo "ac_cv_func_${ipv6_cv_pfx}getnameinfo" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "${ipv6_cv_pfx}getnameinfo" "$as_ac_var"
++eval as_val=\$$as_ac_var
++   if test "x$as_val" = x""yes; then :
+ 
+ fi
+-done
+ 
++fi
++rm -f conftest*
+ 
++      if eval test X\$ac_cv_func_${ipv6_cv_pfx}getnameinfo = Xyes; then
+ 
++$as_echo "#define HAVE_GETADDRINFO /**/" >>confdefs.h
+ 
+-for ac_func in strlcat strlcpy
+-do
+-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define $ac_func innocuous_$ac_func
++        ipv6_cv_getnameinfo=yes
++        break
++      fi
++    done
++  fi
++fi
++if test $ipv6_cv_getnameinfo = yes; then
+ 
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
++$as_echo "#define HAVE_GETNAMEINFO /**/" >>confdefs.h
+ 
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
++else
++  cyrus_cv_getnameinfo=no
++fi
+ 
+-#undef $ac_func
++if test $cyrus_cv_getnameinfo = no; then
++	IPV6_OBJS="$IPV6_OBJS getnameinfo.o"
++fi
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-{
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+-choke me
+-#else
+-char (*f) () = $ac_func;
+-#endif
+-#ifdef __cplusplus
+-}
+-#endif
+ 
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether you have ss_family in struct sockaddr_storage" >&5
++$as_echo_n "checking whether you have ss_family in struct sockaddr_storage... " >&6; }
++if test "${ipv6_cv_ss_family+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <sys/types.h>
++#include <sys/socket.h>
+ int
+ main ()
+ {
+-return f != $ac_func;
++struct sockaddr_storage ss; int i = ss.ss_family;
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  eval "$as_ac_var=yes"
++if ac_fn_c_try_compile "$LINENO"; then :
++  ipv6_cv_ss_family=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-eval "$as_ac_var=no"
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
++  ipv6_cv_ss_family=no
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+-if test `eval echo '${'$as_ac_var'}'` = yes; then
+-  cat >>confdefs.h <<_ACEOF
+-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-_ACEOF
+-
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-done
+-
+-
+-
++if test $ipv6_cv_ss_family = yes; then
+ 
++$as_echo "#define HAVE_SS_FAMILY /**/" >>confdefs.h
+ 
++else
++  :
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ipv6_cv_ss_family" >&5
++$as_echo "$ipv6_cv_ss_family" >&6; }
+ 
+-ac_header_dirent=no
+-for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
+-  as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5
+-echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether you have sa_len in struct sockaddr" >&5
++$as_echo_n "checking whether you have sa_len in struct sockaddr... " >&6; }
++if test "${ipv6_cv_sa_len+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include <sys/types.h>
+-#include <$ac_hdr>
+-
++#include <sys/socket.h>
+ int
+ main ()
+ {
+-if ((DIR *) 0)
+-return 0;
++struct sockaddr sa; int i = sa.sa_len;
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  eval "$as_ac_Header=yes"
++if ac_fn_c_try_compile "$LINENO"; then :
++  ipv6_cv_sa_len=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-eval "$as_ac_Header=no"
++  ipv6_cv_sa_len=no
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++if test $ipv6_cv_sa_len = yes; then
++
++$as_echo "#define HAVE_SOCKADDR_SA_LEN /**/" >>confdefs.h
++
++else
++  :
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+-if test `eval echo '${'$as_ac_Header'}'` = yes; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ipv6_cv_sa_len" >&5
++$as_echo "$ipv6_cv_sa_len" >&6; }
++
++
++
++for ac_header in sys/time.h
++do :
++  ac_fn_c_check_header_mongrel "$LINENO" "sys/time.h" "ac_cv_header_sys_time_h" "$ac_includes_default"
++if test "x$ac_cv_header_sys_time_h" = x""yes; then :
+   cat >>confdefs.h <<_ACEOF
+-#define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
++#define HAVE_SYS_TIME_H 1
+ _ACEOF
+ 
+-ac_header_dirent=$ac_hdr; break
+ fi
+ 
+ done
+-# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
+-if test $ac_header_dirent = dirent.h; then
+-  echo "$as_me:$LINENO: checking for library containing opendir" >&5
+-echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6
+-if test "${ac_cv_search_opendir+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
++$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
++if test "${ac_cv_header_time+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
+-  ac_func_search_save_LIBS=$LIBS
+-ac_cv_search_opendir=no
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
++#include <sys/types.h>
++#include <sys/time.h>
++#include <time.h>
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char opendir ();
+ int
+ main ()
+ {
+-opendir ();
++if ((struct tm *) 0)
++return 0;
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_search_opendir="none required"
++if ac_fn_c_try_compile "$LINENO"; then :
++  ac_cv_header_time=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++  ac_cv_header_time=no
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5
++$as_echo "$ac_cv_header_time" >&6; }
++if test $ac_cv_header_time = yes; then
++
++$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h
+ 
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-if test "$ac_cv_search_opendir" = no; then
+-  for ac_lib in dir; do
+-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+-    cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5
++$as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; }
++if test "${ac_cv_struct_tm+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
++#include <sys/types.h>
++#include <time.h>
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char opendir ();
+ int
+ main ()
+ {
+-opendir ();
++struct tm tm;
++				     int *p = &tm.tm_sec;
++				     return !p;
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_search_opendir="-l$ac_lib"
+-break
++if ac_fn_c_try_compile "$LINENO"; then :
++  ac_cv_struct_tm=time.h
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
++  ac_cv_struct_tm=sys/time.h
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-  done
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-LIBS=$ac_func_search_save_LIBS
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_tm" >&5
++$as_echo "$ac_cv_struct_tm" >&6; }
++if test $ac_cv_struct_tm = sys/time.h; then
++
++$as_echo "#define TM_IN_SYS_TIME 1" >>confdefs.h
++
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
+-echo "${ECHO_T}$ac_cv_search_opendir" >&6
+-if test "$ac_cv_search_opendir" != no; then
+-  test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS"
++
++ac_fn_c_check_member "$LINENO" "struct tm" "tm_zone" "ac_cv_member_struct_tm_tm_zone" "#include <sys/types.h>
++#include <$ac_cv_struct_tm>
++
++"
++if test "x$ac_cv_member_struct_tm_tm_zone" = x""yes; then :
++
++cat >>confdefs.h <<_ACEOF
++#define HAVE_STRUCT_TM_TM_ZONE 1
++_ACEOF
++
+ 
+ fi
+ 
++if test "$ac_cv_member_struct_tm_tm_zone" = yes; then
++
++$as_echo "#define HAVE_TM_ZONE 1" >>confdefs.h
++
+ else
+-  echo "$as_me:$LINENO: checking for library containing opendir" >&5
+-echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6
+-if test "${ac_cv_search_opendir+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  ac_fn_c_check_decl "$LINENO" "tzname" "ac_cv_have_decl_tzname" "#include <time.h>
++"
++if test "x$ac_cv_have_decl_tzname" = x""yes; then :
++  ac_have_decl=1
+ else
+-  ac_func_search_save_LIBS=$LIBS
+-ac_cv_search_opendir=no
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
++  ac_have_decl=0
++fi
++
++cat >>confdefs.h <<_ACEOF
++#define HAVE_DECL_TZNAME $ac_have_decl
+ _ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tzname" >&5
++$as_echo_n "checking for tzname... " >&6; }
++if test "${ac_cv_var_tzname+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <time.h>
++#if !HAVE_DECL_TZNAME
++extern char *tzname[];
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char opendir ();
++
+ int
+ main ()
+ {
+-opendir ();
++return tzname[0][0];
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_search_opendir="none required"
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_var_tzname=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++  ac_cv_var_tzname=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_var_tzname" >&5
++$as_echo "$ac_cv_var_tzname" >&6; }
++  if test $ac_cv_var_tzname = yes; then
+ 
++$as_echo "#define HAVE_TZNAME 1" >>confdefs.h
++
++  fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-if test "$ac_cv_search_opendir" = no; then
+-  for ac_lib in x; do
+-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+-    cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char opendir ();
+-int
+-main ()
+-{
+-opendir ();
+-  ;
+-  return 0;
+-}
++
++
++
++
++
++
++for ac_func in vprintf
++do :
++  ac_fn_c_check_func "$LINENO" "vprintf" "ac_cv_func_vprintf"
++if test "x$ac_cv_func_vprintf" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_VPRINTF 1
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_search_opendir="-l$ac_lib"
+-break
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_fn_c_check_func "$LINENO" "_doprnt" "ac_cv_func__doprnt"
++if test "x$ac_cv_func__doprnt" = x""yes; then :
++
++$as_echo "#define HAVE_DOPRNT 1" >>confdefs.h
+ 
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-  done
+-fi
+-LIBS=$ac_func_search_save_LIBS
++
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
+-echo "${ECHO_T}$ac_cv_search_opendir" >&6
+-if test "$ac_cv_search_opendir" != no; then
+-  test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS"
++done
++
++
++
+ 
++CYRUSDB_OBJS="cyrusdb_flat.o cyrusdb_skiplist.o cyrusdb_quotalegacy.o"
++
++
++
++# Check whether --with-bdb was given.
++if test "${with_bdb+set}" = set; then :
++  withval=$with_bdb; with_bdb=$withval
++else
++  with_bdb="yes"
+ fi
+ 
++
++
++# Check whether --with-dbdir was given.
++if test "${with_dbdir+set}" = set; then :
++  withval=$with_dbdir; with_bdb=$withval
+ fi
+ 
+ 
++case "$with_bdb" in
++  no)
++	use_berkeley="no"
++	;;
++  yes)
++	use_berkeley="yes"
++	with_bdb_lib=none
++	with_bdb_inc=none
++	;;
+ 
+-	save_LIBS="$LIBS"
+-	LIB_SOCKET=""
+-	echo "$as_me:$LINENO: checking for connect" >&5
+-echo $ECHO_N "checking for connect... $ECHO_C" >&6
+-if test "${ac_cv_func_connect+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  *)
++	use_berkeley="yes"
++	with_bdb_lib="$with_bdb/lib"
++	with_bdb_inc="$with_bdb/include"
++	;;
++esac
++
++if test "$use_berkeley" != "no"; then
++
++
++# Check whether --with-bdb-libdir was given.
++if test "${with_bdb_libdir+set}" = set; then :
++  withval=$with_bdb_libdir; with_bdb_lib=$withval
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-/* Define connect to an innocuous variant, in case <limits.h> declares connect.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define connect innocuous_connect
++   test "${with_bdb_lib+set}" = set || with_bdb_lib=none
++fi
+ 
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char connect (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+ 
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
++# Check whether --with-bdb-incdir was given.
++if test "${with_bdb_incdir+set}" = set; then :
++  withval=$with_bdb_incdir; with_bdb_inc=$withval
++else
++   test "${with_bdb_inc+set}" = set || with_bdb_inc=none
++fi
+ 
+-#undef connect
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-{
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char connect ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_connect) || defined (__stub___connect)
+-choke me
+-#else
+-char (*f) () = connect;
+-#endif
+-#ifdef __cplusplus
+-}
+-#endif
+ 
++
++
++	cmu_save_CPPFLAGS=$CPPFLAGS
++
++	if test -d $with_bdb_inc; then
++	    CPPFLAGS="$CPPFLAGS -I$with_bdb_inc"
++	    BDB_INCADD="-I$with_bdb_inc"
++	else
++	    BDB_INCADD=""
++	fi
++
++	                ac_fn_c_check_header_mongrel "$LINENO" "db.h" "ac_cv_header_db_h" "$ac_includes_default"
++if test "x$ac_cv_header_db_h" = x""yes; then :
++
++	BDB_SAVE_LDFLAGS=$LDFLAGS
++
++	if test -d $with_bdb_lib; then
++
++  # this is CMU ADD LIBPATH TO
++  if test "$andrew_runpath_switch" = "none" ; then
++	LDFLAGS="-L$with_bdb_lib ${LDFLAGS}"
++  else
++	LDFLAGS="-L$with_bdb_lib ${LDFLAGS} $andrew_runpath_switch$with_bdb_lib"
++  fi
++
++
++  # this is CMU ADD LIBPATH TO
++  if test "$andrew_runpath_switch" = "none" ; then
++	BDB_LIBADD="-L$with_bdb_lib ${BDB_LIBADD}"
++  else
++	BDB_LIBADD="-L$with_bdb_lib ${BDB_LIBADD} $andrew_runpath_switch$with_bdb_lib"
++  fi
++
++	else
++	    BDB_LIBADD=""
++	fi
++
++	saved_LIBS=$LIBS
++        for dbname in \
++		      db-4.7 db4.7 db47 \
++		      db-4.8 db4.8 db48 \
++		      db-4.6 db4.6 db46 \
++		      db-4.5 db4.5 db45 \
++		      db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
++          do
++	    LIBS="$saved_LIBS -l$dbname"
++	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <db.h>
+ int
+ main ()
+ {
+-return f != connect;
++db_create(NULL, NULL, 0);
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_func_connect=yes
++if ac_fn_c_try_link "$LINENO"; then :
++  BDB_LIBADD="$BDB_LIBADD -l$dbname"; dblib="berkeley"; dbname=db
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_func_connect=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
++  dblib="no"
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
+-echo "${ECHO_T}$ac_cv_func_connect" >&6
+-if test $ac_cv_func_connect = yes; then
+-  :
+-else
+-  echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
+-echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
+-if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lnsl  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++	    if test "$dblib" = "berkeley"; then break; fi
++          done
++        if test "$dblib" = "no"; then
++	    LIBS="$saved_LIBS -ldb"
++	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+-
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char gethostbyname ();
++#include <db.h>
+ int
+ main ()
+ {
+-gethostbyname ();
++db_open(NULL, 0, 0, 0, NULL, NULL, NULL);
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_lib_nsl_gethostbyname=yes
++if ac_fn_c_try_link "$LINENO"; then :
++  BDB_LIBADD="$BDB_LIBADD -ldb"; dblib="berkeley"; dbname=db
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_lib_nsl_gethostbyname=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
+-echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
+-if test $ac_cv_lib_nsl_gethostbyname = yes; then
+-  LIB_SOCKET="-lnsl $LIB_SOCKET"
++  dblib="no"
+ fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++        fi
++	LIBS=$saved_LIBS
++
++	LDFLAGS=$BDB_SAVE_LDFLAGS
+ 
+-		echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
+-echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
+-if test "${ac_cv_lib_socket_connect+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lsocket  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
++  dblib="no"
++fi
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char connect ();
+-int
+-main ()
+-{
+-connect ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_lib_socket_connect=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_lib_socket_connect=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
+-echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
+-if test $ac_cv_lib_socket_connect = yes; then
+-  LIB_SOCKET="-lsocket $LIB_SOCKET"
+-fi
+-
+-
+-fi
+-
+-	LIBS="$LIB_SOCKET $save_LIBS"
+-	echo "$as_me:$LINENO: checking for res_search" >&5
+-echo $ECHO_N "checking for res_search... $ECHO_C" >&6
+-if test "${ac_cv_func_res_search+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-/* Define res_search to an innocuous variant, in case <limits.h> declares res_search.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define res_search innocuous_res_search
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char res_search (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef res_search
+-
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-{
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char res_search ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_res_search) || defined (__stub___res_search)
+-choke me
+-#else
+-char (*f) () = res_search;
+-#endif
+-#ifdef __cplusplus
+-}
+-#endif
+-
+-int
+-main ()
+-{
+-return f != res_search;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_func_res_search=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_func_res_search=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_res_search" >&5
+-echo "${ECHO_T}$ac_cv_func_res_search" >&6
+-if test $ac_cv_func_res_search = yes; then
+-  :
+-else
+-  LIBS="-lresolv $LIB_SOCKET $save_LIBS"
+-		cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-#include <sys/types.h>
+-#include <netinet/in.h>
+-#include <arpa/nameser.h>
+-#ifdef HAVE_ARPA_NAMESER_COMPAT_H
+-#include <arpa/nameser_compat.h>
+-#endif
+-#include <resolv.h>
+-int
+-main ()
+-{
+-
+-const char host[12]="openafs.org";
+-u_char ans[1024];
+-res_search( host, C_IN, T_MX, (u_char *)&ans, sizeof(ans));
+-return 0;
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  LIB_SOCKET="-lresolv $LIB_SOCKET"
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-
+-fi
+-
+-	LIBS="$LIB_SOCKET $save_LIBS"
+-
+-
+-for ac_func in dn_expand dns_lookup
+-do
+-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $ac_func
+-
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-{
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+-choke me
+-#else
+-char (*f) () = $ac_func;
+-#endif
+-#ifdef __cplusplus
+-}
+-#endif
+-
+-int
+-main ()
+-{
+-return f != $ac_func;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  eval "$as_ac_var=yes"
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-eval "$as_ac_var=no"
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+-if test `eval echo '${'$as_ac_var'}'` = yes; then
+-  cat >>confdefs.h <<_ACEOF
+-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-_ACEOF
+-
+-fi
+-done
+-
+-	LIBS="$save_LIBS"
+-
+-
+-LIBS="$LIBS ${LIB_SOCKET}"
+-
+-cyrus_cv_getaddrinfo=yes
+-
+-echo "$as_me:$LINENO: checking for getaddrinfo" >&5
+-echo $ECHO_N "checking for getaddrinfo... $ECHO_C" >&6
+-if test "${ac_cv_func_getaddrinfo+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-/* Define getaddrinfo to an innocuous variant, in case <limits.h> declares getaddrinfo.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define getaddrinfo innocuous_getaddrinfo
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char getaddrinfo (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef getaddrinfo
+-
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-{
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char getaddrinfo ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_getaddrinfo) || defined (__stub___getaddrinfo)
+-choke me
+-#else
+-char (*f) () = getaddrinfo;
+-#endif
+-#ifdef __cplusplus
+-}
+-#endif
+-
+-int
+-main ()
+-{
+-return f != getaddrinfo;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_func_getaddrinfo=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_func_getaddrinfo=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_getaddrinfo" >&5
+-echo "${ECHO_T}$ac_cv_func_getaddrinfo" >&6
+-if test $ac_cv_func_getaddrinfo = yes; then
+-    ac_cv_lib_socket_getaddrinfo=no
+-  ac_cv_lib_inet6_getaddrinfo=no
+-
+-else
+-    echo "$as_me:$LINENO: checking for getaddrinfo in -lsocket" >&5
+-echo $ECHO_N "checking for getaddrinfo in -lsocket... $ECHO_C" >&6
+-if test "${ac_cv_lib_socket_getaddrinfo+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lsocket  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char getaddrinfo ();
+-int
+-main ()
+-{
+-getaddrinfo ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_lib_socket_getaddrinfo=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_lib_socket_getaddrinfo=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_socket_getaddrinfo" >&5
+-echo "${ECHO_T}$ac_cv_lib_socket_getaddrinfo" >&6
+-if test $ac_cv_lib_socket_getaddrinfo = yes; then
+-      LIBS="$LIBS -lsocket"
+-    ac_cv_lib_inet6_getaddrinfo=no
+-
+-else
+-      echo "$as_me:$LINENO: checking whether your system has IPv6 directory" >&5
+-echo $ECHO_N "checking whether your system has IPv6 directory... $ECHO_C" >&6
+-    if test "${ipv6_cv_dir+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-        for ipv6_cv_dir in /usr/local/v6 /usr/inet6 no; do
+-	if test $ipv6_cv_dir = no -o -d $ipv6_cv_dir; then
+-	  break
+-	fi
+-      done
+-fi
+-    echo "$as_me:$LINENO: result: $ipv6_cv_dir" >&5
+-echo "${ECHO_T}$ipv6_cv_dir" >&6
+-    if test $ipv6_cv_dir = no; then
+-      ac_cv_lib_inet6_getaddrinfo=no
+-    else
+-      if test x$ipv6_libinet6 = x; then
+-	ipv6_libinet6=no
+-	SAVELDFLAGS="$LDFLAGS"
+-	LDFLAGS="$LDFLAGS -L$ipv6_cv_dir/lib"
+-      fi
+-      echo "$as_me:$LINENO: checking for getaddrinfo in -linet6" >&5
+-echo $ECHO_N "checking for getaddrinfo in -linet6... $ECHO_C" >&6
+-if test "${ac_cv_lib_inet6_getaddrinfo+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-linet6  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char getaddrinfo ();
+-int
+-main ()
+-{
+-getaddrinfo ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_lib_inet6_getaddrinfo=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_lib_inet6_getaddrinfo=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_inet6_getaddrinfo" >&5
+-echo "${ECHO_T}$ac_cv_lib_inet6_getaddrinfo" >&6
+-if test $ac_cv_lib_inet6_getaddrinfo = yes; then
+-  	if test $ipv6_libinet6 = no; then
+-	  ipv6_libinet6=yes
+-	  LIBS="$LIBS -linet6"
+-	fi
+-fi
+-      if test $ipv6_libinet6 = no; then
+-	LDFLAGS="$SAVELDFLAGS"
+-      fi
+-    fi
+-fi
+-
+-fi
+-ipv6_cv_getaddrinfo=no
+-if test $ac_cv_func_getaddrinfo = yes -o $ac_cv_lib_socket_getaddrinfo = yes \
+-     -o $ac_cv_lib_inet6_getaddrinfo = yes
+-then
+-  ipv6_cv_getaddrinfo=yes
+-fi
+-if test $ipv6_cv_getaddrinfo = no; then
+-  if test getaddrinfo = getaddrinfo; then
+-    for ipv6_cv_pfx in o n; do
+-      cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <netdb.h>
+-
+-_ACEOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  $EGREP "${ipv6_cv_pfx}getaddrinfo" >/dev/null 2>&1; then
+-  as_ac_var=`echo "ac_cv_func_${ipv6_cv_pfx}getaddrinfo" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for ${ipv6_cv_pfx}getaddrinfo" >&5
+-echo $ECHO_N "checking for ${ipv6_cv_pfx}getaddrinfo... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-/* Define ${ipv6_cv_pfx}getaddrinfo to an innocuous variant, in case <limits.h> declares ${ipv6_cv_pfx}getaddrinfo.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define ${ipv6_cv_pfx}getaddrinfo innocuous_${ipv6_cv_pfx}getaddrinfo
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char ${ipv6_cv_pfx}getaddrinfo (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef ${ipv6_cv_pfx}getaddrinfo
+-
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-{
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char ${ipv6_cv_pfx}getaddrinfo ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_${ipv6_cv_pfx}getaddrinfo) || defined (__stub___${ipv6_cv_pfx}getaddrinfo)
+-choke me
+-#else
+-char (*f) () = ${ipv6_cv_pfx}getaddrinfo;
+-#endif
+-#ifdef __cplusplus
+-}
+-#endif
+-
+-int
+-main ()
+-{
+-return f != ${ipv6_cv_pfx}getaddrinfo;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  eval "$as_ac_var=yes"
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-eval "$as_ac_var=no"
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+-
+-fi
+-rm -f conftest*
+-
+-      if eval test X\$ac_cv_func_${ipv6_cv_pfx}getaddrinfo = Xyes; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_GETADDRINFO
+-_ACEOF
+-
+-        ipv6_cv_getaddrinfo=yes
+-        break
+-      fi
+-    done
+-  fi
+-fi
+-if test $ipv6_cv_getaddrinfo = yes; then
+-
+-echo "$as_me:$LINENO: checking for gai_strerror" >&5
+-echo $ECHO_N "checking for gai_strerror... $ECHO_C" >&6
+-if test "${ac_cv_func_gai_strerror+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-/* Define gai_strerror to an innocuous variant, in case <limits.h> declares gai_strerror.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define gai_strerror innocuous_gai_strerror
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char gai_strerror (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef gai_strerror
+-
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-{
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char gai_strerror ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_gai_strerror) || defined (__stub___gai_strerror)
+-choke me
+-#else
+-char (*f) () = gai_strerror;
+-#endif
+-#ifdef __cplusplus
+-}
+-#endif
+-
+-int
+-main ()
+-{
+-return f != gai_strerror;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_func_gai_strerror=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_func_gai_strerror=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_gai_strerror" >&5
+-echo "${ECHO_T}$ac_cv_func_gai_strerror" >&6
+-if test $ac_cv_func_gai_strerror = yes; then
+-    ac_cv_lib_socket_gai_strerror=no
+-  ac_cv_lib_inet6_gai_strerror=no
+-
+-else
+-    echo "$as_me:$LINENO: checking for gai_strerror in -lsocket" >&5
+-echo $ECHO_N "checking for gai_strerror in -lsocket... $ECHO_C" >&6
+-if test "${ac_cv_lib_socket_gai_strerror+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lsocket  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char gai_strerror ();
+-int
+-main ()
+-{
+-gai_strerror ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_lib_socket_gai_strerror=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_lib_socket_gai_strerror=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_socket_gai_strerror" >&5
+-echo "${ECHO_T}$ac_cv_lib_socket_gai_strerror" >&6
+-if test $ac_cv_lib_socket_gai_strerror = yes; then
+-      LIBS="$LIBS -lsocket"
+-    ac_cv_lib_inet6_gai_strerror=no
+-
+-else
+-      echo "$as_me:$LINENO: checking whether your system has IPv6 directory" >&5
+-echo $ECHO_N "checking whether your system has IPv6 directory... $ECHO_C" >&6
+-    if test "${ipv6_cv_dir+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-        for ipv6_cv_dir in /usr/local/v6 /usr/inet6 no; do
+-	if test $ipv6_cv_dir = no -o -d $ipv6_cv_dir; then
+-	  break
+-	fi
+-      done
+-fi
+-    echo "$as_me:$LINENO: result: $ipv6_cv_dir" >&5
+-echo "${ECHO_T}$ipv6_cv_dir" >&6
+-    if test $ipv6_cv_dir = no; then
+-      ac_cv_lib_inet6_gai_strerror=no
+-    else
+-      if test x$ipv6_libinet6 = x; then
+-	ipv6_libinet6=no
+-	SAVELDFLAGS="$LDFLAGS"
+-	LDFLAGS="$LDFLAGS -L$ipv6_cv_dir/lib"
+-      fi
+-      echo "$as_me:$LINENO: checking for gai_strerror in -linet6" >&5
+-echo $ECHO_N "checking for gai_strerror in -linet6... $ECHO_C" >&6
+-if test "${ac_cv_lib_inet6_gai_strerror+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-linet6  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char gai_strerror ();
+-int
+-main ()
+-{
+-gai_strerror ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_lib_inet6_gai_strerror=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_lib_inet6_gai_strerror=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_inet6_gai_strerror" >&5
+-echo "${ECHO_T}$ac_cv_lib_inet6_gai_strerror" >&6
+-if test $ac_cv_lib_inet6_gai_strerror = yes; then
+-  	if test $ipv6_libinet6 = no; then
+-	  ipv6_libinet6=yes
+-	  LIBS="$LIBS -linet6"
+-	fi
+-fi
+-      if test $ipv6_libinet6 = no; then
+-	LDFLAGS="$SAVELDFLAGS"
+-      fi
+-    fi
+-fi
+-
+-fi
+-ipv6_cv_gai_strerror=no
+-if test $ac_cv_func_gai_strerror = yes -o $ac_cv_lib_socket_gai_strerror = yes \
+-     -o $ac_cv_lib_inet6_gai_strerror = yes
+-then
+-  ipv6_cv_gai_strerror=yes
+-fi
+-if test $ipv6_cv_gai_strerror = no; then
+-  if test gai_strerror = getaddrinfo; then
+-    for ipv6_cv_pfx in o n; do
+-      cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <netdb.h>
+-
+-_ACEOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  $EGREP "${ipv6_cv_pfx}gai_strerror" >/dev/null 2>&1; then
+-  as_ac_var=`echo "ac_cv_func_${ipv6_cv_pfx}gai_strerror" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for ${ipv6_cv_pfx}gai_strerror" >&5
+-echo $ECHO_N "checking for ${ipv6_cv_pfx}gai_strerror... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-/* Define ${ipv6_cv_pfx}gai_strerror to an innocuous variant, in case <limits.h> declares ${ipv6_cv_pfx}gai_strerror.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define ${ipv6_cv_pfx}gai_strerror innocuous_${ipv6_cv_pfx}gai_strerror
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char ${ipv6_cv_pfx}gai_strerror (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef ${ipv6_cv_pfx}gai_strerror
+-
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-{
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char ${ipv6_cv_pfx}gai_strerror ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_${ipv6_cv_pfx}gai_strerror) || defined (__stub___${ipv6_cv_pfx}gai_strerror)
+-choke me
+-#else
+-char (*f) () = ${ipv6_cv_pfx}gai_strerror;
+-#endif
+-#ifdef __cplusplus
+-}
+-#endif
+-
+-int
+-main ()
+-{
+-return f != ${ipv6_cv_pfx}gai_strerror;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  eval "$as_ac_var=yes"
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-eval "$as_ac_var=no"
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+-
+-fi
+-rm -f conftest*
+-
+-      if eval test X\$ac_cv_func_${ipv6_cv_pfx}gai_strerror = Xyes; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_GETADDRINFO
+-_ACEOF
+-
+-        ipv6_cv_gai_strerror=yes
+-        break
+-      fi
+-    done
+-  fi
+-fi
+-if test $ipv6_cv_gai_strerror = yes; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_GETADDRINFO
+-_ACEOF
+-
+-else
+-  cyrus_cv_getaddrinfo=no
+-fi
+-else
+-  cyrus_cv_getaddrinfo=no
+-fi
+-
+-if test $cyrus_cv_getaddrinfo = no; then
+-	IPV6_OBJS="getaddrinfo.o"
+-fi
+-
+-cyrus_cv_getnameinfo=yes
+-
+-echo "$as_me:$LINENO: checking for getnameinfo" >&5
+-echo $ECHO_N "checking for getnameinfo... $ECHO_C" >&6
+-if test "${ac_cv_func_getnameinfo+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-/* Define getnameinfo to an innocuous variant, in case <limits.h> declares getnameinfo.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define getnameinfo innocuous_getnameinfo
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char getnameinfo (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef getnameinfo
+-
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-{
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char getnameinfo ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_getnameinfo) || defined (__stub___getnameinfo)
+-choke me
+-#else
+-char (*f) () = getnameinfo;
+-#endif
+-#ifdef __cplusplus
+-}
+-#endif
+-
+-int
+-main ()
+-{
+-return f != getnameinfo;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_func_getnameinfo=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_func_getnameinfo=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_getnameinfo" >&5
+-echo "${ECHO_T}$ac_cv_func_getnameinfo" >&6
+-if test $ac_cv_func_getnameinfo = yes; then
+-    ac_cv_lib_socket_getnameinfo=no
+-  ac_cv_lib_inet6_getnameinfo=no
+-
+-else
+-    echo "$as_me:$LINENO: checking for getnameinfo in -lsocket" >&5
+-echo $ECHO_N "checking for getnameinfo in -lsocket... $ECHO_C" >&6
+-if test "${ac_cv_lib_socket_getnameinfo+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lsocket  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char getnameinfo ();
+-int
+-main ()
+-{
+-getnameinfo ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_lib_socket_getnameinfo=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_lib_socket_getnameinfo=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_socket_getnameinfo" >&5
+-echo "${ECHO_T}$ac_cv_lib_socket_getnameinfo" >&6
+-if test $ac_cv_lib_socket_getnameinfo = yes; then
+-      LIBS="$LIBS -lsocket"
+-    ac_cv_lib_inet6_getnameinfo=no
+-
+-else
+-      echo "$as_me:$LINENO: checking whether your system has IPv6 directory" >&5
+-echo $ECHO_N "checking whether your system has IPv6 directory... $ECHO_C" >&6
+-    if test "${ipv6_cv_dir+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-        for ipv6_cv_dir in /usr/local/v6 /usr/inet6 no; do
+-	if test $ipv6_cv_dir = no -o -d $ipv6_cv_dir; then
+-	  break
+-	fi
+-      done
+-fi
+-    echo "$as_me:$LINENO: result: $ipv6_cv_dir" >&5
+-echo "${ECHO_T}$ipv6_cv_dir" >&6
+-    if test $ipv6_cv_dir = no; then
+-      ac_cv_lib_inet6_getnameinfo=no
+-    else
+-      if test x$ipv6_libinet6 = x; then
+-	ipv6_libinet6=no
+-	SAVELDFLAGS="$LDFLAGS"
+-	LDFLAGS="$LDFLAGS -L$ipv6_cv_dir/lib"
+-      fi
+-      echo "$as_me:$LINENO: checking for getnameinfo in -linet6" >&5
+-echo $ECHO_N "checking for getnameinfo in -linet6... $ECHO_C" >&6
+-if test "${ac_cv_lib_inet6_getnameinfo+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-linet6  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char getnameinfo ();
+-int
+-main ()
+-{
+-getnameinfo ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_lib_inet6_getnameinfo=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_lib_inet6_getnameinfo=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_inet6_getnameinfo" >&5
+-echo "${ECHO_T}$ac_cv_lib_inet6_getnameinfo" >&6
+-if test $ac_cv_lib_inet6_getnameinfo = yes; then
+-  	if test $ipv6_libinet6 = no; then
+-	  ipv6_libinet6=yes
+-	  LIBS="$LIBS -linet6"
+-	fi
+-fi
+-      if test $ipv6_libinet6 = no; then
+-	LDFLAGS="$SAVELDFLAGS"
+-      fi
+-    fi
+-fi
+-
+-fi
+-ipv6_cv_getnameinfo=no
+-if test $ac_cv_func_getnameinfo = yes -o $ac_cv_lib_socket_getnameinfo = yes \
+-     -o $ac_cv_lib_inet6_getnameinfo = yes
+-then
+-  ipv6_cv_getnameinfo=yes
+-fi
+-if test $ipv6_cv_getnameinfo = no; then
+-  if test getnameinfo = getaddrinfo; then
+-    for ipv6_cv_pfx in o n; do
+-      cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <netdb.h>
+-
+-_ACEOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  $EGREP "${ipv6_cv_pfx}getnameinfo" >/dev/null 2>&1; then
+-  as_ac_var=`echo "ac_cv_func_${ipv6_cv_pfx}getnameinfo" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for ${ipv6_cv_pfx}getnameinfo" >&5
+-echo $ECHO_N "checking for ${ipv6_cv_pfx}getnameinfo... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-/* Define ${ipv6_cv_pfx}getnameinfo to an innocuous variant, in case <limits.h> declares ${ipv6_cv_pfx}getnameinfo.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define ${ipv6_cv_pfx}getnameinfo innocuous_${ipv6_cv_pfx}getnameinfo
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char ${ipv6_cv_pfx}getnameinfo (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef ${ipv6_cv_pfx}getnameinfo
+-
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-{
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char ${ipv6_cv_pfx}getnameinfo ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_${ipv6_cv_pfx}getnameinfo) || defined (__stub___${ipv6_cv_pfx}getnameinfo)
+-choke me
+-#else
+-char (*f) () = ${ipv6_cv_pfx}getnameinfo;
+-#endif
+-#ifdef __cplusplus
+-}
+-#endif
+-
+-int
+-main ()
+-{
+-return f != ${ipv6_cv_pfx}getnameinfo;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  eval "$as_ac_var=yes"
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-eval "$as_ac_var=no"
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+-
+-fi
+-rm -f conftest*
+-
+-      if eval test X\$ac_cv_func_${ipv6_cv_pfx}getnameinfo = Xyes; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_GETADDRINFO
+-_ACEOF
+-
+-        ipv6_cv_getnameinfo=yes
+-        break
+-      fi
+-    done
+-  fi
+-fi
+-if test $ipv6_cv_getnameinfo = yes; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_GETNAMEINFO
+-_ACEOF
+-
+-else
+-  cyrus_cv_getnameinfo=no
+-fi
+-
+-if test $cyrus_cv_getnameinfo = no; then
+-	IPV6_OBJS="$IPV6_OBJS getnameinfo.o"
+-fi
+-
+-
+-echo "$as_me:$LINENO: checking whether you have ss_family in struct sockaddr_storage" >&5
+-echo $ECHO_N "checking whether you have ss_family in struct sockaddr_storage... $ECHO_C" >&6
+-if test "${ipv6_cv_ss_family+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <sys/types.h>
+-#include <sys/socket.h>
+-int
+-main ()
+-{
+-struct sockaddr_storage ss; int i = ss.ss_family;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ipv6_cv_ss_family=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ipv6_cv_ss_family=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-if test $ipv6_cv_ss_family = yes; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_SS_FAMILY
+-_ACEOF
+-
+-else
+-  :
+-fi
+-echo "$as_me:$LINENO: result: $ipv6_cv_ss_family" >&5
+-echo "${ECHO_T}$ipv6_cv_ss_family" >&6
+-
+-echo "$as_me:$LINENO: checking whether you have sa_len in struct sockaddr" >&5
+-echo $ECHO_N "checking whether you have sa_len in struct sockaddr... $ECHO_C" >&6
+-if test "${ipv6_cv_sa_len+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <sys/types.h>
+-#include <sys/socket.h>
+-int
+-main ()
+-{
+-struct sockaddr sa; int i = sa.sa_len;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ipv6_cv_sa_len=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ipv6_cv_sa_len=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-if test $ipv6_cv_sa_len = yes; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_SOCKADDR_SA_LEN
+-_ACEOF
+-
+-else
+-  :
+-fi
+-echo "$as_me:$LINENO: result: $ipv6_cv_sa_len" >&5
+-echo "${ECHO_T}$ipv6_cv_sa_len" >&6
+-
+-
+-
+-
+-for ac_header in sys/time.h
+-do
+-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+-else
+-  # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-#include <$ac_header>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_header_compiler=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_header_compiler=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
+-
+-# Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <$ac_header>
+-_ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
+-  ac_header_preproc=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-  ac_header_preproc=no
+-fi
+-rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
+-
+-# So?  What about this header?
+-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+-  yes:no: )
+-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  eval "$as_ac_Header=\$ac_header_preproc"
+-fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+-
+-fi
+-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+-  cat >>confdefs.h <<_ACEOF
+-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+-_ACEOF
+-
+-fi
+-
+-done
+-
+-echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
+-echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
+-if test "${ac_cv_header_time+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <sys/types.h>
+-#include <sys/time.h>
+-#include <time.h>
+-
+-int
+-main ()
+-{
+-if ((struct tm *) 0)
+-return 0;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_header_time=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_header_time=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
+-echo "${ECHO_T}$ac_cv_header_time" >&6
+-if test $ac_cv_header_time = yes; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define TIME_WITH_SYS_TIME 1
+-_ACEOF
+-
+-fi
+-
+-echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5
+-echo $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" >&6
+-if test "${ac_cv_struct_tm+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <sys/types.h>
+-#include <time.h>
+-
+-int
+-main ()
+-{
+-struct tm *tp; tp->tm_sec;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_struct_tm=time.h
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_struct_tm=sys/time.h
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5
+-echo "${ECHO_T}$ac_cv_struct_tm" >&6
+-if test $ac_cv_struct_tm = sys/time.h; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define TM_IN_SYS_TIME 1
+-_ACEOF
+-
+-fi
+-
+-echo "$as_me:$LINENO: checking for struct tm.tm_zone" >&5
+-echo $ECHO_N "checking for struct tm.tm_zone... $ECHO_C" >&6
+-if test "${ac_cv_member_struct_tm_tm_zone+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <sys/types.h>
+-#include <$ac_cv_struct_tm>
+-
+-
+-int
+-main ()
+-{
+-static struct tm ac_aggr;
+-if (ac_aggr.tm_zone)
+-return 0;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_member_struct_tm_tm_zone=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <sys/types.h>
+-#include <$ac_cv_struct_tm>
+-
+-
+-int
+-main ()
+-{
+-static struct tm ac_aggr;
+-if (sizeof ac_aggr.tm_zone)
+-return 0;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_member_struct_tm_tm_zone=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_member_struct_tm_tm_zone=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_member_struct_tm_tm_zone" >&5
+-echo "${ECHO_T}$ac_cv_member_struct_tm_tm_zone" >&6
+-if test $ac_cv_member_struct_tm_tm_zone = yes; then
+-
+-cat >>confdefs.h <<_ACEOF
+-#define HAVE_STRUCT_TM_TM_ZONE 1
+-_ACEOF
+-
+-
+-fi
+-
+-if test "$ac_cv_member_struct_tm_tm_zone" = yes; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_TM_ZONE 1
+-_ACEOF
+-
+-else
+-  echo "$as_me:$LINENO: checking for tzname" >&5
+-echo $ECHO_N "checking for tzname... $ECHO_C" >&6
+-if test "${ac_cv_var_tzname+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <time.h>
+-#ifndef tzname /* For SGI.  */
+-extern char *tzname[]; /* RS6000 and others reject char **tzname.  */
+-#endif
+-
+-int
+-main ()
+-{
+-atoi(*tzname);
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_var_tzname=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_var_tzname=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_var_tzname" >&5
+-echo "${ECHO_T}$ac_cv_var_tzname" >&6
+-  if test $ac_cv_var_tzname = yes; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_TZNAME 1
+-_ACEOF
+-
+-  fi
+-fi
+-
+-
+-
+-
+-
+-
+-
+-
+-for ac_func in vprintf
+-do
+-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $ac_func
+-
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-{
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+-choke me
+-#else
+-char (*f) () = $ac_func;
+-#endif
+-#ifdef __cplusplus
+-}
+-#endif
+-
+-int
+-main ()
+-{
+-return f != $ac_func;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  eval "$as_ac_var=yes"
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-eval "$as_ac_var=no"
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+-if test `eval echo '${'$as_ac_var'}'` = yes; then
+-  cat >>confdefs.h <<_ACEOF
+-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-_ACEOF
+-
+-echo "$as_me:$LINENO: checking for _doprnt" >&5
+-echo $ECHO_N "checking for _doprnt... $ECHO_C" >&6
+-if test "${ac_cv_func__doprnt+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-/* Define _doprnt to an innocuous variant, in case <limits.h> declares _doprnt.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define _doprnt innocuous__doprnt
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char _doprnt (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef _doprnt
+-
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-{
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char _doprnt ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined (__stub__doprnt) || defined (__stub____doprnt)
+-choke me
+-#else
+-char (*f) () = _doprnt;
+-#endif
+-#ifdef __cplusplus
+-}
+-#endif
+-
+-int
+-main ()
+-{
+-return f != _doprnt;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_func__doprnt=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_func__doprnt=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_func__doprnt" >&5
+-echo "${ECHO_T}$ac_cv_func__doprnt" >&6
+-if test $ac_cv_func__doprnt = yes; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_DOPRNT 1
+-_ACEOF
+-
+-fi
+-
+-fi
+-done
+-
+-
+-
+-
+-CYRUSDB_OBJS="cyrusdb_flat.o cyrusdb_skiplist.o cyrusdb_quotalegacy.o"
+-
+-
+-
+-# Check whether --with-bdb or --without-bdb was given.
+-if test "${with_bdb+set}" = set; then
+-  withval="$with_bdb"
+-  with_bdb=$withval
+-else
+-  with_bdb="yes"
+-fi;
+-
+-
+-# Check whether --with-dbdir or --without-dbdir was given.
+-if test "${with_dbdir+set}" = set; then
+-  withval="$with_dbdir"
+-  with_bdb=$withval
+-fi;
+-
+-case "$with_bdb" in
+-  no)
+-	use_berkeley="no"
+-	;;
+-  yes)
+-	use_berkeley="yes"
+-	with_bdb_lib=none
+-	with_bdb_inc=none
+-	;;
+-
+-  *)
+-	use_berkeley="yes"
+-	with_bdb_lib="$with_bdb/lib"
+-	with_bdb_inc="$with_bdb/include"
+-	;;
+-esac
+-
+-if test "$use_berkeley" != "no"; then
+-
+-
+-# Check whether --with-bdb-libdir or --without-bdb-libdir was given.
+-if test "${with_bdb_libdir+set}" = set; then
+-  withval="$with_bdb_libdir"
+-  with_bdb_lib=$withval
+-else
+-   test "${with_bdb_lib+set}" = set || with_bdb_lib=none
+-fi;
+-
+-# Check whether --with-bdb-incdir or --without-bdb-incdir was given.
+-if test "${with_bdb_incdir+set}" = set; then
+-  withval="$with_bdb_incdir"
+-  with_bdb_inc=$withval
+-else
+-   test "${with_bdb_inc+set}" = set || with_bdb_inc=none
+-fi;
+-
+-
+-
+-
+-	cmu_save_CPPFLAGS=$CPPFLAGS
+-
+-	if test -d $with_bdb_inc; then
+-	    CPPFLAGS="$CPPFLAGS -I$with_bdb_inc"
+-	    BDB_INCADD="-I$with_bdb_inc"
+-	else
+-	    BDB_INCADD=""
+-	fi
+-
+-	                if test "${ac_cv_header_db_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for db.h" >&5
+-echo $ECHO_N "checking for db.h... $ECHO_C" >&6
+-if test "${ac_cv_header_db_h+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_db_h" >&5
+-echo "${ECHO_T}$ac_cv_header_db_h" >&6
+-else
+-  # Is the header compilable?
+-echo "$as_me:$LINENO: checking db.h usability" >&5
+-echo $ECHO_N "checking db.h usability... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-#include <db.h>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_header_compiler=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_header_compiler=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
+-
+-# Is the header present?
+-echo "$as_me:$LINENO: checking db.h presence" >&5
+-echo $ECHO_N "checking db.h presence... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <db.h>
+-_ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
+-  ac_header_preproc=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-  ac_header_preproc=no
+-fi
+-rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
+-
+-# So?  What about this header?
+-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+-  yes:no: )
+-    { echo "$as_me:$LINENO: WARNING: db.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-echo "$as_me: WARNING: db.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: db.h: proceeding with the compiler's result" >&5
+-echo "$as_me: WARNING: db.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { echo "$as_me:$LINENO: WARNING: db.h: present but cannot be compiled" >&5
+-echo "$as_me: WARNING: db.h: present but cannot be compiled" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: db.h:     check for missing prerequisite headers?" >&5
+-echo "$as_me: WARNING: db.h:     check for missing prerequisite headers?" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: db.h: see the Autoconf documentation" >&5
+-echo "$as_me: WARNING: db.h: see the Autoconf documentation" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: db.h:     section \"Present But Cannot Be Compiled\"" >&5
+-echo "$as_me: WARNING: db.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: db.h: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: db.h: proceeding with the preprocessor's result" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: db.h: in the future, the compiler will take precedence" >&5
+-echo "$as_me: WARNING: db.h: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-echo "$as_me:$LINENO: checking for db.h" >&5
+-echo $ECHO_N "checking for db.h... $ECHO_C" >&6
+-if test "${ac_cv_header_db_h+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_cv_header_db_h=$ac_header_preproc
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_db_h" >&5
+-echo "${ECHO_T}$ac_cv_header_db_h" >&6
+-
+-fi
+-if test $ac_cv_header_db_h = yes; then
+-
+-	BDB_SAVE_LDFLAGS=$LDFLAGS
+-
+-	if test -d $with_bdb_lib; then
+-
+-  # this is CMU ADD LIBPATH TO
+-  if test "$andrew_runpath_switch" = "none" ; then
+-	LDFLAGS="-L$with_bdb_lib ${LDFLAGS}"
+-  else
+-	LDFLAGS="-L$with_bdb_lib ${LDFLAGS} $andrew_runpath_switch$with_bdb_lib"
+-  fi
+-
+-
+-  # this is CMU ADD LIBPATH TO
+-  if test "$andrew_runpath_switch" = "none" ; then
+-	BDB_LIBADD="-L$with_bdb_lib ${BDB_LIBADD}"
+-  else
+-	BDB_LIBADD="-L$with_bdb_lib ${BDB_LIBADD} $andrew_runpath_switch$with_bdb_lib"
+-  fi
+-
+-	else
+-	    BDB_LIBADD=""
+-	fi
+-
+-	saved_LIBS=$LIBS
+-        for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
+-          do
+-	    LIBS="$saved_LIBS -l$dbname"
+-	    cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <db.h>
+-int
+-main ()
+-{
+-db_create(NULL, NULL, 0);
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  BDB_LIBADD="$BDB_LIBADD -l$dbname"; dblib="berkeley"; dbname=db
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-dblib="no"
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-	    if test "$dblib" = "berkeley"; then break; fi
+-          done
+-        if test "$dblib" = "no"; then
+-	    LIBS="$saved_LIBS -ldb"
+-	    cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <db.h>
+-int
+-main ()
+-{
+-db_open(NULL, 0, 0, 0, NULL, NULL, NULL);
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  BDB_LIBADD="$BDB_LIBADD -ldb"; dblib="berkeley"; dbname=db
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-dblib="no"
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-        fi
+-	LIBS=$saved_LIBS
+-
+-	LDFLAGS=$BDB_SAVE_LDFLAGS
+-
+-else
+-  dblib="no"
+-fi
+-
+-
+-
+-	CPPFLAGS=$cmu_save_CPPFLAGS
+-
+-
+-  if test "$dblib" = "no"; then
+-    { { echo "$as_me:$LINENO: error: Berkeley DB 3.x or later was not found.  You may need to
+-    supply the --with-bdb-libdir or --with-bdb-incdir configure options." >&5
+-echo "$as_me: error: Berkeley DB 3.x or later was not found.  You may need to
+-    supply the --with-bdb-libdir or --with-bdb-incdir configure options." >&2;}
+-   { (exit 1); exit 1; }; }
+-  fi
+-
+-  if test "$with_bdb_lib" != "none"; then
+-
+-  # this is CMU ADD LIBPATH
+-  if test "$andrew_runpath_switch" = "none" ; then
+-	LDFLAGS="-L$with_bdb_lib ${LDFLAGS}"
+-  else
+-	LDFLAGS="-L$with_bdb_lib $andrew_runpath_switch$with_bdb_lib ${LDFLAGS}"
+-  fi
+-
+-  fi
+-
+-  BDB_INC=${BDB_INCADD}
+-  BDB_LIB=${BDB_LIBADD}
+-
+-
+-
+-  LIBS="${LIBS} ${BDB_LIBADD}"
+-  CPPFLAGS="${BDB_INCADD} ${CPPFLAGS}"
+-
+-  CYRUSDB_OBJS="$CYRUSDB_OBJS cyrusdb_berkeley.o"
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_BDB
+-_ACEOF
+-
+-fi
+-
+-
+-
+-
+-SIEVE_SUBDIRS=""
+-sievedir="sieve"
+-# Check whether --enable-sieve or --disable-sieve was given.
+-if test "${enable_sieve+set}" = set; then
+-  enableval="$enable_sieve"
+-  if test "$enableval" = no; then
+- 		sievedir="no"
+-	fi
+-fi;
+-
+-if test "$sievedir" != "no"; then
+-	SIEVE_OBJS="lmtp_sieve.o smtpclient.o"
+-
+-	SIEVE_LIBS="../${sievedir}/libsieve.a"
+-
+-	SIEVE_CPPFLAGS="-I\$(srcdir)/../$sievedir"
+-
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define USE_SIEVE
+-_ACEOF
+-
+-
+-		for ac_prog in 'bison -y' byacc
+-do
+-  # Extract the first word of "$ac_prog", so it can be a program name with args.
+-set dummy $ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_YACC+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  if test -n "$YACC"; then
+-  ac_cv_prog_YACC="$YACC" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_YACC="$ac_prog"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-done
+-
+-fi
+-fi
+-YACC=$ac_cv_prog_YACC
+-if test -n "$YACC"; then
+-  echo "$as_me:$LINENO: result: $YACC" >&5
+-echo "${ECHO_T}$YACC" >&6
+-else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+-
+-  test -n "$YACC" && break
+-done
+-test -n "$YACC" || YACC="yacc"
+-
+-	for ac_prog in flex lex
+-do
+-  # Extract the first word of "$ac_prog", so it can be a program name with args.
+-set dummy $ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_LEX+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  if test -n "$LEX"; then
+-  ac_cv_prog_LEX="$LEX" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_LEX="$ac_prog"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-done
+-
+-fi
+-fi
+-LEX=$ac_cv_prog_LEX
+-if test -n "$LEX"; then
+-  echo "$as_me:$LINENO: result: $LEX" >&5
+-echo "${ECHO_T}$LEX" >&6
+-else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+-
+-  test -n "$LEX" && break
+-done
+-test -n "$LEX" || LEX=":"
+-
+-if test -z "$LEXLIB"
+-then
+-  echo "$as_me:$LINENO: checking for yywrap in -lfl" >&5
+-echo $ECHO_N "checking for yywrap in -lfl... $ECHO_C" >&6
+-if test "${ac_cv_lib_fl_yywrap+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lfl  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char yywrap ();
+-int
+-main ()
+-{
+-yywrap ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_lib_fl_yywrap=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_lib_fl_yywrap=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_fl_yywrap" >&5
+-echo "${ECHO_T}$ac_cv_lib_fl_yywrap" >&6
+-if test $ac_cv_lib_fl_yywrap = yes; then
+-  LEXLIB="-lfl"
+-else
+-  echo "$as_me:$LINENO: checking for yywrap in -ll" >&5
+-echo $ECHO_N "checking for yywrap in -ll... $ECHO_C" >&6
+-if test "${ac_cv_lib_l_yywrap+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ll  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char yywrap ();
+-int
+-main ()
+-{
+-yywrap ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_lib_l_yywrap=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_lib_l_yywrap=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_l_yywrap" >&5
+-echo "${ECHO_T}$ac_cv_lib_l_yywrap" >&6
+-if test $ac_cv_lib_l_yywrap = yes; then
+-  LEXLIB="-ll"
+-fi
+-
+-fi
+-
+-fi
+-
+-if test "x$LEX" != "x:"; then
+-  echo "$as_me:$LINENO: checking lex output file root" >&5
+-echo $ECHO_N "checking lex output file root... $ECHO_C" >&6
+-if test "${ac_cv_prog_lex_root+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  # The minimal lex program is just a single line: %%.  But some broken lexes
+-# (Solaris, I think it was) want two %% lines, so accommodate them.
+-cat >conftest.l <<_ACEOF
+-%%
+-%%
+-_ACEOF
+-{ (eval echo "$as_me:$LINENO: \"$LEX conftest.l\"") >&5
+-  (eval $LEX conftest.l) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }
+-if test -f lex.yy.c; then
+-  ac_cv_prog_lex_root=lex.yy
+-elif test -f lexyy.c; then
+-  ac_cv_prog_lex_root=lexyy
+-else
+-  { { echo "$as_me:$LINENO: error: cannot find output from $LEX; giving up" >&5
+-echo "$as_me: error: cannot find output from $LEX; giving up" >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_prog_lex_root" >&5
+-echo "${ECHO_T}$ac_cv_prog_lex_root" >&6
+-rm -f conftest.l
+-LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
+-
+-echo "$as_me:$LINENO: checking whether yytext is a pointer" >&5
+-echo $ECHO_N "checking whether yytext is a pointer... $ECHO_C" >&6
+-if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  # POSIX says lex can declare yytext either as a pointer or an array; the
+-# default is implementation-dependent. Figure out which it is, since
+-# not all implementations provide the %pointer and %array declarations.
+-ac_cv_prog_lex_yytext_pointer=no
+-echo 'extern char *yytext;' >>$LEX_OUTPUT_ROOT.c
+-ac_save_LIBS=$LIBS
+-LIBS="$LIBS $LEXLIB"
+-cat >conftest.$ac_ext <<_ACEOF
+-`cat $LEX_OUTPUT_ROOT.c`
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_prog_lex_yytext_pointer=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_save_LIBS
+-rm -f "${LEX_OUTPUT_ROOT}.c"
+-
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_prog_lex_yytext_pointer" >&5
+-echo "${ECHO_T}$ac_cv_prog_lex_yytext_pointer" >&6
+-if test $ac_cv_prog_lex_yytext_pointer = yes; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define YYTEXT_POINTER 1
+-_ACEOF
+-
+-fi
+-
+-fi
+-
+-echo "$as_me:$LINENO: checking for main in -lfl" >&5
+-echo $ECHO_N "checking for main in -lfl... $ECHO_C" >&6
+-if test "${ac_cv_lib_fl_main+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lfl  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-
+-int
+-main ()
+-{
+-main ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_lib_fl_main=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_lib_fl_main=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_fl_main" >&5
+-echo "${ECHO_T}$ac_cv_lib_fl_main" >&6
+-if test $ac_cv_lib_fl_main = yes; then
+-  cat >>confdefs.h <<_ACEOF
+-#define HAVE_LIBFL 1
+-_ACEOF
+-
+-  LIBS="-lfl $LIBS"
+-
+-fi
+-
+-
+- 	echo "$as_me:$LINENO: checking for library containing regcomp" >&5
+-echo $ECHO_N "checking for library containing regcomp... $ECHO_C" >&6
+-if test "${ac_cv_search_regcomp+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_func_search_save_LIBS=$LIBS
+-ac_cv_search_regcomp=no
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char regcomp ();
+-int
+-main ()
+-{
+-regcomp ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_search_regcomp="none required"
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-if test "$ac_cv_search_regcomp" = no; then
+-  for ac_lib in rx regex; do
+-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+-    cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char regcomp ();
+-int
+-main ()
+-{
+-regcomp ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_search_regcomp="-l$ac_lib"
+-break
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-  done
+-fi
+-LIBS=$ac_func_search_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_search_regcomp" >&5
+-echo "${ECHO_T}$ac_cv_search_regcomp" >&6
+-if test "$ac_cv_search_regcomp" != no; then
+-  test "$ac_cv_search_regcomp" = "none required" || LIBS="$ac_cv_search_regcomp $LIBS"
+ 
++	CPPFLAGS=$cmu_save_CPPFLAGS
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define ENABLE_REGEX
+-_ACEOF
+ 
+-		 	if test "${ac_cv_header_rxposix_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for rxposix.h" >&5
+-echo $ECHO_N "checking for rxposix.h... $ECHO_C" >&6
+-if test "${ac_cv_header_rxposix_h+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_rxposix_h" >&5
+-echo "${ECHO_T}$ac_cv_header_rxposix_h" >&6
+-else
+-  # Is the header compilable?
+-echo "$as_me:$LINENO: checking rxposix.h usability" >&5
+-echo $ECHO_N "checking rxposix.h usability... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-#include <rxposix.h>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_header_compiler=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++  if test "$dblib" = "no"; then
++    as_fn_error "Berkeley DB 3.x or later was not found.  You may need to
++    supply the --with-bdb-libdir or --with-bdb-incdir configure options." "$LINENO" 5
++  fi
+ 
+-ac_header_compiler=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++  if test "$with_bdb_lib" != "none"; then
+ 
+-# Is the header present?
+-echo "$as_me:$LINENO: checking rxposix.h presence" >&5
+-echo $ECHO_N "checking rxposix.h presence... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <rxposix.h>
+-_ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  # this is CMU ADD LIBPATH
++  if test "$andrew_runpath_switch" = "none" ; then
++	LDFLAGS="-L$with_bdb_lib ${LDFLAGS}"
+   else
+-    ac_cpp_err=
++	LDFLAGS="-L$with_bdb_lib $andrew_runpath_switch$with_bdb_lib ${LDFLAGS}"
+   fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
+-  ac_header_preproc=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-  ac_header_preproc=no
+-fi
+-rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
+-
+-# So?  What about this header?
+-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+-  yes:no: )
+-    { echo "$as_me:$LINENO: WARNING: rxposix.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-echo "$as_me: WARNING: rxposix.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: rxposix.h: proceeding with the compiler's result" >&5
+-echo "$as_me: WARNING: rxposix.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { echo "$as_me:$LINENO: WARNING: rxposix.h: present but cannot be compiled" >&5
+-echo "$as_me: WARNING: rxposix.h: present but cannot be compiled" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: rxposix.h:     check for missing prerequisite headers?" >&5
+-echo "$as_me: WARNING: rxposix.h:     check for missing prerequisite headers?" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: rxposix.h: see the Autoconf documentation" >&5
+-echo "$as_me: WARNING: rxposix.h: see the Autoconf documentation" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: rxposix.h:     section \"Present But Cannot Be Compiled\"" >&5
+-echo "$as_me: WARNING: rxposix.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: rxposix.h: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: rxposix.h: proceeding with the preprocessor's result" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: rxposix.h: in the future, the compiler will take precedence" >&5
+-echo "$as_me: WARNING: rxposix.h: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-echo "$as_me:$LINENO: checking for rxposix.h" >&5
+-echo $ECHO_N "checking for rxposix.h... $ECHO_C" >&6
+-if test "${ac_cv_header_rxposix_h+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_cv_header_rxposix_h=$ac_header_preproc
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_rxposix_h" >&5
+-echo "${ECHO_T}$ac_cv_header_rxposix_h" >&6
+-
+-fi
+-if test $ac_cv_header_rxposix_h = yes; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_RX
+-_ACEOF
+-
+-fi
+-
+-
+-fi
+-
+-
+-
+-	SIEVE_SUBDIRS="${SIEVE_SUBDIRS} $sievedir"
+-	EXTRA_OUTPUT="${EXTRA_OUTPUT} $sievedir/Makefile"
+-fi
+-
+ 
++  fi
+ 
+-echo "$as_me:$LINENO: checking for strerror" >&5
+-echo $ECHO_N "checking for strerror... $ECHO_C" >&6
+-if test "${ac_cv_func_strerror+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-/* Define strerror to an innocuous variant, in case <limits.h> declares strerror.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define strerror innocuous_strerror
++  BDB_INC=${BDB_INCADD}
++  BDB_LIB=${BDB_LIBADD}
+ 
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char strerror (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+ 
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+ 
+-#undef strerror
++  LIBS="${LIBS} ${BDB_LIBADD}"
++  CPPFLAGS="${BDB_INCADD} ${CPPFLAGS}"
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-{
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char strerror ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_strerror) || defined (__stub___strerror)
+-choke me
+-#else
+-char (*f) () = strerror;
+-#endif
+-#ifdef __cplusplus
+-}
+-#endif
++  CYRUSDB_OBJS="$CYRUSDB_OBJS cyrusdb_berkeley.o"
+ 
+-int
+-main ()
+-{
+-return f != strerror;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_func_strerror=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++$as_echo "#define HAVE_BDB /**/" >>confdefs.h
+ 
+-ac_cv_func_strerror=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_strerror" >&5
+-echo "${ECHO_T}$ac_cv_func_strerror" >&6
+-if test $ac_cv_func_strerror = yes; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAS_STRERROR
+-_ACEOF
+ 
+-else
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define NEED_SYS_ERRLIST
+-_ACEOF
+ 
++SIEVE_SUBDIRS=""
++sievedir="sieve"
++# Check whether --enable-sieve was given.
++if test "${enable_sieve+set}" = set; then :
++  enableval=$enable_sieve; if test "$enableval" = no; then
++ 		sievedir="no"
++	fi
+ fi
+ 
+ 
++if test "$sievedir" != "no"; then
++	SIEVE_OBJS="lmtp_sieve.o smtpclient.o"
+ 
+-for ac_header in sys/resource.h
+-do
+-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+-else
+-  # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-#include <$ac_header>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_header_compiler=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++	SIEVE_LIBS="../${sievedir}/libsieve.a"
+ 
+-ac_header_compiler=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++	SIEVE_CPPFLAGS="-I\$(srcdir)/../$sievedir"
+ 
+-# Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <$ac_header>
+-_ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
++
++$as_echo "#define USE_SIEVE /**/" >>confdefs.h
++
++
++		for ac_prog in 'bison -y' byacc
++do
++  # Extract the first word of "$ac_prog", so it can be a program name with args.
++set dummy $ac_prog; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_YACC+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
+-  ac_header_preproc=yes
++  if test -n "$YACC"; then
++  ac_cv_prog_YACC="$YACC" # Let the user override the test.
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_YACC="$ac_prog"
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++  done
++IFS=$as_save_IFS
+ 
+-  ac_header_preproc=no
+ fi
+-rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
+-
+-# So?  What about this header?
+-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+-  yes:no: )
+-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+-
++YACC=$ac_cv_prog_YACC
++if test -n "$YACC"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $YACC" >&5
++$as_echo "$YACC" >&6; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+-  cat >>confdefs.h <<_ACEOF
+-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+-_ACEOF
+ 
+-fi
+ 
++  test -n "$YACC" && break
+ done
++test -n "$YACC" || YACC="yacc"
+ 
+-
+-for ac_func in setrlimit
++	for ac_prog in flex lex
+ do
+-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  # Extract the first word of "$ac_prog", so it can be a program name with args.
++set dummy $ac_prog; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_LEX+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define $ac_func innocuous_$ac_func
++  if test -n "$LEX"; then
++  ac_cv_prog_LEX="$LEX" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_LEX="$ac_prog"
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++  done
++IFS=$as_save_IFS
+ 
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
++fi
++fi
++LEX=$ac_cv_prog_LEX
++if test -n "$LEX"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LEX" >&5
++$as_echo "$LEX" >&6; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
+ 
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+ 
+-#undef $ac_func
++  test -n "$LEX" && break
++done
++test -n "$LEX" || LEX=":"
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-{
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+-choke me
+-#else
+-char (*f) () = $ac_func;
+-#endif
+-#ifdef __cplusplus
+-}
++if test "x$LEX" != "x:"; then
++  cat >conftest.l <<_ACEOF
++%%
++a { ECHO; }
++b { REJECT; }
++c { yymore (); }
++d { yyless (1); }
++e { yyless (input () != 0); }
++f { unput (yytext[0]); }
++. { BEGIN INITIAL; }
++%%
++#ifdef YYTEXT_POINTER
++extern char *yytext;
+ #endif
+-
+ int
+-main ()
++main (void)
+ {
+-return f != $ac_func;
+-  ;
+-  return 0;
++  return ! yylex () + ! yywrap ();
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++{ { ac_try="$LEX conftest.l"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++  (eval "$LEX conftest.l") 2>&5
+   ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  eval "$as_ac_var=yes"
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking lex output file root" >&5
++$as_echo_n "checking lex output file root... " >&6; }
++if test "${ac_cv_prog_lex_root+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-eval "$as_ac_var=no"
++if test -f lex.yy.c; then
++  ac_cv_prog_lex_root=lex.yy
++elif test -f lexyy.c; then
++  ac_cv_prog_lex_root=lexyy
++else
++  as_fn_error "cannot find output from $LEX; giving up" "$LINENO" 5
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+-if test `eval echo '${'$as_ac_var'}'` = yes; then
+-  cat >>confdefs.h <<_ACEOF
+-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_root" >&5
++$as_echo "$ac_cv_prog_lex_root" >&6; }
++LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
++
++if test -z "${LEXLIB+set}"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking lex library" >&5
++$as_echo_n "checking lex library... " >&6; }
++if test "${ac_cv_lib_lex+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++
++    ac_save_LIBS=$LIBS
++    ac_cv_lib_lex='none needed'
++    for ac_lib in '' -lfl -ll; do
++      LIBS="$ac_lib $ac_save_LIBS"
++      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++`cat $LEX_OUTPUT_ROOT.c`
+ _ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_lib_lex=$ac_lib
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++      test "$ac_cv_lib_lex" != 'none needed' && break
++    done
++    LIBS=$ac_save_LIBS
+ 
+ fi
+-done
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lex" >&5
++$as_echo "$ac_cv_lib_lex" >&6; }
++  test "$ac_cv_lib_lex" != 'none needed' && LEXLIB=$ac_cv_lib_lex
++fi
+ 
+ 
+-for ac_func in getrlimit
+-do
+-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether yytext is a pointer" >&5
++$as_echo_n "checking whether yytext is a pointer... " >&6; }
++if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  # POSIX says lex can declare yytext either as a pointer or an array; the
++# default is implementation-dependent.  Figure out which it is, since
++# not all implementations provide the %pointer and %array declarations.
++ac_cv_prog_lex_yytext_pointer=no
++ac_save_LIBS=$LIBS
++LIBS="$LEXLIB $ac_save_LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define $ac_func innocuous_$ac_func
++#define YYTEXT_POINTER 1
++`cat $LEX_OUTPUT_ROOT.c`
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_prog_lex_yytext_pointer=yes
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_save_LIBS
+ 
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_yytext_pointer" >&5
++$as_echo "$ac_cv_prog_lex_yytext_pointer" >&6; }
++if test $ac_cv_prog_lex_yytext_pointer = yes; then
+ 
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
++$as_echo "#define YYTEXT_POINTER 1" >>confdefs.h
+ 
+-#undef $ac_func
++fi
++rm -f conftest.l $LEX_OUTPUT_ROOT.c
++
++fi
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lfl" >&5
++$as_echo_n "checking for main in -lfl... " >&6; }
++if test "${ac_cv_lib_fl_main+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lfl  $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-{
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+-choke me
+-#else
+-char (*f) () = $ac_func;
+-#endif
+-#ifdef __cplusplus
+-}
+-#endif
+ 
+ int
+ main ()
+ {
+-return f != $ac_func;
++return main ();
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  eval "$as_ac_var=yes"
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_lib_fl_main=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-eval "$as_ac_var=no"
++  ac_cv_lib_fl_main=no
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+-if test `eval echo '${'$as_ac_var'}'` = yes; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_fl_main" >&5
++$as_echo "$ac_cv_lib_fl_main" >&6; }
++if test "x$ac_cv_lib_fl_main" = x""yes; then :
+   cat >>confdefs.h <<_ACEOF
+-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define HAVE_LIBFL 1
+ _ACEOF
+ 
+-fi
+-done
+-
++  LIBS="-lfl $LIBS"
+ 
++fi
+ 
+ 
+-for ac_func in daemon setsid
+-do
+-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing regcomp" >&5
++$as_echo_n "checking for library containing regcomp... " >&6; }
++if test "${ac_cv_search_regcomp+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $ac_func
+-
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-{
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+-choke me
+-#else
+-char (*f) () = $ac_func;
+-#endif
++  ac_func_search_save_LIBS=$LIBS
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+-}
++extern "C"
+ #endif
+-
++char regcomp ();
+ int
+ main ()
+ {
+-return f != $ac_func;
++return regcomp ();
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  eval "$as_ac_var=yes"
++for ac_lib in '' rx regex; do
++  if test -z "$ac_lib"; then
++    ac_res="none required"
++  else
++    ac_res=-l$ac_lib
++    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
++  fi
++  if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_search_regcomp=$ac_res
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext
++  if test "${ac_cv_search_regcomp+set}" = set; then :
++  break
++fi
++done
++if test "${ac_cv_search_regcomp+set}" = set; then :
++
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++  ac_cv_search_regcomp=no
++fi
++rm conftest.$ac_ext
++LIBS=$ac_func_search_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_regcomp" >&5
++$as_echo "$ac_cv_search_regcomp" >&6; }
++ac_res=$ac_cv_search_regcomp
++if test "$ac_res" != no; then :
++  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
++
++
++$as_echo "#define ENABLE_REGEX /**/" >>confdefs.h
++
++		 	ac_fn_c_check_header_mongrel "$LINENO" "rxposix.h" "ac_cv_header_rxposix_h" "$ac_includes_default"
++if test "x$ac_cv_header_rxposix_h" = x""yes; then :
++
++$as_echo "#define HAVE_RX /**/" >>confdefs.h
+ 
+-eval "$as_ac_var=no"
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
++
++
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+-if test `eval echo '${'$as_ac_var'}'` = yes; then
+-  cat >>confdefs.h <<_ACEOF
+-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-_ACEOF
+ 
++
++
++	SIEVE_SUBDIRS="${SIEVE_SUBDIRS} $sievedir"
++	EXTRA_OUTPUT="${EXTRA_OUTPUT} $sievedir/Makefile"
+ fi
+-done
+ 
+ 
+ 
+-for ac_func in shutdown
+-do
+-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++ac_fn_c_check_func "$LINENO" "strerror" "ac_cv_func_strerror"
++if test "x$ac_cv_func_strerror" = x""yes; then :
++
++$as_echo "#define HAS_STRERROR /**/" >>confdefs.h
++
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define $ac_func innocuous_$ac_func
+ 
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
++$as_echo "#define NEED_SYS_ERRLIST /**/" >>confdefs.h
+ 
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
++fi
+ 
+-#undef $ac_func
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-{
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+-choke me
+-#else
+-char (*f) () = $ac_func;
+-#endif
+-#ifdef __cplusplus
+-}
+-#endif
++for ac_header in sys/resource.h
++do :
++  ac_fn_c_check_header_mongrel "$LINENO" "sys/resource.h" "ac_cv_header_sys_resource_h" "$ac_includes_default"
++if test "x$ac_cv_header_sys_resource_h" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_SYS_RESOURCE_H 1
++_ACEOF
+ 
+-int
+-main ()
+-{
+-return f != $ac_func;
+-  ;
+-  return 0;
+-}
++fi
++
++done
++
++for ac_func in setrlimit
++do :
++  ac_fn_c_check_func "$LINENO" "setrlimit" "ac_cv_func_setrlimit"
++if test "x$ac_cv_func_setrlimit" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_SETRLIMIT 1
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  eval "$as_ac_var=yes"
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-eval "$as_ac_var=no"
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
++done
++
++for ac_func in getrlimit
++do :
++  ac_fn_c_check_func "$LINENO" "getrlimit" "ac_cv_func_getrlimit"
++if test "x$ac_cv_func_getrlimit" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_GETRLIMIT 1
++_ACEOF
++
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+-if test `eval echo '${'$as_ac_var'}'` = yes; then
++done
++
++
++for ac_func in daemon setsid
++do :
++  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++   if test "x$as_val" = x""yes; then :
+   cat >>confdefs.h <<_ACEOF
+-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+ done
+ 
+ 
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
++for ac_func in shutdown
++do :
++  ac_fn_c_check_func "$LINENO" "shutdown" "ac_cv_func_shutdown"
++if test "x$ac_cv_func_shutdown" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_SHUTDOWN 1
+ _ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++
++fi
++done
++
++
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include <sys/socket.h>
+ 
+ _ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  $EGREP "socklen_t" >/dev/null 2>&1; then
++  $EGREP "socklen_t" >/dev/null 2>&1; then :
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_SOCKLEN_T
+-_ACEOF
++$as_echo "#define HAVE_SOCKLEN_T /**/" >>confdefs.h
+ 
+ fi
+ rm -f conftest*
+ 
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include <sys/socket.h>
+ 
+ _ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  $EGREP "sockaddr_storage" >/dev/null 2>&1; then
++  $EGREP "sockaddr_storage" >/dev/null 2>&1; then :
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_STRUCT_SOCKADDR_STORAGE
+-_ACEOF
++$as_echo "#define HAVE_STRUCT_SOCKADDR_STORAGE /**/" >>confdefs.h
+ 
+ fi
+ rm -f conftest*
+ 
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include <sys/resource.h>
+ 
+ _ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  $EGREP "rlim_t" >/dev/null 2>&1; then
++  $EGREP "rlim_t" >/dev/null 2>&1; then :
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_RLIM_T
+-_ACEOF
++$as_echo "#define HAVE_RLIM_T /**/" >>confdefs.h
+ 
+ fi
+ rm -f conftest*
+ 
+ 
+ spt_type=""
+-echo "$as_me:$LINENO: checking for setproctitle" >&5
+-echo $ECHO_N "checking for setproctitle... $ECHO_C" >&6
+-if test "${ac_cv_func_setproctitle+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-/* Define setproctitle to an innocuous variant, in case <limits.h> declares setproctitle.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define setproctitle innocuous_setproctitle
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char setproctitle (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef setproctitle
+-
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-{
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char setproctitle ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_setproctitle) || defined (__stub___setproctitle)
+-choke me
+-#else
+-char (*f) () = setproctitle;
+-#endif
+-#ifdef __cplusplus
+-}
+-#endif
+-
+-int
+-main ()
+-{
+-return f != setproctitle;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_func_setproctitle=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_func_setproctitle=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_setproctitle" >&5
+-echo "${ECHO_T}$ac_cv_func_setproctitle" >&6
+-if test $ac_cv_func_setproctitle = yes; then
++ac_fn_c_check_func "$LINENO" "setproctitle" "ac_cv_func_setproctitle"
++if test "x$ac_cv_func_setproctitle" = x""yes; then :
+   spt_type=SPT_BUILTIN
+ fi
+ 
+ if test "$spt_type" = ""; then
+-		echo "$as_me:$LINENO: checking for setproctitle in -lutil" >&5
+-echo $ECHO_N "checking for setproctitle in -lutil... $ECHO_C" >&6
+-if test "${ac_cv_lib_util_setproctitle+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for setproctitle in -lutil" >&5
++$as_echo_n "checking for setproctitle in -lutil... " >&6; }
++if test "${ac_cv_lib_util_setproctitle+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lutil  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char setproctitle ();
+ int
+ main ()
+ {
+-setproctitle ();
++return setproctitle ();
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_util_setproctitle=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_lib_util_setproctitle=no
++  ac_cv_lib_util_setproctitle=no
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_util_setproctitle" >&5
+-echo "${ECHO_T}$ac_cv_lib_util_setproctitle" >&6
+-if test $ac_cv_lib_util_setproctitle = yes; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_util_setproctitle" >&5
++$as_echo "$ac_cv_lib_util_setproctitle" >&6; }
++if test "x$ac_cv_lib_util_setproctitle" = x""yes; then :
+   spt_type=SPT_BUILTIN
+ 			LIBS="${LIBS} -lutil"
+ fi
+ 
+ fi
+ if test "$spt_type" = ""; then
+-	if test "${ac_cv_header_sys_pstat_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for sys/pstat.h" >&5
+-echo $ECHO_N "checking for sys/pstat.h... $ECHO_C" >&6
+-if test "${ac_cv_header_sys_pstat_h+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_sys_pstat_h" >&5
+-echo "${ECHO_T}$ac_cv_header_sys_pstat_h" >&6
+-else
+-  # Is the header compilable?
+-echo "$as_me:$LINENO: checking sys/pstat.h usability" >&5
+-echo $ECHO_N "checking sys/pstat.h usability... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-#include <sys/pstat.h>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_header_compiler=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_header_compiler=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
+-
+-# Is the header present?
+-echo "$as_me:$LINENO: checking sys/pstat.h presence" >&5
+-echo $ECHO_N "checking sys/pstat.h presence... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <sys/pstat.h>
+-_ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
+-  ac_header_preproc=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-  ac_header_preproc=no
+-fi
+-rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
+-
+-# So?  What about this header?
+-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+-  yes:no: )
+-    { echo "$as_me:$LINENO: WARNING: sys/pstat.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-echo "$as_me: WARNING: sys/pstat.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: sys/pstat.h: proceeding with the compiler's result" >&5
+-echo "$as_me: WARNING: sys/pstat.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { echo "$as_me:$LINENO: WARNING: sys/pstat.h: present but cannot be compiled" >&5
+-echo "$as_me: WARNING: sys/pstat.h: present but cannot be compiled" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: sys/pstat.h:     check for missing prerequisite headers?" >&5
+-echo "$as_me: WARNING: sys/pstat.h:     check for missing prerequisite headers?" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: sys/pstat.h: see the Autoconf documentation" >&5
+-echo "$as_me: WARNING: sys/pstat.h: see the Autoconf documentation" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: sys/pstat.h:     section \"Present But Cannot Be Compiled\"" >&5
+-echo "$as_me: WARNING: sys/pstat.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: sys/pstat.h: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: sys/pstat.h: proceeding with the preprocessor's result" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: sys/pstat.h: in the future, the compiler will take precedence" >&5
+-echo "$as_me: WARNING: sys/pstat.h: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-echo "$as_me:$LINENO: checking for sys/pstat.h" >&5
+-echo $ECHO_N "checking for sys/pstat.h... $ECHO_C" >&6
+-if test "${ac_cv_header_sys_pstat_h+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_cv_header_sys_pstat_h=$ac_header_preproc
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_sys_pstat_h" >&5
+-echo "${ECHO_T}$ac_cv_header_sys_pstat_h" >&6
+-
+-fi
+-if test $ac_cv_header_sys_pstat_h = yes; then
++	ac_fn_c_check_header_mongrel "$LINENO" "sys/pstat.h" "ac_cv_header_sys_pstat_h" "$ac_includes_default"
++if test "x$ac_cv_header_sys_pstat_h" = x""yes; then :
+   spt_type=SPT_PSTAT
+ fi
+ 
+ 
+ fi
+ if test "$spt_type" = ""; then
+-	if test "${ac_cv_header_sys_sysnews_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for sys/sysnews.h" >&5
+-echo $ECHO_N "checking for sys/sysnews.h... $ECHO_C" >&6
+-if test "${ac_cv_header_sys_sysnews_h+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_sys_sysnews_h" >&5
+-echo "${ECHO_T}$ac_cv_header_sys_sysnews_h" >&6
+-else
+-  # Is the header compilable?
+-echo "$as_me:$LINENO: checking sys/sysnews.h usability" >&5
+-echo $ECHO_N "checking sys/sysnews.h usability... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-#include <sys/sysnews.h>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_header_compiler=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_header_compiler=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
+-
+-# Is the header present?
+-echo "$as_me:$LINENO: checking sys/sysnews.h presence" >&5
+-echo $ECHO_N "checking sys/sysnews.h presence... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <sys/sysnews.h>
+-_ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
+-  ac_header_preproc=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-  ac_header_preproc=no
+-fi
+-rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
+-
+-# So?  What about this header?
+-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+-  yes:no: )
+-    { echo "$as_me:$LINENO: WARNING: sys/sysnews.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-echo "$as_me: WARNING: sys/sysnews.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: sys/sysnews.h: proceeding with the compiler's result" >&5
+-echo "$as_me: WARNING: sys/sysnews.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { echo "$as_me:$LINENO: WARNING: sys/sysnews.h: present but cannot be compiled" >&5
+-echo "$as_me: WARNING: sys/sysnews.h: present but cannot be compiled" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: sys/sysnews.h:     check for missing prerequisite headers?" >&5
+-echo "$as_me: WARNING: sys/sysnews.h:     check for missing prerequisite headers?" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: sys/sysnews.h: see the Autoconf documentation" >&5
+-echo "$as_me: WARNING: sys/sysnews.h: see the Autoconf documentation" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: sys/sysnews.h:     section \"Present But Cannot Be Compiled\"" >&5
+-echo "$as_me: WARNING: sys/sysnews.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: sys/sysnews.h: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: sys/sysnews.h: proceeding with the preprocessor's result" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: sys/sysnews.h: in the future, the compiler will take precedence" >&5
+-echo "$as_me: WARNING: sys/sysnews.h: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-echo "$as_me:$LINENO: checking for sys/sysnews.h" >&5
+-echo $ECHO_N "checking for sys/sysnews.h... $ECHO_C" >&6
+-if test "${ac_cv_header_sys_sysnews_h+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_cv_header_sys_sysnews_h=$ac_header_preproc
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_sys_sysnews_h" >&5
+-echo "${ECHO_T}$ac_cv_header_sys_sysnews_h" >&6
+-
+-fi
+-if test $ac_cv_header_sys_sysnews_h = yes; then
++	ac_fn_c_check_header_mongrel "$LINENO" "sys/sysnews.h" "ac_cv_header_sys_sysnews_h" "$ac_includes_default"
++if test "x$ac_cv_header_sys_sysnews_h" = x""yes; then :
+   spt_type=SPT_SYSMIPS
+ fi
+ 
+ 
+ fi
+ if test "$spt_type" = ""; then
+-	echo "$as_me:$LINENO: checking for PS_STRINGS" >&5
+-echo $ECHO_N "checking for PS_STRINGS... $ECHO_C" >&6
+-	if test "${cyrus_cv_sys_psstrings+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PS_STRINGS" >&5
++$as_echo_n "checking for PS_STRINGS... " >&6; }
++if test "${cyrus_cv_sys_psstrings+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ #include <machine/vmparam.h>
+ #include <sys/exec.h>
+-#ifndef PS_STRINGS
+-#include </nonexistent>
+-#endif
++void *p = PS_STRINGS;
++
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++if ac_fn_c_try_compile "$LINENO"; then :
+   cyrus_cv_sys_psstrings=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+   cyrus_cv_sys_psstrings=no
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ 
+-	if test $cyrus_cv_sys_psstrings = yes; then
+-		spt_type=SPT_PSSTRINGS
+-	fi
+-	echo "$as_me:$LINENO: result: $cyrus_cv_sys_psstrings" >&5
+-echo "${ECHO_T}$cyrus_cv_sys_psstrings" >&6
++         if test $cyrus_cv_sys_psstrings = yes; then
++                 spt_type=SPT_PSSTRINGS
++         fi
++         { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cyrus_cv_sys_psstrings" >&5
++$as_echo "$cyrus_cv_sys_psstrings" >&6; }
+ fi
+ if test "$spt_type" = ""; then
+-	echo "$as_me:$LINENO: checking for SCO" >&5
+-echo $ECHO_N "checking for SCO... $ECHO_C" >&6
+-	if test "${cyrus_cv_sys_sco+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SCO" >&5
++$as_echo_n "checking for SCO... " >&6; }
++	if test "${cyrus_cv_sys_sco+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ #ifndef _SCO_unix_
+ #include </nonexistent>
+ #endif
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++if ac_fn_c_try_cpp "$LINENO"; then :
+   cyrus_cv_sys_sco=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+   cyrus_cv_sys_sco=no
+ fi
+ rm -f conftest.err conftest.$ac_ext
+@@ -9824,49 +6704,25 @@ fi
+ 	if test $cyrus_cv_sys_sco = yes; then
+ 		spt_type=SPT_SCO
+ 	fi
+-	echo "$as_me:$LINENO: result: $cyrus_cv_sys_sco" >&5
+-echo "${ECHO_T}$cyrus_cv_sys_sco" >&6
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cyrus_cv_sys_sco" >&5
++$as_echo "$cyrus_cv_sys_sco" >&6; }
+ fi
+ if test "$spt_type" = ""; then
+-	echo "$as_me:$LINENO: checking for setproctitle usability" >&5
+-echo $ECHO_N "checking for setproctitle usability... $ECHO_C" >&6
+-	if test "${cyrus_cv_sys_setproctitle+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for setproctitle usability" >&5
++$as_echo_n "checking for setproctitle usability... " >&6; }
++	if test "${cyrus_cv_sys_setproctitle+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ #if defined(DGUX) || defined(_SEQUENT_) || defined(apollo)
+ #include </nonexistent>
+ #endif
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++if ac_fn_c_try_cpp "$LINENO"; then :
+   cyrus_cv_sys_setproctitle=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+   cyrus_cv_sys_setproctitle=no
+ fi
+ rm -f conftest.err conftest.$ac_ext
+@@ -9875,8 +6731,8 @@ fi
+ 	if test $cyrus_cv_sys_setproctitle = no; then
+ 		spt_type=SPT_NONE
+ 	fi
+-	echo "$as_me:$LINENO: result: $cyrus_cv_sys_setproctitle" >&5
+-echo "${ECHO_T}$cyrus_cv_sys_setproctitle" >&6
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cyrus_cv_sys_setproctitle" >&5
++$as_echo "$cyrus_cv_sys_setproctitle" >&6; }
+ fi
+ if test "$spt_type" != ""; then
+ 
+@@ -9886,16 +6742,12 @@ _ACEOF
+ 
+ fi
+ 
+-echo "$as_me:$LINENO: checking nonblocking method" >&5
+-echo $ECHO_N "checking nonblocking method... $ECHO_C" >&6
+-if test "${cyrus_cv_sys_nonblock+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking nonblocking method" >&5
++$as_echo_n "checking nonblocking method... " >&6; }
++if test "${cyrus_cv_sys_nonblock+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include <sys/types.h>
+ #include <sys/file.h>
+@@ -9911,54 +6763,26 @@ fcntl(0, F_GETFL, 0)&FNDELAY
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   cyrus_cv_sys_nonblock=fcntl
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-cyrus_cv_sys_nonblock=ioctl
++  cyrus_cv_sys_nonblock=ioctl
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ fi
+ 
+ WITH_NONBLOCK=$cyrus_cv_sys_nonblock
+ 
+-echo "$as_me:$LINENO: result: $WITH_NONBLOCK" >&5
+-echo "${ECHO_T}$WITH_NONBLOCK" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $WITH_NONBLOCK" >&5
++$as_echo "$WITH_NONBLOCK" >&6; }
+ 
+-echo "$as_me:$LINENO: checking timezone GMT offset method" >&5
+-echo $ECHO_N "checking timezone GMT offset method... $ECHO_C" >&6
+-if test "${cyrus_cv_struct_sys_gmtoff+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking timezone GMT offset method" >&5
++$as_echo_n "checking timezone GMT offset method... " >&6; }
++if test "${cyrus_cv_struct_sys_gmtoff+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ #include <time.h>
+@@ -9972,55 +6796,27 @@ tm.tm_gmtoff = 0;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++if ac_fn_c_try_compile "$LINENO"; then :
+   cyrus_cv_struct_sys_gmtoff=tm
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-cyrus_cv_struct_sys_gmtoff=gmtime
++  cyrus_cv_struct_sys_gmtoff=gmtime
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ 
+ WITH_GMTOFF=$cyrus_cv_struct_sys_gmtoff
+ 
+-echo "$as_me:$LINENO: result: $WITH_GMTOFF" >&5
+-echo "${ECHO_T}$WITH_GMTOFF" >&6
+-echo "$as_me:$LINENO: checking for shared mmap" >&5
+-echo $ECHO_N "checking for shared mmap... $ECHO_C" >&6
+-if test "${cyrus_cv_func_mmap_shared+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $WITH_GMTOFF" >&5
++$as_echo "$WITH_GMTOFF" >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for shared mmap" >&5
++$as_echo_n "checking for shared mmap... " >&6; }
++if test "${cyrus_cv_func_mmap_shared+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
+-  if test "$cross_compiling" = yes; then
++  if test "$cross_compiling" = yes; then :
+   cyrus_cv_func_mmap_shared=no
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ #include <sys/types.h>
+@@ -10048,48 +6844,31 @@ if (strncmp(base+4, "test", 4) != 0) exi
+ exit(0);}
+ 
+ _ACEOF
+-rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++if ac_fn_c_try_run "$LINENO"; then :
+   cyrus_cv_func_mmap_shared=yes
+ else
+-  echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-( exit $ac_status )
+-cyrus_cv_func_mmap_shared=no
++  cyrus_cv_func_mmap_shared=no
+ fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++  conftest.$ac_objext conftest.beam conftest.$ac_ext
+ fi
++
+ fi
+ 
+-echo "$as_me:$LINENO: result: $cyrus_cv_func_mmap_shared" >&5
+-echo "${ECHO_T}$cyrus_cv_func_mmap_shared" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cyrus_cv_func_mmap_shared" >&5
++$as_echo "$cyrus_cv_func_mmap_shared" >&6; }
+ if test $cyrus_cv_func_mmap_shared = yes; then
+ 	WITH_MAP="shared"
+ else
+-echo "$as_me:$LINENO: checking for stupid shared mmap" >&5
+-echo $ECHO_N "checking for stupid shared mmap... $ECHO_C" >&6
+-if test "${cyrus_cv_func_mmap_stupidshared+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for stupid shared mmap" >&5
++$as_echo_n "checking for stupid shared mmap... " >&6; }
++if test "${cyrus_cv_func_mmap_stupidshared+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
+-  if test "$cross_compiling" = yes; then
++  if test "$cross_compiling" = yes; then :
+   cyrus_cv_func_mmap_stupidshared=no
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ #include <sys/types.h>
+@@ -10118,242 +6897,51 @@ if (strncmp(base, "xyzz", 4) != 0) exit(
+ exit(0);}
+ 
+ _ACEOF
+-rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++if ac_fn_c_try_run "$LINENO"; then :
+   cyrus_cv_func_mmap_stupidshared=yes
+ else
+-  echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-( exit $ac_status )
+-cyrus_cv_func_mmap_stupidshared=no
++  cyrus_cv_func_mmap_stupidshared=no
+ fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++  conftest.$ac_objext conftest.beam conftest.$ac_ext
+ fi
++
+ fi
+ 
+-echo "$as_me:$LINENO: result: $cyrus_cv_func_mmap_stupidshared" >&5
+-echo "${ECHO_T}$cyrus_cv_func_mmap_stupidshared" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cyrus_cv_func_mmap_stupidshared" >&5
++$as_echo "$cyrus_cv_func_mmap_stupidshared" >&6; }
+ if test $cyrus_cv_func_mmap_stupidshared = yes; then
+ 	WITH_MAP="stupidshared"
+ else
+-	{ echo "$as_me:$LINENO: WARNING: *** This system does not have a working mmap()" >&5
+-echo "$as_me: WARNING: *** This system does not have a working mmap()" >&2;}
+-	{ echo "$as_me:$LINENO: WARNING: *** Expect a considerable performance penalty" >&5
+-echo "$as_me: WARNING: *** Expect a considerable performance penalty" >&2;}
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** This system does not have a working mmap()" >&5
++$as_echo "$as_me: WARNING: *** This system does not have a working mmap()" >&2;}
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Expect a considerable performance penalty" >&5
++$as_echo "$as_me: WARNING: *** Expect a considerable performance penalty" >&2;}
+ 	WITH_MAP=nommap
+ fi
+ fi
+ 
+ 
+ 
+-# Check whether --with-lock or --without-lock was given.
+-if test "${with_lock+set}" = set; then
+-  withval="$with_lock"
+-  WITH_LOCK="$withval"
+-else
+-
+-  echo "$as_me:$LINENO: checking for fcntl" >&5
+-echo $ECHO_N "checking for fcntl... $ECHO_C" >&6
+-if test "${ac_cv_func_fcntl+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-/* Define fcntl to an innocuous variant, in case <limits.h> declares fcntl.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define fcntl innocuous_fcntl
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char fcntl (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef fcntl
+-
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-{
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char fcntl ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_fcntl) || defined (__stub___fcntl)
+-choke me
+-#else
+-char (*f) () = fcntl;
+-#endif
+-#ifdef __cplusplus
+-}
+-#endif
+-
+-int
+-main ()
+-{
+-return f != fcntl;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_func_fcntl=yes
++# Check whether --with-lock was given.
++if test "${with_lock+set}" = set; then :
++  withval=$with_lock; WITH_LOCK="$withval"
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_func_fcntl=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_fcntl" >&5
+-echo "${ECHO_T}$ac_cv_func_fcntl" >&6
+-if test $ac_cv_func_fcntl = yes; then
++  ac_fn_c_check_func "$LINENO" "fcntl" "ac_cv_func_fcntl"
++if test "x$ac_cv_func_fcntl" = x""yes; then :
+   WITH_LOCK="fcntl"
+ else
+ 
+-		echo "$as_me:$LINENO: checking for flock" >&5
+-echo $ECHO_N "checking for flock... $ECHO_C" >&6
+-if test "${ac_cv_func_flock+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++		ac_fn_c_check_func "$LINENO" "flock" "ac_cv_func_flock"
++if test "x$ac_cv_func_flock" = x""yes; then :
++  WITH_LOCK="flock"
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-/* Define flock to an innocuous variant, in case <limits.h> declares flock.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define flock innocuous_flock
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char flock (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef flock
+-
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-{
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char flock ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_flock) || defined (__stub___flock)
+-choke me
+-#else
+-char (*f) () = flock;
+-#endif
+-#ifdef __cplusplus
+-}
+-#endif
+ 
+-int
+-main ()
+-{
+-return f != flock;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_func_flock=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++				as_fn_error "unable to detect locking method" "$LINENO" 5
+ 
+-ac_cv_func_flock=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_flock" >&5
+-echo "${ECHO_T}$ac_cv_func_flock" >&6
+-if test $ac_cv_func_flock = yes; then
+-  WITH_LOCK="flock"
+-else
+ 
+-				{ { echo "$as_me:$LINENO: error: unable to detect locking method" >&5
+-echo "$as_me: error: unable to detect locking method" >&2;}
+-   { (exit 1); exit 1; }; }
+ 
+ fi
+ 
+@@ -10361,180 +6949,57 @@ fi
+ fi
+ 
+ 
+-fi;
+-
+ 
+ 
+ LIB_RT=""
+-echo "$as_me:$LINENO: checking for fdatasync" >&5
+-echo $ECHO_N "checking for fdatasync... $ECHO_C" >&6
+-if test "${ac_cv_func_fdatasync+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-/* Define fdatasync to an innocuous variant, in case <limits.h> declares fdatasync.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define fdatasync innocuous_fdatasync
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char fdatasync (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef fdatasync
+-
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-{
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char fdatasync ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_fdatasync) || defined (__stub___fdatasync)
+-choke me
+-#else
+-char (*f) () = fdatasync;
+-#endif
+-#ifdef __cplusplus
+-}
+-#endif
+-
+-int
+-main ()
+-{
+-return f != fdatasync;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_func_fdatasync=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_func_fdatasync=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_fdatasync" >&5
+-echo "${ECHO_T}$ac_cv_func_fdatasync" >&6
+-if test $ac_cv_func_fdatasync = yes; then
++ac_fn_c_check_func "$LINENO" "fdatasync" "ac_cv_func_fdatasync"
++if test "x$ac_cv_func_fdatasync" = x""yes; then :
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_FDATASYNC
+-_ACEOF
++$as_echo "#define HAVE_FDATASYNC /**/" >>confdefs.h
+ 
+ else
+ 
+-  echo "$as_me:$LINENO: checking for fdatasync in -lrt" >&5
+-echo $ECHO_N "checking for fdatasync in -lrt... $ECHO_C" >&6
+-if test "${ac_cv_lib_rt_fdatasync+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fdatasync in -lrt" >&5
++$as_echo_n "checking for fdatasync in -lrt... " >&6; }
++if test "${ac_cv_lib_rt_fdatasync+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lrt  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char fdatasync ();
+ int
+ main ()
+ {
+-fdatasync ();
++return fdatasync ();
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_rt_fdatasync=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_lib_rt_fdatasync=no
++  ac_cv_lib_rt_fdatasync=no
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_rt_fdatasync" >&5
+-echo "${ECHO_T}$ac_cv_lib_rt_fdatasync" >&6
+-if test $ac_cv_lib_rt_fdatasync = yes; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_fdatasync" >&5
++$as_echo "$ac_cv_lib_rt_fdatasync" >&6; }
++if test "x$ac_cv_lib_rt_fdatasync" = x""yes; then :
+ 
+ 	LIB_RT="-lrt"
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_FDATASYNC
+-_ACEOF
++$as_echo "#define HAVE_FDATASYNC /**/" >>confdefs.h
+ 
+ 
+ fi
+@@ -10544,241 +7009,96 @@ fi
+ 
+ 
+ cant_find_sigvec=no
+-if test "${cyrus_sigveclib+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-
+-  echo "$as_me:$LINENO: checking for sigvec" >&5
+-echo $ECHO_N "checking for sigvec... $ECHO_C" >&6
+-if test "${ac_cv_func_sigvec+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-/* Define sigvec to an innocuous variant, in case <limits.h> declares sigvec.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define sigvec innocuous_sigvec
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char sigvec (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef sigvec
+-
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-{
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char sigvec ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_sigvec) || defined (__stub___sigvec)
+-choke me
+-#else
+-char (*f) () = sigvec;
+-#endif
+-#ifdef __cplusplus
+-}
+-#endif
+-
+-int
+-main ()
+-{
+-return f != sigvec;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_func_sigvec=yes
++if test "${cyrus_sigveclib+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_func_sigvec=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_sigvec" >&5
+-echo "${ECHO_T}$ac_cv_func_sigvec" >&6
+-if test $ac_cv_func_sigvec = yes; then
++  ac_fn_c_check_func "$LINENO" "sigvec" "ac_cv_func_sigvec"
++if test "x$ac_cv_func_sigvec" = x""yes; then :
+ 
+ 	cyrus_sigveclib=""
+ 
+ else
+ 
+-    echo "$as_me:$LINENO: checking for sigvec in -lBSD" >&5
+-echo $ECHO_N "checking for sigvec in -lBSD... $ECHO_C" >&6
+-if test "${ac_cv_lib_BSD_sigvec+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sigvec in -lBSD" >&5
++$as_echo_n "checking for sigvec in -lBSD... " >&6; }
++if test "${ac_cv_lib_BSD_sigvec+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lBSD  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char sigvec ();
+ int
+ main ()
+ {
+-sigvec ();
++return sigvec ();
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_BSD_sigvec=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_lib_BSD_sigvec=no
++  ac_cv_lib_BSD_sigvec=no
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_BSD_sigvec" >&5
+-echo "${ECHO_T}$ac_cv_lib_BSD_sigvec" >&6
+-if test $ac_cv_lib_BSD_sigvec = yes; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_BSD_sigvec" >&5
++$as_echo "$ac_cv_lib_BSD_sigvec" >&6; }
++if test "x$ac_cv_lib_BSD_sigvec" = x""yes; then :
+   cyrus_sigveclib="-lBSD"
+ else
+ 
+         SAVE_LDFLAGS="$LDFLAGS"
+         LDFLAGS="-L/usr/ucblib -R/usr/ucblib $LDFLAGS"
+-    echo "$as_me:$LINENO: checking for sigvec in -lucb" >&5
+-echo $ECHO_N "checking for sigvec in -lucb... $ECHO_C" >&6
+-if test "${ac_cv_lib_ucb_sigvec+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sigvec in -lucb" >&5
++$as_echo_n "checking for sigvec in -lucb... " >&6; }
++if test "${ac_cv_lib_ucb_sigvec+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lucb  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char sigvec ();
+ int
+ main ()
+ {
+-sigvec ();
++return sigvec ();
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_ucb_sigvec=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_lib_ucb_sigvec=no
++  ac_cv_lib_ucb_sigvec=no
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_ucb_sigvec" >&5
+-echo "${ECHO_T}$ac_cv_lib_ucb_sigvec" >&6
+-if test $ac_cv_lib_ucb_sigvec = yes; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ucb_sigvec" >&5
++$as_echo "$ac_cv_lib_ucb_sigvec" >&6; }
++if test "x$ac_cv_lib_ucb_sigvec" = x""yes; then :
+ 
+             cyrus_sigveclib="-lc -L/usr/ucblib -R/usr/ucblib -lucb"
+ else
+@@ -10800,34 +7120,32 @@ fi
+ # all authentication goes through SASL
+ 
+ 
+-# Check whether --with-afs or --without-afs was given.
+-if test "${with_afs+set}" = set; then
+-  withval="$with_afs"
+-  with_afs="${withval}"
++# Check whether --with-afs was given.
++if test "${with_afs+set}" = set; then :
++  withval=$with_afs; with_afs="${withval}"
+ else
+   with_afs="no"
+-fi;
++fi
+ 
+ 
+-# Check whether --with-ldap or --without-ldap was given.
+-if test "${with_ldap+set}" = set; then
+-  withval="$with_ldap"
+-  with_ldap="${withval}"
++
++# Check whether --with-ldap was given.
++if test "${with_ldap+set}" = set; then :
++  withval=$with_ldap; with_ldap="${withval}"
+ else
+   with_ldap="no"
+-fi;
++fi
+ 
+-# Check whether --enable-krb5afspts or --disable-krb5afspts was given.
+-if test "${enable_krb5afspts+set}" = set; then
+-  enableval="$enable_krb5afspts"
+-  SASL_GSSAPI_LIBS_SET="yes"
+ 
++# Check whether --enable-krb5afspts was given.
++if test "${enable_krb5afspts+set}" = set; then :
++  enableval=$enable_krb5afspts; SASL_GSSAPI_LIBS_SET="yes"
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define AFSPTS_USE_KRB5
+-_ACEOF
+ 
+-fi;
++$as_echo "#define AFSPTS_USE_KRB5 /**/" >>confdefs.h
++
++fi
++
+ 
+ if test "x$with_afs" != "xno"; then
+     if test ! -d $with_afs; then
+@@ -10850,19 +7168,15 @@ if test "x$with_afs" != "xno"; then
+     AFS_LIBS="$AFS_LIBS -lc -lucb"
+     fi
+ 
+-    if test "${cyrus_afs_sigvec+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++    if test "${cyrus_afs_sigvec+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
+ 
+         SAVE_LIBS="$LIBS"
+         LIBS="${with_afs}/lib/liblwp.a"
+-        echo "$as_me:$LINENO: checking if AFS libraries need sigvec" >&5
+-echo $ECHO_N "checking if AFS libraries need sigvec... $ECHO_C" >&6
+-                        cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if AFS libraries need sigvec" >&5
++$as_echo_n "checking if AFS libraries need sigvec... " >&6; }
++                        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ IOMGR_Initialize();
+ int
+@@ -10873,60 +7187,34 @@ IOMGR_Initialize()
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++if ac_fn_c_try_link "$LINENO"; then :
+ 
+-                                                echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++                                                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+                         cyrus_afs_sigvec="no"
+ 
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+ 
+-                                                echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++                                                { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
+                         cyrus_afs_sigvec="yes"
+ 
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+ 
+     if test "$cyrus_afs_sigvec" = yes; then
+       if test "$cant_find_sigvec" = yes; then
+-        { echo "$as_me:$LINENO: WARNING: Can't find a sigvec for AFS libraries which seem to need one." >&5
+-echo "$as_me: WARNING: Can't find a sigvec for AFS libraries which seem to need one." >&2;}
++        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Can't find a sigvec for AFS libraries which seem to need one." >&5
++$as_echo "$as_me: WARNING: Can't find a sigvec for AFS libraries which seem to need one." >&2;}
+       else
+         AFS_LIBS="${AFS_LIBS} $cyrus_sigveclib"
+ 
+ 
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_AFSKRB
+-_ACEOF
++$as_echo "#define HAVE_AFSKRB /**/" >>confdefs.h
+ 
+       fi
+     else
+@@ -10934,9 +7222,7 @@ _ACEOF
+ 
+ 
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_AFSKRB
+-_ACEOF
++$as_echo "#define HAVE_AFSKRB /**/" >>confdefs.h
+ 
+     fi
+     LIBS="$SAVE_LIBS"
+@@ -10960,75 +7246,45 @@ if test "x$with_ldap" != "xno"; then
+     CPPFLAGS=$LDAP_CPPFLAGS
+     LDFLAGS=$LDAP_LDFLAGS
+ 
+-    echo "$as_me:$LINENO: checking for ldap_initialize in -lldap" >&5
+-echo $ECHO_N "checking for ldap_initialize in -lldap... $ECHO_C" >&6
+-if test "${ac_cv_lib_ldap_ldap_initialize+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_initialize in -lldap" >&5
++$as_echo_n "checking for ldap_initialize in -lldap... " >&6; }
++if test "${ac_cv_lib_ldap_ldap_initialize+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lldap -llber $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char ldap_initialize ();
+ int
+ main ()
+ {
+-ldap_initialize ();
++return ldap_initialize ();
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_ldap_ldap_initialize=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_lib_ldap_ldap_initialize=no
++  ac_cv_lib_ldap_ldap_initialize=no
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_ldap_ldap_initialize" >&5
+-echo "${ECHO_T}$ac_cv_lib_ldap_ldap_initialize" >&6
+-if test $ac_cv_lib_ldap_ldap_initialize = yes; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ldap_ldap_initialize" >&5
++$as_echo "$ac_cv_lib_ldap_ldap_initialize" >&6; }
++if test "x$ac_cv_lib_ldap_ldap_initialize" = x""yes; then :
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_LDAP
+-_ACEOF
++$as_echo "#define HAVE_LDAP /**/" >>confdefs.h
+ 
+ 
+ 
+@@ -11045,116 +7301,85 @@ if test "x$with_afs" != "xno" -o "x$with
+ 	EXTRA_SUBDIRS="${EXTRA_SUBDIRS} ptclient"
+ 	EXTRA_OUTPUT="${EXTRA_OUTPUT} ptclient/Makefile"
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define WITH_PTS
+-_ACEOF
++$as_echo "#define WITH_PTS /**/" >>confdefs.h
+ 
+ fi
+ 
+ SERVER_SUBDIRS="master imap"
+-# Check whether --enable-server or --disable-server was given.
+-if test "${enable_server+set}" = set; then
+-  enableval="$enable_server"
+-  if test "$enableval" = no; then
++# Check whether --enable-server was given.
++if test "${enable_server+set}" = set; then :
++  enableval=$enable_server; if test "$enableval" = no; then
+         	SERVER_SUBDIRS=""
+ 	fi
+-fi;
++fi
++
+ 
+ # We always output a server makefile (just because we can)
+ 
+ 
+-# Check whether --with-krb or --without-krb was given.
+-if test "${with_krb+set}" = set; then
+-  withval="$with_krb"
+-  with_krb="$withval"
++# Check whether --with-krb was given.
++if test "${with_krb+set}" = set; then :
++  withval=$with_krb; with_krb="$withval"
+ else
+   with_krb="no"
+-fi;
++fi
++
+ 
+ 
+-# Check whether --with-krbimpl or --without-krbimpl was given.
+-if test "${with_krbimpl+set}" = set; then
+-  withval="$with_krbimpl"
+-  with_krbimpl="$withval"
++# Check whether --with-krbimpl was given.
++if test "${with_krbimpl+set}" = set; then :
++  withval=$with_krbimpl; with_krbimpl="$withval"
+ else
+   with_krbimpl="kth"
+-fi;
++fi
++
+ 
+-# Check whether --enable-statickrb or --disable-statickrb was given.
+-if test "${enable_statickrb+set}" = set; then
+-  enableval="$enable_statickrb"
+-  with_statickrb="yes"
++# Check whether --enable-statickrb was given.
++if test "${enable_statickrb+set}" = set; then :
++  enableval=$enable_statickrb; with_statickrb="yes"
+ else
+   with_statickrb="no"
+-fi;
++fi
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for res_search in -lresolv" >&5
+-echo $ECHO_N "checking for res_search in -lresolv... $ECHO_C" >&6
+-if test "${ac_cv_lib_resolv_res_search+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_search in -lresolv" >&5
++$as_echo_n "checking for res_search in -lresolv... " >&6; }
++if test "${ac_cv_lib_resolv_res_search+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lresolv  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char res_search ();
+ int
+ main ()
+ {
+-res_search ();
++return res_search ();
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_resolv_res_search=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_lib_resolv_res_search=no
++  ac_cv_lib_resolv_res_search=no
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_search" >&5
+-echo "${ECHO_T}$ac_cv_lib_resolv_res_search" >&6
+-if test $ac_cv_lib_resolv_res_search = yes; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_res_search" >&5
++$as_echo "$ac_cv_lib_resolv_res_search" >&6; }
++if test "x$ac_cv_lib_resolv_res_search" = x""yes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBRESOLV 1
+ _ACEOF
+@@ -11165,105 +7390,73 @@ fi
+ 
+ 
+ if test "$with_statickrb" = "yes" -a ! -d "$with_krb"; then
+-      { { echo "$as_me:$LINENO: error: --enable-statickrb specified but --with-krb did not specify a valid directory" >&5
+-echo "$as_me: error: --enable-statickrb specified but --with-krb did not specify a valid directory" >&2;}
+-   { (exit 1); exit 1; }; }
++      as_fn_error "--enable-statickrb specified but --with-krb did not specify a valid directory" "$LINENO" 5
+ fi
+ 
+ if test "$with_krb" != "no"; then
+ 
+-# Check whether --with-krbdes or --without-krbdes was given.
+-if test "${with_krbdes+set}" = set; then
+-  withval="$with_krbdes"
+-  with_krbdes="$withval"
++# Check whether --with-krbdes was given.
++if test "${with_krbdes+set}" = set; then :
++  withval=$with_krbdes; with_krbdes="$withval"
+ else
+   with_krbdes="yes"
+-fi;
++fi
++
+ if test "$with_krbdes" = "yes"; then
+-  echo "$as_me:$LINENO: checking for des_ecb_encrypt in -ldes" >&5
+-echo $ECHO_N "checking for des_ecb_encrypt in -ldes... $ECHO_C" >&6
+-if test "${ac_cv_lib_des_des_ecb_encrypt+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for des_ecb_encrypt in -ldes" >&5
++$as_echo_n "checking for des_ecb_encrypt in -ldes... " >&6; }
++if test "${ac_cv_lib_des_des_ecb_encrypt+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldes  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char des_ecb_encrypt ();
+ int
+ main ()
+ {
+-des_ecb_encrypt ();
++return des_ecb_encrypt ();
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_des_des_ecb_encrypt=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_lib_des_des_ecb_encrypt=no
++  ac_cv_lib_des_des_ecb_encrypt=no
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_des_des_ecb_encrypt" >&5
+-echo "${ECHO_T}$ac_cv_lib_des_des_ecb_encrypt" >&6
+-if test $ac_cv_lib_des_des_ecb_encrypt = yes; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_des_des_ecb_encrypt" >&5
++$as_echo "$ac_cv_lib_des_des_ecb_encrypt" >&6; }
++if test "x$ac_cv_lib_des_des_ecb_encrypt" = x""yes; then :
+   if test "$with_statickrb" = "yes"; then
+           KRB_LIBS="$with_krb/lib/libdes.a"
+       else
+           KRB_LIBS="-ldes"
+       fi
+ else
+-  { { echo "$as_me:$LINENO: error: The Kerberos DES library is required for Kerberos support.  You might want --with-auth=unix." >&5
+-echo "$as_me: error: The Kerberos DES library is required for Kerberos support.  You might want --with-auth=unix." >&2;}
+-   { (exit 1); exit 1; }; }
++  as_fn_error "The Kerberos DES library is required for Kerberos support.  You might want --with-auth=unix." "$LINENO" 5
+ fi
+ 
+ fi
+ fi
+ 
+ if test -d ${with_krb}; then
+-   echo "$as_me:$LINENO: checking for Kerberos includes" >&5
+-echo $ECHO_N "checking for Kerberos includes... $ECHO_C" >&6
+-if test "${cyrus_krbinclude+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Kerberos includes" >&5
++$as_echo_n "checking for Kerberos includes... " >&6; }
++if test "${cyrus_krbinclude+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
+ 
+      for krbhloc in include/kerberosIV include
+@@ -11275,8 +7468,8 @@ else
+      done
+ 
+ fi
+-echo "$as_me:$LINENO: result: $cyrus_krbinclude" >&5
+-echo "${ECHO_T}$cyrus_krbinclude" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cyrus_krbinclude" >&5
++$as_echo "$cyrus_krbinclude" >&6; }
+ 
+    if test -n "${cyrus_krbinclude}"; then
+      CPPFLAGS="$CPPFLAGS -I${cyrus_krbinclude}"
+@@ -11298,237 +7491,73 @@ else
+ fi
+ 
+ if test "$with_des" != no; then
+-  if test "${ac_cv_header_krb_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for krb.h" >&5
+-echo $ECHO_N "checking for krb.h... $ECHO_C" >&6
+-if test "${ac_cv_header_krb_h+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_krb_h" >&5
+-echo "${ECHO_T}$ac_cv_header_krb_h" >&6
+-else
+-  # Is the header compilable?
+-echo "$as_me:$LINENO: checking krb.h usability" >&5
+-echo $ECHO_N "checking krb.h usability... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-#include <krb.h>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_header_compiler=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_header_compiler=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
+-
+-# Is the header present?
+-echo "$as_me:$LINENO: checking krb.h presence" >&5
+-echo $ECHO_N "checking krb.h presence... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <krb.h>
+-_ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
+-  ac_header_preproc=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-  ac_header_preproc=no
+-fi
+-rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
+-
+-# So?  What about this header?
+-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+-  yes:no: )
+-    { echo "$as_me:$LINENO: WARNING: krb.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-echo "$as_me: WARNING: krb.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: krb.h: proceeding with the compiler's result" >&5
+-echo "$as_me: WARNING: krb.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { echo "$as_me:$LINENO: WARNING: krb.h: present but cannot be compiled" >&5
+-echo "$as_me: WARNING: krb.h: present but cannot be compiled" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: krb.h:     check for missing prerequisite headers?" >&5
+-echo "$as_me: WARNING: krb.h:     check for missing prerequisite headers?" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: krb.h: see the Autoconf documentation" >&5
+-echo "$as_me: WARNING: krb.h: see the Autoconf documentation" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: krb.h:     section \"Present But Cannot Be Compiled\"" >&5
+-echo "$as_me: WARNING: krb.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: krb.h: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: krb.h: proceeding with the preprocessor's result" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: krb.h: in the future, the compiler will take precedence" >&5
+-echo "$as_me: WARNING: krb.h: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-echo "$as_me:$LINENO: checking for krb.h" >&5
+-echo $ECHO_N "checking for krb.h... $ECHO_C" >&6
+-if test "${ac_cv_header_krb_h+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_cv_header_krb_h=$ac_header_preproc
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_krb_h" >&5
+-echo "${ECHO_T}$ac_cv_header_krb_h" >&6
+-
+-fi
+-if test $ac_cv_header_krb_h = yes; then
+-  as_ac_Lib=`echo "ac_cv_lib_${KRBLIB}''_krb_mk_priv" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for krb_mk_priv in -l${KRBLIB}" >&5
+-echo $ECHO_N "checking for krb_mk_priv in -l${KRBLIB}... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Lib+set}\" = set"; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  ac_fn_c_check_header_mongrel "$LINENO" "krb.h" "ac_cv_header_krb_h" "$ac_includes_default"
++if test "x$ac_cv_header_krb_h" = x""yes; then :
++  as_ac_Lib=`$as_echo "ac_cv_lib_${KRBLIB}''_krb_mk_priv" | $as_tr_sh`
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb_mk_priv in -l${KRBLIB}" >&5
++$as_echo_n "checking for krb_mk_priv in -l${KRBLIB}... " >&6; }
++if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
++  $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l${KRBLIB} $KRB_LIBS $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char krb_mk_priv ();
+ int
+ main ()
+ {
+-krb_mk_priv ();
++return krb_mk_priv ();
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   eval "$as_ac_Lib=yes"
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-eval "$as_ac_Lib=no"
++  eval "$as_ac_Lib=no"
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
+-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
++eval ac_res=\$$as_ac_Lib
++	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
++$as_echo "$ac_res" >&6; }
++eval as_val=\$$as_ac_Lib
++   if test "x$as_val" = x""yes; then :
+   if test "$with_statickrb" = "yes"; then
+           KRB_LIBS="$KRB_LIBS $with_krb/lib/lib${KRBLIB}.a"
+       else
+           KRB_LIBS="$KRB_LIBS -l${KRBLIB}"
+       fi
+ else
+-  { echo "$as_me:$LINENO: WARNING: No Kerberos V4 found" >&5
+-echo "$as_me: WARNING: No Kerberos V4 found" >&2;}; krb4=no
++  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No Kerberos V4 found" >&5
++$as_echo "$as_me: WARNING: No Kerberos V4 found" >&2;}; krb4=no
+ fi
+ 
+ else
+-  { echo "$as_me:$LINENO: WARNING: No Kerberos V4 found" >&5
+-echo "$as_me: WARNING: No Kerberos V4 found" >&2;}; krb4=no
++  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No Kerberos V4 found" >&5
++$as_echo "$as_me: WARNING: No Kerberos V4 found" >&2;}; krb4=no
+ fi
+ 
+ 
+ else
+-  { echo "$as_me:$LINENO: WARNING: No DES library found for Kerberos V4 support" >&5
+-echo "$as_me: WARNING: No DES library found for Kerberos V4 support" >&2;}
++  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No DES library found for Kerberos V4 support" >&5
++$as_echo "$as_me: WARNING: No DES library found for Kerberos V4 support" >&2;}
+   krb4=no
+ fi
+ 
+ if test "${krb4}" != no; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_KRB
+-_ACEOF
++$as_echo "#define HAVE_KRB /**/" >>confdefs.h
+ 
+ fi
+ 
+@@ -11539,11 +7568,11 @@ SASL_GSSAPI_LIBS_SET="yes"
+ 
+ IMAP_PROGS=""
+ 
+-# Check whether --with-openssl or --without-openssl was given.
+-if test "${with_openssl+set}" = set; then
+-  withval="$with_openssl"
+-  with_openssl="${withval}"
+-fi;
++# Check whether --with-openssl was given.
++if test "${with_openssl+set}" = set; then :
++  withval=$with_openssl; with_openssl="${withval}"
++fi
++
+ 
+ OPENSSL_INC=
+ OPENSSL_LIB=
+@@ -11551,71 +7580,43 @@ case "$with_openssl" in
+ 	no) with_openssl="no";;
+ 	""|yes)
+ 	  	                  LIB_RSAREF=""
+-	        echo "$as_me:$LINENO: checking for RSAPublicEncrypt in -lrsaref" >&5
+-echo $ECHO_N "checking for RSAPublicEncrypt in -lrsaref... $ECHO_C" >&6
+-if test "${ac_cv_lib_rsaref_RSAPublicEncrypt+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++	        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for RSAPublicEncrypt in -lrsaref" >&5
++$as_echo_n "checking for RSAPublicEncrypt in -lrsaref... " >&6; }
++if test "${ac_cv_lib_rsaref_RSAPublicEncrypt+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lrsaref  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char RSAPublicEncrypt ();
+ int
+ main ()
+ {
+-RSAPublicEncrypt ();
++return RSAPublicEncrypt ();
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_rsaref_RSAPublicEncrypt=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_lib_rsaref_RSAPublicEncrypt=no
++  ac_cv_lib_rsaref_RSAPublicEncrypt=no
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_rsaref_RSAPublicEncrypt" >&5
+-echo "${ECHO_T}$ac_cv_lib_rsaref_RSAPublicEncrypt" >&6
+-if test $ac_cv_lib_rsaref_RSAPublicEncrypt = yes; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rsaref_RSAPublicEncrypt" >&5
++$as_echo "$ac_cv_lib_rsaref_RSAPublicEncrypt" >&6; }
++if test "x$ac_cv_lib_rsaref_RSAPublicEncrypt" = x""yes; then :
+   LIB_RSAREF="-lRSAglue -lrsaref"; cmu_have_rsaref=yes
+ else
+   cmu_have_rsaref=no
+@@ -11623,141 +7624,85 @@ fi
+ 
+ 
+ 		with_openssl="yes"
+-		echo "$as_me:$LINENO: checking for BIO_accept in -lcrypto" >&5
+-echo $ECHO_N "checking for BIO_accept in -lcrypto... $ECHO_C" >&6
+-if test "${ac_cv_lib_crypto_BIO_accept+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BIO_accept in -lcrypto" >&5
++$as_echo_n "checking for BIO_accept in -lcrypto... " >&6; }
++if test "${ac_cv_lib_crypto_BIO_accept+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lcrypto $LIB_RSAREF $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char BIO_accept ();
+ int
+ main ()
+ {
+-BIO_accept ();
++return BIO_accept ();
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_crypto_BIO_accept=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_lib_crypto_BIO_accept=no
++  ac_cv_lib_crypto_BIO_accept=no
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_BIO_accept" >&5
+-echo "${ECHO_T}$ac_cv_lib_crypto_BIO_accept" >&6
+-if test $ac_cv_lib_crypto_BIO_accept = yes; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_BIO_accept" >&5
++$as_echo "$ac_cv_lib_crypto_BIO_accept" >&6; }
++if test "x$ac_cv_lib_crypto_BIO_accept" = x""yes; then :
+   LIBS="-lcrypto $LIB_RSAREF ${LIBS}"
+ else
+   with_openssl="no"
+ fi
+ 
+-		echo "$as_me:$LINENO: checking for SSL_CTX_new in -lssl" >&5
+-echo $ECHO_N "checking for SSL_CTX_new in -lssl... $ECHO_C" >&6
+-if test "${ac_cv_lib_ssl_SSL_CTX_new+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_CTX_new in -lssl" >&5
++$as_echo_n "checking for SSL_CTX_new in -lssl... " >&6; }
++if test "${ac_cv_lib_ssl_SSL_CTX_new+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lssl -lcrypto $LIB_RSAREF $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char SSL_CTX_new ();
+ int
+ main ()
+ {
+-SSL_CTX_new ();
++return SSL_CTX_new ();
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_ssl_SSL_CTX_new=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_lib_ssl_SSL_CTX_new=no
++  ac_cv_lib_ssl_SSL_CTX_new=no
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_SSL_CTX_new" >&5
+-echo "${ECHO_T}$ac_cv_lib_ssl_SSL_CTX_new" >&6
+-if test $ac_cv_lib_ssl_SSL_CTX_new = yes; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_CTX_new" >&5
++$as_echo "$ac_cv_lib_ssl_SSL_CTX_new" >&6; }
++if test "x$ac_cv_lib_ssl_SSL_CTX_new" = x""yes; then :
+   LIBS="-lssl ${LIBS}"
+ else
+   with_openssl="no"
+@@ -11788,28 +7733,22 @@ fi
+ 	    LIBS="${LIBS} -lssl -lcrypto";;
+ esac
+ 
+-echo "$as_me:$LINENO: checking for openssl" >&5
+-echo $ECHO_N "checking for openssl... $ECHO_C" >&6
+-echo "$as_me:$LINENO: result: $with_openssl" >&5
+-echo "${ECHO_T}$with_openssl" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for openssl" >&5
++$as_echo_n "checking for openssl... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_openssl" >&5
++$as_echo "$with_openssl" >&6; }
+ 
+ if test "$with_openssl" != "no"; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_SSL
+-_ACEOF
++$as_echo "#define HAVE_SSL /**/" >>confdefs.h
+ 
+ 	IMAP_PROGS="$IMAP_PROGS tls_prune"
+         if test "${krb4}" != no; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define OPENSSL_ENABLE_OLD_DES_SUPPORT
+-_ACEOF
++$as_echo "#define OPENSSL_ENABLE_OLD_DES_SUPPORT /**/" >>confdefs.h
+ 
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define OPENSSL_DES_LIBDES_COMPATIBILITY
+-_ACEOF
++$as_echo "#define OPENSSL_DES_LIBDES_COMPATIBILITY /**/" >>confdefs.h
+ 
+         fi
+ fi
+@@ -11817,12 +7756,12 @@ fi
+ 
+ 
+ 
+-# Check whether --with-egd-socket or --without-egd-socket was given.
+-if test "${with_egd_socket+set}" = set; then
+-  withval="$with_egd_socket"
+-   EGD_SOCKET="$withval"
++# Check whether --with-egd-socket was given.
++if test "${with_egd_socket+set}" = set; then :
++  withval=$with_egd_socket;  EGD_SOCKET="$withval"
++
++fi
+ 
+-fi;
+ if test -n "$EGD_SOCKET" ; then
+ 
+ cat >>confdefs.h <<_ACEOF
+@@ -11832,11 +7771,11 @@ _ACEOF
+ fi
+ 
+ 
+-# Check whether --with-zephyr or --without-zephyr was given.
+-if test "${with_zephyr+set}" = set; then
+-  withval="$with_zephyr"
+-  with_zephyr="${withval}"
+-fi;
++# Check whether --with-zephyr was given.
++if test "${with_zephyr+set}" = set; then :
++  withval=$with_zephyr; with_zephyr="${withval}"
++fi
++
+ if test -z "$with_zephyr"; then
+      if test -f /usr/local/lib/libzephyr.a; then
+ 	with_zephyr="/usr/local"
+@@ -11848,71 +7787,43 @@ ZEPHYR_LIBS=""
+ ZEPHYR_CPPFLAGS=""
+ case "$with_zephyr" in
+ 	no) true;;
+-	""|yes) echo "$as_me:$LINENO: checking for ZInitialize in -lzephyr" >&5
+-echo $ECHO_N "checking for ZInitialize in -lzephyr... $ECHO_C" >&6
+-if test "${ac_cv_lib_zephyr_ZInitialize+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++	""|yes) { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ZInitialize in -lzephyr" >&5
++$as_echo_n "checking for ZInitialize in -lzephyr... " >&6; }
++if test "${ac_cv_lib_zephyr_ZInitialize+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lzephyr  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char ZInitialize ();
+ int
+ main ()
+ {
+-ZInitialize ();
++return ZInitialize ();
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_zephyr_ZInitialize=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_lib_zephyr_ZInitialize=no
++  ac_cv_lib_zephyr_ZInitialize=no
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_zephyr_ZInitialize" >&5
+-echo "${ECHO_T}$ac_cv_lib_zephyr_ZInitialize" >&6
+-if test $ac_cv_lib_zephyr_ZInitialize = yes; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_zephyr_ZInitialize" >&5
++$as_echo "$ac_cv_lib_zephyr_ZInitialize" >&6; }
++if test "x$ac_cv_lib_zephyr_ZInitialize" = x""yes; then :
+   ZEPHYR_LIBS="-lzephyr"
+ else
+   with_zephyr="no"
+@@ -11929,425 +7840,116 @@ esac
+ 
+ if test "$with_zephyr" != "no"; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_ZEPHYR
+-_ACEOF
++$as_echo "#define HAVE_ZEPHYR /**/" >>confdefs.h
+ 
+ fi
+ 
+ 
+-# Check whether --with-pidfile or --without-pidfile was given.
+-if test "${with_pidfile+set}" = set; then
+-  withval="$with_pidfile"
+-  MASTERPIDFILE="$withval"
++# Check whether --with-pidfile was given.
++if test "${with_pidfile+set}" = set; then :
++  withval=$with_pidfile; MASTERPIDFILE="$withval"
+ else
+   MASTERPIDFILE="/var/run/cyrus-master.pid"
+-fi;
++fi
++
+ MASTERPIDFILE="\"$MASTERPIDFILE\""
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define MASTER_PIDFILE $MASTERPIDFILE
+ _ACEOF
+ 
+-
+-
+-# Check whether --with-idle or --without-idle was given.
+-if test "${with_idle+set}" = set; then
+-  withval="$with_idle"
+-  WITH_IDLE="${withval}"
+-else
+-  WITH_IDLE="poll"
+-fi;
+-
+-if test "$WITH_IDLE" = "idled"; then
+-  IMAP_PROGS="$IMAP_PROGS idled"
+-fi
+-
+-ENABLE_NNTP=no
+-# Check whether --enable-nntp or --disable-nntp was given.
+-if test "${enable_nntp+set}" = set; then
+-  enableval="$enable_nntp"
+-  ENABLE_NNTP=$enableval
+-        if test "$ENABLE_NNTP" != no; then
+-	  IMAP_PROGS="$IMAP_PROGS nntpd fetchnews"
+-        fi
+-fi;
+-
+-# Check whether --enable-murder or --disable-murder was given.
+-if test "${enable_murder+set}" = set; then
+-  enableval="$enable_murder"
+-  if test "$enableval" != no; then
+-	  IMAP_PROGS="$IMAP_PROGS proxyd lmtpproxyd mupdate"
+-        fi
+-fi;
+-
+-
+-
+-
+-# Check whether --with-com_err or --without-com_err was given.
+-if test "${with_com_err+set}" = set; then
+-  withval="$with_com_err"
+-
+-fi;
+-if test -z "$with_com_err"; then
+-	# no value supplied
+-	echo "$as_me:$LINENO: checking for com_err in -lcom_err" >&5
+-echo $ECHO_N "checking for com_err in -lcom_err... $ECHO_C" >&6
+-if test "${ac_cv_lib_com_err_com_err+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lcom_err  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char com_err ();
+-int
+-main ()
+-{
+-com_err ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_lib_com_err_com_err=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_lib_com_err_com_err=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_com_err_com_err" >&5
+-echo "${ECHO_T}$ac_cv_lib_com_err_com_err" >&6
+-if test $ac_cv_lib_com_err_com_err = yes; then
+-
+-		# com_err is already in library path
+-		# guess we're okay
+-		# can use system com_err
+-		with_com_err=""
+-		if test "${ac_cv_header_et_com_err_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for et/com_err.h" >&5
+-echo $ECHO_N "checking for et/com_err.h... $ECHO_C" >&6
+-if test "${ac_cv_header_et_com_err_h+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_et_com_err_h" >&5
+-echo "${ECHO_T}$ac_cv_header_et_com_err_h" >&6
+-else
+-  # Is the header compilable?
+-echo "$as_me:$LINENO: checking et/com_err.h usability" >&5
+-echo $ECHO_N "checking et/com_err.h usability... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-#include <et/com_err.h>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_header_compiler=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_header_compiler=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
+-
+-# Is the header present?
+-echo "$as_me:$LINENO: checking et/com_err.h presence" >&5
+-echo $ECHO_N "checking et/com_err.h presence... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <et/com_err.h>
+-_ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
+-  ac_header_preproc=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-  ac_header_preproc=no
+-fi
+-rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
+-
+-# So?  What about this header?
+-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+-  yes:no: )
+-    { echo "$as_me:$LINENO: WARNING: et/com_err.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-echo "$as_me: WARNING: et/com_err.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: et/com_err.h: proceeding with the compiler's result" >&5
+-echo "$as_me: WARNING: et/com_err.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { echo "$as_me:$LINENO: WARNING: et/com_err.h: present but cannot be compiled" >&5
+-echo "$as_me: WARNING: et/com_err.h: present but cannot be compiled" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: et/com_err.h:     check for missing prerequisite headers?" >&5
+-echo "$as_me: WARNING: et/com_err.h:     check for missing prerequisite headers?" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: et/com_err.h: see the Autoconf documentation" >&5
+-echo "$as_me: WARNING: et/com_err.h: see the Autoconf documentation" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: et/com_err.h:     section \"Present But Cannot Be Compiled\"" >&5
+-echo "$as_me: WARNING: et/com_err.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: et/com_err.h: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: et/com_err.h: proceeding with the preprocessor's result" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: et/com_err.h: in the future, the compiler will take precedence" >&5
+-echo "$as_me: WARNING: et/com_err.h: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-echo "$as_me:$LINENO: checking for et/com_err.h" >&5
+-echo $ECHO_N "checking for et/com_err.h... $ECHO_C" >&6
+-if test "${ac_cv_header_et_com_err_h+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++
++
++# Check whether --with-idle was given.
++if test "${with_idle+set}" = set; then :
++  withval=$with_idle; WITH_IDLE="${withval}"
+ else
+-  ac_cv_header_et_com_err_h=$ac_header_preproc
++  WITH_IDLE="poll"
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_et_com_err_h" >&5
+-echo "${ECHO_T}$ac_cv_header_et_com_err_h" >&6
+ 
++
++
++ENABLE_NNTP=no
++# Check whether --enable-nntp was given.
++if test "${enable_nntp+set}" = set; then :
++  enableval=$enable_nntp; ENABLE_NNTP=$enableval
++        if test "$ENABLE_NNTP" != no; then
++	  IMAP_PROGS="$IMAP_PROGS nntpd fetchnews"
++        fi
+ fi
+-if test $ac_cv_header_et_com_err_h = yes; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_ET_COM_ERR_H
+-_ACEOF
+ 
+-else
+-  if test "${ac_cv_header_com_err_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for com_err.h" >&5
+-echo $ECHO_N "checking for com_err.h... $ECHO_C" >&6
+-if test "${ac_cv_header_com_err_h+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++# Check whether --enable-murder was given.
++if test "${enable_murder+set}" = set; then :
++  enableval=$enable_murder; if test "$enableval" != no; then
++	  IMAP_PROGS="$IMAP_PROGS proxyd lmtpproxyd mupdate"
++        fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_com_err_h" >&5
+-echo "${ECHO_T}$ac_cv_header_com_err_h" >&6
+-else
+-  # Is the header compilable?
+-echo "$as_me:$LINENO: checking com_err.h usability" >&5
+-echo $ECHO_N "checking com_err.h usability... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-#include <com_err.h>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_header_compiler=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
++
++
++
++
++# Check whether --with-com_err was given.
++if test "${with_com_err+set}" = set; then :
++  withval=$with_com_err;
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
+ 
+-# Is the header present?
+-echo "$as_me:$LINENO: checking com_err.h presence" >&5
+-echo $ECHO_N "checking com_err.h presence... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++if test -z "$with_com_err"; then
++	# no value supplied
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for com_err in -lcom_err" >&5
++$as_echo_n "checking for com_err in -lcom_err... " >&6; }
++if test "${ac_cv_lib_com_err_com_err+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lcom_err  $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+-#include <com_err.h>
++
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char com_err ();
++int
++main ()
++{
++return com_err ();
++  ;
++  return 0;
++}
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_lib_com_err_com_err=yes
+ else
+-  ac_cpp_err=yes
++  ac_cv_lib_com_err_com_err=no
+ fi
+-if test -z "$ac_cpp_err"; then
+-  ac_header_preproc=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-  ac_header_preproc=no
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
+ fi
+-rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_com_err_com_err" >&5
++$as_echo "$ac_cv_lib_com_err_com_err" >&6; }
++if test "x$ac_cv_lib_com_err_com_err" = x""yes; then :
++
++		# com_err is already in library path
++		# guess we're okay
++		# can use system com_err
++		with_com_err=""
++		ac_fn_c_check_header_mongrel "$LINENO" "et/com_err.h" "ac_cv_header_et_com_err_h" "$ac_includes_default"
++if test "x$ac_cv_header_et_com_err_h" = x""yes; then :
++
++$as_echo "#define HAVE_ET_COM_ERR_H /**/" >>confdefs.h
+ 
+-# So?  What about this header?
+-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+-  yes:no: )
+-    { echo "$as_me:$LINENO: WARNING: com_err.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-echo "$as_me: WARNING: com_err.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: com_err.h: proceeding with the compiler's result" >&5
+-echo "$as_me: WARNING: com_err.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { echo "$as_me:$LINENO: WARNING: com_err.h: present but cannot be compiled" >&5
+-echo "$as_me: WARNING: com_err.h: present but cannot be compiled" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: com_err.h:     check for missing prerequisite headers?" >&5
+-echo "$as_me: WARNING: com_err.h:     check for missing prerequisite headers?" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: com_err.h: see the Autoconf documentation" >&5
+-echo "$as_me: WARNING: com_err.h: see the Autoconf documentation" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: com_err.h:     section \"Present But Cannot Be Compiled\"" >&5
+-echo "$as_me: WARNING: com_err.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: com_err.h: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: com_err.h: proceeding with the preprocessor's result" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: com_err.h: in the future, the compiler will take precedence" >&5
+-echo "$as_me: WARNING: com_err.h: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-echo "$as_me:$LINENO: checking for com_err.h" >&5
+-echo $ECHO_N "checking for com_err.h... $ECHO_C" >&6
+-if test "${ac_cv_header_com_err_h+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ac_cv_header_com_err_h=$ac_header_preproc
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_com_err_h" >&5
+-echo "${ECHO_T}$ac_cv_header_com_err_h" >&6
++  ac_fn_c_check_header_mongrel "$LINENO" "com_err.h" "ac_cv_header_com_err_h" "$ac_includes_default"
++if test "x$ac_cv_header_com_err_h" = x""yes; then :
+ 
+-fi
+-if test $ac_cv_header_com_err_h = yes; then
+-  :
+ else
+-  { { echo "$as_me:$LINENO: error: cannot locate com_err.h" >&5
+-echo "$as_me: error: cannot locate com_err.h" >&2;}
+-   { (exit 1); exit 1; }; }
++  as_fn_error "cannot locate com_err.h" "$LINENO" 5
+ fi
+ 
+ 
+@@ -12356,10 +7958,10 @@ fi
+ 
+ 		# Extract the first word of "compile_et", so it can be a program name with args.
+ set dummy compile_et; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_path_COMPILE_ET+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_path_COMPILE_ET+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
+   case $COMPILE_ET in
+   [\\/]* | ?:[\\/]*)
+@@ -12371,40 +7973,41 @@ for as_dir in $PATH
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_path_COMPILE_ET="$as_dir/$ac_word$ac_exec_ext"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
++IFS=$as_save_IFS
+ 
+   test -z "$ac_cv_path_COMPILE_ET" && ac_cv_path_COMPILE_ET="no compile et"
+   ;;
+ esac
+ fi
+ COMPILE_ET=$ac_cv_path_COMPILE_ET
+-
+ if test -n "$COMPILE_ET"; then
+-  echo "$as_me:$LINENO: result: $COMPILE_ET" >&5
+-echo "${ECHO_T}$COMPILE_ET" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $COMPILE_ET" >&5
++$as_echo "$COMPILE_ET" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+ 
+ 
++
+ else
+ 
+ 	if test -f /usr/local/include/com_err.h -o -f /usr/local/include/et/com_err.h; then
+ 		with_com_err="/usr/local"
+ 		# Extract the first word of "/usr/local/bin/compile_et", so it can be a program name with args.
+ set dummy /usr/local/bin/compile_et; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_path_COMPILE_ET+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_path_COMPILE_ET+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
+   case $COMPILE_ET in
+   [\\/]* | ?:[\\/]*)
+@@ -12416,37 +8019,38 @@ for as_dir in $PATH
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_path_COMPILE_ET="$as_dir/$ac_word$ac_exec_ext"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
++IFS=$as_save_IFS
+ 
+   test -z "$ac_cv_path_COMPILE_ET" && ac_cv_path_COMPILE_ET="no compile et"
+   ;;
+ esac
+ fi
+ COMPILE_ET=$ac_cv_path_COMPILE_ET
+-
+ if test -n "$COMPILE_ET"; then
+-  echo "$as_me:$LINENO: result: $COMPILE_ET" >&5
+-echo "${ECHO_T}$COMPILE_ET" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $COMPILE_ET" >&5
++$as_echo "$COMPILE_ET" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+ 
++
+ 	elif test -f /usr/include/com_err.h -o -f /usr/include/et/com_err.h; then
+ 		with_com_err="/usr"
+ 		# Extract the first word of "/usr/bin/compile_et", so it can be a program name with args.
+ set dummy /usr/bin/compile_et; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_path_COMPILE_ET+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_path_COMPILE_ET+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
+   case $COMPILE_ET in
+   [\\/]* | ?:[\\/]*)
+@@ -12458,29 +8062,30 @@ for as_dir in $PATH
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_path_COMPILE_ET="$as_dir/$ac_word$ac_exec_ext"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
++IFS=$as_save_IFS
+ 
+   test -z "$ac_cv_path_COMPILE_ET" && ac_cv_path_COMPILE_ET="no compile et"
+   ;;
+ esac
+ fi
+ COMPILE_ET=$ac_cv_path_COMPILE_ET
+-
+ if test -n "$COMPILE_ET"; then
+-  echo "$as_me:$LINENO: result: $COMPILE_ET" >&5
+-echo "${ECHO_T}$COMPILE_ET" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $COMPILE_ET" >&5
++$as_echo "$COMPILE_ET" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+ 
++
+ 	else
+ 		# use ours
+ 		with_com_err=yes
+@@ -12490,15 +8095,15 @@ fi
+ 
+ 
+ 	if test "${with_com_err}" = "no"; then
+-	  { echo "$as_me:$LINENO: WARNING: com_err is required; included version will be used." >&5
+-echo "$as_me: WARNING: com_err is required; included version will be used." >&2;}
++	  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: com_err is required; included version will be used." >&5
++$as_echo "$as_me: WARNING: com_err is required; included version will be used." >&2;}
+ 	  with_com_err="yes"
+ 	fi
+ 	if test "${COMPILE_ET}" = "no compile et" -o "${COMPILE_ET}" = ""; then
+-	  { echo "$as_me:$LINENO: WARNING: Parts of com_err distribuion were found, but not compile_et." >&5
+-echo "$as_me: WARNING: Parts of com_err distribuion were found, but not compile_et." >&2;}
+-	  { echo "$as_me:$LINENO: WARNING: Will build com_err from included sources." >&5
+-echo "$as_me: WARNING: Will build com_err from included sources." >&2;}
++	  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Parts of com_err distribuion were found, but not compile_et." >&5
++$as_echo "$as_me: WARNING: Parts of com_err distribuion were found, but not compile_et." >&2;}
++	  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Will build com_err from included sources." >&5
++$as_echo "$as_me: WARNING: Will build com_err from included sources." >&2;}
+ 	  with_com_err="yes" # build it ourselves
+ 	fi
+ fi
+@@ -12535,45 +8140,21 @@ esac
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for modern syslog" >&5
+-echo $ECHO_N "checking for modern syslog... $ECHO_C" >&6
+-if test "${cyrus_cv_lib_syslog+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for modern syslog" >&5
++$as_echo_n "checking for modern syslog... " >&6; }
++if test "${cyrus_cv_lib_syslog+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include <syslog.h>
+ #ifndef LOG_LOCAL6
+ #include </nonexistent>
+ #endif
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++if ac_fn_c_try_cpp "$LINENO"; then :
+   cyrus_cv_lib_syslog=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+   cyrus_cv_lib_syslog=no
+ fi
+ rm -f conftest.err conftest.$ac_ext
+@@ -12585,522 +8166,188 @@ if test $cyrus_cv_lib_syslog = no; then
+ 	DEPLIBS="${DEPLIBS} ../syslog/libsyslog.a"
+ 	CPPFLAGS="$CPPFLAGS -I\$(srcdir)/../syslog"
+ fi
+-echo "$as_me:$LINENO: result: $cyrus_cv_lib_syslog" >&5
+-echo "${ECHO_T}$cyrus_cv_lib_syslog" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cyrus_cv_lib_syslog" >&5
++$as_echo "$cyrus_cv_lib_syslog" >&6; }
+ 
+-echo "$as_me:$LINENO: checking which syslog facility to use" >&5
+-echo $ECHO_N "checking which syslog facility to use... $ECHO_C" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which syslog facility to use" >&5
++$as_echo_n "checking which syslog facility to use... " >&6; }
+ SYSLOG_FACILITY=LOG_LOCAL6
+ 
+-# Check whether --with-syslogfacility or --without-syslogfacility was given.
+-if test "${with_syslogfacility+set}" = set; then
+-  withval="$with_syslogfacility"
+-   if test "$withval" != "yes" -a "$withval" != "no" ; then
++# Check whether --with-syslogfacility was given.
++if test "${with_syslogfacility+set}" = set; then :
++  withval=$with_syslogfacility;  if test "$withval" != "yes" -a "$withval" != "no" ; then
+                        SYSLOG_FACILITY=LOG_$withval
+                fi;
+-fi;
++fi
++
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define SYSLOG_FACILITY $SYSLOG_FACILITY
+ _ACEOF
+ 
+-echo "$as_me:$LINENO: result: $SYSLOG_FACILITY" >&5
+-echo "${ECHO_T}$SYSLOG_FACILITY" >&6
+-
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $SYSLOG_FACILITY" >&5
++$as_echo "$SYSLOG_FACILITY" >&6; }
+ 
+ for ac_func in getdtablesize
+-do
+-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $ac_func
+-
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-{
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+-choke me
+-#else
+-char (*f) () = $ac_func;
+-#endif
+-#ifdef __cplusplus
+-}
+-#endif
+-
+-int
+-main ()
+-{
+-return f != $ac_func;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  eval "$as_ac_var=yes"
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-eval "$as_ac_var=no"
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+-if test `eval echo '${'$as_ac_var'}'` = yes; then
++do :
++  ac_fn_c_check_func "$LINENO" "getdtablesize" "ac_cv_func_getdtablesize"
++if test "x$ac_cv_func_getdtablesize" = x""yes; then :
+   cat >>confdefs.h <<_ACEOF
+-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define HAVE_GETDTABLESIZE 1
+ _ACEOF
+ 
+ else
+-  case $LIBOBJS in
+-    "$ac_func.$ac_objext"   | \
+-  *" $ac_func.$ac_objext"   | \
+-    "$ac_func.$ac_objext "* | \
++  case " $LIBOBJS " in
+   *" $ac_func.$ac_objext "* ) ;;
+-  *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" ;;
++  *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext"
++ ;;
+ esac
+ 
+ fi
+ done
+ 
+ 
+-# Check whether --enable-cmulocal or --disable-cmulocal was given.
+-if test "${enable_cmulocal+set}" = set; then
+-  enableval="$enable_cmulocal"
+-  if test "$enableval" = yes; then
++# Check whether --enable-cmulocal was given.
++if test "${enable_cmulocal+set}" = set; then :
++  enableval=$enable_cmulocal; if test "$enableval" = yes; then
+ 		EXTRA_SUBDIRS="${EXTRA_SUBDIRS} netnews depot"
+ 		EXTRA_OUTPUT="${EXTRA_OUTPUT} depot/Makefile"
+ 	fi
+-fi;
++fi
+ 
+-echo "$as_me:$LINENO: checking to use old sieve service name" >&5
+-echo $ECHO_N "checking to use old sieve service name... $ECHO_C" >&6
+-# Check whether --enable-oldsievename or --disable-oldsievename was given.
+-if test "${enable_oldsievename+set}" = set; then
+-  enableval="$enable_oldsievename"
+-  if test "$enableval" = yes; then
+-		echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define OLD_SIEVE_SERVICE_NAME
+-_ACEOF
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking to use old sieve service name" >&5
++$as_echo_n "checking to use old sieve service name... " >&6; }
++# Check whether --enable-oldsievename was given.
++if test "${enable_oldsievename+set}" = set; then :
++  enableval=$enable_oldsievename; if test "$enableval" = yes; then
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++
++$as_echo "#define OLD_SIEVE_SERVICE_NAME /**/" >>confdefs.h
+ 
+ 	else
+-		echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ 	fi
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi;
+-
+-# Check whether --enable-listext or --disable-listext was given.
+-if test "${enable_listext+set}" = set; then
+-  enableval="$enable_listext"
+-  if test "$enableval" = yes; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define ENABLE_LISTEXT
+-_ACEOF
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
+ 
+-	fi
+-fi;
+ 
+-# Check whether --enable-netscapehack or --disable-netscapehack was given.
+-if test "${enable_netscapehack+set}" = set; then
+-  enableval="$enable_netscapehack"
+-  if test "$enableval" = yes; then
++# Check whether --enable-listext was given.
++if test "${enable_listext+set}" = set; then :
++  enableval=$enable_listext; if test "$enableval" = yes; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define ENABLE_X_NETSCAPE_HACK
+-_ACEOF
++$as_echo "#define ENABLE_LISTEXT /**/" >>confdefs.h
+ 
+ 	fi
+-fi;
++fi
+ 
+-echo "$as_me:$LINENO: checking for dlopen" >&5
+-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
+-if test "${ac_cv_func_dlopen+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define dlopen innocuous_dlopen
+ 
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char dlopen (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
++# Check whether --enable-netscapehack was given.
++if test "${enable_netscapehack+set}" = set; then :
++  enableval=$enable_netscapehack; if test "$enableval" = yes; then
+ 
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
++$as_echo "#define ENABLE_X_NETSCAPE_HACK /**/" >>confdefs.h
+ 
+-#undef dlopen
++	fi
++fi
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-{
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char dlopen ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_dlopen) || defined (__stub___dlopen)
+-choke me
+-#else
+-char (*f) () = dlopen;
+-#endif
+-#ifdef __cplusplus
+-}
+-#endif
+ 
+-int
+-main ()
+-{
+-return f != dlopen;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_func_dlopen=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
++if test "x$ac_cv_func_dlopen" = x""yes; then :
+ 
+-ac_cv_func_dlopen=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_func_dlopen" >&6
+-if test $ac_cv_func_dlopen = yes; then
+-  :
+ else
+-
+-echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
+-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
++$as_echo_n "checking for dlopen in -ldl... " >&6; }
++if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldl  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char dlopen ();
+ int
+ main ()
+ {
+-dlopen ();
++return dlopen ();
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_dl_dlopen=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_lib_dl_dlopen=no
++  ac_cv_lib_dl_dlopen=no
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
+-if test $ac_cv_lib_dl_dlopen = yes; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
++$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
++if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBDL 1
+ _ACEOF
+ 
+-  LIBS="-ldl $LIBS"
+-
+-fi
+-
+-fi
+-
+-echo "$as_me:$LINENO: checking for crypt" >&5
+-echo $ECHO_N "checking for crypt... $ECHO_C" >&6
+-if test "${ac_cv_func_crypt+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-/* Define crypt to an innocuous variant, in case <limits.h> declares crypt.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define crypt innocuous_crypt
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char crypt (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef crypt
+-
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-{
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char crypt ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_crypt) || defined (__stub___crypt)
+-choke me
+-#else
+-char (*f) () = crypt;
+-#endif
+-#ifdef __cplusplus
+-}
+-#endif
+-
+-int
+-main ()
+-{
+-return f != crypt;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_func_crypt=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_func_crypt=no
++  LIBS="-ldl $LIBS"
++
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
++
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_crypt" >&5
+-echo "${ECHO_T}$ac_cv_func_crypt" >&6
+-if test $ac_cv_func_crypt = yes; then
++
++ac_fn_c_check_func "$LINENO" "crypt" "ac_cv_func_crypt"
++if test "x$ac_cv_func_crypt" = x""yes; then :
+   cmu_have_crypt=yes
+ else
+-  echo "$as_me:$LINENO: checking for crypt in -lcrypt" >&5
+-echo $ECHO_N "checking for crypt in -lcrypt... $ECHO_C" >&6
+-if test "${ac_cv_lib_crypt_crypt+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for crypt in -lcrypt" >&5
++$as_echo_n "checking for crypt in -lcrypt... " >&6; }
++if test "${ac_cv_lib_crypt_crypt+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lcrypt  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char crypt ();
+ int
+ main ()
+ {
+-crypt ();
++return crypt ();
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_crypt_crypt=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_lib_crypt_crypt=no
++  ac_cv_lib_crypt_crypt=no
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5
+-echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6
+-if test $ac_cv_lib_crypt_crypt = yes; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypt_crypt" >&5
++$as_echo "$ac_cv_lib_crypt_crypt" >&6; }
++if test "x$ac_cv_lib_crypt_crypt" = x""yes; then :
+   LIB_CRYPT="-lcrypt"; cmu_have_crypt=yes
+ else
+   cmu_have_crypt=no
+@@ -13112,21 +8359,21 @@ fi
+ 
+ 
+ 
+-# Check whether --enable-gssapi or --disable-gssapi was given.
+-if test "${enable_gssapi+set}" = set; then
+-  enableval="$enable_gssapi"
+-  gssapi=$enableval
++# Check whether --enable-gssapi was given.
++if test "${enable_gssapi+set}" = set; then :
++  enableval=$enable_gssapi; gssapi=$enableval
+ else
+   gssapi=yes
+-fi;
++fi
+ 
+-# Check whether --with-gss_impl or --without-gss_impl was given.
+-if test "${with_gss_impl+set}" = set; then
+-  withval="$with_gss_impl"
+-  gss_impl=$withval
++
++# Check whether --with-gss_impl was given.
++if test "${with_gss_impl+set}" = set; then :
++  withval=$with_gss_impl; gss_impl=$withval
+ else
+   gss_impl=auto
+-fi;
++fi
++
+ 
+ if test "$gssapi" != no; then
+   platform=
+@@ -13149,12 +8396,10 @@ if test "$gssapi" != no; then
+       platform=__aix
+       ;;
+     *)
+-      { echo "$as_me:$LINENO: WARNING: The system type is not recognized. If you believe that CyberSafe GSSAPI works on this platform, please update the configure script" >&5
+-echo "$as_me: WARNING: The system type is not recognized. If you believe that CyberSafe GSSAPI works on this platform, please update the configure script" >&2;}
++      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The system type is not recognized. If you believe that CyberSafe GSSAPI works on this platform, please update the configure script" >&5
++$as_echo "$as_me: WARNING: The system type is not recognized. If you believe that CyberSafe GSSAPI works on this platform, please update the configure script" >&2;}
+       if test "$gss_impl" = "cybersafe"; then
+-        { { echo "$as_me:$LINENO: error: CyberSafe was forced, cannot continue as platform is not supported" >&5
+-echo "$as_me: error: CyberSafe was forced, cannot continue as platform is not supported" >&2;}
+-   { (exit 1); exit 1; }; }
++        as_fn_error "CyberSafe was forced, cannot continue as platform is not supported" "$LINENO" 5
+       fi
+       ;;
+   esac
+@@ -13178,292 +8423,18 @@ echo "$as_me: error: CyberSafe was force
+       fi
+     fi
+   fi
+-  if test "${ac_cv_header_gssapi_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for gssapi.h" >&5
+-echo $ECHO_N "checking for gssapi.h... $ECHO_C" >&6
+-if test "${ac_cv_header_gssapi_h+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_gssapi_h" >&5
+-echo "${ECHO_T}$ac_cv_header_gssapi_h" >&6
+-else
+-  # Is the header compilable?
+-echo "$as_me:$LINENO: checking gssapi.h usability" >&5
+-echo $ECHO_N "checking gssapi.h usability... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-#include <gssapi.h>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_header_compiler=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_header_compiler=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
+-
+-# Is the header present?
+-echo "$as_me:$LINENO: checking gssapi.h presence" >&5
+-echo $ECHO_N "checking gssapi.h presence... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <gssapi.h>
+-_ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
+-  ac_header_preproc=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-  ac_header_preproc=no
+-fi
+-rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
+-
+-# So?  What about this header?
+-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+-  yes:no: )
+-    { echo "$as_me:$LINENO: WARNING: gssapi.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-echo "$as_me: WARNING: gssapi.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: gssapi.h: proceeding with the compiler's result" >&5
+-echo "$as_me: WARNING: gssapi.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { echo "$as_me:$LINENO: WARNING: gssapi.h: present but cannot be compiled" >&5
+-echo "$as_me: WARNING: gssapi.h: present but cannot be compiled" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: gssapi.h:     check for missing prerequisite headers?" >&5
+-echo "$as_me: WARNING: gssapi.h:     check for missing prerequisite headers?" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: gssapi.h: see the Autoconf documentation" >&5
+-echo "$as_me: WARNING: gssapi.h: see the Autoconf documentation" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: gssapi.h:     section \"Present But Cannot Be Compiled\"" >&5
+-echo "$as_me: WARNING: gssapi.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: gssapi.h: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: gssapi.h: proceeding with the preprocessor's result" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: gssapi.h: in the future, the compiler will take precedence" >&5
+-echo "$as_me: WARNING: gssapi.h: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-echo "$as_me:$LINENO: checking for gssapi.h" >&5
+-echo $ECHO_N "checking for gssapi.h... $ECHO_C" >&6
+-if test "${ac_cv_header_gssapi_h+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_cv_header_gssapi_h=$ac_header_preproc
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_gssapi_h" >&5
+-echo "${ECHO_T}$ac_cv_header_gssapi_h" >&6
+-
+-fi
+-if test $ac_cv_header_gssapi_h = yes; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_GSSAPI_H
+-_ACEOF
+-
+-else
+-  if test "${ac_cv_header_gssapi_gssapi_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for gssapi/gssapi.h" >&5
+-echo $ECHO_N "checking for gssapi/gssapi.h... $ECHO_C" >&6
+-if test "${ac_cv_header_gssapi_gssapi_h+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_gssapi_gssapi_h" >&5
+-echo "${ECHO_T}$ac_cv_header_gssapi_gssapi_h" >&6
+-else
+-  # Is the header compilable?
+-echo "$as_me:$LINENO: checking gssapi/gssapi.h usability" >&5
+-echo $ECHO_N "checking gssapi/gssapi.h usability... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-#include <gssapi/gssapi.h>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_header_compiler=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_header_compiler=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
+-
+-# Is the header present?
+-echo "$as_me:$LINENO: checking gssapi/gssapi.h presence" >&5
+-echo $ECHO_N "checking gssapi/gssapi.h presence... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <gssapi/gssapi.h>
+-_ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
+-  ac_header_preproc=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++  ac_fn_c_check_header_mongrel "$LINENO" "gssapi.h" "ac_cv_header_gssapi_h" "$ac_includes_default"
++if test "x$ac_cv_header_gssapi_h" = x""yes; then :
+ 
+-  ac_header_preproc=no
+-fi
+-rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++$as_echo "#define HAVE_GSSAPI_H /**/" >>confdefs.h
+ 
+-# So?  What about this header?
+-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+-  yes:no: )
+-    { echo "$as_me:$LINENO: WARNING: gssapi/gssapi.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-echo "$as_me: WARNING: gssapi/gssapi.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: gssapi/gssapi.h: proceeding with the compiler's result" >&5
+-echo "$as_me: WARNING: gssapi/gssapi.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { echo "$as_me:$LINENO: WARNING: gssapi/gssapi.h: present but cannot be compiled" >&5
+-echo "$as_me: WARNING: gssapi/gssapi.h: present but cannot be compiled" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: gssapi/gssapi.h:     check for missing prerequisite headers?" >&5
+-echo "$as_me: WARNING: gssapi/gssapi.h:     check for missing prerequisite headers?" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: gssapi/gssapi.h: see the Autoconf documentation" >&5
+-echo "$as_me: WARNING: gssapi/gssapi.h: see the Autoconf documentation" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: gssapi/gssapi.h:     section \"Present But Cannot Be Compiled\"" >&5
+-echo "$as_me: WARNING: gssapi/gssapi.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: gssapi/gssapi.h: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: gssapi/gssapi.h: proceeding with the preprocessor's result" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: gssapi/gssapi.h: in the future, the compiler will take precedence" >&5
+-echo "$as_me: WARNING: gssapi/gssapi.h: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-echo "$as_me:$LINENO: checking for gssapi/gssapi.h" >&5
+-echo $ECHO_N "checking for gssapi/gssapi.h... $ECHO_C" >&6
+-if test "${ac_cv_header_gssapi_gssapi_h+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ac_cv_header_gssapi_gssapi_h=$ac_header_preproc
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_gssapi_gssapi_h" >&5
+-echo "${ECHO_T}$ac_cv_header_gssapi_gssapi_h" >&6
++  ac_fn_c_check_header_mongrel "$LINENO" "gssapi/gssapi.h" "ac_cv_header_gssapi_gssapi_h" "$ac_includes_default"
++if test "x$ac_cv_header_gssapi_gssapi_h" = x""yes; then :
+ 
+-fi
+-if test $ac_cv_header_gssapi_gssapi_h = yes; then
+-  :
+ else
+-  { echo "$as_me:$LINENO: WARNING: Disabling GSSAPI - no include files found" >&5
+-echo "$as_me: WARNING: Disabling GSSAPI - no include files found" >&2;}; gssapi=no
++  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Disabling GSSAPI - no include files found" >&5
++$as_echo "$as_me: WARNING: Disabling GSSAPI - no include files found" >&2;}; gssapi=no
+ fi
+ 
+ 
+@@ -13484,72 +8455,43 @@ if test "$gssapi" != no; then
+   #
+   # The choice is reflected in GSSAPIBASE_LIBS
+ 
+-
+-echo "$as_me:$LINENO: checking for res_search in -lresolv" >&5
+-echo $ECHO_N "checking for res_search in -lresolv... $ECHO_C" >&6
+-if test "${ac_cv_lib_resolv_res_search+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_search in -lresolv" >&5
++$as_echo_n "checking for res_search in -lresolv... " >&6; }
++if test "${ac_cv_lib_resolv_res_search+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lresolv  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char res_search ();
+ int
+ main ()
+ {
+-res_search ();
++return res_search ();
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_resolv_res_search=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_lib_resolv_res_search=no
++  ac_cv_lib_resolv_res_search=no
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_search" >&5
+-echo "${ECHO_T}$ac_cv_lib_resolv_res_search" >&6
+-if test $ac_cv_lib_resolv_res_search = yes; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_res_search" >&5
++$as_echo "$ac_cv_lib_resolv_res_search" >&6; }
++if test "x$ac_cv_lib_resolv_res_search" = x""yes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBRESOLV 1
+ _ACEOF
+@@ -13575,71 +8517,43 @@ fi
+ 
+   if test "$gss_impl" = "auto" -o "$gss_impl" = "heimdal"; then
+     gss_failed=0
+-    echo "$as_me:$LINENO: checking for gss_unwrap in -lgssapi" >&5
+-echo $ECHO_N "checking for gss_unwrap in -lgssapi... $ECHO_C" >&6
+-if test "${ac_cv_lib_gssapi_gss_unwrap+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gss_unwrap in -lgssapi" >&5
++$as_echo_n "checking for gss_unwrap in -lgssapi... " >&6; }
++if test "${ac_cv_lib_gssapi_gss_unwrap+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgssapi ${GSSAPIBASE_LIBS} -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err ${LIB_SOCKET} $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char gss_unwrap ();
+ int
+ main ()
+ {
+-gss_unwrap ();
++return gss_unwrap ();
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_gssapi_gss_unwrap=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_lib_gssapi_gss_unwrap=no
++  ac_cv_lib_gssapi_gss_unwrap=no
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_gssapi_gss_unwrap" >&5
+-echo "${ECHO_T}$ac_cv_lib_gssapi_gss_unwrap" >&6
+-if test $ac_cv_lib_gssapi_gss_unwrap = yes; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gssapi_gss_unwrap" >&5
++$as_echo "$ac_cv_lib_gssapi_gss_unwrap" >&6; }
++if test "x$ac_cv_lib_gssapi_gss_unwrap" = x""yes; then :
+   gss_impl="heimdal"
+ else
+   gss_failed=1
+@@ -13651,72 +8565,86 @@ fi
+   fi
+ 
+   if test "$gss_impl" = "auto" -o "$gss_impl" = "mit"; then
+-    gss_failed=0
+-    echo "$as_me:$LINENO: checking for gss_unwrap in -lgssapi_krb5" >&5
+-echo $ECHO_N "checking for gss_unwrap in -lgssapi_krb5... $ECHO_C" >&6
+-if test "${ac_cv_lib_gssapi_krb5_gss_unwrap+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++    # check for libkrb5support first
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5int_getspecific in -lkrb5support" >&5
++$as_echo_n "checking for krb5int_getspecific in -lkrb5support... " >&6; }
++if test "${ac_cv_lib_krb5support_krb5int_getspecific+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lgssapi_krb5 ${GSSAPIBASE_LIBS} -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${LIB_SOCKET} $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++LIBS="-lkrb5support ${LIB_SOCKET} $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
++char krb5int_getspecific ();
++int
++main ()
++{
++return krb5int_getspecific ();
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_lib_krb5support_krb5int_getspecific=yes
++else
++  ac_cv_lib_krb5support_krb5int_getspecific=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_krb5support_krb5int_getspecific" >&5
++$as_echo "$ac_cv_lib_krb5support_krb5int_getspecific" >&6; }
++if test "x$ac_cv_lib_krb5support_krb5int_getspecific" = x""yes; then :
++  K5SUP=-lkrb5support K5SUPSTATIC=$gssapi_dir/libkrb5support.a
++fi
++
++
++    gss_failed=0
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gss_unwrap in -lgssapi_krb5" >&5
++$as_echo_n "checking for gss_unwrap in -lgssapi_krb5... " >&6; }
++if test "${ac_cv_lib_gssapi_krb5_gss_unwrap+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lgssapi_krb5 ${GSSAPIBASE_LIBS} -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${K5SUP} ${LIB_SOCKET} $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
+    builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
+ char gss_unwrap ();
+ int
+ main ()
+ {
+-gss_unwrap ();
++return gss_unwrap ();
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_gssapi_krb5_gss_unwrap=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_lib_gssapi_krb5_gss_unwrap=no
++  ac_cv_lib_gssapi_krb5_gss_unwrap=no
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_gssapi_krb5_gss_unwrap" >&5
+-echo "${ECHO_T}$ac_cv_lib_gssapi_krb5_gss_unwrap" >&6
+-if test $ac_cv_lib_gssapi_krb5_gss_unwrap = yes; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gssapi_krb5_gss_unwrap" >&5
++$as_echo "$ac_cv_lib_gssapi_krb5_gss_unwrap" >&6; }
++if test "x$ac_cv_lib_gssapi_krb5_gss_unwrap" = x""yes; then :
+   gss_impl="mit"
+ else
+   gss_failed=1
+@@ -13747,139 +8675,83 @@ fi
+ # library (older CyberSafe)
+ 
+     unset ac_cv_lib_gss_csf_gss_acq_user
+-    echo "$as_me:$LINENO: checking for csf_gss_acq_user in -lgss" >&5
+-echo $ECHO_N "checking for csf_gss_acq_user in -lgss... $ECHO_C" >&6
+-if test "${ac_cv_lib_gss_csf_gss_acq_user+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for csf_gss_acq_user in -lgss" >&5
++$as_echo_n "checking for csf_gss_acq_user in -lgss... " >&6; }
++if test "${ac_cv_lib_gss_csf_gss_acq_user+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgss ${GSSAPIBASE_LIBS} -lgss -lcstbk5 $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char csf_gss_acq_user ();
+ int
+ main ()
+ {
+-csf_gss_acq_user ();
++return csf_gss_acq_user ();
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_gss_csf_gss_acq_user=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_lib_gss_csf_gss_acq_user=no
++  ac_cv_lib_gss_csf_gss_acq_user=no
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_gss_csf_gss_acq_user" >&5
+-echo "${ECHO_T}$ac_cv_lib_gss_csf_gss_acq_user" >&6
+-if test $ac_cv_lib_gss_csf_gss_acq_user = yes; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gss_csf_gss_acq_user" >&5
++$as_echo "$ac_cv_lib_gss_csf_gss_acq_user" >&6; }
++if test "x$ac_cv_lib_gss_csf_gss_acq_user" = x""yes; then :
+   gss_impl="cybersafe03"
+ else
+   unset ac_cv_lib_gss_csf_gss_acq_user;
+-                  echo "$as_me:$LINENO: checking for csf_gss_acq_user in -lgss" >&5
+-echo $ECHO_N "checking for csf_gss_acq_user in -lgss... $ECHO_C" >&6
+-if test "${ac_cv_lib_gss_csf_gss_acq_user+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++                  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for csf_gss_acq_user in -lgss" >&5
++$as_echo_n "checking for csf_gss_acq_user in -lgss... " >&6; }
++if test "${ac_cv_lib_gss_csf_gss_acq_user+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgss $GSSAPIBASE_LIBS -lgss $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char csf_gss_acq_user ();
+ int
+ main ()
+ {
+-csf_gss_acq_user ();
++return csf_gss_acq_user ();
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_gss_csf_gss_acq_user=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_lib_gss_csf_gss_acq_user=no
++  ac_cv_lib_gss_csf_gss_acq_user=no
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_gss_csf_gss_acq_user" >&5
+-echo "${ECHO_T}$ac_cv_lib_gss_csf_gss_acq_user" >&6
+-if test $ac_cv_lib_gss_csf_gss_acq_user = yes; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gss_csf_gss_acq_user" >&5
++$as_echo "$ac_cv_lib_gss_csf_gss_acq_user" >&6; }
++if test "x$ac_cv_lib_gss_csf_gss_acq_user" = x""yes; then :
+   gss_impl="cybersafe"
+ else
+   gss_failed=1
+@@ -13901,71 +8773,43 @@ fi
+ 
+   if test "$gss_impl" = "auto" -o "$gss_impl" = "seam"; then
+     gss_failed=0
+-    echo "$as_me:$LINENO: checking for gss_unwrap in -lgss" >&5
+-echo $ECHO_N "checking for gss_unwrap in -lgss... $ECHO_C" >&6
+-if test "${ac_cv_lib_gss_gss_unwrap+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gss_unwrap in -lgss" >&5
++$as_echo_n "checking for gss_unwrap in -lgss... " >&6; }
++if test "${ac_cv_lib_gss_gss_unwrap+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgss -lgss $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char gss_unwrap ();
+ int
+ main ()
+ {
+-gss_unwrap ();
++return gss_unwrap ();
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_gss_gss_unwrap=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_lib_gss_gss_unwrap=no
++  ac_cv_lib_gss_gss_unwrap=no
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_gss_gss_unwrap" >&5
+-echo "${ECHO_T}$ac_cv_lib_gss_gss_unwrap" >&6
+-if test $ac_cv_lib_gss_gss_unwrap = yes; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gss_gss_unwrap" >&5
++$as_echo "$ac_cv_lib_gss_gss_unwrap" >&6; }
++if test "x$ac_cv_lib_gss_gss_unwrap" = x""yes; then :
+   gss_impl="seam"
+ else
+   gss_failed=1
+@@ -13977,8 +8821,8 @@ fi
+   fi
+ 
+   if test "$gss_impl" = "mit"; then
+-    GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err"
+-    GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a"
++    GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${K5SUP}"
++    GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a ${K5SUPSTATIC}"
+   elif test "$gss_impl" = "heimdal"; then
+     CPPFLAGS="$CPPFLAGS -DKRB5_HEIMDAL"
+     GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err"
+@@ -14002,14 +8846,14 @@ fi
+     gssapi="no"
+     GSSAPIBASE_LIBS=
+     GSSAPIBASE_STATIC_LIBS=
+-    { echo "$as_me:$LINENO: WARNING: Disabling GSSAPI - specified library not found" >&5
+-echo "$as_me: WARNING: Disabling GSSAPI - specified library not found" >&2;}
++    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Disabling GSSAPI - specified library not found" >&5
++$as_echo "$as_me: WARNING: Disabling GSSAPI - specified library not found" >&2;}
+   else
+     gssapi="no"
+     GSSAPIBASE_LIBS=
+     GSSAPIBASE_STATIC_LIBS=
+-    { echo "$as_me:$LINENO: WARNING: Disabling GSSAPI - no library" >&5
+-echo "$as_me: WARNING: Disabling GSSAPI - no library" >&2;}
++    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Disabling GSSAPI - no library" >&5
++$as_echo "$as_me: WARNING: Disabling GSSAPI - no library" >&2;}
+   fi
+ fi
+ 
+@@ -14019,11 +8863,7 @@ fi
+ #
+ if test "$gssapi" != "no"; then
+   if test "$gss_impl" = "cybersafe" -o "$gss_impl" = "cybersafe03"; then
+-    cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include <gssapi/gssapi.h>
+                   #ifdef GSS_C_NT_HOSTBASED_SERVICE
+@@ -14031,55 +8871,41 @@ cat >>conftest.$ac_ext <<_ACEOF
+                   #endif
+ _ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  $EGREP "hostbased_service_gss_nt_yes" >/dev/null 2>&1; then
++  $EGREP "hostbased_service_gss_nt_yes" >/dev/null 2>&1; then :
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_GSS_C_NT_HOSTBASED_SERVICE
+-_ACEOF
++$as_echo "#define HAVE_GSS_C_NT_HOSTBASED_SERVICE /**/" >>confdefs.h
+ 
+ else
+-  { echo "$as_me:$LINENO: WARNING: Cybersafe define not found" >&5
+-echo "$as_me: WARNING: Cybersafe define not found" >&2;}
++  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cybersafe define not found" >&5
++$as_echo "$as_me: WARNING: Cybersafe define not found" >&2;}
+ fi
+ rm -f conftest*
+ 
+ 
+   elif test "$ac_cv_header_gssapi_h" = "yes"; then
+-    cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include <gssapi.h>
+ 
+ _ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  $EGREP "GSS_C_NT_HOSTBASED_SERVICE" >/dev/null 2>&1; then
++  $EGREP "GSS_C_NT_HOSTBASED_SERVICE" >/dev/null 2>&1; then :
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_GSS_C_NT_HOSTBASED_SERVICE
+-_ACEOF
++$as_echo "#define HAVE_GSS_C_NT_HOSTBASED_SERVICE /**/" >>confdefs.h
+ 
+ fi
+ rm -f conftest*
+ 
+   elif test "$ac_cv_header_gssapi_gssapi_h"; then
+-    cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include <gssapi/gssapi.h>
+ 
+ _ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  $EGREP "GSS_C_NT_HOSTBASED_SERVICE" >/dev/null 2>&1; then
++  $EGREP "GSS_C_NT_HOSTBASED_SERVICE" >/dev/null 2>&1; then :
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_GSS_C_NT_HOSTBASED_SERVICE
+-_ACEOF
++$as_echo "#define HAVE_GSS_C_NT_HOSTBASED_SERVICE /**/" >>confdefs.h
+ 
+ fi
+ rm -f conftest*
+@@ -14087,11 +8913,7 @@ rm -f conftest*
+   fi
+ 
+   if test "$gss_impl" = "cybersafe" -o "$gss_impl" = "cybersafe03"; then
+-    cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include <gssapi/gssapi.h>
+                   #ifdef GSS_C_NT_USER_NAME
+@@ -14099,238 +8921,105 @@ cat >>conftest.$ac_ext <<_ACEOF
+                   #endif
+ _ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  $EGREP "user_name_yes_gss_nt" >/dev/null 2>&1; then
++  $EGREP "user_name_yes_gss_nt" >/dev/null 2>&1; then :
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_GSS_C_NT_USER_NAME
+-_ACEOF
++$as_echo "#define HAVE_GSS_C_NT_USER_NAME /**/" >>confdefs.h
+ 
+ else
+-  { echo "$as_me:$LINENO: WARNING: Cybersafe define not found" >&5
+-echo "$as_me: WARNING: Cybersafe define not found" >&2;}
++  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cybersafe define not found" >&5
++$as_echo "$as_me: WARNING: Cybersafe define not found" >&2;}
+ fi
+ rm -f conftest*
+ 
+   elif test "$ac_cv_header_gssapi_h" = "yes"; then
+-    cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include <gssapi.h>
+ 
+ _ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  $EGREP "GSS_C_NT_USER_NAME" >/dev/null 2>&1; then
++  $EGREP "GSS_C_NT_USER_NAME" >/dev/null 2>&1; then :
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_GSS_C_NT_USER_NAME
+-_ACEOF
++$as_echo "#define HAVE_GSS_C_NT_USER_NAME /**/" >>confdefs.h
+ 
+ fi
+ rm -f conftest*
+ 
+   elif test "$ac_cv_header_gssapi_gssapi_h"; then
+-    cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include <gssapi/gssapi.h>
+ 
+-_ACEOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  $EGREP "GSS_C_NT_USER_NAME" >/dev/null 2>&1; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_GSS_C_NT_USER_NAME
+-_ACEOF
+-
+-fi
+-rm -f conftest*
+-
+-  fi
+-fi
+-
+-GSSAPI_LIBS=""
+-echo "$as_me:$LINENO: checking GSSAPI" >&5
+-echo $ECHO_N "checking GSSAPI... $ECHO_C" >&6
+-if test "$gssapi" != no; then
+-  echo "$as_me:$LINENO: result: with implementation ${gss_impl}" >&5
+-echo "${ECHO_T}with implementation ${gss_impl}" >&6
+-  echo "$as_me:$LINENO: checking for res_search in -lresolv" >&5
+-echo $ECHO_N "checking for res_search in -lresolv... $ECHO_C" >&6
+-if test "${ac_cv_lib_resolv_res_search+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lresolv  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char res_search ();
+-int
+-main ()
+-{
+-res_search ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_lib_resolv_res_search=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_lib_resolv_res_search=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_search" >&5
+-echo "${ECHO_T}$ac_cv_lib_resolv_res_search" >&6
+-if test $ac_cv_lib_resolv_res_search = yes; then
+-  GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lresolv"
+-fi
+-
+-  SASL_MECHS="$SASL_MECHS libgssapiv2.la"
+-  SASL_STATIC_OBJS="$SASL_STATIC_OBJS gssapi.o"
+-  SASL_STATIC_SRCS="$SASL_STATIC_SRCS ../plugins/gssapi.c"
+-
+-  cmu_save_LIBS="$LIBS"
+-  LIBS="$LIBS $GSSAPIBASE_LIBS"
+-
+-for ac_func in gsskrb5_register_acceptor_identity
+-do
+-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define $ac_func innocuous_$ac_func
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "GSS_C_NT_USER_NAME" >/dev/null 2>&1; then :
+ 
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
++$as_echo "#define HAVE_GSS_C_NT_USER_NAME /**/" >>confdefs.h
+ 
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
++fi
++rm -f conftest*
+ 
+-#undef $ac_func
++  fi
++fi
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-{
+-#endif
+-/* We use char because int might match the return type of a gcc2
++GSSAPI_LIBS=""
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking GSSAPI" >&5
++$as_echo_n "checking GSSAPI... " >&6; }
++if test "$gssapi" != no; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: with implementation ${gss_impl}" >&5
++$as_echo "with implementation ${gss_impl}" >&6; }
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_search in -lresolv" >&5
++$as_echo_n "checking for res_search in -lresolv... " >&6; }
++if test "${ac_cv_lib_resolv_res_search+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lresolv  $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
+    builtin and then its argument prototype would still apply.  */
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+-choke me
+-#else
+-char (*f) () = $ac_func;
+-#endif
+ #ifdef __cplusplus
+-}
++extern "C"
+ #endif
+-
++char res_search ();
+ int
+ main ()
+ {
+-return f != $ac_func;
++return res_search ();
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  eval "$as_ac_var=yes"
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_lib_resolv_res_search=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-eval "$as_ac_var=no"
++  ac_cv_lib_resolv_res_search=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_res_search" >&5
++$as_echo "$ac_cv_lib_resolv_res_search" >&6; }
++if test "x$ac_cv_lib_resolv_res_search" = x""yes; then :
++  GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lresolv"
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+-if test `eval echo '${'$as_ac_var'}'` = yes; then
++
++  SASL_MECHS="$SASL_MECHS libgssapiv2.la"
++  SASL_STATIC_OBJS="$SASL_STATIC_OBJS gssapi.o"
++  SASL_STATIC_SRCS="$SASL_STATIC_SRCS ../plugins/gssapi.c"
++
++  cmu_save_LIBS="$LIBS"
++  LIBS="$LIBS $GSSAPIBASE_LIBS"
++  for ac_func in gsskrb5_register_acceptor_identity
++do :
++  ac_fn_c_check_func "$LINENO" "gsskrb5_register_acceptor_identity" "ac_cv_func_gsskrb5_register_acceptor_identity"
++if test "x$ac_cv_func_gsskrb5_register_acceptor_identity" = x""yes; then :
+   cat >>confdefs.h <<_ACEOF
+-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define HAVE_GSSKRB5_REGISTER_ACCEPTOR_IDENTITY 1
+ _ACEOF
+ 
+ fi
+@@ -14338,8 +9027,8 @@ done
+ 
+   LIBS="$cmu_save_LIBS"
+ else
+-  echo "$as_me:$LINENO: result: disabled" >&5
+-echo "${ECHO_T}disabled" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5
++$as_echo "disabled" >&6; }
+ fi
+ 
+ 
+@@ -14347,25 +9036,25 @@ fi
+ 
+ 
+ 
+-# Check whether --with-sasl or --without-sasl was given.
+-if test "${with_sasl+set}" = set; then
+-  withval="$with_sasl"
+-  with_sasl="$withval"
++# Check whether --with-sasl was given.
++if test "${with_sasl+set}" = set; then :
++  withval=$with_sasl; with_sasl="$withval"
+ else
+   with_sasl="yes"
+-fi;
++fi
+ 
+ 
+-# Check whether --with-staticsasl or --without-staticsasl was given.
+-if test "${with_staticsasl+set}" = set; then
+-  withval="$with_staticsasl"
+-  with_staticsasl="$withval";
++
++# Check whether --with-staticsasl was given.
++if test "${with_staticsasl+set}" = set; then :
++  withval=$with_staticsasl; with_staticsasl="$withval";
+              if test $with_staticsasl != "no"; then
+                using_static_sasl="static"
+              fi
+ else
+   with_staticsasl="no"; using_static_sasl="no"
+-fi;
++fi
++
+ 
+ SASLFLAGS=""
+ LIB_SASL=""
+@@ -14392,296 +9081,22 @@ if test ${with_staticsasl} != "no"; then
+     with_staticsasl="/usr"
+   fi
+ 
+-  if test "${ac_cv_header_sasl_sasl_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for sasl/sasl.h" >&5
+-echo $ECHO_N "checking for sasl/sasl.h... $ECHO_C" >&6
+-if test "${ac_cv_header_sasl_sasl_h+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_sasl_sasl_h" >&5
+-echo "${ECHO_T}$ac_cv_header_sasl_sasl_h" >&6
+-else
+-  # Is the header compilable?
+-echo "$as_me:$LINENO: checking sasl/sasl.h usability" >&5
+-echo $ECHO_N "checking sasl/sasl.h usability... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-#include <sasl/sasl.h>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_header_compiler=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_header_compiler=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
+-
+-# Is the header present?
+-echo "$as_me:$LINENO: checking sasl/sasl.h presence" >&5
+-echo $ECHO_N "checking sasl/sasl.h presence... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <sasl/sasl.h>
+-_ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
+-  ac_header_preproc=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-  ac_header_preproc=no
+-fi
+-rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
+-
+-# So?  What about this header?
+-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+-  yes:no: )
+-    { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-echo "$as_me: WARNING: sasl/sasl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: proceeding with the compiler's result" >&5
+-echo "$as_me: WARNING: sasl/sasl.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: present but cannot be compiled" >&5
+-echo "$as_me: WARNING: sasl/sasl.h: present but cannot be compiled" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: sasl/sasl.h:     check for missing prerequisite headers?" >&5
+-echo "$as_me: WARNING: sasl/sasl.h:     check for missing prerequisite headers?" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: see the Autoconf documentation" >&5
+-echo "$as_me: WARNING: sasl/sasl.h: see the Autoconf documentation" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: sasl/sasl.h:     section \"Present But Cannot Be Compiled\"" >&5
+-echo "$as_me: WARNING: sasl/sasl.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: sasl/sasl.h: proceeding with the preprocessor's result" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: in the future, the compiler will take precedence" >&5
+-echo "$as_me: WARNING: sasl/sasl.h: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-echo "$as_me:$LINENO: checking for sasl/sasl.h" >&5
+-echo $ECHO_N "checking for sasl/sasl.h... $ECHO_C" >&6
+-if test "${ac_cv_header_sasl_sasl_h+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_cv_header_sasl_sasl_h=$ac_header_preproc
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_sasl_sasl_h" >&5
+-echo "${ECHO_T}$ac_cv_header_sasl_sasl_h" >&6
+-
+-fi
+-if test $ac_cv_header_sasl_sasl_h = yes; then
+-  if test "${ac_cv_header_sasl_saslutil_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for sasl/saslutil.h" >&5
+-echo $ECHO_N "checking for sasl/saslutil.h... $ECHO_C" >&6
+-if test "${ac_cv_header_sasl_saslutil_h+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_sasl_saslutil_h" >&5
+-echo "${ECHO_T}$ac_cv_header_sasl_saslutil_h" >&6
+-else
+-  # Is the header compilable?
+-echo "$as_me:$LINENO: checking sasl/saslutil.h usability" >&5
+-echo $ECHO_N "checking sasl/saslutil.h usability... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-#include <sasl/saslutil.h>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_header_compiler=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_header_compiler=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
+-
+-# Is the header present?
+-echo "$as_me:$LINENO: checking sasl/saslutil.h presence" >&5
+-echo $ECHO_N "checking sasl/saslutil.h presence... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <sasl/saslutil.h>
+-_ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
+-  ac_header_preproc=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-  ac_header_preproc=no
+-fi
+-rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
+-
+-# So?  What about this header?
+-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+-  yes:no: )
+-    { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-echo "$as_me: WARNING: sasl/saslutil.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: proceeding with the compiler's result" >&5
+-echo "$as_me: WARNING: sasl/saslutil.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: present but cannot be compiled" >&5
+-echo "$as_me: WARNING: sasl/saslutil.h: present but cannot be compiled" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h:     check for missing prerequisite headers?" >&5
+-echo "$as_me: WARNING: sasl/saslutil.h:     check for missing prerequisite headers?" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: see the Autoconf documentation" >&5
+-echo "$as_me: WARNING: sasl/saslutil.h: see the Autoconf documentation" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h:     section \"Present But Cannot Be Compiled\"" >&5
+-echo "$as_me: WARNING: sasl/saslutil.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: sasl/saslutil.h: proceeding with the preprocessor's result" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: in the future, the compiler will take precedence" >&5
+-echo "$as_me: WARNING: sasl/saslutil.h: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-echo "$as_me:$LINENO: checking for sasl/saslutil.h" >&5
+-echo $ECHO_N "checking for sasl/saslutil.h... $ECHO_C" >&6
+-if test "${ac_cv_header_sasl_saslutil_h+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_cv_header_sasl_saslutil_h=$ac_header_preproc
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_sasl_saslutil_h" >&5
+-echo "${ECHO_T}$ac_cv_header_sasl_saslutil_h" >&6
+-
+-fi
+-if test $ac_cv_header_sasl_saslutil_h = yes; then
++  ac_fn_c_check_header_mongrel "$LINENO" "sasl/sasl.h" "ac_cv_header_sasl_sasl_h" "$ac_includes_default"
++if test "x$ac_cv_header_sasl_sasl_h" = x""yes; then :
++  ac_fn_c_check_header_mongrel "$LINENO" "sasl/saslutil.h" "ac_cv_header_sasl_saslutil_h" "$ac_includes_default"
++if test "x$ac_cv_header_sasl_saslutil_h" = x""yes; then :
+   for i42 in lib64 lib; do
+                                       if test -r ${with_staticsasl}/$i42/libsasl2.a; then
+                                         ac_cv_found_sasl=yes
+-                                        echo "$as_me:$LINENO: checking for static libsasl" >&5
+-echo $ECHO_N "checking for static libsasl... $ECHO_C" >&6
++                                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for static libsasl" >&5
++$as_echo_n "checking for static libsasl... " >&6; }
+                                         LIB_SASL="$LIB_SASL ${with_staticsasl}/$i42/libsasl2.a"
+                                       fi
+                                     done
+                                     if test ! "$ac_cv_found_sasl" = "yes"; then
+-                                      echo "$as_me:$LINENO: checking for static libsasl" >&5
+-echo $ECHO_N "checking for static libsasl... $ECHO_C" >&6
+-                                      { { echo "$as_me:$LINENO: error: Could not find ${with_staticsasl}/lib*/libsasl2.a" >&5
+-echo "$as_me: error: Could not find ${with_staticsasl}/lib*/libsasl2.a" >&2;}
+-   { (exit 1); exit 1; }; }
++                                      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for static libsasl" >&5
++$as_echo_n "checking for static libsasl... " >&6; }
++                                      as_fn_error "Could not find ${with_staticsasl}/lib*/libsasl2.a" "$LINENO" 5
+                                     fi
+ fi
+ 
+@@ -14690,8 +9105,8 @@ fi
+ 
+ 
+ 
+-  echo "$as_me:$LINENO: result: found" >&5
+-echo "${ECHO_T}found" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
++$as_echo "found" >&6; }
+ 
+   if test "x$SASL_GSSAPI_LIBS_SET" = "x"; then
+     LIB_SASL="$LIB_SASL $GSSAPIBASE_STATIC_LIBS"
+@@ -14722,347 +9137,47 @@ if test -d ${with_sasl}; then
+ fi
+ 
+ # be sure to check for a SASLv2 specific function
+-if test "${ac_cv_header_sasl_sasl_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for sasl/sasl.h" >&5
+-echo $ECHO_N "checking for sasl/sasl.h... $ECHO_C" >&6
+-if test "${ac_cv_header_sasl_sasl_h+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_sasl_sasl_h" >&5
+-echo "${ECHO_T}$ac_cv_header_sasl_sasl_h" >&6
+-else
+-  # Is the header compilable?
+-echo "$as_me:$LINENO: checking sasl/sasl.h usability" >&5
+-echo $ECHO_N "checking sasl/sasl.h usability... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-#include <sasl/sasl.h>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_header_compiler=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_header_compiler=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
+-
+-# Is the header present?
+-echo "$as_me:$LINENO: checking sasl/sasl.h presence" >&5
+-echo $ECHO_N "checking sasl/sasl.h presence... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <sasl/sasl.h>
+-_ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
+-  ac_header_preproc=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-  ac_header_preproc=no
+-fi
+-rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
+-
+-# So?  What about this header?
+-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+-  yes:no: )
+-    { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-echo "$as_me: WARNING: sasl/sasl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: proceeding with the compiler's result" >&5
+-echo "$as_me: WARNING: sasl/sasl.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: present but cannot be compiled" >&5
+-echo "$as_me: WARNING: sasl/sasl.h: present but cannot be compiled" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: sasl/sasl.h:     check for missing prerequisite headers?" >&5
+-echo "$as_me: WARNING: sasl/sasl.h:     check for missing prerequisite headers?" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: see the Autoconf documentation" >&5
+-echo "$as_me: WARNING: sasl/sasl.h: see the Autoconf documentation" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: sasl/sasl.h:     section \"Present But Cannot Be Compiled\"" >&5
+-echo "$as_me: WARNING: sasl/sasl.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: sasl/sasl.h: proceeding with the preprocessor's result" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: in the future, the compiler will take precedence" >&5
+-echo "$as_me: WARNING: sasl/sasl.h: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-echo "$as_me:$LINENO: checking for sasl/sasl.h" >&5
+-echo $ECHO_N "checking for sasl/sasl.h... $ECHO_C" >&6
+-if test "${ac_cv_header_sasl_sasl_h+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_cv_header_sasl_sasl_h=$ac_header_preproc
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_sasl_sasl_h" >&5
+-echo "${ECHO_T}$ac_cv_header_sasl_sasl_h" >&6
+-
+-fi
+-if test $ac_cv_header_sasl_sasl_h = yes; then
+-  if test "${ac_cv_header_sasl_saslutil_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for sasl/saslutil.h" >&5
+-echo $ECHO_N "checking for sasl/saslutil.h... $ECHO_C" >&6
+-if test "${ac_cv_header_sasl_saslutil_h+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_sasl_saslutil_h" >&5
+-echo "${ECHO_T}$ac_cv_header_sasl_saslutil_h" >&6
+-else
+-  # Is the header compilable?
+-echo "$as_me:$LINENO: checking sasl/saslutil.h usability" >&5
+-echo $ECHO_N "checking sasl/saslutil.h usability... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-#include <sasl/saslutil.h>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_header_compiler=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_header_compiler=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
+-
+-# Is the header present?
+-echo "$as_me:$LINENO: checking sasl/saslutil.h presence" >&5
+-echo $ECHO_N "checking sasl/saslutil.h presence... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <sasl/saslutil.h>
+-_ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
+-  ac_header_preproc=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-  ac_header_preproc=no
+-fi
+-rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
+-
+-# So?  What about this header?
+-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+-  yes:no: )
+-    { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-echo "$as_me: WARNING: sasl/saslutil.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: proceeding with the compiler's result" >&5
+-echo "$as_me: WARNING: sasl/saslutil.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: present but cannot be compiled" >&5
+-echo "$as_me: WARNING: sasl/saslutil.h: present but cannot be compiled" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h:     check for missing prerequisite headers?" >&5
+-echo "$as_me: WARNING: sasl/saslutil.h:     check for missing prerequisite headers?" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: see the Autoconf documentation" >&5
+-echo "$as_me: WARNING: sasl/saslutil.h: see the Autoconf documentation" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h:     section \"Present But Cannot Be Compiled\"" >&5
+-echo "$as_me: WARNING: sasl/saslutil.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: sasl/saslutil.h: proceeding with the preprocessor's result" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: in the future, the compiler will take precedence" >&5
+-echo "$as_me: WARNING: sasl/saslutil.h: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-echo "$as_me:$LINENO: checking for sasl/saslutil.h" >&5
+-echo $ECHO_N "checking for sasl/saslutil.h... $ECHO_C" >&6
+-if test "${ac_cv_header_sasl_saslutil_h+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_cv_header_sasl_saslutil_h=$ac_header_preproc
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_sasl_saslutil_h" >&5
+-echo "${ECHO_T}$ac_cv_header_sasl_saslutil_h" >&6
+-
+-fi
+-if test $ac_cv_header_sasl_saslutil_h = yes; then
+-  echo "$as_me:$LINENO: checking for prop_get in -lsasl2" >&5
+-echo $ECHO_N "checking for prop_get in -lsasl2... $ECHO_C" >&6
+-if test "${ac_cv_lib_sasl2_prop_get+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++ac_fn_c_check_header_mongrel "$LINENO" "sasl/sasl.h" "ac_cv_header_sasl_sasl_h" "$ac_includes_default"
++if test "x$ac_cv_header_sasl_sasl_h" = x""yes; then :
++  ac_fn_c_check_header_mongrel "$LINENO" "sasl/saslutil.h" "ac_cv_header_sasl_saslutil_h" "$ac_includes_default"
++if test "x$ac_cv_header_sasl_saslutil_h" = x""yes; then :
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for prop_get in -lsasl2" >&5
++$as_echo_n "checking for prop_get in -lsasl2... " >&6; }
++if test "${ac_cv_lib_sasl2_prop_get+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsasl2  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char prop_get ();
+ int
+ main ()
+ {
+-prop_get ();
++return prop_get ();
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_sasl2_prop_get=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_lib_sasl2_prop_get=no
++  ac_cv_lib_sasl2_prop_get=no
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_sasl2_prop_get" >&5
+-echo "${ECHO_T}$ac_cv_lib_sasl2_prop_get" >&6
+-if test $ac_cv_lib_sasl2_prop_get = yes; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sasl2_prop_get" >&5
++$as_echo "$ac_cv_lib_sasl2_prop_get" >&6; }
++if test "x$ac_cv_lib_sasl2_prop_get" = x""yes; then :
+   ac_cv_found_sasl=yes
+ else
+   ac_cv_found_sasl=no
+@@ -15117,22 +9232,15 @@ CPPFLAGS="$cmu_saved_CPPFLAGS"
+ 
+ 
+ if test "$ac_cv_found_sasl" != "yes"; then
+-  { { echo "$as_me:$LINENO: error: Cannot continue without libsasl2.
+-Get it from ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/." >&5
+-echo "$as_me: error: Cannot continue without libsasl2.
+-Get it from ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/." >&2;}
+-   { (exit 1); exit 1; }; }
++  as_fn_error "Cannot continue without libsasl2.
++Get it from ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/." "$LINENO" 5
+ fi
+ 
+ 
+ cmu_saved_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS $SASLFLAGS"
+ 
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ #include <sasl/sasl.h>
+@@ -15145,39 +9253,17 @@ cat >>conftest.$ac_ext <<_ACEOF
+ #endif
+ #ifndef SASL_VERSION_STEP
+ #error SASL_VERSION_STEP not defined
+-#endif
+-
+-#if SASL_VERSION_MAJOR < 2 || SASL_VERSION_MINOR < 1 || SASL_VERSION_STEP < 7
+-#error SASL version is less than 2.1.7
+-#endif
+-
+-_ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
+-  :
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++#endif
++
++#if SASL_VERSION_MAJOR < 2 || SASL_VERSION_MINOR < 1 || SASL_VERSION_STEP < 7
++#error SASL version is less than 2.1.7
++#endif
++
++_ACEOF
++if ac_fn_c_try_cpp "$LINENO"; then :
+ 
+-  { { echo "$as_me:$LINENO: error: Incorrect SASL headers found.  This package requires SASL 2.1.7 or newer." >&5
+-echo "$as_me: error: Incorrect SASL headers found.  This package requires SASL 2.1.7 or newer." >&2;}
+-   { (exit 1); exit 1; }; }
++else
++  as_fn_error "Incorrect SASL headers found.  This package requires SASL 2.1.7 or newer." "$LINENO" 5
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ 
+@@ -15189,80 +9275,48 @@ cmu_saved_LDFLAGS=$LDFLAGS
+ 
+ LDFLAGS="$LDFLAGS $LIB_SASL"
+ 
+-echo "$as_me:$LINENO: checking for sasl_checkapop in -lsasl2" >&5
+-echo $ECHO_N "checking for sasl_checkapop in -lsasl2... $ECHO_C" >&6
+-if test "${ac_cv_lib_sasl2_sasl_checkapop+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sasl_checkapop in -lsasl2" >&5
++$as_echo_n "checking for sasl_checkapop in -lsasl2... " >&6; }
++if test "${ac_cv_lib_sasl2_sasl_checkapop+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsasl2  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char sasl_checkapop ();
+ int
+ main ()
+ {
+-sasl_checkapop ();
++return sasl_checkapop ();
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_sasl2_sasl_checkapop=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_lib_sasl2_sasl_checkapop=no
++  ac_cv_lib_sasl2_sasl_checkapop=no
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_sasl2_sasl_checkapop" >&5
+-echo "${ECHO_T}$ac_cv_lib_sasl2_sasl_checkapop" >&6
+-if test $ac_cv_lib_sasl2_sasl_checkapop = yes; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sasl2_sasl_checkapop" >&5
++$as_echo "$ac_cv_lib_sasl2_sasl_checkapop" >&6; }
++if test "x$ac_cv_lib_sasl2_sasl_checkapop" = x""yes; then :
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_APOP
+-_ACEOF
++$as_echo "#define HAVE_APOP /**/" >>confdefs.h
+ 
+ else
+-  { { echo "$as_me:$LINENO: error: libsasl2 without working sasl_checkapop.  Cannot continue." >&5
+-echo "$as_me: error: libsasl2 without working sasl_checkapop.  Cannot continue." >&2;}
+-   { (exit 1); exit 1; }; }
++  as_fn_error "libsasl2 without working sasl_checkapop.  Cannot continue." "$LINENO" 5
+ fi
+ 
+ 
+@@ -15270,31 +9324,31 @@ LDFLAGS=$cmu_saved_LDFLAGS
+ 
+ 
+ 
+-# Check whether --with-perl or --without-perl was given.
+-if test "${with_perl+set}" = set; then
+-  withval="$with_perl"
+-  with_perl="$withval"
++# Check whether --with-perl was given.
++if test "${with_perl+set}" = set; then :
++  withval=$with_perl; with_perl="$withval"
+ else
+   with_perl="perl"
+-fi;
++fi
++
+ 
+ if test "${with_perl}" = yes; then
+     with_perl="perl"
+ fi
+ if test "${with_perl}" != no; then
+     if test ${using_static_sasl} = "staticonly"; then
+-	{ echo "$as_me:$LINENO: WARNING: Cannot compile perl utilities using static libsasl" >&5
+-echo "$as_me: WARNING: Cannot compile perl utilities using static libsasl" >&2;}
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot compile perl utilities using static libsasl" >&5
++$as_echo "$as_me: WARNING: Cannot compile perl utilities using static libsasl" >&2;}
+ 	with_perl="no"
+     else
+ 	for ac_prog in ${with_perl} perl
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_PERL+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_PERL+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
+   if test -n "$PERL"; then
+   ac_cv_prog_PERL="$PERL" # Let the user override the test.
+@@ -15304,26 +9358,28 @@ for as_dir in $PATH
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_PERL="$ac_prog"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
++IFS=$as_save_IFS
+ 
+ fi
+ fi
+ PERL=$ac_cv_prog_PERL
+ if test -n "$PERL"; then
+-  echo "$as_me:$LINENO: result: $PERL" >&5
+-echo "${ECHO_T}$PERL" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5
++$as_echo "$PERL" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+ 
++
+   test -n "$PERL" && break
+ done
+ test -n "$PERL" || PERL="with_perl=notfound"
+@@ -15331,8 +9387,8 @@ test -n "$PERL" || PERL="with_perl=notfo
+     fi
+ fi
+ if test "$with_perl" = "notfound"; then
+-    { echo "$as_me:$LINENO: WARNING: Perl not found: Administrative tools won't be available" >&5
+-echo "$as_me: WARNING: Perl not found: Administrative tools won't be available" >&2;}
++    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Perl not found: Administrative tools won't be available" >&5
++$as_echo "$as_me: WARNING: Perl not found: Administrative tools won't be available" >&2;}
+ elif test "${with_perl}" != "no"; then
+     EXTRA_SUBDIRS="${EXTRA_SUBDIRS} perl"
+     PERL_SUBDIRS="imap"
+@@ -15352,600 +9408,103 @@ else
+ 	PERL_DEPSUBDIRS="none"
+ fi
+ 
+-echo "$as_me:$LINENO: checking for MD5Init" >&5
+-echo $ECHO_N "checking for MD5Init... $ECHO_C" >&6
+-if test "${ac_cv_func_MD5Init+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-/* Define MD5Init to an innocuous variant, in case <limits.h> declares MD5Init.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define MD5Init innocuous_MD5Init
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char MD5Init (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef MD5Init
+-
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-{
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char MD5Init ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_MD5Init) || defined (__stub___MD5Init)
+-choke me
+-#else
+-char (*f) () = MD5Init;
+-#endif
+-#ifdef __cplusplus
+-}
+-#endif
+-
+-int
+-main ()
+-{
+-return f != MD5Init;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_func_MD5Init=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++ac_fn_c_check_func "$LINENO" "MD5Init" "ac_cv_func_MD5Init"
++if test "x$ac_cv_func_MD5Init" = x""yes; then :
+ 
+-ac_cv_func_MD5Init=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_MD5Init" >&5
+-echo "${ECHO_T}$ac_cv_func_MD5Init" >&6
+-if test $ac_cv_func_MD5Init = yes; then
+-  :
+ else
+-  echo "$as_me:$LINENO: checking for MD5Init in -lmd" >&5
+-echo $ECHO_N "checking for MD5Init in -lmd... $ECHO_C" >&6
+-if test "${ac_cv_lib_md_MD5Init+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MD5Init in -lmd" >&5
++$as_echo_n "checking for MD5Init in -lmd... " >&6; }
++if test "${ac_cv_lib_md_MD5Init+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmd  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char MD5Init ();
+-int
+-main ()
+-{
+-MD5Init ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_lib_md_MD5Init=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_lib_md_MD5Init=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_md_MD5Init" >&5
+-echo "${ECHO_T}$ac_cv_lib_md_MD5Init" >&6
+-if test $ac_cv_lib_md_MD5Init = yes; then
+-  LIBS="${LIBS} -lmd"
+-else
+-  MD5OBJ="md5.o"
+-fi
+-
+-fi
+-
+-
+-
+-SNMP_SUBDIRS=""
+-
+-
+-
+-# Check whether --with-lib-subdir or --without-lib-subdir was given.
+-if test "${with_lib_subdir+set}" = set; then
+-  withval="$with_lib_subdir"
+-
+-fi;
+-echo "$as_me:$LINENO: checking for long" >&5
+-echo $ECHO_N "checking for long... $ECHO_C" >&6
+-if test "${ac_cv_type_long+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-if ((long *) 0)
+-  return 0;
+-if (sizeof (long))
+-  return 0;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_type_long=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_type_long=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
+-echo "${ECHO_T}$ac_cv_type_long" >&6
+-
+-echo "$as_me:$LINENO: checking size of long" >&5
+-echo $ECHO_N "checking size of long... $ECHO_C" >&6
+-if test "${ac_cv_sizeof_long+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  if test "$ac_cv_type_long" = yes; then
+-  # The cast to unsigned long works around a bug in the HP C Compiler
+-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+-  # This bug is HP SR number 8606223364.
+-  if test "$cross_compiling" = yes; then
+-  # Depending upon the size, compute the lo and hi bounds.
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(((long) (sizeof (long))) >= 0)];
+-test_array [0] = 0
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_lo=0 ac_mid=0
+-  while :; do
+-    cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
+-test_array [0] = 0
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_hi=$ac_mid; break
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_lo=`expr $ac_mid + 1`
+-		    if test $ac_lo -le $ac_mid; then
+-		      ac_lo= ac_hi=
+-		      break
+-		    fi
+-		    ac_mid=`expr 2 '*' $ac_mid + 1`
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-  done
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(((long) (sizeof (long))) < 0)];
+-test_array [0] = 0
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_hi=-1 ac_mid=-1
+-  while :; do
+-    cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(((long) (sizeof (long))) >= $ac_mid)];
+-test_array [0] = 0
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_lo=$ac_mid; break
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_hi=`expr '(' $ac_mid ')' - 1`
+-		       if test $ac_mid -le $ac_hi; then
+-			 ac_lo= ac_hi=
+-			 break
+-		       fi
+-		       ac_mid=`expr 2 '*' $ac_mid`
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-  done
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_lo= ac_hi=
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-# Binary search between lo and hi bounds.
+-while test "x$ac_lo" != "x$ac_hi"; do
+-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
+-test_array [0] = 0
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_hi=$ac_mid
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_lo=`expr '(' $ac_mid ')' + 1`
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-done
+-case $ac_lo in
+-?*) ac_cv_sizeof_long=$ac_lo;;
+-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (long), 77
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; } ;;
+-esac
+-else
+-  if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-long longval () { return (long) (sizeof (long)); }
+-unsigned long ulongval () { return (long) (sizeof (long)); }
+-#include <stdio.h>
+-#include <stdlib.h>
+-int
+-main ()
+-{
+-
+-  FILE *f = fopen ("conftest.val", "w");
+-  if (! f)
+-    exit (1);
+-  if (((long) (sizeof (long))) < 0)
+-    {
+-      long i = longval ();
+-      if (i != ((long) (sizeof (long))))
+-	exit (1);
+-      fprintf (f, "%ld\n", i);
+-    }
+-  else
+-    {
+-      unsigned long i = ulongval ();
+-      if (i != ((long) (sizeof (long))))
+-	exit (1);
+-      fprintf (f, "%lu\n", i);
+-    }
+-  exit (ferror (f) || fclose (f) != 0);
+-
++char MD5Init ();
++int
++main ()
++{
++return MD5Init ();
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_sizeof_long=`cat conftest.val`
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_lib_md_MD5Init=yes
+ else
+-  echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-( exit $ac_status )
+-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (long), 77
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
++  ac_cv_lib_md_MD5Init=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
+ fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_md_MD5Init" >&5
++$as_echo "$ac_cv_lib_md_MD5Init" >&6; }
++if test "x$ac_cv_lib_md_MD5Init" = x""yes; then :
++  LIBS="${LIBS} -lmd"
++else
++  MD5OBJ="md5.o"
+ fi
++
+ fi
+-rm -f conftest.val
++
++
++
++SNMP_SUBDIRS=""
++
++
++
++# Check whether --with-lib-subdir was given.
++if test "${with_lib_subdir+set}" = set; then :
++  withval=$with_lib_subdir;
++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
++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++# This bug is HP SR number 8606223364.
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
++$as_echo_n "checking size of long... " >&6; }
++if test "${ac_cv_sizeof_long+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"; then :
++
+ else
+-  ac_cv_sizeof_long=0
++  if test "$ac_cv_type_long" = yes; then
++     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ as_fn_set_status 77
++as_fn_error "cannot compute sizeof (long)
++See \`config.log' for more details." "$LINENO" 5; }; }
++   else
++     ac_cv_sizeof_long=0
++   fi
+ fi
++
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
+-echo "${ECHO_T}$ac_cv_sizeof_long" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
++$as_echo "$ac_cv_sizeof_long" >&6; }
++
++
++
+ cat >>confdefs.h <<_ACEOF
+ #define SIZEOF_LONG $ac_cv_sizeof_long
+ _ACEOF
+ 
+ 
+-echo "$as_me:$LINENO: checking what directory libraries are found in" >&5
+-echo $ECHO_N "checking what directory libraries are found in... $ECHO_C" >&6
+-if test "${ac_cv_cmu_lib_subdir+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking what directory libraries are found in" >&5
++$as_echo_n "checking what directory libraries are found in... " >&6; }
++if test "${ac_cv_cmu_lib_subdir+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
+   test "X$with_lib_subdir" = "Xyes" && with_lib_subdir=
+ test "X$with_lib_subdir" = "Xno" && with_lib_subdir=
+@@ -15961,8 +9520,8 @@ else
+   ac_cv_cmu_lib_subdir=$with_lib_subdir
+ fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_cmu_lib_subdir" >&5
+-echo "${ECHO_T}$ac_cv_cmu_lib_subdir" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cmu_lib_subdir" >&5
++$as_echo "$ac_cv_cmu_lib_subdir" >&6; }
+ CMU_LIB_SUBDIR=$ac_cv_cmu_lib_subdir
+ 
+ 
+@@ -15970,224 +9529,60 @@ CMU_LIB_SUBDIR=$ac_cv_cmu_lib_subdir
+ 
+ 
+ 
+-# Check whether --with-libwrap or --without-libwrap was given.
+-if test "${with_libwrap+set}" = set; then
+-  withval="$with_libwrap"
+-  with_libwrap=$withval
++# Check whether --with-libwrap was given.
++if test "${with_libwrap+set}" = set; then :
++  withval=$with_libwrap; with_libwrap=$withval
+ else
+   with_libwrap=yes
+-fi;
++fi
++
+   if test "$with_libwrap" != no; then
+     if test -d "$with_libwrap"; then
+       CPPFLAGS="$CPPFLAGS -I${with_libwrap}/include"
+       LDFLAGS="$LDFLAGS -L${with_libwrap}/$CMU_LIB_SUBDIR"
+     fi
+     cmu_save_LIBS="$LIBS"
+-    echo "$as_me:$LINENO: checking for request_init in -lwrap" >&5
+-echo $ECHO_N "checking for request_init in -lwrap... $ECHO_C" >&6
+-if test "${ac_cv_lib_wrap_request_init+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for request_init in -lwrap" >&5
++$as_echo_n "checking for request_init in -lwrap... " >&6; }
++if test "${ac_cv_lib_wrap_request_init+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lwrap ${LIB_SOCKET} $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char request_init ();
+ int
+ main ()
+ {
+-request_init ();
++return request_init ();
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_wrap_request_init=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_lib_wrap_request_init=no
++  ac_cv_lib_wrap_request_init=no
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_wrap_request_init" >&5
+-echo "${ECHO_T}$ac_cv_lib_wrap_request_init" >&6
+-if test $ac_cv_lib_wrap_request_init = yes; then
+-
+-		 if test "${ac_cv_header_tcpd_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for tcpd.h" >&5
+-echo $ECHO_N "checking for tcpd.h... $ECHO_C" >&6
+-if test "${ac_cv_header_tcpd_h+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_tcpd_h" >&5
+-echo "${ECHO_T}$ac_cv_header_tcpd_h" >&6
+-else
+-  # Is the header compilable?
+-echo "$as_me:$LINENO: checking tcpd.h usability" >&5
+-echo $ECHO_N "checking tcpd.h usability... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-#include <tcpd.h>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_header_compiler=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_header_compiler=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
+-
+-# Is the header present?
+-echo "$as_me:$LINENO: checking tcpd.h presence" >&5
+-echo $ECHO_N "checking tcpd.h presence... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <tcpd.h>
+-_ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
+-  ac_header_preproc=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-  ac_header_preproc=no
+-fi
+-rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_wrap_request_init" >&5
++$as_echo "$ac_cv_lib_wrap_request_init" >&6; }
++if test "x$ac_cv_lib_wrap_request_init" = x""yes; then :
+ 
+-# So?  What about this header?
+-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+-  yes:no: )
+-    { echo "$as_me:$LINENO: WARNING: tcpd.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-echo "$as_me: WARNING: tcpd.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: tcpd.h: proceeding with the compiler's result" >&5
+-echo "$as_me: WARNING: tcpd.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { echo "$as_me:$LINENO: WARNING: tcpd.h: present but cannot be compiled" >&5
+-echo "$as_me: WARNING: tcpd.h: present but cannot be compiled" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: tcpd.h:     check for missing prerequisite headers?" >&5
+-echo "$as_me: WARNING: tcpd.h:     check for missing prerequisite headers?" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: tcpd.h: see the Autoconf documentation" >&5
+-echo "$as_me: WARNING: tcpd.h: see the Autoconf documentation" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: tcpd.h:     section \"Present But Cannot Be Compiled\"" >&5
+-echo "$as_me: WARNING: tcpd.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: tcpd.h: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: tcpd.h: proceeding with the preprocessor's result" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: tcpd.h: in the future, the compiler will take precedence" >&5
+-echo "$as_me: WARNING: tcpd.h: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-echo "$as_me:$LINENO: checking for tcpd.h" >&5
+-echo $ECHO_N "checking for tcpd.h... $ECHO_C" >&6
+-if test "${ac_cv_header_tcpd_h+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_cv_header_tcpd_h=$ac_header_preproc
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_tcpd_h" >&5
+-echo "${ECHO_T}$ac_cv_header_tcpd_h" >&6
++		 ac_fn_c_check_header_mongrel "$LINENO" "tcpd.h" "ac_cv_header_tcpd_h" "$ac_includes_default"
++if test "x$ac_cv_header_tcpd_h" = x""yes; then :
+ 
+-fi
+-if test $ac_cv_header_tcpd_h = yes; then
+-  :
+ else
+   with_libwrap=no
+ fi
+@@ -16199,83 +9594,53 @@ fi
+ 
+     LIBS="$cmu_save_LIBS"
+   fi
+-  echo "$as_me:$LINENO: checking libwrap support" >&5
+-echo $ECHO_N "checking libwrap support... $ECHO_C" >&6
+-  echo "$as_me:$LINENO: result: $with_libwrap" >&5
+-echo "${ECHO_T}$with_libwrap" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking libwrap support" >&5
++$as_echo_n "checking libwrap support... " >&6; }
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_libwrap" >&5
++$as_echo "$with_libwrap" >&6; }
+   LIB_WRAP=""
+   if test "$with_libwrap" != no; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_LIBWRAP
+-_ACEOF
++$as_echo "#define HAVE_LIBWRAP /**/" >>confdefs.h
+ 
+     LIB_WRAP="-lwrap"
+-    echo "$as_me:$LINENO: checking for yp_get_default_domain in -lnsl" >&5
+-echo $ECHO_N "checking for yp_get_default_domain in -lnsl... $ECHO_C" >&6
+-if test "${ac_cv_lib_nsl_yp_get_default_domain+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for yp_get_default_domain in -lnsl" >&5
++$as_echo_n "checking for yp_get_default_domain in -lnsl... " >&6; }
++if test "${ac_cv_lib_nsl_yp_get_default_domain+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lnsl  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char yp_get_default_domain ();
+ int
+ main ()
+ {
+-yp_get_default_domain ();
++return yp_get_default_domain ();
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_nsl_yp_get_default_domain=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_lib_nsl_yp_get_default_domain=no
++  ac_cv_lib_nsl_yp_get_default_domain=no
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_yp_get_default_domain" >&5
+-echo "${ECHO_T}$ac_cv_lib_nsl_yp_get_default_domain" >&6
+-if test $ac_cv_lib_nsl_yp_get_default_domain = yes; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_yp_get_default_domain" >&5
++$as_echo "$ac_cv_lib_nsl_yp_get_default_domain" >&6; }
++if test "x$ac_cv_lib_nsl_yp_get_default_domain" = x""yes; then :
+   LIB_WRAP="${LIB_WRAP} -lnsl"
+ fi
+ 
+@@ -16286,30 +9651,30 @@ fi
+ 
+ 
+ 
+-# Check whether --with-snmp or --without-snmp was given.
+-if test "${with_snmp+set}" = set; then
+-  withval="$with_snmp"
+-  with_snmp=$withval
++# Check whether --with-snmp was given.
++if test "${with_snmp+set}" = set; then :
++  withval=$with_snmp; with_snmp=$withval
+ else
+   with_snmp=yes
+-fi;
++fi
++
++
+ 
++# Check whether --with-ucdsnmp was given.
++if test "${with_ucdsnmp+set}" = set; then :
++  withval=$with_ucdsnmp; with_snmp=$withval
++fi
+ 
+-# Check whether --with-ucdsnmp or --without-ucdsnmp was given.
+-if test "${with_ucdsnmp+set}" = set; then
+-  withval="$with_ucdsnmp"
+-  with_snmp=$withval
+-fi;
+ 
+ if test "$with_snmp" != "no"; then
+ 
+         if test "$with_snmp" = "yes"; then
+     # Extract the first word of "net-snmp-config", so it can be a program name with args.
+ set dummy net-snmp-config; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_path_SNMP_CONFIG+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_path_SNMP_CONFIG+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
+   case $SNMP_CONFIG in
+   [\\/]* | ?:[\\/]*)
+@@ -16322,35 +9687,36 @@ for as_dir in $as_dummy
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_path_SNMP_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
++IFS=$as_save_IFS
+ 
+   ;;
+ esac
+ fi
+ SNMP_CONFIG=$ac_cv_path_SNMP_CONFIG
+-
+ if test -n "$SNMP_CONFIG"; then
+-  echo "$as_me:$LINENO: result: $SNMP_CONFIG" >&5
+-echo "${ECHO_T}$SNMP_CONFIG" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SNMP_CONFIG" >&5
++$as_echo "$SNMP_CONFIG" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+ 
++
+   else
+     SNMP_CONFIG="$with_snmp/bin/net-snmp-config"
+   fi
+ 
+   if test -x "$SNMP_CONFIG"; then
+-    echo "$as_me:$LINENO: checking NET SNMP libraries" >&5
+-echo $ECHO_N "checking NET SNMP libraries... $ECHO_C" >&6
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking NET SNMP libraries" >&5
++$as_echo_n "checking NET SNMP libraries... " >&6; }
+ 
+     SNMP_LIBS=`$SNMP_CONFIG --agent-libs`
+     SNMP_PREFIX=`$SNMP_CONFIG --prefix`
+@@ -16359,18 +9725,16 @@ echo $ECHO_N "checking NET SNMP librarie
+       CPPFLAGS="$CPPFLAGS -I${SNMP_PREFIX}/include"
+       LIB_UCDSNMP=$SNMP_LIBS
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_NETSNMP 1
+-_ACEOF
++$as_echo "#define HAVE_NETSNMP 1" >>confdefs.h
+ 
+ 
+-      echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
+     else
+-      echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-      { echo "$as_me:$LINENO: WARNING: Could not find the required paths. Please check your net-snmp installation." >&5
+-echo "$as_me: WARNING: Could not find the required paths. Please check your net-snmp installation." >&2;}
++      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find the required paths. Please check your net-snmp installation." >&5
++$as_echo "$as_me: WARNING: Could not find the required paths. Please check your net-snmp installation." >&2;}
+     fi
+   else
+                 if test "$with_snmp" != no; then
+@@ -16379,211 +9743,47 @@ echo "$as_me: WARNING: Could not find th
+         LDFLAGS="$LDFLAGS -L${with_snmp}/$CMU_LIB_SUBDIR"
+       fi
+       cmu_save_LIBS="$LIBS"
+-      echo "$as_me:$LINENO: checking for sprint_objid in -lsnmp" >&5
+-echo $ECHO_N "checking for sprint_objid in -lsnmp... $ECHO_C" >&6
+-if test "${ac_cv_lib_snmp_sprint_objid+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sprint_objid in -lsnmp" >&5
++$as_echo_n "checking for sprint_objid in -lsnmp... " >&6; }
++if test "${ac_cv_lib_snmp_sprint_objid+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsnmp ${LIB_SOCKET} $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char sprint_objid ();
+ int
+ main ()
+ {
+-sprint_objid ();
++return sprint_objid ();
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_snmp_sprint_objid=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_lib_snmp_sprint_objid=no
++  ac_cv_lib_snmp_sprint_objid=no
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_snmp_sprint_objid" >&5
+-echo "${ECHO_T}$ac_cv_lib_snmp_sprint_objid" >&6
+-if test $ac_cv_lib_snmp_sprint_objid = yes; then
+-
+-  		 if test "${ac_cv_header_ucd_snmp_version_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for ucd-snmp/version.h" >&5
+-echo $ECHO_N "checking for ucd-snmp/version.h... $ECHO_C" >&6
+-if test "${ac_cv_header_ucd_snmp_version_h+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_ucd_snmp_version_h" >&5
+-echo "${ECHO_T}$ac_cv_header_ucd_snmp_version_h" >&6
+-else
+-  # Is the header compilable?
+-echo "$as_me:$LINENO: checking ucd-snmp/version.h usability" >&5
+-echo $ECHO_N "checking ucd-snmp/version.h usability... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-#include <ucd-snmp/version.h>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_header_compiler=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_header_compiler=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
+-
+-# Is the header present?
+-echo "$as_me:$LINENO: checking ucd-snmp/version.h presence" >&5
+-echo $ECHO_N "checking ucd-snmp/version.h presence... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <ucd-snmp/version.h>
+-_ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
+-  ac_header_preproc=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-  ac_header_preproc=no
+-fi
+-rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_snmp_sprint_objid" >&5
++$as_echo "$ac_cv_lib_snmp_sprint_objid" >&6; }
++if test "x$ac_cv_lib_snmp_sprint_objid" = x""yes; then :
+ 
+-# So?  What about this header?
+-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+-  yes:no: )
+-    { echo "$as_me:$LINENO: WARNING: ucd-snmp/version.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-echo "$as_me: WARNING: ucd-snmp/version.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: ucd-snmp/version.h: proceeding with the compiler's result" >&5
+-echo "$as_me: WARNING: ucd-snmp/version.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { echo "$as_me:$LINENO: WARNING: ucd-snmp/version.h: present but cannot be compiled" >&5
+-echo "$as_me: WARNING: ucd-snmp/version.h: present but cannot be compiled" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: ucd-snmp/version.h:     check for missing prerequisite headers?" >&5
+-echo "$as_me: WARNING: ucd-snmp/version.h:     check for missing prerequisite headers?" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: ucd-snmp/version.h: see the Autoconf documentation" >&5
+-echo "$as_me: WARNING: ucd-snmp/version.h: see the Autoconf documentation" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: ucd-snmp/version.h:     section \"Present But Cannot Be Compiled\"" >&5
+-echo "$as_me: WARNING: ucd-snmp/version.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: ucd-snmp/version.h: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: ucd-snmp/version.h: proceeding with the preprocessor's result" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: ucd-snmp/version.h: in the future, the compiler will take precedence" >&5
+-echo "$as_me: WARNING: ucd-snmp/version.h: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-echo "$as_me:$LINENO: checking for ucd-snmp/version.h" >&5
+-echo $ECHO_N "checking for ucd-snmp/version.h... $ECHO_C" >&6
+-if test "${ac_cv_header_ucd_snmp_version_h+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_cv_header_ucd_snmp_version_h=$ac_header_preproc
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_ucd_snmp_version_h" >&5
+-echo "${ECHO_T}$ac_cv_header_ucd_snmp_version_h" >&6
++  		 ac_fn_c_check_header_mongrel "$LINENO" "ucd-snmp/version.h" "ac_cv_header_ucd_snmp_version_h" "$ac_includes_default"
++if test "x$ac_cv_header_ucd_snmp_version_h" = x""yes; then :
+ 
+-fi
+-if test $ac_cv_header_ucd_snmp_version_h = yes; then
+-  :
+ else
+   with_snmp=no
+ fi
+@@ -16595,83 +9795,53 @@ fi
+ 
+       LIBS="$cmu_save_LIBS"
+     fi
+-    echo "$as_me:$LINENO: checking UCD SNMP libraries" >&5
+-echo $ECHO_N "checking UCD SNMP libraries... $ECHO_C" >&6
+-    echo "$as_me:$LINENO: result: $with_snmp" >&5
+-echo "${ECHO_T}$with_snmp" >&6
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking UCD SNMP libraries" >&5
++$as_echo_n "checking UCD SNMP libraries... " >&6; }
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_snmp" >&5
++$as_echo "$with_snmp" >&6; }
+     LIB_UCDSNMP=""
+     if test "$with_snmp" != no; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_UCDSNMP 1
+-_ACEOF
++$as_echo "#define HAVE_UCDSNMP 1" >>confdefs.h
+ 
+       LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp"
+-      echo "$as_me:$LINENO: checking for rpmdbOpen in -lrpm" >&5
+-echo $ECHO_N "checking for rpmdbOpen in -lrpm... $ECHO_C" >&6
+-if test "${ac_cv_lib_rpm_rpmdbOpen+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rpmdbOpen in -lrpm" >&5
++$as_echo_n "checking for rpmdbOpen in -lrpm... " >&6; }
++if test "${ac_cv_lib_rpm_rpmdbOpen+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lrpm -lpopt $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char rpmdbOpen ();
+ int
+ main ()
+ {
+-rpmdbOpen ();
++return rpmdbOpen ();
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_rpm_rpmdbOpen=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_lib_rpm_rpmdbOpen=no
++  ac_cv_lib_rpm_rpmdbOpen=no
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_rpm_rpmdbOpen" >&5
+-echo "${ECHO_T}$ac_cv_lib_rpm_rpmdbOpen" >&6
+-if test $ac_cv_lib_rpm_rpmdbOpen = yes; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rpm_rpmdbOpen" >&5
++$as_echo "$ac_cv_lib_rpm_rpmdbOpen" >&6; }
++if test "x$ac_cv_lib_rpm_rpmdbOpen" = x""yes; then :
+   LIB_UCDSNMP="${LIB_UCDSNMP} -lrpm -lpopt"
+ fi
+ 
+@@ -16727,9 +9897,8 @@ IMAP_LIBS="${LIB_SASL} ${LIBS}"
+ 
+ 
+ 
++ac_config_files="$ac_config_files man/Makefile master/Makefile lib/Makefile imap/Makefile imtest/Makefile netnews/Makefile perl/Makefile $EXTRA_OUTPUT Makefile"
+ 
+-
+-                                                                                          ac_config_files="$ac_config_files man/Makefile master/Makefile lib/Makefile imap/Makefile imtest/Makefile netnews/Makefile perl/Makefile $EXTRA_OUTPUT Makefile"
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
+ # tests run on this system so they can be shared between configure
+@@ -16748,39 +9917,59 @@ _ACEOF
+ 
+ # The following way of writing the cache mishandles newlines in values,
+ # but we know of no workaround that is simple, portable, and efficient.
+-# So, don't put newlines in cache variables' values.
++# So, we kill variables containing newlines.
+ # Ultrix sh set writes to stderr and can't be redirected directly,
+ # and sets the high bit in the cache file unless we assign to the vars.
+-{
++(
++  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
++    eval ac_val=\$$ac_var
++    case $ac_val in #(
++    *${as_nl}*)
++      case $ac_var in #(
++      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
++      esac
++      case $ac_var in #(
++      _ | IFS | as_nl) ;; #(
++      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
++      *) { eval $ac_var=; unset $ac_var;} ;;
++      esac ;;
++    esac
++  done
++
+   (set) 2>&1 |
+-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
+-    *ac_space=\ *)
+-      # `set' does not quote correctly, so add quotes (double-quote
+-      # substitution turns \\\\ into \\, and sed turns \\ into \).
++    case $as_nl`(ac_space=' '; set) 2>&1` in #(
++    *${as_nl}ac_space=\ *)
++      # `set' does not quote correctly, so add quotes: double-quote
++      # substitution turns \\\\ into \\, and sed turns \\ into \.
+       sed -n \
+ 	"s/'/'\\\\''/g;
+ 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+-      ;;
++      ;; #(
+     *)
+       # `set' quotes correctly as required by POSIX, so do not add quotes.
+-      sed -n \
+-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
++      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+       ;;
+-    esac;
+-} |
++    esac |
++    sort
++) |
+   sed '
++     /^ac_cv_env_/b end
+      t clear
+-     : clear
++     :clear
+      s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+      t end
+-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+-     : end' >>confcache
+-if diff $cache_file confcache >/dev/null 2>&1; then :; else
+-  if test -w $cache_file; then
+-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
++     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
++     :end' >>confcache
++if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
++  if test -w "$cache_file"; then
++    test "x$cache_file" != "x/dev/null" &&
++      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
++$as_echo "$as_me: updating cache $cache_file" >&6;}
+     cat confcache >$cache_file
+   else
+-    echo "not updating unwritable cache $cache_file"
++    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
++$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+   fi
+ fi
+ rm -f confcache
+@@ -16789,32 +9978,18 @@ test "x$prefix" = xNONE && prefix=$ac_de
+ # Let make expand exec_prefix.
+ test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+ 
+-# VPATH may cause trouble with some makes, so we remove $(srcdir),
+-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+-# trailing colons and then remove the whole line if VPATH becomes empty
+-# (actually we leave an empty line to preserve line numbers).
+-if test "x$srcdir" = x.; then
+-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
+-s/:*\$(srcdir):*/:/;
+-s/:*\${srcdir}:*/:/;
+-s/:*@srcdir@:*/:/;
+-s/^\([^=]*=[	 ]*\):*/\1/;
+-s/:*$//;
+-s/^[^=]*=[	 ]*$//;
+-}'
+-fi
+-
+ DEFS=-DHAVE_CONFIG_H
+ 
+ ac_libobjs=
+ ac_ltlibobjs=
+ for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
+   # 1. Remove the extension, and $U if already installed.
+-  ac_i=`echo "$ac_i" |
+-	 sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
+-  # 2. Add them.
+-  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
+-  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
++  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
++  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
++  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
++  #    will be set to the directory where LIBOBJS objects are built.
++  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
++  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
+ done
+ LIBOBJS=$ac_libobjs
+ 
+@@ -16822,12 +9997,15 @@ LTLIBOBJS=$ac_ltlibobjs
+ 
+ 
+ 
++
+ : ${CONFIG_STATUS=./config.status}
++ac_write_fail=0
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+-echo "$as_me: creating $CONFIG_STATUS" >&6;}
+-cat >$CONFIG_STATUS <<_ACEOF
++{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
++$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
++as_write_fail=0
++cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
+ #! $SHELL
+ # Generated by $as_me.
+ # Run this file to recreate the current configuration.
+@@ -16837,230 +10015,376 @@ cat >$CONFIG_STATUS <<_ACEOF
+ debug=false
+ ac_cs_recheck=false
+ ac_cs_silent=false
+-SHELL=\${CONFIG_SHELL-$SHELL}
+-_ACEOF
+ 
+-cat >>$CONFIG_STATUS <<\_ACEOF
+-## --------------------- ##
+-## M4sh Initialization.  ##
+-## --------------------- ##
++SHELL=\${CONFIG_SHELL-$SHELL}
++export SHELL
++_ASEOF
++cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
++## -------------------- ##
++## M4sh Initialization. ##
++## -------------------- ##
+ 
+-# Be Bourne compatible
+-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
++# Be more Bourne compatible
++DUALCASE=1; export DUALCASE # for MKS sh
++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+   emulate sh
+   NULLCMD=:
+-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
++  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+   # is contrary to our usage.  Disable this feature.
+   alias -g '${1+"$@"}'='"$@"'
+-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+-  set -o posix
+-fi
+-DUALCASE=1; export DUALCASE # for MKS sh
+-
+-# Support unset when possible.
+-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+-  as_unset=unset
++  setopt NO_GLOB_SUBST
+ else
+-  as_unset=false
++  case `(set -o) 2>/dev/null` in #(
++  *posix*) :
++    set -o posix ;; #(
++  *) :
++     ;;
++esac
+ fi
+ 
+ 
+-# Work around bugs in pre-3.0 UWIN ksh.
+-$as_unset ENV MAIL MAILPATH
+-PS1='$ '
+-PS2='> '
+-PS4='+ '
+-
+-# NLS nuisances.
+-for as_var in \
+-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
+-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
+-  LC_TELEPHONE LC_TIME
+-do
+-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
+-    eval $as_var=C; export $as_var
+-  else
+-    $as_unset $as_var
++as_nl='
++'
++export as_nl
++# Printing a long string crashes Solaris 7 /usr/bin/printf.
++as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
++as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
++as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
++# Prefer a ksh shell builtin over an external printf program on Solaris,
++# but without wasting forks for bash or zsh.
++if test -z "$BASH_VERSION$ZSH_VERSION" \
++    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
++  as_echo='print -r --'
++  as_echo_n='print -rn --'
++elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
++  as_echo='printf %s\n'
++  as_echo_n='printf %s'
++else
++  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
++    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
++    as_echo_n='/usr/ucb/echo -n'
++  else
++    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
++    as_echo_n_body='eval
++      arg=$1;
++      case $arg in #(
++      *"$as_nl"*)
++	expr "X$arg" : "X\\(.*\\)$as_nl";
++	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
++      esac;
++      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
++    '
++    export as_echo_n_body
++    as_echo_n='sh -c $as_echo_n_body as_echo'
+   fi
+-done
+-
+-# Required to use basename.
+-if expr a : '\(a\)' >/dev/null 2>&1; then
+-  as_expr=expr
+-else
+-  as_expr=false
+-fi
+-
+-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
+-  as_basename=basename
+-else
+-  as_basename=false
++  export as_echo_body
++  as_echo='sh -c $as_echo_body as_echo'
+ fi
+ 
+-
+-# Name of the executable.
+-as_me=`$as_basename "$0" ||
+-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+-	 X"$0" : 'X\(//\)$' \| \
+-	 X"$0" : 'X\(/\)$' \| \
+-	 .     : '\(.\)' 2>/dev/null ||
+-echo X/"$0" |
+-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
+-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
+-  	  /^X\/\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`
+-
+-
+-# PATH needs CR, and LINENO needs CR and PATH.
+-# Avoid depending upon Character Ranges.
+-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+-as_cr_digits='0123456789'
+-as_cr_alnum=$as_cr_Letters$as_cr_digits
+-
+ # The user is always right.
+ if test "${PATH_SEPARATOR+set}" != set; then
+-  echo "#! /bin/sh" >conf$$.sh
+-  echo  "exit 0"   >>conf$$.sh
+-  chmod +x conf$$.sh
+-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+-    PATH_SEPARATOR=';'
+-  else
+-    PATH_SEPARATOR=:
+-  fi
+-  rm -f conf$$.sh
++  PATH_SEPARATOR=:
++  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
++    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
++      PATH_SEPARATOR=';'
++  }
+ fi
+ 
+ 
+-  as_lineno_1=$LINENO
+-  as_lineno_2=$LINENO
+-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+-  test "x$as_lineno_1" != "x$as_lineno_2" &&
+-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
+-  # Find who we are.  Look in the path if we contain no path at all
+-  # relative or not.
+-  case $0 in
+-    *[\\/]* ) as_myself=$0 ;;
+-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++# IFS
++# We need space, tab and new line, in precisely that order.  Quoting is
++# there to prevent editors from complaining about space-tab.
++# (If _AS_PATH_WALK were called with IFS unset, it would disable word
++# splitting by setting IFS to empty value.)
++IFS=" ""	$as_nl"
++
++# Find who we are.  Look in the path if we contain no directory separator.
++case $0 in #((
++  *[\\/]* ) as_myself=$0 ;;
++  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+-done
++    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
++  done
++IFS=$as_save_IFS
+ 
+-       ;;
+-  esac
+-  # We did not find ourselves, most probably we were run as `sh COMMAND'
+-  # in which case we are not to be found in the path.
+-  if test "x$as_myself" = x; then
+-    as_myself=$0
+-  fi
+-  if test ! -f "$as_myself"; then
+-    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
+-echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
+-   { (exit 1); exit 1; }; }
+-  fi
+-  case $CONFIG_SHELL in
+-  '')
+-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for as_base in sh bash ksh sh5; do
+-	 case $as_dir in
+-	 /*)
+-	   if ("$as_dir/$as_base" -c '
+-  as_lineno_1=$LINENO
+-  as_lineno_2=$LINENO
+-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+-  test "x$as_lineno_1" != "x$as_lineno_2" &&
+-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
+-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
+-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
+-	     CONFIG_SHELL=$as_dir/$as_base
+-	     export CONFIG_SHELL
+-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
+-	   fi;;
+-	 esac
+-       done
++     ;;
++esac
++# We did not find ourselves, most probably we were run as `sh COMMAND'
++# in which case we are not to be found in the path.
++if test "x$as_myself" = x; then
++  as_myself=$0
++fi
++if test ! -f "$as_myself"; then
++  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
++  exit 1
++fi
++
++# Unset variables that we do not need and which cause bugs (e.g. in
++# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
++# suppresses any "Segmentation fault" message there.  '((' could
++# trigger a bug in pdksh 5.2.14.
++for as_var in BASH_ENV ENV MAIL MAILPATH
++do eval test x\${$as_var+set} = xset \
++  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+ done
+-;;
+-  esac
++PS1='$ '
++PS2='> '
++PS4='+ '
+ 
+-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+-  # uniformly replaced by the line number.  The first 'sed' inserts a
+-  # line-number line before each line; the second 'sed' does the real
+-  # work.  The second script uses 'N' to pair each line-number line
+-  # with the numbered line, and appends trailing '-' during
+-  # substitution so that $LINENO is not a special case at line end.
+-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
+-  sed '=' <$as_myself |
+-    sed '
+-      N
+-      s,$,-,
+-      : loop
+-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
+-      t loop
+-      s,-$,,
+-      s,^['$as_cr_digits']*\n,,
+-    ' >$as_me.lineno &&
+-  chmod +x $as_me.lineno ||
+-    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
+-echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
+-   { (exit 1); exit 1; }; }
++# NLS nuisances.
++LC_ALL=C
++export LC_ALL
++LANGUAGE=C
++export LANGUAGE
+ 
+-  # Don't try to exec as it changes $[0], causing all sort of problems
+-  # (the dirname of $[0] is not the place where we might find the
+-  # original and so on.  Autoconf is especially sensible to this).
+-  . ./$as_me.lineno
+-  # Exit status is that of the last command.
+-  exit
+-}
++# CDPATH.
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+ 
+ 
+-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
+-  *c*,-n*) ECHO_N= ECHO_C='
+-' ECHO_T='	' ;;
+-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
+-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
+-esac
++# as_fn_error ERROR [LINENO LOG_FD]
++# ---------------------------------
++# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
++# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
++# script with status $?, using 1 if that was 0.
++as_fn_error ()
++{
++  as_status=$?; test $as_status -eq 0 && as_status=1
++  if test "$3"; then
++    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
++  fi
++  $as_echo "$as_me: error: $1" >&2
++  as_fn_exit $as_status
++} # as_fn_error
++
++
++# as_fn_set_status STATUS
++# -----------------------
++# Set $? to STATUS, without forking.
++as_fn_set_status ()
++{
++  return $1
++} # as_fn_set_status
++
++# as_fn_exit STATUS
++# -----------------
++# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
++as_fn_exit ()
++{
++  set +e
++  as_fn_set_status $1
++  exit $1
++} # as_fn_exit
++
++# as_fn_unset VAR
++# ---------------
++# Portably unset VAR.
++as_fn_unset ()
++{
++  { eval $1=; unset $1;}
++}
++as_unset=as_fn_unset
++# as_fn_append VAR VALUE
++# ----------------------
++# Append the text in VALUE to the end of the definition contained in VAR. Take
++# advantage of any shell optimizations that allow amortized linear growth over
++# repeated appends, instead of the typical quadratic growth present in naive
++# implementations.
++if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
++  eval 'as_fn_append ()
++  {
++    eval $1+=\$2
++  }'
++else
++  as_fn_append ()
++  {
++    eval $1=\$$1\$2
++  }
++fi # as_fn_append
++
++# as_fn_arith ARG...
++# ------------------
++# Perform arithmetic evaluation on the ARGs, and store the result in the
++# global $as_val. Take advantage of shells that can avoid forks. The arguments
++# must be portable across $(()) and expr.
++if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
++  eval 'as_fn_arith ()
++  {
++    as_val=$(( $* ))
++  }'
++else
++  as_fn_arith ()
++  {
++    as_val=`expr "$@" || test $? -eq 1`
++  }
++fi # as_fn_arith
++
+ 
+-if expr a : '\(a\)' >/dev/null 2>&1; then
++if expr a : '\(a\)' >/dev/null 2>&1 &&
++   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+   as_expr=expr
+ else
+   as_expr=false
+ fi
+ 
++if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
++  as_basename=basename
++else
++  as_basename=false
++fi
++
++if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
++  as_dirname=dirname
++else
++  as_dirname=false
++fi
++
++as_me=`$as_basename -- "$0" ||
++$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
++	 X"$0" : 'X\(//\)$' \| \
++	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
++$as_echo X/"$0" |
++    sed '/^.*\/\([^/][^/]*\)\/*$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\/\(\/\/\)$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\/\(\/\).*/{
++	    s//\1/
++	    q
++	  }
++	  s/.*/./; q'`
++
++# Avoid depending upon Character Ranges.
++as_cr_letters='abcdefghijklmnopqrstuvwxyz'
++as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
++as_cr_Letters=$as_cr_letters$as_cr_LETTERS
++as_cr_digits='0123456789'
++as_cr_alnum=$as_cr_Letters$as_cr_digits
++
++ECHO_C= ECHO_N= ECHO_T=
++case `echo -n x` in #(((((
++-n*)
++  case `echo 'xy\c'` in
++  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
++  xy)  ECHO_C='\c';;
++  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
++       ECHO_T='	';;
++  esac;;
++*)
++  ECHO_N='-n';;
++esac
++
+ rm -f conf$$ conf$$.exe conf$$.file
+-echo >conf$$.file
+-if ln -s conf$$.file conf$$ 2>/dev/null; then
+-  # We could just check for DJGPP; but this test a) works b) is more generic
+-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
+-  if test -f conf$$.exe; then
+-    # Don't use ln at all; we don't have any links
+-    as_ln_s='cp -p'
+-  else
++if test -d conf$$.dir; then
++  rm -f conf$$.dir/conf$$.file
++else
++  rm -f conf$$.dir
++  mkdir conf$$.dir 2>/dev/null
++fi
++if (echo >conf$$.file) 2>/dev/null; then
++  if ln -s conf$$.file conf$$ 2>/dev/null; then
+     as_ln_s='ln -s'
++    # ... but there are two gotchas:
++    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
++    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
++    # In both cases, we have to default to `cp -p'.
++    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
++      as_ln_s='cp -p'
++  elif ln conf$$.file conf$$ 2>/dev/null; then
++    as_ln_s=ln
++  else
++    as_ln_s='cp -p'
+   fi
+-elif ln conf$$.file conf$$ 2>/dev/null; then
+-  as_ln_s=ln
+ else
+   as_ln_s='cp -p'
+ fi
+-rm -f conf$$ conf$$.exe conf$$.file
++rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
++rmdir conf$$.dir 2>/dev/null
++
++
++# as_fn_mkdir_p
++# -------------
++# Create "$as_dir" as a directory, including parents if necessary.
++as_fn_mkdir_p ()
++{
++
++  case $as_dir in #(
++  -*) as_dir=./$as_dir;;
++  esac
++  test -d "$as_dir" || eval $as_mkdir_p || {
++    as_dirs=
++    while :; do
++      case $as_dir in #(
++      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
++      *) as_qdir=$as_dir;;
++      esac
++      as_dirs="'$as_qdir' $as_dirs"
++      as_dir=`$as_dirname -- "$as_dir" ||
++$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++	 X"$as_dir" : 'X\(//\)[^/]' \| \
++	 X"$as_dir" : 'X\(//\)$' \| \
++	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
++$as_echo X"$as_dir" |
++    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\/\)[^/].*/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\/\)$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\).*/{
++	    s//\1/
++	    q
++	  }
++	  s/.*/./; q'`
++      test -d "$as_dir" && break
++    done
++    test -z "$as_dirs" || eval "mkdir $as_dirs"
++  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+ 
++
++} # as_fn_mkdir_p
+ if mkdir -p . 2>/dev/null; then
+-  as_mkdir_p=:
++  as_mkdir_p='mkdir -p "$as_dir"'
+ else
+   test -d ./-p && rmdir ./-p
+   as_mkdir_p=false
+ fi
+ 
+-as_executable_p="test -f"
++if test -x / >/dev/null 2>&1; then
++  as_test_x='test -x'
++else
++  if ls -dL / >/dev/null 2>&1; then
++    as_ls_L_option=L
++  else
++    as_ls_L_option=
++  fi
++  as_test_x='
++    eval sh -c '\''
++      if test -d "$1"; then
++	test -d "$1/.";
++      else
++	case $1 in #(
++	-*)set "./$1";;
++	esac;
++	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
++	???[sx]*):;;*)false;;esac;fi
++    '\'' sh
++  '
++fi
++as_executable_p=$as_test_x
+ 
+ # Sed expression to map a string onto a valid CPP name.
+ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+@@ -17069,31 +10393,20 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P
+ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+ 
+ 
+-# IFS
+-# We need space, tab and new line, in precisely that order.
+-as_nl='
+-'
+-IFS=" 	$as_nl"
+-
+-# CDPATH.
+-$as_unset CDPATH
+-
+ exec 6>&1
++## ----------------------------------- ##
++## Main body of $CONFIG_STATUS script. ##
++## ----------------------------------- ##
++_ASEOF
++test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
+ 
+-# Open the log real soon, to keep \$[0] and so on meaningful, and to
++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
++# Save the log message, to keep $0 and so on meaningful, and to
+ # report actual input values of CONFIG_FILES etc. instead of their
+-# values after options handling.  Logging --version etc. is OK.
+-exec 5>>config.log
+-{
+-  echo
+-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+-## Running $as_me. ##
+-_ASBOX
+-} >&5
+-cat >&5 <<_CSEOF
+-
++# values after options handling.
++ac_log="
+ This file was extended by $as_me, which was
+-generated by GNU Autoconf 2.59.  Invocation command line was
++generated by GNU Autoconf 2.65.  Invocation command line was
+ 
+   CONFIG_FILES    = $CONFIG_FILES
+   CONFIG_HEADERS  = $CONFIG_HEADERS
+@@ -17101,45 +10414,46 @@ generated by GNU Autoconf 2.59.  Invocat
+   CONFIG_COMMANDS = $CONFIG_COMMANDS
+   $ $0 $@
+ 
+-_CSEOF
+-echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
+-echo >&5
++on `(hostname || uname -n) 2>/dev/null | sed 1q`
++"
++
+ _ACEOF
+ 
+-# Files that config.status was made for.
+-if test -n "$ac_config_files"; then
+-  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
+-fi
++case $ac_config_files in *"
++"*) set x $ac_config_files; shift; ac_config_files=$*;;
++esac
+ 
+-if test -n "$ac_config_headers"; then
+-  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
+-fi
++case $ac_config_headers in *"
++"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
++esac
+ 
+-if test -n "$ac_config_links"; then
+-  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
+-fi
+ 
+-if test -n "$ac_config_commands"; then
+-  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
+-fi
++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
++# Files that config.status was made for.
++config_files="$ac_config_files"
++config_headers="$ac_config_headers"
+ 
+-cat >>$CONFIG_STATUS <<\_ACEOF
++_ACEOF
+ 
++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+ ac_cs_usage="\
+-\`$as_me' instantiates files from templates according to the
+-current configuration.
++\`$as_me' instantiates files and other configuration actions
++from templates according to the current configuration.  Unless the files
++and actions are specified as TAGs, all are instantiated by default.
+ 
+-Usage: $0 [OPTIONS] [FILE]...
++Usage: $0 [OPTION]... [TAG]...
+ 
+   -h, --help       print this help, then exit
+-  -V, --version    print version number, then exit
+-  -q, --quiet      do not print progress messages
++  -V, --version    print version number and configuration settings, then exit
++      --config     print configuration, then exit
++  -q, --quiet, --silent
++                   do not print progress messages
+   -d, --debug      don't remove temporary files
+       --recheck    update $as_me by reconfiguring in the same conditions
+-  --file=FILE[:TEMPLATE]
+-		   instantiate the configuration file FILE
+-  --header=FILE[:TEMPLATE]
+-		   instantiate the configuration header FILE
++      --file=FILE[:TEMPLATE]
++                   instantiate the configuration file FILE
++      --header=FILE[:TEMPLATE]
++                   instantiate the configuration header FILE
+ 
+ Configuration files:
+ $config_files
+@@ -17147,84 +10461,85 @@ $config_files
+ Configuration headers:
+ $config_headers
+ 
+-Report bugs to <bug-autoconf@gnu.org>."
+-_ACEOF
++Report bugs to the package provider."
+ 
+-cat >>$CONFIG_STATUS <<_ACEOF
++_ACEOF
++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
++ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
+ ac_cs_version="\\
+ config.status
+-configured by $0, generated by GNU Autoconf 2.59,
+-  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
++configured by $0, generated by GNU Autoconf 2.65,
++  with options \\"\$ac_cs_config\\"
+ 
+-Copyright (C) 2003 Free Software Foundation, Inc.
++Copyright (C) 2009 Free Software Foundation, Inc.
+ This config.status script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it."
+-srcdir=$srcdir
+-INSTALL="$INSTALL"
++
++ac_pwd='$ac_pwd'
++srcdir='$srcdir'
++INSTALL='$INSTALL'
++AWK='$AWK'
++test -n "\$AWK" || AWK=awk
+ _ACEOF
+ 
+-cat >>$CONFIG_STATUS <<\_ACEOF
+-# If no file are specified by the user, then we need to provide default
+-# value.  By we need to know if files were specified by the user.
++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
++# The default lists apply if the user does not specify any file.
+ ac_need_defaults=:
+ while test $# != 0
+ do
+   case $1 in
+   --*=*)
+-    ac_option=`expr "x$1" : 'x\([^=]*\)='`
+-    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
++    ac_option=`expr "X$1" : 'X\([^=]*\)='`
++    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
+     ac_shift=:
+     ;;
+-  -*)
++  *)
+     ac_option=$1
+     ac_optarg=$2
+     ac_shift=shift
+     ;;
+-  *) # This is not an option, so the user has probably given explicit
+-     # arguments.
+-     ac_option=$1
+-     ac_need_defaults=false;;
+   esac
+ 
+   case $ac_option in
+   # Handling of the options.
+-_ACEOF
+-cat >>$CONFIG_STATUS <<\_ACEOF
+   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+     ac_cs_recheck=: ;;
+-  --version | --vers* | -V )
+-    echo "$ac_cs_version"; exit 0 ;;
+-  --he | --h)
+-    # Conflict between --help and --header
+-    { { echo "$as_me:$LINENO: error: ambiguous option: $1
+-Try \`$0 --help' for more information." >&5
+-echo "$as_me: error: ambiguous option: $1
+-Try \`$0 --help' for more information." >&2;}
+-   { (exit 1); exit 1; }; };;
+-  --help | --hel | -h )
+-    echo "$ac_cs_usage"; exit 0 ;;
+-  --debug | --d* | -d )
++  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
++    $as_echo "$ac_cs_version"; exit ;;
++  --config | --confi | --conf | --con | --co | --c )
++    $as_echo "$ac_cs_config"; exit ;;
++  --debug | --debu | --deb | --de | --d | -d )
+     debug=: ;;
+   --file | --fil | --fi | --f )
+     $ac_shift
+-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
++    case $ac_optarg in
++    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
++    esac
++    as_fn_append CONFIG_FILES " '$ac_optarg'"
+     ac_need_defaults=false;;
+   --header | --heade | --head | --hea )
+     $ac_shift
+-    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
++    case $ac_optarg in
++    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
++    esac
++    as_fn_append CONFIG_HEADERS " '$ac_optarg'"
+     ac_need_defaults=false;;
++  --he | --h)
++    # Conflict between --help and --header
++    as_fn_error "ambiguous option: \`$1'
++Try \`$0 --help' for more information.";;
++  --help | --hel | -h )
++    $as_echo "$ac_cs_usage"; exit ;;
+   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+   | -silent | --silent | --silen | --sile | --sil | --si | --s)
+     ac_cs_silent=: ;;
+ 
+   # This is an error.
+-  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
+-Try \`$0 --help' for more information." >&5
+-echo "$as_me: error: unrecognized option: $1
+-Try \`$0 --help' for more information." >&2;}
+-   { (exit 1); exit 1; }; } ;;
++  -*) as_fn_error "unrecognized option: \`$1'
++Try \`$0 --help' for more information." ;;
+ 
+-  *) ac_config_targets="$ac_config_targets $1" ;;
++  *) as_fn_append ac_config_targets " $1"
++     ac_need_defaults=false ;;
+ 
+   esac
+   shift
+@@ -17238,39 +10553,53 @@ if $ac_cs_silent; then
+ fi
+ 
+ _ACEOF
+-cat >>$CONFIG_STATUS <<_ACEOF
++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ if \$ac_cs_recheck; then
+-  echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
+-  exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
++  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
++  shift
++  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
++  CONFIG_SHELL='$SHELL'
++  export CONFIG_SHELL
++  exec "\$@"
+ fi
+ 
+ _ACEOF
++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
++exec 5>>config.log
++{
++  echo
++  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
++## Running $as_me. ##
++_ASBOX
++  $as_echo "$ac_log"
++} >&5
+ 
++_ACEOF
++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
++_ACEOF
+ 
++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+ 
+-
+-
+-cat >>$CONFIG_STATUS <<\_ACEOF
++# Handling of arguments.
+ for ac_config_target in $ac_config_targets
+ do
+-  case "$ac_config_target" in
+-  # Handling of arguments.
+-  "man/Makefile" ) CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
+-  "master/Makefile" ) CONFIG_FILES="$CONFIG_FILES master/Makefile" ;;
+-  "lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
+-  "imap/Makefile" ) CONFIG_FILES="$CONFIG_FILES imap/Makefile" ;;
+-  "imtest/Makefile" ) CONFIG_FILES="$CONFIG_FILES imtest/Makefile" ;;
+-  "netnews/Makefile" ) CONFIG_FILES="$CONFIG_FILES netnews/Makefile" ;;
+-  "perl/Makefile" ) CONFIG_FILES="$CONFIG_FILES perl/Makefile" ;;
+-  "$EXTRA_OUTPUT" ) CONFIG_FILES="$CONFIG_FILES $EXTRA_OUTPUT" ;;
+-  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+-  "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
+-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+-   { (exit 1); exit 1; }; };;
++  case $ac_config_target in
++    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
++    "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
++    "master/Makefile") CONFIG_FILES="$CONFIG_FILES master/Makefile" ;;
++    "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
++    "imap/Makefile") CONFIG_FILES="$CONFIG_FILES imap/Makefile" ;;
++    "imtest/Makefile") CONFIG_FILES="$CONFIG_FILES imtest/Makefile" ;;
++    "netnews/Makefile") CONFIG_FILES="$CONFIG_FILES netnews/Makefile" ;;
++    "perl/Makefile") CONFIG_FILES="$CONFIG_FILES perl/Makefile" ;;
++    "$EXTRA_OUTPUT") CONFIG_FILES="$CONFIG_FILES $EXTRA_OUTPUT" ;;
++    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
++
++  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+   esac
+ done
+ 
++
+ # If the user did not use the arguments to specify the items to instantiate,
+ # then the envvar interface is used.  Set only those that are not.
+ # We use the long form for the default assignment because of an extremely
+@@ -17281,632 +10610,539 @@ if $ac_need_defaults; then
+ fi
+ 
+ # Have a temporary directory for convenience.  Make it in the build tree
+-# simply because there is no reason to put it here, and in addition,
++# simply because there is no reason against having it here, and in addition,
+ # creating and moving files from /tmp can sometimes cause problems.
+-# Create a temporary directory, and hook for its removal unless debugging.
++# Hook for its removal unless debugging.
++# Note that there is a small window in which the directory will not be cleaned:
++# after its creation but before its name has been assigned to `$tmp'.
+ $debug ||
+ {
+-  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
+-  trap '{ (exit 1); exit 1; }' 1 2 13 15
++  tmp=
++  trap 'exit_status=$?
++  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
++' 0
++  trap 'as_fn_exit 1' 1 2 13 15
+ }
+-
+ # Create a (secure) tmp directory for tmp files.
+ 
+ {
+-  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
++  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
+   test -n "$tmp" && test -d "$tmp"
+ }  ||
+ {
+-  tmp=./confstat$$-$RANDOM
+-  (umask 077 && mkdir $tmp)
+-} ||
++  tmp=./conf$$-$RANDOM
++  (umask 077 && mkdir "$tmp")
++} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
++
++# Set up the scripts for CONFIG_FILES section.
++# No need to generate them if there are no CONFIG_FILES.
++# This happens for instance with `./config.status config.h'.
++if test -n "$CONFIG_FILES"; then
++
++
++ac_cr=`echo X | tr X '\015'`
++# On cygwin, bash can eat \r inside `` if the user requested igncr.
++# But we know of no other shell where ac_cr would be empty at this
++# point, so we can use a bashism as a fallback.
++if test "x$ac_cr" = x; then
++  eval ac_cr=\$\'\\r\'
++fi
++ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
++if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
++  ac_cs_awk_cr='\r'
++else
++  ac_cs_awk_cr=$ac_cr
++fi
++
++echo 'BEGIN {' >"$tmp/subs1.awk" &&
++_ACEOF
++
++
+ {
+-   echo "$me: cannot create a temporary directory in ." >&2
+-   { (exit 1); exit 1; }
++  echo "cat >conf$$subs.awk <<_ACEOF" &&
++  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
++  echo "_ACEOF"
++} >conf$$subs.sh ||
++  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
++ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
++ac_delim='%!_!# '
++for ac_last_try in false false false false false :; do
++  . ./conf$$subs.sh ||
++    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
++
++  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
++  if test $ac_delim_n = $ac_delim_num; then
++    break
++  elif $ac_last_try; then
++    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
++  else
++    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
++  fi
++done
++rm -f conf$$subs.sh
++
++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
++cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
++_ACEOF
++sed -n '
++h
++s/^/S["/; s/!.*/"]=/
++p
++g
++s/^[^!]*!//
++:repl
++t repl
++s/'"$ac_delim"'$//
++t delim
++:nl
++h
++s/\(.\{148\}\)..*/\1/
++t more1
++s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
++p
++n
++b repl
++:more1
++s/["\\]/\\&/g; s/^/"/; s/$/"\\/
++p
++g
++s/.\{148\}//
++t nl
++:delim
++h
++s/\(.\{148\}\)..*/\1/
++t more2
++s/["\\]/\\&/g; s/^/"/; s/$/"/
++p
++b
++:more2
++s/["\\]/\\&/g; s/^/"/; s/$/"\\/
++p
++g
++s/.\{148\}//
++t delim
++' <conf$$subs.awk | sed '
++/^[^""]/{
++  N
++  s/\n//
++}
++' >>$CONFIG_STATUS || ac_write_fail=1
++rm -f conf$$subs.awk
++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
++_ACAWK
++cat >>"\$tmp/subs1.awk" <<_ACAWK &&
++  for (key in S) S_is_set[key] = 1
++  FS = ""
++
++}
++{
++  line = $ 0
++  nfields = split(line, field, "@")
++  substed = 0
++  len = length(field[1])
++  for (i = 2; i < nfields; i++) {
++    key = field[i]
++    keylen = length(key)
++    if (S_is_set[key]) {
++      value = S[key]
++      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
++      len += length(value) + length(field[++i])
++      substed = 1
++    } else
++      len += 1 + keylen
++  }
++
++  print line
+ }
+ 
++_ACAWK
++_ACEOF
++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
++if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
++  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
++else
++  cat
++fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
++  || as_fn_error "could not setup config files machinery" "$LINENO" 5
+ _ACEOF
+ 
+-cat >>$CONFIG_STATUS <<_ACEOF
++# VPATH may cause trouble with some makes, so we remove $(srcdir),
++# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
++# trailing colons and then remove the whole line if VPATH becomes empty
++# (actually we leave an empty line to preserve line numbers).
++if test "x$srcdir" = x.; then
++  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
++s/:*\$(srcdir):*/:/
++s/:*\${srcdir}:*/:/
++s/:*@srcdir@:*/:/
++s/^\([^=]*=[	 ]*\):*/\1/
++s/:*$//
++s/^[^=]*=[	 ]*$//
++}'
++fi
+ 
+-#
+-# CONFIG_FILES section.
+-#
++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
++fi # test -n "$CONFIG_FILES"
+ 
+-# No need to generate the scripts if there are no CONFIG_FILES.
+-# This happens for instance when ./config.status config.h
+-if test -n "\$CONFIG_FILES"; then
+-  # Protect against being on the right side of a sed subst in config.status.
+-  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
+-   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
+-s,@SHELL@,$SHELL,;t t
+-s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
+-s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
+-s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
+-s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
+-s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
+-s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
+-s,@exec_prefix@,$exec_prefix,;t t
+-s,@prefix@,$prefix,;t t
+-s,@program_transform_name@,$program_transform_name,;t t
+-s,@bindir@,$bindir,;t t
+-s,@sbindir@,$sbindir,;t t
+-s,@libexecdir@,$libexecdir,;t t
+-s,@datadir@,$datadir,;t t
+-s,@sysconfdir@,$sysconfdir,;t t
+-s,@sharedstatedir@,$sharedstatedir,;t t
+-s,@localstatedir@,$localstatedir,;t t
+-s,@libdir@,$libdir,;t t
+-s,@includedir@,$includedir,;t t
+-s,@oldincludedir@,$oldincludedir,;t t
+-s,@infodir@,$infodir,;t t
+-s,@mandir@,$mandir,;t t
+-s,@build_alias@,$build_alias,;t t
+-s,@host_alias@,$host_alias,;t t
+-s,@target_alias@,$target_alias,;t t
+-s,@DEFS@,$DEFS,;t t
+-s,@ECHO_C@,$ECHO_C,;t t
+-s,@ECHO_N@,$ECHO_N,;t t
+-s,@ECHO_T@,$ECHO_T,;t t
+-s,@LIBS@,$LIBS,;t t
+-s,@build@,$build,;t t
+-s,@build_cpu@,$build_cpu,;t t
+-s,@build_vendor@,$build_vendor,;t t
+-s,@build_os@,$build_os,;t t
+-s,@host@,$host,;t t
+-s,@host_cpu@,$host_cpu,;t t
+-s,@host_vendor@,$host_vendor,;t t
+-s,@host_os@,$host_os,;t t
+-s,@MAKEDEPEND@,$MAKEDEPEND,;t t
+-s,@cyrus_prefix@,$cyrus_prefix,;t t
+-s,@service_path@,$service_path,;t t
+-s,@cyrus_user@,$cyrus_user,;t t
+-s,@cyrus_group@,$cyrus_group,;t t
+-s,@CC@,$CC,;t t
+-s,@CFLAGS@,$CFLAGS,;t t
+-s,@LDFLAGS@,$LDFLAGS,;t t
+-s,@CPPFLAGS@,$CPPFLAGS,;t t
+-s,@ac_ct_CC@,$ac_ct_CC,;t t
+-s,@EXEEXT@,$EXEEXT,;t t
+-s,@OBJEXT@,$OBJEXT,;t t
+-s,@RANLIB@,$RANLIB,;t t
+-s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
+-s,@SET_MAKE@,$SET_MAKE,;t t
+-s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
+-s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
+-s,@INSTALL_DATA@,$INSTALL_DATA,;t t
+-s,@CPP@,$CPP,;t t
+-s,@EGREP@,$EGREP,;t t
+-s,@AWK@,$AWK,;t t
+-s,@LIBOBJS@,$LIBOBJS,;t t
+-s,@LIB_SOCKET@,$LIB_SOCKET,;t t
+-s,@IPV6_OBJS@,$IPV6_OBJS,;t t
+-s,@PRE_SUBDIRS@,$PRE_SUBDIRS,;t t
+-s,@EXTRA_SUBDIRS@,$EXTRA_SUBDIRS,;t t
+-s,@DEPLIBS@,$DEPLIBS,;t t
+-s,@LOCALDEFS@,$LOCALDEFS,;t t
+-s,@BDB_INC@,$BDB_INC,;t t
+-s,@BDB_LIB@,$BDB_LIB,;t t
+-s,@CYRUSDB_OBJS@,$CYRUSDB_OBJS,;t t
+-s,@SIEVE_OBJS@,$SIEVE_OBJS,;t t
+-s,@SIEVE_LIBS@,$SIEVE_LIBS,;t t
+-s,@SIEVE_CPPFLAGS@,$SIEVE_CPPFLAGS,;t t
+-s,@YACC@,$YACC,;t t
+-s,@LEX@,$LEX,;t t
+-s,@LEXLIB@,$LEXLIB,;t t
+-s,@LEX_OUTPUT_ROOT@,$LEX_OUTPUT_ROOT,;t t
+-s,@SIEVE_SUBDIRS@,$SIEVE_SUBDIRS,;t t
+-s,@WITH_NONBLOCK@,$WITH_NONBLOCK,;t t
+-s,@WITH_GMTOFF@,$WITH_GMTOFF,;t t
+-s,@WITH_MAP@,$WITH_MAP,;t t
+-s,@WITH_LOCK@,$WITH_LOCK,;t t
+-s,@cyrus_sigveclib@,$cyrus_sigveclib,;t t
+-s,@AFS_LIBS@,$AFS_LIBS,;t t
+-s,@AFS_LDFLAGS@,$AFS_LDFLAGS,;t t
+-s,@LDAP_CPPFLAGS@,$LDAP_CPPFLAGS,;t t
+-s,@LDAP_LDFLAGS@,$LDAP_LDFLAGS,;t t
+-s,@LDAP_LIBS@,$LDAP_LIBS,;t t
+-s,@SERVER_SUBDIRS@,$SERVER_SUBDIRS,;t t
+-s,@OPENSSL_INC@,$OPENSSL_INC,;t t
+-s,@OPENSSL_LIB@,$OPENSSL_LIB,;t t
+-s,@ZEPHYR_LIBS@,$ZEPHYR_LIBS,;t t
+-s,@ZEPHYR_CPPFLAGS@,$ZEPHYR_CPPFLAGS,;t t
+-s,@WITH_IDLE@,$WITH_IDLE,;t t
+-s,@IMAP_PROGS@,$IMAP_PROGS,;t t
+-s,@COMPILE_ET@,$COMPILE_ET,;t t
+-s,@COM_ERR_LIBS@,$COM_ERR_LIBS,;t t
+-s,@COM_ERR_LDFLAGS@,$COM_ERR_LDFLAGS,;t t
+-s,@COM_ERR_CPPFLAGS@,$COM_ERR_CPPFLAGS,;t t
+-s,@LIB_CRYPT@,$LIB_CRYPT,;t t
+-s,@GSSAPI_LIBS@,$GSSAPI_LIBS,;t t
+-s,@GSSAPIBASE_LIBS@,$GSSAPIBASE_LIBS,;t t
+-s,@LIB_DYN_SASL@,$LIB_DYN_SASL,;t t
+-s,@DYNSASLFLAGS@,$DYNSASLFLAGS,;t t
+-s,@LIB_SASL@,$LIB_SASL,;t t
+-s,@SASLFLAGS@,$SASLFLAGS,;t t
+-s,@PERL@,$PERL,;t t
+-s,@PERL_CCCDLFLAGS@,$PERL_CCCDLFLAGS,;t t
+-s,@MD5OBJ@,$MD5OBJ,;t t
+-s,@SNMP_SUBDIRS@,$SNMP_SUBDIRS,;t t
+-s,@CMU_LIB_SUBDIR@,$CMU_LIB_SUBDIR,;t t
+-s,@LIB_WRAP@,$LIB_WRAP,;t t
+-s,@SNMP_CONFIG@,$SNMP_CONFIG,;t t
+-s,@LIB_UCDSNMP@,$LIB_UCDSNMP,;t t
+-s,@LIB_RT@,$LIB_RT,;t t
+-s,@IMAP_COM_ERR_LIBS@,$IMAP_COM_ERR_LIBS,;t t
+-s,@IMAP_LIBS@,$IMAP_LIBS,;t t
+-s,@PERL_SUBDIRS@,$PERL_SUBDIRS,;t t
+-s,@PERL_DEPSUBDIRS@,$PERL_DEPSUBDIRS,;t t
+-s,@LTLIBOBJS@,$LTLIBOBJS,;t t
+-CEOF
+-
+-_ACEOF
+-
+-  cat >>$CONFIG_STATUS <<\_ACEOF
+-  # Split the substitutions into bite-sized pieces for seds with
+-  # small command number limits, like on Digital OSF/1 and HP-UX.
+-  ac_max_sed_lines=48
+-  ac_sed_frag=1 # Number of current file.
+-  ac_beg=1 # First line for current file.
+-  ac_end=$ac_max_sed_lines # Line after last line for current file.
+-  ac_more_lines=:
+-  ac_sed_cmds=
+-  while $ac_more_lines; do
+-    if test $ac_beg -gt 1; then
+-      sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
+-    else
+-      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
+-    fi
+-    if test ! -s $tmp/subs.frag; then
+-      ac_more_lines=false
+-    else
+-      # The purpose of the label and of the branching condition is to
+-      # speed up the sed processing (if there are no `@' at all, there
+-      # is no need to browse any of the substitutions).
+-      # These are the two extra sed commands mentioned above.
+-      (echo ':t
+-  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
+-      if test -z "$ac_sed_cmds"; then
+-	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
+-      else
+-	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
+-      fi
+-      ac_sed_frag=`expr $ac_sed_frag + 1`
+-      ac_beg=$ac_end
+-      ac_end=`expr $ac_end + $ac_max_sed_lines`
+-    fi
+-  done
+-  if test -z "$ac_sed_cmds"; then
+-    ac_sed_cmds=cat
++# Set up the scripts for CONFIG_HEADERS section.
++# No need to generate them if there are no CONFIG_HEADERS.
++# This happens for instance with `./config.status Makefile'.
++if test -n "$CONFIG_HEADERS"; then
++cat >"$tmp/defines.awk" <<\_ACAWK ||
++BEGIN {
++_ACEOF
++
++# Transform confdefs.h into an awk script `defines.awk', embedded as
++# here-document in config.status, that substitutes the proper values into
++# config.h.in to produce config.h.
++
++# Create a delimiter string that does not exist in confdefs.h, to ease
++# handling of long lines.
++ac_delim='%!_!# '
++for ac_last_try in false false :; do
++  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
++  if test -z "$ac_t"; then
++    break
++  elif $ac_last_try; then
++    as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
++  else
++    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+   fi
+-fi # test -n "$CONFIG_FILES"
++done
+ 
++# For the awk script, D is an array of macro values keyed by name,
++# likewise P contains macro parameters if any.  Preserve backslash
++# newline sequences.
++
++ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
++sed -n '
++s/.\{148\}/&'"$ac_delim"'/g
++t rset
++:rset
++s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
++t def
++d
++:def
++s/\\$//
++t bsnl
++s/["\\]/\\&/g
++s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
++D["\1"]=" \3"/p
++s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2"/p
++d
++:bsnl
++s/["\\]/\\&/g
++s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
++D["\1"]=" \3\\\\\\n"\\/p
++t cont
++s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
++t cont
++d
++:cont
++n
++s/.\{148\}/&'"$ac_delim"'/g
++t clear
++:clear
++s/\\$//
++t bsnlc
++s/["\\]/\\&/g; s/^/"/; s/$/"/p
++d
++:bsnlc
++s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
++b cont
++' <confdefs.h | sed '
++s/'"$ac_delim"'/"\\\
++"/g' >>$CONFIG_STATUS || ac_write_fail=1
++
++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
++  for (key in D) D_is_set[key] = 1
++  FS = ""
++}
++/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
++  line = \$ 0
++  split(line, arg, " ")
++  if (arg[1] == "#") {
++    defundef = arg[2]
++    mac1 = arg[3]
++  } else {
++    defundef = substr(arg[1], 2)
++    mac1 = arg[2]
++  }
++  split(mac1, mac2, "(") #)
++  macro = mac2[1]
++  prefix = substr(line, 1, index(line, defundef) - 1)
++  if (D_is_set[macro]) {
++    # Preserve the white space surrounding the "#".
++    print prefix "define", macro P[macro] D[macro]
++    next
++  } else {
++    # Replace #undef with comments.  This is necessary, for example,
++    # in the case of _POSIX_SOURCE, which is predefined and required
++    # on some systems where configure will not decide to define it.
++    if (defundef == "undef") {
++      print "/*", prefix defundef, macro, "*/"
++      next
++    }
++  }
++}
++{ print }
++_ACAWK
+ _ACEOF
+-cat >>$CONFIG_STATUS <<\_ACEOF
+-for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
+-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
+-  case $ac_file in
+-  - | *:- | *:-:* ) # input from stdin
+-	cat >$tmp/stdin
+-	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+-  * )   ac_file_in=$ac_file.in ;;
++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
++  as_fn_error "could not setup config headers machinery" "$LINENO" 5
++fi # test -n "$CONFIG_HEADERS"
++
++
++eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    "
++shift
++for ac_tag
++do
++  case $ac_tag in
++  :[FHLC]) ac_mode=$ac_tag; continue;;
++  esac
++  case $ac_mode$ac_tag in
++  :[FHL]*:*);;
++  :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
++  :[FH]-) ac_tag=-:-;;
++  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
++  esac
++  ac_save_IFS=$IFS
++  IFS=:
++  set x $ac_tag
++  IFS=$ac_save_IFS
++  shift
++  ac_file=$1
++  shift
++
++  case $ac_mode in
++  :L) ac_source=$1;;
++  :[FH])
++    ac_file_inputs=
++    for ac_f
++    do
++      case $ac_f in
++      -) ac_f="$tmp/stdin";;
++      *) # Look for the file first in the build tree, then in the source tree
++	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
++	 # because $ac_f cannot contain `:'.
++	 test -f "$ac_f" ||
++	   case $ac_f in
++	   [\\/$]*) false;;
++	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
++	   esac ||
++	   as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
++      esac
++      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
++      as_fn_append ac_file_inputs " '$ac_f'"
++    done
++
++    # Let's still pretend it is `configure' which instantiates (i.e., don't
++    # use $as_me), people would be surprised to read:
++    #    /* config.h.  Generated by config.status.  */
++    configure_input='Generated from '`
++	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
++	`' by configure.'
++    if test x"$ac_file" != x-; then
++      configure_input="$ac_file.  $configure_input"
++      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
++$as_echo "$as_me: creating $ac_file" >&6;}
++    fi
++    # Neutralize special characters interpreted by sed in replacement strings.
++    case $configure_input in #(
++    *\&* | *\|* | *\\* )
++       ac_sed_conf_input=`$as_echo "$configure_input" |
++       sed 's/[\\\\&|]/\\\\&/g'`;; #(
++    *) ac_sed_conf_input=$configure_input;;
++    esac
++
++    case $ac_tag in
++    *:-:* | *:-) cat >"$tmp/stdin" \
++      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
++    esac
++    ;;
+   esac
+ 
+-  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
+-  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
++  ac_dir=`$as_dirname -- "$ac_file" ||
+ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ 	 X"$ac_file" : 'X\(//\)[^/]' \| \
+ 	 X"$ac_file" : 'X\(//\)$' \| \
+-	 X"$ac_file" : 'X\(/\)' \| \
+-	 .     : '\(.\)' 2>/dev/null ||
+-echo X"$ac_file" |
+-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+-  	  /^X\(\/\/\)$/{ s//\1/; q; }
+-  	  /^X\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`
+-  { if $as_mkdir_p; then
+-    mkdir -p "$ac_dir"
+-  else
+-    as_dir="$ac_dir"
+-    as_dirs=
+-    while test ! -d "$as_dir"; do
+-      as_dirs="$as_dir $as_dirs"
+-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
+-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+-	 X"$as_dir" : 'X\(//\)[^/]' \| \
+-	 X"$as_dir" : 'X\(//\)$' \| \
+-	 X"$as_dir" : 'X\(/\)' \| \
+-	 .     : '\(.\)' 2>/dev/null ||
+-echo X"$as_dir" |
+-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+-  	  /^X\(\/\/\)$/{ s//\1/; q; }
+-  	  /^X\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`
+-    done
+-    test ! -n "$as_dirs" || mkdir $as_dirs
+-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
+-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
+-   { (exit 1); exit 1; }; }; }
+-
++	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
++$as_echo X"$ac_file" |
++    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\/\)[^/].*/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\/\)$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\).*/{
++	    s//\1/
++	    q
++	  }
++	  s/.*/./; q'`
++  as_dir="$ac_dir"; as_fn_mkdir_p
+   ac_builddir=.
+ 
+-if test "$ac_dir" != .; then
+-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+-  # A "../" for each directory in $ac_dir_suffix.
+-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+-else
+-  ac_dir_suffix= ac_top_builddir=
+-fi
++case "$ac_dir" in
++.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
++*)
++  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
++  # A ".." for each directory in $ac_dir_suffix.
++  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
++  case $ac_top_builddir_sub in
++  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
++  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
++  esac ;;
++esac
++ac_abs_top_builddir=$ac_pwd
++ac_abs_builddir=$ac_pwd$ac_dir_suffix
++# for backward compatibility:
++ac_top_builddir=$ac_top_build_prefix
+ 
+ case $srcdir in
+-  .)  # No --srcdir option.  We are building in place.
++  .)  # We are building in place.
+     ac_srcdir=.
+-    if test -z "$ac_top_builddir"; then
+-       ac_top_srcdir=.
+-    else
+-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+-    fi ;;
+-  [\\/]* | ?:[\\/]* )  # Absolute path.
++    ac_top_srcdir=$ac_top_builddir_sub
++    ac_abs_top_srcdir=$ac_pwd ;;
++  [\\/]* | ?:[\\/]* )  # Absolute name.
+     ac_srcdir=$srcdir$ac_dir_suffix;
+-    ac_top_srcdir=$srcdir ;;
+-  *) # Relative path.
+-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
++    ac_top_srcdir=$srcdir
++    ac_abs_top_srcdir=$srcdir ;;
++  *) # Relative name.
++    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
++    ac_top_srcdir=$ac_top_build_prefix$srcdir
++    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+ esac
++ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+ 
+-# Do not use `cd foo && pwd` to compute absolute paths, because
+-# the directories may not exist.
+-case `pwd` in
+-.) ac_abs_builddir="$ac_dir";;
+-*)
+-  case "$ac_dir" in
+-  .) ac_abs_builddir=`pwd`;;
+-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
+-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
+-  esac;;
+-esac
+-case $ac_abs_builddir in
+-.) ac_abs_top_builddir=${ac_top_builddir}.;;
+-*)
+-  case ${ac_top_builddir}. in
+-  .) ac_abs_top_builddir=$ac_abs_builddir;;
+-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
+-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
+-  esac;;
+-esac
+-case $ac_abs_builddir in
+-.) ac_abs_srcdir=$ac_srcdir;;
+-*)
+-  case $ac_srcdir in
+-  .) ac_abs_srcdir=$ac_abs_builddir;;
+-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
+-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
+-  esac;;
+-esac
+-case $ac_abs_builddir in
+-.) ac_abs_top_srcdir=$ac_top_srcdir;;
+-*)
+-  case $ac_top_srcdir in
+-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
+-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
+-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
+-  esac;;
+-esac
+ 
++  case $ac_mode in
++  :F)
++  #
++  # CONFIG_FILE
++  #
+ 
+   case $INSTALL in
+   [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
+-  *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
++  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
+   esac
++_ACEOF
+ 
+-  if test x"$ac_file" != x-; then
+-    { echo "$as_me:$LINENO: creating $ac_file" >&5
+-echo "$as_me: creating $ac_file" >&6;}
+-    rm -f "$ac_file"
+-  fi
+-  # Let's still pretend it is `configure' which instantiates (i.e., don't
+-  # use $as_me), people would be surprised to read:
+-  #    /* config.h.  Generated by config.status.  */
+-  if test x"$ac_file" = x-; then
+-    configure_input=
+-  else
+-    configure_input="$ac_file.  "
+-  fi
+-  configure_input=$configure_input"Generated from `echo $ac_file_in |
+-				     sed 's,.*/,,'` by configure."
+-
+-  # First look for the input files in the build tree, otherwise in the
+-  # src tree.
+-  ac_file_inputs=`IFS=:
+-    for f in $ac_file_in; do
+-      case $f in
+-      -) echo $tmp/stdin ;;
+-      [\\/$]*)
+-	 # Absolute (can't be DOS-style, as IFS=:)
+-	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+-echo "$as_me: error: cannot find input file: $f" >&2;}
+-   { (exit 1); exit 1; }; }
+-	 echo "$f";;
+-      *) # Relative
+-	 if test -f "$f"; then
+-	   # Build tree
+-	   echo "$f"
+-	 elif test -f "$srcdir/$f"; then
+-	   # Source tree
+-	   echo "$srcdir/$f"
+-	 else
+-	   # /dev/null tree
+-	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+-echo "$as_me: error: cannot find input file: $f" >&2;}
+-   { (exit 1); exit 1; }; }
+-	 fi;;
+-      esac
+-    done` || { (exit 1); exit 1; }
++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
++# If the template does not know about datarootdir, expand it.
++# FIXME: This hack should be removed a few years after 2.60.
++ac_datarootdir_hack=; ac_datarootdir_seen=
++ac_sed_dataroot='
++/datarootdir/ {
++  p
++  q
++}
++/@datadir@/p
++/@docdir@/p
++/@infodir@/p
++/@localedir@/p
++/@mandir@/p'
++case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
++*datarootdir*) ac_datarootdir_seen=yes;;
++*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
++  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
++$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
++_ACEOF
++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
++  ac_datarootdir_hack='
++  s&@datadir@&$datadir&g
++  s&@docdir@&$docdir&g
++  s&@infodir@&$infodir&g
++  s&@localedir@&$localedir&g
++  s&@mandir@&$mandir&g
++  s&\\\${datarootdir}&$datarootdir&g' ;;
++esac
+ _ACEOF
+-cat >>$CONFIG_STATUS <<_ACEOF
+-  sed "$ac_vpsub
++
++# Neutralize VPATH when `$srcdir' = `.'.
++# Shell code in configure.ac might set extrasub.
++# FIXME: do we really want to maintain this feature?
++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
++ac_sed_extra="$ac_vpsub
+ $extrasub
+ _ACEOF
+-cat >>$CONFIG_STATUS <<\_ACEOF
++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+ :t
+ /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+-s,@configure_input@,$configure_input,;t t
+-s,@srcdir@,$ac_srcdir,;t t
+-s,@abs_srcdir@,$ac_abs_srcdir,;t t
+-s,@top_srcdir@,$ac_top_srcdir,;t t
+-s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
+-s,@builddir@,$ac_builddir,;t t
+-s,@abs_builddir@,$ac_abs_builddir,;t t
+-s,@top_builddir@,$ac_top_builddir,;t t
+-s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
+-s,@INSTALL@,$ac_INSTALL,;t t
+-" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
+-  rm -f $tmp/stdin
+-  if test x"$ac_file" != x-; then
+-    mv $tmp/out $ac_file
+-  else
+-    cat $tmp/out
+-    rm -f $tmp/out
+-  fi
+-
+-done
+-_ACEOF
+-cat >>$CONFIG_STATUS <<\_ACEOF
+-
+-#
+-# CONFIG_HEADER section.
+-#
+-
+-# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
+-# NAME is the cpp macro being defined and VALUE is the value it is being given.
+-#
+-# ac_d sets the value in "#define NAME VALUE" lines.
+-ac_dA='s,^\([	 ]*\)#\([	 ]*define[	 ][	 ]*\)'
+-ac_dB='[	 ].*$,\1#\2'
+-ac_dC=' '
+-ac_dD=',;t'
+-# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
+-ac_uA='s,^\([	 ]*\)#\([	 ]*\)undef\([	 ][	 ]*\)'
+-ac_uB='$,\1#\2define\3'
+-ac_uC=' '
+-ac_uD=',;t'
++s|@configure_input@|$ac_sed_conf_input|;t t
++s&@top_builddir@&$ac_top_builddir_sub&;t t
++s&@top_build_prefix@&$ac_top_build_prefix&;t t
++s&@srcdir@&$ac_srcdir&;t t
++s&@abs_srcdir@&$ac_abs_srcdir&;t t
++s&@top_srcdir@&$ac_top_srcdir&;t t
++s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
++s&@builddir@&$ac_builddir&;t t
++s&@abs_builddir@&$ac_abs_builddir&;t t
++s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
++s&@INSTALL@&$ac_INSTALL&;t t
++$ac_datarootdir_hack
++"
++eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
++  || as_fn_error "could not create $ac_file" "$LINENO" 5
++
++test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
++  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
++  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
++  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
++which seems to be undefined.  Please make sure it is defined." >&5
++$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
++which seems to be undefined.  Please make sure it is defined." >&2;}
+ 
+-for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
+-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
++  rm -f "$tmp/stdin"
+   case $ac_file in
+-  - | *:- | *:-:* ) # input from stdin
+-	cat >$tmp/stdin
+-	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+-  * )   ac_file_in=$ac_file.in ;;
+-  esac
+-
+-  test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5
+-echo "$as_me: creating $ac_file" >&6;}
+-
+-  # First look for the input files in the build tree, otherwise in the
+-  # src tree.
+-  ac_file_inputs=`IFS=:
+-    for f in $ac_file_in; do
+-      case $f in
+-      -) echo $tmp/stdin ;;
+-      [\\/$]*)
+-	 # Absolute (can't be DOS-style, as IFS=:)
+-	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+-echo "$as_me: error: cannot find input file: $f" >&2;}
+-   { (exit 1); exit 1; }; }
+-	 # Do quote $f, to prevent DOS paths from being IFS'd.
+-	 echo "$f";;
+-      *) # Relative
+-	 if test -f "$f"; then
+-	   # Build tree
+-	   echo "$f"
+-	 elif test -f "$srcdir/$f"; then
+-	   # Source tree
+-	   echo "$srcdir/$f"
+-	 else
+-	   # /dev/null tree
+-	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+-echo "$as_me: error: cannot find input file: $f" >&2;}
+-   { (exit 1); exit 1; }; }
+-	 fi;;
+-      esac
+-    done` || { (exit 1); exit 1; }
+-  # Remove the trailing spaces.
+-  sed 's/[	 ]*$//' $ac_file_inputs >$tmp/in
+-
+-_ACEOF
+-
+-# Transform confdefs.h into two sed scripts, `conftest.defines' and
+-# `conftest.undefs', that substitutes the proper values into
+-# config.h.in to produce config.h.  The first handles `#define'
+-# templates, and the second `#undef' templates.
+-# And first: Protect against being on the right side of a sed subst in
+-# config.status.  Protect against being in an unquoted here document
+-# in config.status.
+-rm -f conftest.defines conftest.undefs
+-# Using a here document instead of a string reduces the quoting nightmare.
+-# Putting comments in sed scripts is not portable.
+-#
+-# `end' is used to avoid that the second main sed command (meant for
+-# 0-ary CPP macros) applies to n-ary macro definitions.
+-# See the Autoconf documentation for `clear'.
+-cat >confdef2sed.sed <<\_ACEOF
+-s/[\\&,]/\\&/g
+-s,[\\$`],\\&,g
+-t clear
+-: clear
+-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*\)\(([^)]*)\)[	 ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
+-t end
+-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
+-: end
+-_ACEOF
+-# If some macros were called several times there might be several times
+-# the same #defines, which is useless.  Nevertheless, we may not want to
+-# sort them, since we want the *last* AC-DEFINE to be honored.
+-uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines
+-sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs
+-rm -f confdef2sed.sed
+-
+-# This sed command replaces #undef with comments.  This is necessary, for
+-# example, in the case of _POSIX_SOURCE, which is predefined and required
+-# on some systems where configure will not decide to define it.
+-cat >>conftest.undefs <<\_ACEOF
+-s,^[	 ]*#[	 ]*undef[	 ][	 ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
+-_ACEOF
+-
+-# Break up conftest.defines because some shells have a limit on the size
+-# of here documents, and old seds have small limits too (100 cmds).
+-echo '  # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
+-echo '  if grep "^[	 ]*#[	 ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
+-echo '  # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
+-echo '  :' >>$CONFIG_STATUS
+-rm -f conftest.tail
+-while grep . conftest.defines >/dev/null
+-do
+-  # Write a limited-size here document to $tmp/defines.sed.
+-  echo '  cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
+-  # Speed up: don't consider the non `#define' lines.
+-  echo '/^[	 ]*#[	 ]*define/!b' >>$CONFIG_STATUS
+-  # Work around the forget-to-reset-the-flag bug.
+-  echo 't clr' >>$CONFIG_STATUS
+-  echo ': clr' >>$CONFIG_STATUS
+-  sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS
+-  echo 'CEOF
+-  sed -f $tmp/defines.sed $tmp/in >$tmp/out
+-  rm -f $tmp/in
+-  mv $tmp/out $tmp/in
+-' >>$CONFIG_STATUS
+-  sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail
+-  rm -f conftest.defines
+-  mv conftest.tail conftest.defines
+-done
+-rm -f conftest.defines
+-echo '  fi # grep' >>$CONFIG_STATUS
+-echo >>$CONFIG_STATUS
+-
+-# Break up conftest.undefs because some shells have a limit on the size
+-# of here documents, and old seds have small limits too (100 cmds).
+-echo '  # Handle all the #undef templates' >>$CONFIG_STATUS
+-rm -f conftest.tail
+-while grep . conftest.undefs >/dev/null
+-do
+-  # Write a limited-size here document to $tmp/undefs.sed.
+-  echo '  cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
+-  # Speed up: don't consider the non `#undef'
+-  echo '/^[	 ]*#[	 ]*undef/!b' >>$CONFIG_STATUS
+-  # Work around the forget-to-reset-the-flag bug.
+-  echo 't clr' >>$CONFIG_STATUS
+-  echo ': clr' >>$CONFIG_STATUS
+-  sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS
+-  echo 'CEOF
+-  sed -f $tmp/undefs.sed $tmp/in >$tmp/out
+-  rm -f $tmp/in
+-  mv $tmp/out $tmp/in
+-' >>$CONFIG_STATUS
+-  sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail
+-  rm -f conftest.undefs
+-  mv conftest.tail conftest.undefs
+-done
+-rm -f conftest.undefs
+-
+-cat >>$CONFIG_STATUS <<\_ACEOF
+-  # Let's still pretend it is `configure' which instantiates (i.e., don't
+-  # use $as_me), people would be surprised to read:
+-  #    /* config.h.  Generated by config.status.  */
+-  if test x"$ac_file" = x-; then
+-    echo "/* Generated by configure.  */" >$tmp/config.h
+-  else
+-    echo "/* $ac_file.  Generated by configure.  */" >$tmp/config.h
+-  fi
+-  cat $tmp/in >>$tmp/config.h
+-  rm -f $tmp/in
++  -) cat "$tmp/out" && rm -f "$tmp/out";;
++  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
++  esac \
++  || as_fn_error "could not create $ac_file" "$LINENO" 5
++ ;;
++  :H)
++  #
++  # CONFIG_HEADER
++  #
+   if test x"$ac_file" != x-; then
+-    if diff $ac_file $tmp/config.h >/dev/null 2>&1; then
+-      { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
+-echo "$as_me: $ac_file is unchanged" >&6;}
++    {
++      $as_echo "/* $configure_input  */" \
++      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
++    } >"$tmp/config.h" \
++      || as_fn_error "could not create $ac_file" "$LINENO" 5
++    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
++      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
++$as_echo "$as_me: $ac_file is unchanged" >&6;}
+     else
+-      ac_dir=`(dirname "$ac_file") 2>/dev/null ||
+-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+-	 X"$ac_file" : 'X\(//\)[^/]' \| \
+-	 X"$ac_file" : 'X\(//\)$' \| \
+-	 X"$ac_file" : 'X\(/\)' \| \
+-	 .     : '\(.\)' 2>/dev/null ||
+-echo X"$ac_file" |
+-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+-  	  /^X\(\/\/\)$/{ s//\1/; q; }
+-  	  /^X\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`
+-      { if $as_mkdir_p; then
+-    mkdir -p "$ac_dir"
+-  else
+-    as_dir="$ac_dir"
+-    as_dirs=
+-    while test ! -d "$as_dir"; do
+-      as_dirs="$as_dir $as_dirs"
+-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
+-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+-	 X"$as_dir" : 'X\(//\)[^/]' \| \
+-	 X"$as_dir" : 'X\(//\)$' \| \
+-	 X"$as_dir" : 'X\(/\)' \| \
+-	 .     : '\(.\)' 2>/dev/null ||
+-echo X"$as_dir" |
+-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+-  	  /^X\(\/\/\)$/{ s//\1/; q; }
+-  	  /^X\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`
+-    done
+-    test ! -n "$as_dirs" || mkdir $as_dirs
+-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
+-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
+-   { (exit 1); exit 1; }; }; }
+-
+-      rm -f $ac_file
+-      mv $tmp/config.h $ac_file
++      rm -f "$ac_file"
++      mv "$tmp/config.h" "$ac_file" \
++	|| as_fn_error "could not create $ac_file" "$LINENO" 5
+     fi
+   else
+-    cat $tmp/config.h
+-    rm -f $tmp/config.h
++    $as_echo "/* $configure_input  */" \
++      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
++      || as_fn_error "could not create -" "$LINENO" 5
+   fi
+-done
+-_ACEOF
++ ;;
++
++
++  esac
++
++done # for ac_tag
+ 
+-cat >>$CONFIG_STATUS <<\_ACEOF
+ 
+-{ (exit 0); exit 0; }
++as_fn_exit 0
+ _ACEOF
+-chmod +x $CONFIG_STATUS
+ ac_clean_files=$ac_clean_files_save
+ 
++test $ac_write_fail = 0 ||
++  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
++
+ 
+ # configure is writing to config.log, and then calls config.status.
+ # config.status does its own redirection, appending to config.log.
+@@ -17926,6 +11162,10 @@ if test "$no_create" != yes; then
+   exec 5>>config.log
+   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
+   # would make configure fail if this is the last instruction.
+-  $ac_cs_success || { (exit 1); exit 1; }
++  $ac_cs_success || as_fn_exit $?
++fi
++if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
++$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+ fi
+ 
+--- a/install-sh
++++ b/install-sh
+@@ -1,7 +1,7 @@
+ #!/bin/sh
+ # install - install a program, script, or datafile
+ 
+-scriptversion=2005-02-02.21
++scriptversion=2005-05-14.22
+ 
+ # This originates from X11R5 (mit/util/scripts/install.sh), which was
+ # later released in X11R6 (xc/config/util/install.sh) with the
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/0016-upstream-fix-typos.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/0016-upstream-fix-typos.dpatch
@@ -0,0 +1,64 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## upstream-fix-typos by Sven Mueller <sven@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Upstream fix for some typos in manpages for reconstruct and chk_cyrus
+
+@DPATCH@
+diff -urNad cyrus-imapd-2.2.13/man/chk_cyrus.8 cyrus-imapd-2.2.13/man/chk_cyrus.8
+--- cyrus-imapd-2.2.13/man/chk_cyrus.8	2006-08-06 20:04:29.000000000 +0200
++++ cyrus-imapd-2.2.13/man/chk_cyrus.8	2006-08-06 20:08:15.026586061 +0200
+@@ -40,7 +40,7 @@
+ .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ .\" 
+ .SH NAME
+-chk_cyrus \- perform a consistancy check of the cyrus mailstore
++chk_cyrus \- perform a consistency check of the cyrus mailstore
+ .SH SYNOPSIS
+ .B chk_cyrus
+ [
+@@ -57,7 +57,7 @@
+ ]
+ .SH DESCRIPTION
+ .I Chk_cyrus
+-is used to perform a consistancy check on the cyrus datastore, and output
++is used to perform a consistency check on the cyrus datastore, and output
+ a list of files/directories that are expected to exist, but do not.
+ Status messagess are output to stderr, the list of files/directories is
+ output to stdout.  This list can be passed to a backup program to aid a
+@@ -73,10 +73,10 @@
+ Read configuration options from \fIconfig-file\fR.
+ .TP
+ .BI \-P " partition"
+-Run the consistancy check for only the given partition.
++Run the consistency check for only the given partition.
+ May not be specified with -M.
+ .BI \-M " mailbox"
+-Run the consistancy check for only the given mailbox.
++Run the consistency check for only the given mailbox.
+ May not be specified with -P.
+ .SH FILES
+ .TP
+diff -urNad cyrus-imapd-2.2.13/man/reconstruct.8 cyrus-imapd-2.2.13/man/reconstruct.8
+--- cyrus-imapd-2.2.13/man/reconstruct.8	2006-08-06 20:04:29.000000000 +0200
++++ cyrus-imapd-2.2.13/man/reconstruct.8	2006-08-06 20:10:35.754646314 +0200
+@@ -39,7 +39,7 @@
+ .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ .\" 
+-.\" $Id: reconstruct.8,v 1.19 2004/10/13 18:07:49 shadow Exp $
++.\" $Id: reconstruct.8,v 1.20 2006/06/19 13:01:19 murch Exp $
+ .SH NAME
+ reconstruct \- reconstruct mailboxes
+ .SH SYNOPSIS
+@@ -118,8 +118,8 @@
+ .B \-x
+ When processing a mailbox which is not in the mailbox list (e.g. via
+ the -p or -f options), do not import the metadata from the mailbox,
+-instead create it anew (this specifically affects atleast the mailbox's seen
+-stat unique identifier, user flags, and ACL).
++instead create it anew (this specifically affects at least the mailbox's seen
++state unique identifier, user flags, and ACL).
+ .TP
+ .B \-r
+ Recursively reconstruct all sub-mailboxes of the mailboxes or mailbox
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/0021-upstream-applied_RFC4314_READ-ONLY_logic.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/0021-upstream-applied_RFC4314_READ-ONLY_logic.dpatch
@@ -0,0 +1,58 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 0021-upstream-applied_RFC4314_READ-ONLY_logic.dpatch by Sven Mueller <sven@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Upstream: applied RFC4314 READ-ONLY logic (by murch)
+
+@DPATCH@
+diff -urNad cyrus-imapd-2.2.13/imap/imapd.c cyrus-imapd-2.2.13/imap/imapd.c
+--- cyrus-imapd-2.2.13/imap/imapd.c	2006-11-13 19:25:43.000000000 +0100
++++ cyrus-imapd-2.2.13/imap/imapd.c	2006-11-13 19:25:48.253689109 +0100
+@@ -38,7 +38,7 @@
+  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+  */
+ 
+-/* $Id: imapd.c,v 1.500 2006/05/10 15:41:44 murch Exp $ */
++/* $Id: imapd.c,v 1.501 2006/11/13 16:17:52 murch Exp $ */
+ 
+ #include <config.h>
+ 
+@@ -2643,7 +2643,7 @@
+ 
+     /* Examine command puts mailbox in read-only mode */
+     if (cmd[0] == 'E') {
+-	imapd_mailbox->myrights &= ~(ACL_SEEN|ACL_WRITE|ACL_DELETE);
++	imapd_mailbox->myrights &= ~ACL_READ_WRITE;
+     }
+ 
+     if (imapd_mailbox->myrights & ACL_DELETE) {
+@@ -2682,7 +2682,7 @@
+     }
+ 
+     prot_printf(imapd_out, "%s OK [READ-%s] %s\r\n", tag,
+-	   (imapd_mailbox->myrights & (ACL_WRITE|ACL_DELETE)) ?
++	   (imapd_mailbox->myrights & ACL_READ_WRITE) ?
+ 		"WRITE" : "ONLY", error_message(IMAP_OK_COMPLETED));
+ 
+     proc_register("imapd", imapd_clienthost, imapd_userid, mailboxname);
+diff -urNad cyrus-imapd-2.2.13/lib/acl.h cyrus-imapd-2.2.13/lib/acl.h
+--- cyrus-imapd-2.2.13/lib/acl.h	2005-03-12 23:09:22.000000000 +0100
++++ cyrus-imapd-2.2.13/lib/acl.h	2006-11-13 19:22:53.756725336 +0100
+@@ -42,7 +42,7 @@
+  * Start Date: 6/28/93
+  */
+ 
+-/* $Id: acl.h,v 1.16 2004/03/05 19:19:21 rjs3 Exp $ */
++/* $Id: acl.h,v 1.17 2006/11/13 16:17:53 murch Exp $ */
+ 
+ #ifndef INCLUDED_ACL_H
+ #define INCLUDED_ACL_H
+@@ -75,6 +75,8 @@
+ #define ACL_USER9  0x40000L
+ #define ACL_FULL   0xFFFFFL
+ 
++#define ACL_READ_WRITE	(ACL_SEEN|ACL_WRITE|ACL_INSERT|ACL_DELETE)
++
+ #define ACL_MODE_SET 0
+ #define ACL_MODE_ADD 1
+ #define ACL_MODE_REMOVE 2
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/0022-upstream-dont-send-empty-literal-response.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/0022-upstream-dont-send-empty-literal-response.dpatch
@@ -0,0 +1,56 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## filehHM2MA.dpatch by Sven Mueller <sven@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad cyrus-imapd-2.2.13/imap/saslclient.c cyrus-imapd-2.2.13/imap/saslclient.c
+--- cyrus-imapd-2.2.13/imap/saslclient.c	2007-02-27 05:01:09.000000000 +0100
++++ cyrus-imapd-2.2.13/imap/saslclient.c	2007-02-27 05:03:11.579096512 +0100
+@@ -39,7 +39,7 @@
+  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+  */
+ 
+-/* $Id: saslclient.c,v 1.13 2004/07/07 19:49:05 rjs3 Exp $ */
++/* $Id: saslclient.c,v 1.14.2.1 2006/12/19 14:30:28 murch Exp $ */
+ 
+ #include <config.h>
+ 
+@@ -217,21 +217,22 @@
+ 	sprintf(cmdbuf, "%s %s", sasl_cmd->cmd, mech);
+     prot_printf(pout, "%s", cmdbuf);
+ 
+-    if (clientout) { /* initial response */
+-	if (!clientoutlen) { /* zero-length initial response */
+-	    prot_printf(pout, " =");
++    if (!clientout) goto noinitresp;  /* no initial response */
+ 
+-	    clientout = NULL;
+-	}
+-	else if (!sendliteral &&
+-		 ((strlen(cmdbuf) + clientoutlen + 3) > sasl_cmd->maxlen)) {
+-	    /* initial response is too long for auth command,
+-	       so wait for a server challenge before sending it */
+-	    goto noinitresp;
+-	}
+-	else { /* full response -- encoded below */
+-	    prot_printf(pout, " ");
+-	}
++    /* initial response */
++    if (!clientoutlen) { /* zero-length initial response */
++	prot_printf(pout, " =");
++
++	clientout = NULL;
++    }
++    else if (!sendliteral &&
++	     ((strlen(cmdbuf) + clientoutlen + 3) > sasl_cmd->maxlen)) {
++	/* initial response is too long for auth command,
++	   so wait for a server challenge before sending it */
++	goto noinitresp;
++    }
++    else { /* full response -- encoded below */
++	prot_printf(pout, " ");
+     }
+ 
+     do {
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/22-imapd_index_check.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/22-imapd_index_check.dpatch
@@ -0,0 +1,51 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 22-imapd_index_check.dpatch by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix usage of index_check()
+
+@DPATCH@
+diff -urNad cyrus-imapd-2.2.13~/imap/imapd.c cyrus-imapd-2.2.13/imap/imapd.c
+--- cyrus-imapd-2.2.13~/imap/imapd.c	2008-04-15 13:12:21.487623592 +0200
++++ cyrus-imapd-2.2.13/imap/imapd.c	2008-04-15 13:12:21.703642098 +0200
+@@ -3125,8 +3125,8 @@
+ 
+     if (usinguid) {
+ 	fetchitems |= FETCH_UID;
+-	index_check(imapd_mailbox, 1, 0);
+     }
++    index_check(imapd_mailbox, 1, 0);
+ 
+     fetchargs.fetchitems = fetchitems;
+     r = index_fetch(imapd_mailbox, sequence, usinguid, &fetchargs,
+@@ -3141,6 +3141,9 @@
+     } else if (fetchedsomething || usinguid) {
+ 	prot_printf(imapd_out, "%s OK %s (%s sec)\r\n", tag,
+ 		    error_message(IMAP_OK_COMPLETED), mytime);
++	if(fetchargs.fetchitems & FETCH_SETSEEN) {
++	    index_check(imapd_mailbox,usinguid,1);
++	}
+     } else {
+ 	/* normal FETCH, nothing came back */
+ 	prot_printf(imapd_out, "%s NO %s (%s sec)\r\n", tag,
+@@ -3259,7 +3262,8 @@
+ 
+     index_fetch(imapd_mailbox, msgno, 0, &fetchargs, &fetchedsomething);
+ 
+-    index_check(imapd_mailbox, 0, 0);
++    index_check(imapd_mailbox, 0,
++       fetchedsomething && (fetchargs.fetchitems & FETCH_SETSEEN));
+ 
+     if (fetchedsomething) {
+ 	prot_printf(imapd_out, "%s OK %s\r\n", tag,
+@@ -3391,7 +3395,9 @@
+     r = index_store(imapd_mailbox, sequence, usinguid, &storeargs,
+ 		    flag, nflags);
+ 
+-    if (usinguid) {
++    if(storeargs.seen || storeargs.operation==STORE_REPLACE) {
++	index_check(imapd_mailbox, usinguid, 1);
++    } else if (usinguid) {
+ 	index_check(imapd_mailbox, 1, 0);
+     }
+ 
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/70-allow-larger-buffers.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/70-allow-larger-buffers.dpatch
@@ -0,0 +1,25 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## allow-larger-buffers-dpatch by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Patch to allow larger buffers (especially for list of UIDs).
+## DP: Patch taken and "backported" to 2.2 from:
+## DP: http://cyrus.brong.fastmail.fm/patches/cyrus-longwords-2.3.3.diff
+
+@DPATCH@
+diff -urNad cyrus-imapd-2.2.13/imap/imapparse.c cyrus-imapd-2.2.13/imap/imapparse.c
+--- cyrus-imapd-2.2.13/imap/imapparse.c	2007-02-25 21:39:04.000000000 +0100
++++ cyrus-imapd-2.2.13/imap/imapparse.c	2007-02-25 21:40:19.830078835 +0100
+@@ -52,9 +52,9 @@
+ #include "exitcodes.h"
+ 
+ enum {
+-    MAXQUOTED = 32768,
+-    MAXWORD = 32768,
+-    MAXLITERAL = INT_MAX / 20
++    MAXQUOTED = 524288,
++    MAXWORD = 524288,
++    MAXLITERAL = INT_MAX / 10
+ };
+ 
+ void freebuf(struct buf *buf)
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/0006-upstream-free-backend-fix.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/0006-upstream-free-backend-fix.dpatch
@@ -0,0 +1,93 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 0006-upstream-free-backend-fix.dpatch by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Upstream fix: only free() the backend struct if we allocated it
+## DP: (don't free cached connections)
+
+@DPATCH@
+diff -urNad cyrus-imapd-2.2.13/imap/backend.c cyrus-imapd-2.2.13/imap/backend.c
+--- cyrus-imapd-2.2.13/imap/backend.c	2006-05-12 12:01:09.000000000 +0200
++++ cyrus-imapd-2.2.13/imap/backend.c	2006-05-12 12:14:12.909137753 +0200
+@@ -39,7 +39,7 @@
+  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+  */
+ 
+-/* $Id: backend.c,v 1.39 2006/02/07 20:57:27 murch Exp $ */
++/* $Id: backend.c,v 1.41 2006/05/11 18:05:29 murch Exp $ */
+ 
+ #include <config.h>
+ 
+@@ -264,7 +264,7 @@
+     }
+ }
+ 
+-struct backend *backend_connect(struct backend *ret, const char *server,
++struct backend *backend_connect(struct backend *ret_backend, const char *server,
+ 				struct protocol_t *prot, const char *userid,
+ 				const char **auth_status)
+ {
+@@ -276,13 +276,16 @@
+     struct sockaddr_un sunsock;
+     char buf[2048], *mechlist = NULL;
+     struct sigaction action;
++    struct backend *ret;
+ 
+-    if (!ret) {
++    if (!ret_backend) {
+ 	ret = xmalloc(sizeof(struct backend));
+ 	memset(ret, 0, sizeof(struct backend));
+ 	strlcpy(ret->hostname, server, sizeof(ret->hostname));
+ 	ret->timeout = NULL;
+     }
++    else
++	ret = ret_backend;
+ 
+     if (server[0] == '/') { /* unix socket */
+ 	res0 = &hints;
+@@ -312,7 +315,7 @@
+ 	if (err) {
+ 	    syslog(LOG_ERR, "getaddrinfo(%s) failed: %s",
+ 		   server, gai_strerror(err));
+-	    free(ret);
++	    if (!ret_backend) free(ret);
+ 	    return NULL;
+ 	}
+         /* Get addrinfo struct for local interface. */
+@@ -363,7 +366,7 @@
+ 	if (res0 != &hints)
+ 	    freeaddrinfo(res0);
+ 	syslog(LOG_ERR, "connect(%s) failed: %m", server);
+-	free(ret);
++	if (!ret_backend) free(ret);
+ 	return NULL;
+     }
+     memcpy(&ret->addr, res->ai_addr, res->ai_addrlen);
+@@ -381,7 +384,7 @@
+ 	    syslog(LOG_ERR,
+ 		   "backend_connect(): couldn't read initial greeting: %s",
+ 		   ret->in->error ? ret->in->error : "(null)");
+-	    free(ret);
++	    if (!ret_backend) free(ret);
+ 	    close(sock);
+ 	    return NULL;
+ 	}
+@@ -396,14 +399,16 @@
+ 	if ((r = backend_authenticate(ret, prot, &mechlist, userid, auth_status))) {
+ 	    syslog(LOG_ERR, "couldn't authenticate to backend server: %s",
+ 		   sasl_errstring(r, NULL, NULL));
+-	    free(ret);
++	    if (!ret_backend) free(ret);
+ 	    close(sock);
+ 	    ret = NULL;
+ 	}
+     }
+ 
+     if (mechlist) free(mechlist);
+-    
++
++    if (!ret_backend) ret_backend = ret;
++	    
+     return ret;
+ }
+ 
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/0010-upstream-fix-libRSAglue-linkage.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/0010-upstream-fix-libRSAglue-linkage.dpatch
@@ -0,0 +1,33 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 0010-upstream-fix-libRSAglue-linkage by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: check if we need libRSAglue before linking it
+## DP: Upstream committer: murch
+
+@DPATCH@
+diff -urNad cyrus-imapd-2.2.13/cmulocal/openssl.m4 cyrus-imapd-2.2.13/cmulocal/openssl.m4
+--- cyrus-imapd-2.2.13/cmulocal/openssl.m4	2006-03-31 20:18:13.000000000 +0200
++++ cyrus-imapd-2.2.13/cmulocal/openssl.m4	2006-05-17 21:06:43.162414202 +0200
+@@ -1,6 +1,6 @@
+ dnl
+ dnl macros for configure.in to detect openssl
+-dnl $Id: openssl.m4,v 1.10 2005/04/26 19:14:08 shadow Exp $
++dnl $Id: openssl.m4,v 1.11 2006/05/17 18:30:19 murch Exp $
+ dnl
+ 
+ AC_DEFUN([CMU_HAVE_OPENSSL], [
+@@ -24,8 +24,11 @@
+ 	  dnl we need to include the rsaref libraries in the crypto check
+                 LIB_RSAREF=""
+ 	        AC_CHECK_LIB(rsaref, RSAPublicEncrypt,
+-		       LIB_RSAREF="-lRSAglue -lrsaref"; cmu_have_rsaref=yes,
+-		       cmu_have_rsaref=no)
++			cmu_have_rsaref=yes;
++			[AC_CHECK_LIB(RSAglue, RSAPublicEncrypt,
++				LIB_RSAREF="-lRSAglue -lrsaref",
++				LIB_RSAREF="-lrsaref")],
++			cmu_have_rsaref=no)
+ 
+ 		AC_CHECK_HEADER(openssl/evp.h, [
+ 			AC_CHECK_LIB(crypto, EVP_DigestInit,
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/17-fix_tail_syntax_in_xversion.h.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/17-fix_tail_syntax_in_xversion.h.dpatch
@@ -0,0 +1,16 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 17-fix_tail_syntax_in_xversion.h.dpatch by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fix tail syntax in xversion.h (use "tail -n 1" instead of "tail -1")
+
+@DPATCH@
+diff -urNad complete.dpatch/imap/xversion.sh complete.dpatch/imap/xversion.sh
+--- complete.dpatch/imap/xversion.sh	2003-10-22 20:03:00.000000000 +0200
++++ complete.dpatch/imap/xversion.sh	2005-11-10 17:14:52.208238481 +0100
+@@ -22,4 +22,4 @@
+ 	match ($0, pattern) {
+ 	    printf "\"%s\"\n", substr($0, RSTART, RLENGTH)
+ 	}' pattern="$DATEPAT $TIMEPAT" | \
+-	sort | tail -1 >> xversion.h
++	sort | tail -n 1 >> xversion.h
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/15-munge_8bit.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/15-munge_8bit.dpatch
@@ -0,0 +1,75 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 15_munge_8bit.dpatch by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Add support for munge8bit
+
+@DPATCH@
+diff -urNad complete.dpatch/imap/message.c complete.dpatch/imap/message.c
+--- complete.dpatch/imap/message.c	2004-09-16 19:58:54.000000000 +0200
++++ complete.dpatch/imap/message.c	2005-11-10 17:02:02.658034914 +0100
+@@ -227,6 +227,7 @@
+     int n;
+     int sawcr = 0, sawnl;
+     int reject8bit = config_getswitch(IMAPOPT_REJECT8BIT);
++    int munge8bit = config_getswitch(IMAPOPT_MUNGE8BIT);
+     int inheader = 1, blankline = 1;
+ 
+     while (size) {
+@@ -262,7 +263,7 @@
+ 			/* We have been configured to reject all mail of this
+ 			   form. */
+ 			if (!r) r = IMAP_MESSAGE_CONTAINS8BIT;
+-		    } else {
++		    } else if (munge8bit) {
+ 			/* We have been configured to munge all mail of this
+ 			   form. */
+ 			*p = 'X';
+diff -urNad complete.dpatch/imap/spool.c complete.dpatch/imap/spool.c
+--- complete.dpatch/imap/spool.c	2004-10-27 22:40:50.000000000 +0200
++++ complete.dpatch/imap/spool.c	2005-11-10 17:02:02.658034914 +0100
+@@ -140,6 +140,7 @@
+     state s = NAME_START;
+     int r = 0;
+     int reject8bit = config_getswitch(IMAPOPT_REJECT8BIT);
++    int munge8bit = config_getswitch(IMAPOPT_MUNGE8BIT);
+     const char **skip = NULL;
+ 
+     if (namelen == 0) {
+@@ -266,7 +267,7 @@
+ 			   form. */
+ 			r = IMAP_MESSAGE_CONTAINS8BIT;
+ 			goto ph_error;
+-		    } else {
++		    } else if (munge8bit) {
+ 			/* We have been configured to munge all mail of this
+ 			   form. */
+ 			c = 'X';
+diff -urNad complete.dpatch/lib/imapoptions complete.dpatch/lib/imapoptions
+--- complete.dpatch/lib/imapoptions	2004-07-21 21:07:45.000000000 +0200
++++ complete.dpatch/lib/imapoptions	2005-11-10 17:02:02.659034816 +0100
+@@ -458,6 +458,11 @@
+ { "mboxlist_db", "skiplist", STRINGLIST("flat", "berkeley", "skiplist")}
+ /* The cyrusdb backend to use for the mailbox list. */
+ 
++{ "munge8bit", 1, SWITCH }
++/* If enabled, lmtpd changes 8-bit characters to `X'. Also see reject8bit.
++   (A proper soultion to non-ASCII characters in headers is offered by  
++   RFC 2047 and its predecessors.) */
++
+ # xxx badly worded
+ { "mupdate_connections_max", 128, INT }
+ /* The max number of connections that a mupdate process will allow, this
+@@ -670,9 +675,9 @@
+ 
+ { "reject8bit", 0, SWITCH }
+ /* If enabled, lmtpd rejects messages with 8-bit characters in the
+-   headers.  Otherwise, 8-bit characters are changed to `X'.  (A
+-   proper soultion to non-ASCII characters in headers is offered by  
+-   RFC 2047 and its predecessors.) */
++   headers. Also see munge8bit, which is only applied if reject8bit is
++   not activated. (A proper soultion to non-ASCII characters in headers
++   is offered by RFC 2047 and its predecessors.) */
+ 
+ { "rfc2046_strict", 0, SWITCH }
+ /* If enabled, imapd will be strict (per RFC 2046) when matching MIME
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/65-sieveshell-enhancements.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/65-sieveshell-enhancements.dpatch
@@ -0,0 +1,258 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 65-sieveshell-enhancements.dpatch by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Adds some enhancements to sieveshell and fixes some paths.
+
+@DPATCH@
+diff -urNad cyrus-imapd-2.2.13/perl/imap/IMAP/Shell.pm cyrus-imapd-2.2.13/perl/imap/IMAP/Shell.pm
+--- cyrus-imapd-2.2.13/perl/imap/IMAP/Shell.pm	2006-04-18 18:24:55.000000000 +0200
++++ cyrus-imapd-2.2.13/perl/imap/IMAP/Shell.pm	2006-04-18 18:26:19.796548250 +0200
+@@ -126,7 +126,7 @@
+ 		  [\&_sc_info, '[mailbox]',
+ 		   'display mailbox/server metadata'],
+ 		mboxcfg =>
+-		  [\&_sc_mboxcfg, 'mailbox [comment|news2mail|expire|sieve|squat] value',
++		  [\&_sc_mboxcfg, 'mailbox [comment|news2mail|expire|squat|/<explicit annotation>] value',
+ 		   'configure mailbox'],
+ 		mboxconfig => 'mboxcfg',
+ 		reconstruct =>
+@@ -437,7 +437,7 @@
+ # programs, as opposed to things expected from within a program.)
+ sub shell {
+   my ($server, $port, $authz, $auth, $systemrc, $userrc, $dorc, $mech, $pw) =
+-    ('', 143, undef, $ENV{USER} || $ENV{LOGNAME}, '/usr/local/etc/cyradmrc.pl',
++    ('', 143, undef, $ENV{USER} || $ENV{LOGNAME}, '/etc/cyradmrc.pl',
+      "$ENV{HOME}/.cyradmrc.pl", 1, undef, undef);
+   GetOptions('user|u=s' => \$auth,
+ 	     'authz|z=s' => \$authz,
+@@ -467,7 +467,7 @@
+ 			  -rock => \$cyradm});
+     $cyradm->authenticate(-authz => $authz, -user => $auth,
+ 			  -mechanism => $mech, -password => $pw)
+-      or die "cyradm: cannot authenticate to server with $mech as $auth\n";
++      or die "cyradm: cannot authenticate to server" . (defined($mech)?" with $mech":"") . " as $auth\n";
+   }
+   my $fstk = [*STDIN, *STDOUT, *STDERR];
+   if ($dorc && $systemrc ne '' && -f $systemrc) {
+@@ -1400,7 +1400,7 @@
+   while (defined ($opt = shift(@argv))) {
+     last if $opt eq '--';
+     if ($opt =~ /^-/) {
+-      die "usage: mboxconfig mailbox [comment|news2mail|expire|sieve|squat] value\n";
++      die "usage: mboxconfig mailbox [comment|news2mail|expire|squat|/<explicit annotation>] value\n";
+     }
+     else {
+       push(@nargv, $opt);
+@@ -1409,7 +1409,7 @@
+   }
+   push(@nargv, @argv);
+   if (@nargv < 2) {
+-    die "usage: mboxconfig mailbox [comment|news2mail|expire|sieve|squat] value\n";
++    die "usage: mboxconfig mailbox [comment|news2mail|expire|squat|/<explicit annotation>] value\n";
+   }
+   if (!$cyrref || !$$cyrref) {
+     die "mboxconfig: no connection to server\n";
+diff -urNad cyrus-imapd-2.2.13/perl/sieve/lib/request.c cyrus-imapd-2.2.13/perl/sieve/lib/request.c
+--- cyrus-imapd-2.2.13/perl/sieve/lib/request.c	2006-04-18 18:24:55.000000000 +0200
++++ cyrus-imapd-2.2.13/perl/sieve/lib/request.c	2006-04-18 18:25:11.549208277 +0200
+@@ -560,7 +560,6 @@
+ 	      char **refer_to, char **errstrp)
+ {
+   int res;
+-  mystring_t *str=NULL;
+   mystring_t *errstr=NULL;
+   lexstate_t state;
+   int ret = 0;
+diff -urNad cyrus-imapd-2.2.13/perl/sieve/scripts/sieveshell.pl cyrus-imapd-2.2.13/perl/sieve/scripts/sieveshell.pl
+--- cyrus-imapd-2.2.13/perl/sieve/scripts/sieveshell.pl	2006-04-18 18:25:07.000000000 +0200
++++ cyrus-imapd-2.2.13/perl/sieve/scripts/sieveshell.pl	2006-04-18 18:25:11.550208179 +0200
+@@ -60,7 +60,9 @@
+ my $username = $ENV{USER};
+ my $authname = $ENV{USER};
+ my $realm = "";
++my $password;
+ my $ex = "";
++my $exfile = "";
+ my $help = 0;
+ my $man = 0;
+ my $ret;
+@@ -68,7 +70,9 @@
+ GetOptions("a|authname:s" => \$authname,
+     "u|username:s" => \$username,
+     "r|realm:s" => \$realm,
++    "p|password:s" => \$password,
+     "e|exec:s" => \$ex,
++    "f|execfile:s" => \$exfile,
+     "help|?" => \$help,
+     man => \$man) or pod2usage(2);
+ pod2usage(1) if $help;
+@@ -83,20 +87,24 @@
+ my $filehandle;
+ my $interactive;
+ 
+-if (! $ex eq "") {
+-    $filehandle = tempfile();
+-
+-    if (!$filehandle) { die "unable to open tmp file: $?"; }
+-
+-    print $filehandle $ex;
+-    seek $filehandle, 0, 0; # rewind file
++if (! $exfile eq "") {
++    open(FILEH,"<$exfile") || die "unable to open file: $?";
++    $filehandle = *FILEH;
+     $interactive = 0;
+ } else {
+-    $filehandle = *STDIN;
+-    $interactive = 1;
+-}
++    if (! $ex eq "") {
++	$filehandle = tempfile();
+ 
++	if (!$filehandle) { die "unable to open tmp file: $?"; }
+ 
++	print $filehandle $ex;
++	seek $filehandle, 0, 0; # rewind file
++	$interactive = 0;
++    } else {
++	$filehandle = *STDIN;
++	$interactive = 1;
++    }
++}
+ 
+ sub list_cb {
+ 
+@@ -121,6 +129,8 @@
+       return $authname;
+   } elsif (($type eq "realm") && (defined $realm)) {
+       return $realm;
++  } elsif (($type eq "password") && (defined $password)) {
++      return $password;
+   }
+ 
+   my $ostty;
+@@ -171,6 +181,8 @@
+ 
+ my $term = Term::ReadLine->new("sieveshell");
+ 
++my $exitcode = 0;
++
+ $term->ornaments(0);
+ 
+ while(defined($_  = ($interactive ? $term->readline('> ') : <$filehandle>))){
+@@ -197,6 +209,9 @@
+ 	my $errstr = sieve_get_error($obj);
+ 	$errstr = "unknown error" if(!defined($errstr));
+ 	print "upload failed: $errstr\n"; 
++	$exitcode = 1;
++      } else {
++        $exitcode = 0;
+       }
+     } elsif (($words[0] eq "list") || 
+ 	     ($words[0] eq "l") || 
+@@ -206,6 +221,9 @@
+ 	    my $errstr = sieve_get_error($obj);
+ 	    $errstr = "unknown error" if(!defined($errstr));
+ 	    print "list failed: $errstr\n";
++	    $exitcode = 1;
++	} else {
++	    $exitcode = 0;
+ 	}
+     } elsif (($words[0] eq "activate") || 
+ 	     ($words[0] eq "a")) {
+@@ -218,6 +236,9 @@
+ 	    my $errstr = sieve_get_error($obj);
+ 	    $errstr = "unknown error" if(!defined($errstr));
+ 	    print "activate failed: $errstr\n";
++	    $exitcode = 1;
++	} else {
++	    $exitcode = 0;
+ 	}
+     } elsif (($words[0] eq "deactivate") || 
+ 	     ($words[0] eq "da")) {
+@@ -230,6 +251,9 @@
+ 	    my $errstr = sieve_get_error($obj);
+ 	    $errstr = "unknown error" if(!defined($errstr));
+ 	    print "deactivate failed: $errstr\n";
++	    $exitcode = 1;
++	} else {
++	    $exitcode = 0;
+ 	}
+     } elsif (($words[0] eq "delete") || 
+ 	     ($words[0] eq "d")) {    
+@@ -242,6 +266,9 @@
+ 	    my $errstr = sieve_get_error($obj);
+ 	    $errstr = "unknown error" if(!defined($errstr));
+ 	    print "delete failed: $errstr\n"; 
++	    $exitcode = 1;
++	} else {
++	    $exitcode = 0;
+ 	}
+     } elsif (($words[0] eq "get") || 
+ 	     ($words[0] eq "g")) {
+@@ -255,25 +282,32 @@
+ 	    my $errstr = sieve_get_error($obj);
+ 	    $errstr = "unknown error" if(!defined($errstr));
+ 	    print "get failed: $errstr\n"; 
++	    $exitcode = 1;
+ 	} else {
+ 	    if ($words[2]) {
+ 		open (OUTPUT,">$words[2]") || die "Unable to open $words[2]";
+ 		print OUTPUT $str;
+ 		close(OUTPUT);
++		$exitcode = 0;
+ 	    } else {
+ 		print $str;
++		$exitcode = 0;
+ 	    }
+ 	}
+     } elsif (($words[0] eq "quit") || ($words[0] eq "q")) {
+         sieve_logout($obj);
+-	exit 0;
++	exit $exitcode;
+     } elsif (($words[0] eq "help") || ($words[0] eq "?")) {
+ 	show_help();
++	$exitcode = 0;
+     } else {
+ 	print "Invalid command: $words[0]\n";
++	$exitcode = 1;
+     } 
+ }
+ 
++exit $exitcode;
++
+ __END__
+ 
+ =head1 NAME
+@@ -283,7 +317,8 @@
+ =head1 SYNOPSIS
+ 
+ sieveshell [B<--user>=I<user>] [B<--authname>=I<authname>] 
+-[B<--realm>=I<realm>] [B<--exec>=I<script>] I<server>[B<:>I<port>]
++[B<--realm>=I<realm>] [B<--password>=I<password>]
++[B<--exec>=I<script>] [B<--execfile>=I<file>] I<server>[B<:>I<port>]
+ 
+ sieveshell B<--help>
+ 
+@@ -327,11 +362,21 @@
+ 
+ The realm to attempt authentication in.
+ 
++=item B<-p> I<password>, B<--password>=I<password>
++
++The password to use when authenticating to server. Note that this
++parameter can be seen in the process list. B<Use with caution!>
++
+ =item B<-e> I<script>, B<--exec>=I<script> 
+ 
+ Instead of working interactively, run commands from I<script>, and
+ exit when done.
+ 
++=item B<-f> I<file>, B<--execfile>=I<file>
++
++Instead of working interactively, run commands from file I<file> and
++exit when done.
++
+ =back
+ 
+ =head1 REFERENCES
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/03-fix_docs.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/03-fix_docs.dpatch
@@ -0,0 +1,89 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+_# 03-fix_docs.dpatch by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix FAQ and virtual domains installation docs
+
+@DPATCH@
+diff -urNad cyrus-imapd-2.2.13/doc/faq.html cyrus-imapd-2.2.13/doc/faq.html
+--- cyrus-imapd-2.2.13/doc/faq.html	2007-02-27 05:01:09.000000000 +0100
++++ cyrus-imapd-2.2.13/doc/faq.html	2007-03-17 20:49:20.580803890 +0100
+@@ -111,7 +111,7 @@
+ </pre>
+ 
+ <p>Make sure that <tt>saslauthd</tt> is running and that the cyrus
+-user can access the unix domain socket (defaults to <tt>/var/run/mux</tt>).
++user can access the unix domain socket (defaults to <tt>/var/run/saslauthd/mux</tt>).
+ 
+ </dd>
+ 
+diff -urNad cyrus-imapd-2.2.13/doc/install-virtdomains.html cyrus-imapd-2.2.13/doc/install-virtdomains.html
+--- cyrus-imapd-2.2.13/doc/install-virtdomains.html	2007-02-27 05:01:09.000000000 +0100
++++ cyrus-imapd-2.2.13/doc/install-virtdomains.html	2007-03-17 20:49:20.581803792 +0100
+@@ -99,6 +99,10 @@
+ to the <tt>defaultdomain</tt>.  See <a href=#admins>Administrators</a>
+ below for further discussion.
+ 
++<p><b>Note:</b> Users in the <tt>defaultdomain</tt> must <i>not</i>
++log in using the <tt>user@domain</tt> cross-realm login syntax. The
++<tt>user@domain</tt> type specification only works for them in LMTP.
++
+ <p>Here is a sample <tt>imapd.conf</tt> with a minimal set of configuration
+ options.</p>
+ 
+diff -urNad cyrus-imapd-2.2.13/lib/imapoptions cyrus-imapd-2.2.13/lib/imapoptions
+--- cyrus-imapd-2.2.13/lib/imapoptions	2007-03-17 20:49:15.000000000 +0100
++++ cyrus-imapd-2.2.13/lib/imapoptions	2007-03-17 20:49:20.584803499 +0100
+@@ -187,7 +187,11 @@
+    mailbox that does not have a parent mailbox. */
+ 
+ { "defaultdomain", NULL, STRING }
+-/* The default domain for virtual domain support */
++/* The default domain for virtual domain support. Note that this domain
++   is stripped from the email-address transmitted using LMTP, but it
++   is not stripped from usernames at login-time. For imapd/pop3d, 
++   "user" and "user@defaultdomain" specify two different users.
++   Please check install-virtdomains.html for details. */
+ 
+ { "defaultpartition", "default", STRING }
+ /* The partition name used by default for new mailboxes. */
+@@ -440,7 +444,10 @@
+ /* The list of remote realms whose users may authenticate using cross-realm
+    authentication identifiers.  Seperate each realm name by a space.  (A
+    cross-realm identity is considered any identity returned by SASL
+-   with an "@" in it.). */
++   with an "@" in it.) Note that to support multiple virtual domains
++   on the same interface/IP, you need to list them all as loginreals.
++   If you don't list them here, your users probably won't be able to
++   log in. */
+ 
+ { "loginuseacl", 0, SWITCH }
+ /* If enabled, any authentication identity which has \fBa\fR rights on a
+diff -urNad cyrus-imapd-2.2.13/man/squatter.8 cyrus-imapd-2.2.13/man/squatter.8
+--- cyrus-imapd-2.2.13/man/squatter.8	2005-03-12 23:09:22.000000000 +0100
++++ cyrus-imapd-2.2.13/man/squatter.8	2007-03-17 21:01:17.739413717 +0100
+@@ -83,6 +83,11 @@
+ .IR cyrus.conf (5)
+ .
+ .PP
++The
++.I mailbox
++argument can be omitted, which indexes all mailboxes. Otherwise it needs
++to be specified in the same format as used in cyradm.
++.PP
+ .B NOTE:
+ Messages and mailboxes that have not been indexed CAN still be
+ SEARCHed, just not as quickly as those with a SQUAT index.
+@@ -98,7 +103,11 @@
+ .TP
+ .B \-r
+ Recursively create indexes for all sub-mailboxes of the mailboxes or
+-mailbox prefixes given as arguments.
++mailbox prefixes given as arguments. If 
++.B \-r
++is specified, you must also specify at least one
++.I mailbox
++to recurse down from.
+ .TP
+ .B \-s
+ Skip mailboxes whose index file is older than their current squat file
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/0008-upstream-better-message-track-logging.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/0008-upstream-better-message-track-logging.dpatch
@@ -0,0 +1,114 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 0008-upstream-better-message-track-logging by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: better logging to facilitate message tracking (Wes Craig <wes@umich.edu>)
+
+@DPATCH@
+diff -urNad cyrus-imapd-2.2.13/imap/lmtp_sieve.c cyrus-imapd-2.2.13/imap/lmtp_sieve.c
+--- cyrus-imapd-2.2.13/imap/lmtp_sieve.c	2006-03-31 20:18:13.000000000 +0200
++++ cyrus-imapd-2.2.13/imap/lmtp_sieve.c	2006-05-12 12:17:52.579503152 +0200
+@@ -1,6 +1,6 @@
+ /* lmtp_sieve.c -- Sieve implementation for lmtpd
+  *
+- * $Id: lmtp_sieve.c,v 1.11 2005/11/21 16:26:16 murch Exp $
++ * $Id: lmtp_sieve.c,v 1.12 2006/05/10 16:27:17 murch Exp $
+  * Copyright (c) 1998-2003 Carnegie Mellon University.  All rights reserved.
+  *
+  * Redistribution and use in source and binary forms, with or without
+@@ -327,6 +327,8 @@
+ 				    sievedb, strlen(sievedb), time(NULL), 0);
+ 
+ 	snmp_increment(SIEVE_REDIRECT, 1);
++	syslog(LOG_INFO, "sieve redirected: %s to: %s",
++	       m->id ? m->id : "<nomsgid>", rc->addr);
+ 	return SIEVE_OK;
+     } else {
+ 	if (res == -1) {
+@@ -349,17 +351,8 @@
+     snmp_increment(SIEVE_DISCARD, 1);
+ 
+     /* ok, we won't file it, but log it */
+-    if (md->id && strlen(md->id) < 80) {
+-	char pretty[160];
+-
+-	beautify_copy(pretty, md->id);
+-	syslog(LOG_INFO, "sieve: discarded message to %s id %s",
+-	       sd->username, pretty);
+-    }
+-    else {
+-	syslog(LOG_INFO, "sieve: discarded message to %s",
+-	       sd->username);
+-    }	
++    syslog(LOG_INFO, "sieve discarded: %s",
++	   md->id ? md->id : "<nomsgid>");
+ 
+     return SIEVE_OK;
+ }
+@@ -383,7 +376,7 @@
+ 
+     if (strlen(md->return_path) == 0) {
+ 	syslog(LOG_INFO, "sieve: discarded reject to <> for %s id %s",
+-	       sd->username, md->id);
++	       sd->username, md->id ? md->id : "<nomsgid>");
+         return SIEVE_OK;
+     }
+ 
+@@ -393,6 +386,8 @@
+ 			      origreceip, sd->username,
+ 			      rc->msg, md->data)) == 0) {
+ 	snmp_increment(SIEVE_REJECT, 1);
++	syslog(LOG_INFO, "sieve rejected: %s to: %s",
++	       md->id ? md->id : "<nomsgid>", md->return_path);
+ 	return SIEVE_OK;
+     } else {
+ 	if (res == -1) {
+diff -urNad cyrus-imapd-2.2.13/imap/lmtpd.c cyrus-imapd-2.2.13/imap/lmtpd.c
+--- cyrus-imapd-2.2.13/imap/lmtpd.c	2006-05-06 10:34:48.000000000 +0200
++++ cyrus-imapd-2.2.13/imap/lmtpd.c	2006-05-12 12:17:52.578503246 +0200
+@@ -1,6 +1,6 @@
+ /* lmtpd.c -- Program to deliver mail to a mailbox
+  *
+- * $Id: lmtpd.c,v 1.143 2006/01/20 20:29:33 jeaton Exp $
++ * $Id: lmtpd.c,v 1.144 2006/05/10 16:27:17 murch Exp $
+  * Copyright (c) 1998-2003 Carnegie Mellon University.  All rights reserved.
+  *
+  * Redistribution and use in source and binary forms, with or without
+@@ -321,6 +321,7 @@
+ 			       strlen(mailboxname), now, uid);
+ 
+ 	    append_commit(&as, quotaoverride ? -1 : 0, NULL, &uid, NULL);
++	    syslog(LOG_INFO, "Delivered: %s to mailbox: %s", id, mailboxname);
+ 	}
+     }
+ 
+diff -urNad cyrus-imapd-2.2.13/imap/mailbox.c cyrus-imapd-2.2.13/imap/mailbox.c
+--- cyrus-imapd-2.2.13/imap/mailbox.c	2006-05-06 10:34:48.000000000 +0200
++++ cyrus-imapd-2.2.13/imap/mailbox.c	2006-05-12 12:17:52.581502964 +0200
+@@ -1,5 +1,5 @@
+ /* mailbox.c -- Mailbox manipulation routines
+- * $Id: mailbox.c,v 1.159 2005/04/07 00:25:52 shadow Exp $
++ * $Id: mailbox.c,v 1.160 2006/05/10 16:27:18 murch Exp $
+  * Copyright (c) 1998-2003 Carnegie Mellon University.  All rights reserved.
+  *
+  * Redistribution and use in source and binary forms, with or without
+@@ -1931,6 +1931,11 @@
+ 	}
+     }
+ 
++    if (numdeleted > 0) {
++	syslog(LOG_NOTICE, "Expunged %d messages from %s",
++	       numdeleted, mailbox->name); 
++    }
++
+     free(buf);
+     if (deleted) free(deleted);
+ 
+@@ -2187,6 +2192,7 @@
+ 	*tail = '\0';
+     } while (rmdir(buf) == 0 && (tail = strrchr(buf, '/')));
+ 
++    syslog(LOG_NOTICE, "Deleted mailbox %s", mailbox->name); 
+     mailbox_close(mailbox);
+     return 0;
+ }
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/23-configurable_idled.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/23-configurable_idled.dpatch
@@ -0,0 +1,508 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 23-configurable_idled.dpatch by Ondřej Surý <ondrej@sury.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Adds imapd.conf option to select IDLE method at runtime
+
+@DPATCH@
+diff -urNad cyrus-imapd-2.2.13/configure.in cyrus-imapd-2.2.13/configure.in
+--- cyrus-imapd-2.2.13/configure.in	2006-08-23 18:13:47.000000000 +0200
++++ cyrus-imapd-2.2.13/configure.in	2006-08-23 18:13:56.178920138 +0200
+@@ -760,9 +760,6 @@
+                           METHOD is [poll], idled or no],
+ 	WITH_IDLE="${withval}",WITH_IDLE="poll")
+ AC_SUBST(WITH_IDLE)
+-if test "$WITH_IDLE" = "idled"; then
+-  IMAP_PROGS="$IMAP_PROGS idled"
+-fi
+ 
+ dnl
+ dnl see if we're compiling with NNTP support
+diff -urNad cyrus-imapd-2.2.13/imap/Makefile.in cyrus-imapd-2.2.13/imap/Makefile.in
+--- cyrus-imapd-2.2.13/imap/Makefile.in	2006-08-23 18:13:47.000000000 +0200
++++ cyrus-imapd-2.2.13/imap/Makefile.in	2006-08-23 18:13:56.178920138 +0200
+@@ -47,9 +47,6 @@
+ # 'local' (legacy flat file).
+ SEEN=seen_db.o
+ 
+-# IMAP IDLE mechanism
+-IDLE=idle_@WITH_IDLE@.o
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -104,7 +101,8 @@
+ 	convert_code.o duplicate.o saslclient.o saslserver.o signals.o \
+ 	annotate.o search_engines.o squat.o squat_internal.o mbdump.o \
+ 	imapparse.o telemetry.o user.o notify.o protocol.o quota_db.o \
+-	$(SEEN) $(IDLE)
++	idle.o idle_no.o idle_poll.o idle_idled.o \
++	$(SEEN)
+ 
+ IMAPDOBJS=pushstats.o backend.o imapd.o index.o tls.o version.o
+ 
+@@ -118,7 +116,7 @@
+ SERVICE=../master/service.o
+ SERVICETHREAD=../master/service-thread.o
+ 
+-PROGS = imapd lmtpd pop3d \
++PROGS = imapd lmtpd pop3d idled \
+ 	fud smmapd reconstruct quota mbpath ipurge \
+ 	cyrdump chk_cyrus cvt_cyrusdb deliver ctl_mboxlist \
+ 	ctl_deliver ctl_cyrusdb squatter mbexamine cyr_expire arbitron \
+diff -urNad cyrus-imapd-2.2.13/imap/global.c cyrus-imapd-2.2.13/imap/global.c
+--- cyrus-imapd-2.2.13/imap/global.c	2006-08-23 18:13:47.000000000 +0200
++++ cyrus-imapd-2.2.13/imap/global.c	2006-08-23 18:28:28.243411698 +0200
+@@ -72,6 +72,7 @@
+ #include "prot.h" /* for PROT_BUFSIZE */
+ #include "util.h"
+ #include "xmalloc.h"
++#include "idle.h"
+ 
+ static enum {
+     NOT_RUNNING = 0,
+@@ -94,6 +95,8 @@
+ /* syslog prefix tag */
+ static char syslog_prefix[20];
+ 
++struct idle_backend *config_idle=NULL;
++
+ /* Called before a cyrus application starts (but after command line parameters
+  * are read) */
+ int cyrus_init(const char *alt_config, const char *ident, unsigned flags)
+@@ -185,6 +188,10 @@
+ 	config_ptscache_db =
+ 	    cyrusdb_fromname(config_getstring(IMAPOPT_PTSCACHE_DB));
+ 
++        /* lookup idle backend */
++        config_idle =
++            idle_fromname(config_getstring(IMAPOPT_IDLEMETHOD));
++
+ 	/* configure libcyrus as needed */
+ 	libcyrus_config_setstring(CYRUSOPT_CONFIG_DIR, config_dir);
+ 	libcyrus_config_setswitch(CYRUSOPT_AUTH_UNIX_GROUP_ENABLE,
+diff -urNad cyrus-imapd-2.2.13/imap/global.h cyrus-imapd-2.2.13/imap/global.h
+--- cyrus-imapd-2.2.13/imap/global.h	2006-08-21 23:32:39.000000000 +0200
++++ cyrus-imapd-2.2.13/imap/global.h	2006-08-23 18:13:56.179920040 +0200
+@@ -152,4 +152,6 @@
+ extern struct cyrusdb_backend *config_tlscache_db;
+ extern struct cyrusdb_backend *config_ptscache_db;
+ 
++extern struct idle_backend *config_idle;
++
+ #endif /* INCLUDED_GLOBAL_H */
+diff -urNad cyrus-imapd-2.2.13/imap/idle.c cyrus-imapd-2.2.13/imap/idle.c
+--- cyrus-imapd-2.2.13/imap/idle.c	1970-01-01 01:00:00.000000000 +0100
++++ cyrus-imapd-2.2.13/imap/idle.c	2006-08-23 18:13:56.179920040 +0200
+@@ -0,0 +1,87 @@
++/* 
++ * Copyright (c) 1998-2003 Carnegie Mellon University.  All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ *
++ * 1. Redistributions of source code must retain the above copyright
++ *    notice, this list of conditions and the following disclaimer. 
++ *
++ * 2. Redistributions in binary form must reproduce the above copyright
++ *    notice, this list of conditions and the following disclaimer in
++ *    the documentation and/or other materials provided with the
++ *    distribution.
++ *
++ * 3. The name "Carnegie Mellon University" must not be used to
++ *    endorse or promote products derived from this software without
++ *    prior written permission. For permission or any other legal
++ *    details, please contact  
++ *      Office of Technology Transfer
++ *      Carnegie Mellon University
++ *      5000 Forbes Avenue
++ *      Pittsburgh, PA  15213-3890
++ *      (412) 268-4387, fax: (412) 268-7395
++ *      tech-transfer@andrew.cmu.edu
++ *
++ * 4. Redistributions of any form whatsoever must retain the following
++ *    acknowledgment:
++ *    "This product includes software developed by Computing Services
++ *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
++ *
++ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
++ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
++ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
++ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
++ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
++ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
++ */
++
++/* $Id: idle.c,v 1.10 2006/01/04 02:06:23 ondrej Exp $ */
++
++#include <config.h>
++#include <stdlib.h>
++#include <string.h>
++#include <stdio.h>
++#include <netdb.h>
++#include <sys/socket.h>
++#include <netinet/in.h>
++#include <arpa/inet.h>
++#include <errno.h>
++#include <syslog.h>
++#include <sys/types.h>
++#include <sys/stat.h>
++#include <unistd.h>
++#include <fcntl.h>
++#include "makedepend/def.h"
++
++#include "idle.h"
++#include "exitcodes.h"
++
++struct idle_backend *idle_backends[] = {
++    &id_bk_no,
++    &id_bk_poll,
++    &id_bk_idled,
++    NULL };
++
++struct idle_backend *idle_fromname(const char *name)
++{
++    int i;
++    struct idle_backend *idle = NULL;
++
++    for (i = 0; idle_backends[i]; i++) {
++        if (!strcmp(idle_backends[i]->name, name)) {
++            idle = idle_backends[i];
++	    break;
++        }
++    }
++    if (!idle) {
++        char errbuf[1024];
++        snprintf(errbuf, sizeof(errbuf),
++                 "idle backend %s not supported", name);
++        fatal(errbuf, EC_CONFIG);
++    }
++
++    return idle;
++}
+diff -urNad cyrus-imapd-2.2.13/imap/idle.h cyrus-imapd-2.2.13/imap/idle.h
+--- cyrus-imapd-2.2.13/imap/idle.h	2006-08-21 23:32:39.000000000 +0200
++++ cyrus-imapd-2.2.13/imap/idle.h	2006-08-23 18:13:56.180919942 +0200
+@@ -44,8 +44,7 @@
+ #define IDLE_H
+ 
+ #include "mailbox.h"
+-
+-extern const char *idle_method_desc;
++#include "global.h"
+ 
+ typedef enum {
+     IDLE_MAILBOX =	0x1,
+@@ -54,20 +53,43 @@
+ 
+ typedef void idle_updateproc_t(idle_flags_t flags);
+ 
++struct idle_backend {
++    const char *name;
+ 
+-/* Is IDLE enabled?  Can also do initial setup, if necessary */
+-int idle_enabled(void);
++    /* Is IDLE enabled?  Can also do initial setup, if necessary */
++    int (*enabled)(void);
+ 
+-/* Setup for IDLE.
+- * 'proc' is a pointer to a function which reports mailbox updates and/or
+- * ALERTs to the client.
+- */
+-int idle_init(idle_updateproc_t *proc);
++    /* Setup for IDLE.
++     * 'proc' is a pointer to a function which reports mailbox updates and/or
++     * ALERTs to the client.
++     */
++    int (*init)(idle_updateproc_t *proc);
+ 
+-/* Start IDLEing on 'mailbox'. */
+-void idle_start(struct mailbox *mailbox);
++    /* Start IDLEing on 'mailbox'. */
++    void (*start)(struct mailbox *mailbox);
+ 
+-/* Cleanup when IDLE is completed. */
+-void idle_done(struct mailbox *mailbox);
++    /* Cleanup when IDLE is completed. */
++    void (*done)(struct mailbox *mailbox);
++};
++
++/* Defines to simulate old behaviour */
++/* see struct definition above to see what they do */
++
++#define idle_enabled() 		(config_idle?config_idle->enabled():0)
++#define idle_init(proc)		(config_idle?config_idle->init(proc):0)
++#define idle_start(mbox)	(config_idle?config_idle->start(mbox):0)
++#define idle_done(mbox)		(config_idle?config_idle->done(mbox):0)
++#define idle_method_desc	(config_idle?config_idle->name:NULL)
++
++extern struct idle_backend *idle_backends[];
++
++/* Note that some of these may be undefined symbols
++ * if imapd was not built with support for them */
++extern struct idle_backend id_bk_no;
++extern struct idle_backend id_bk_poll;
++extern struct idle_backend id_bk_idled;
++
++/* Configuration */
++struct idle_backend *idle_fromname(const char *name);
+ 
+ #endif
+diff -urNad cyrus-imapd-2.2.13/imap/idle_idled.c cyrus-imapd-2.2.13/imap/idle_idled.c
+--- cyrus-imapd-2.2.13/imap/idle_idled.c	2006-08-23 18:13:47.000000000 +0200
++++ cyrus-imapd-2.2.13/imap/idle_idled.c	2006-08-23 18:13:56.180919942 +0200
+@@ -58,8 +58,6 @@
+ #include "idled.h"
+ #include "global.h"
+ 
+-const char *idle_method_desc = "idled";
+-
+ /* function to report mailbox updates to the client */
+ static idle_updateproc_t *idle_update = NULL;
+ 
+@@ -73,14 +71,14 @@
+ static int idle_remote_len = 0;
+ 
+ /* Forward declarations */
+-int idle_send_msg(int msg, struct mailbox *mailbox);
+-void idle_notify(struct mailbox *mailbox);
++static int idle_send_msg(int msg, struct mailbox *mailbox);
++static void idle_notify(struct mailbox *mailbox);
+ 
+ 
+ /*
+  * Create connection to idled for sending notifications
+  */
+-int idle_enabled(void)
++static int idle_idled_enabled(void)
+ {
+     int s;
+     int fdflags;
+@@ -154,7 +152,10 @@
+     }
+ }
+ 
+-int idle_init(idle_updateproc_t *proc)
++/* forward declaration */
++static void idle_idled_done(struct mailbox *mailbox);
++
++static int idle_idled_init(idle_updateproc_t *proc)
+ {
+     struct sigaction action;
+ 
+@@ -177,14 +178,14 @@
+ 	syslog(LOG_ERR, "sigaction: %m");
+ 
+ 	/* Cancel receiving signals */
+-	idle_done(NULL);
++	idle_idled_done(NULL);
+ 	return 0;
+     }
+ 
+     return 1;
+ }
+ 
+-void idle_start(struct mailbox *mailbox)
++static void idle_idled_start(struct mailbox *mailbox)
+ {
+     idle_started = 1;
+ 
+@@ -195,7 +196,7 @@
+     }
+ }
+ 
+-void idle_done(struct mailbox *mailbox)
++static void idle_idled_done(struct mailbox *mailbox)
+ {
+     /* Tell idled that we're done idling */
+     idle_send_msg(IDLE_DONE, mailbox);
+@@ -212,7 +213,7 @@
+ /*
+  * Send a message to idled
+  */
+-int idle_send_msg(int msg, struct mailbox *mailbox)
++static int idle_send_msg(int msg, struct mailbox *mailbox)
+ {
+     idle_data_t idledata;
+ 
+@@ -235,10 +236,21 @@
+ /*
+  * Notify imapidled of a mailbox change
+  */
+-void idle_notify(struct mailbox *mailbox)
++static void idle_notify(struct mailbox *mailbox)
+ {
+     /* We should try to determine if we need to send this
+      * (ie, is an imapd is IDLE on 'mailbox'?).
+      */
+     idle_send_msg(IDLE_NOTIFY, mailbox);
+ }
++
++struct idle_backend id_bk_idled =
++{
++    "idled", /* name */
++
++    &idle_idled_enabled,
++    &idle_idled_init,
++
++    &idle_idled_start,
++    &idle_idled_done
++};
+diff -urNad cyrus-imapd-2.2.13/imap/idle_no.c cyrus-imapd-2.2.13/imap/idle_no.c
+--- cyrus-imapd-2.2.13/imap/idle_no.c	2006-08-21 23:32:39.000000000 +0200
++++ cyrus-imapd-2.2.13/imap/idle_no.c	2006-08-23 18:13:56.181919844 +0200
+@@ -42,23 +42,31 @@
+ 
+ #include "idle.h"
+ 
+-
+-const char *idle_method_desc = (char *)0;
+-
+-int idle_enabled(void)
++static int idle_no_enabled(void)
+ {
+     return 0;
+ }
+ 
+-int idle_init(idle_updateproc_t *proc)
++static int idle_no_init(idle_updateproc_t *proc)
+ {
+     return 0;
+ }
+ 
+-void idle_start(struct mailbox *mailbox)
++static void idle_no_start(struct mailbox *mailbox __attribute__((unused)))
+ {
+ }
+ 
+-void idle_done(struct mailbox *mailbox)
++static void idle_no_done(struct mailbox *mailbox __attribute__((unused)))
+ {
+ }
++
++struct idle_backend id_bk_no =
++{
++    "no", /* name */
++
++    &idle_no_enabled,
++    &idle_no_init,
++
++    &idle_no_start,
++    &idle_no_done
++};
+diff -urNad cyrus-imapd-2.2.13/imap/idle_poll.c cyrus-imapd-2.2.13/imap/idle_poll.c
+--- cyrus-imapd-2.2.13/imap/idle_poll.c	2006-08-21 23:32:39.000000000 +0200
++++ cyrus-imapd-2.2.13/imap/idle_poll.c	2006-08-23 18:13:56.181919844 +0200
+@@ -51,15 +51,13 @@
+ #include "idle.h"
+ #include "global.h"
+ 
+-const char *idle_method_desc = "poll";
+-
+ /* function to report mailbox updates to the client */
+ static idle_updateproc_t *idle_update = NULL;
+ 
+ /* how often to poll the mailbox */
+ static time_t idle_period = -1;
+ 
+-int idle_enabled(void)
++static int idle_poll_enabled(void)
+ {
+     /* get polling period */
+     if (idle_period == -1) {
+@@ -78,7 +76,10 @@
+     alarm(idle_period);
+ }
+ 
+-int idle_init(idle_updateproc_t *proc)
++/* forward declaration */
++static void idle_poll_done(struct mailbox *mailbox __attribute__((unused)));
++
++static int idle_poll_init(idle_updateproc_t *proc)
+ {
+     struct sigaction action;
+ 
+@@ -96,22 +97,33 @@
+ 	syslog(LOG_ERR, "sigaction: %m");
+ 
+ 	/* Cancel receiving signals */
+-	idle_done(NULL);
++	idle_poll_done(NULL);
+ 	return 0;
+     }
+ 
+     return 1;
+ }
+ 
+-void idle_start(struct mailbox *mailbox __attribute__((unused)))
++static void idle_poll_start(struct mailbox *mailbox __attribute__((unused)))
+ {
+     alarm(idle_period);
+ }
+ 
+-void idle_done(struct mailbox *mailbox __attribute__((unused)))
++static void idle_poll_done(struct mailbox *mailbox __attribute__((unused)))
+ {
+     /* Remove the polling function */
+     signal(SIGALRM, SIG_IGN);
+ 
+     idle_update = NULL;
+ }
++
++struct idle_backend id_bk_poll = 
++{
++    "poll", /* name */
++
++    &idle_poll_enabled,
++    &idle_poll_init,
++
++    &idle_poll_start,
++    &idle_poll_done
++};
+diff -urNad cyrus-imapd-2.2.13/imap/version.c cyrus-imapd-2.2.13/imap/version.c
+--- cyrus-imapd-2.2.13/imap/version.c	2006-08-21 23:32:39.000000000 +0200
++++ cyrus-imapd-2.2.13/imap/version.c	2006-08-23 18:13:56.181919844 +0200
+@@ -62,6 +62,7 @@
+ #include "map.h"
+ #include "lock.h"
+ #include "nonblock.h"
++#include "global.h"
+ #include "idle.h"
+ 
+ #ifdef USE_SIEVE
+diff -urNad cyrus-imapd-2.2.13/lib/Makefile.in cyrus-imapd-2.2.13/lib/Makefile.in
+--- cyrus-imapd-2.2.13/lib/Makefile.in	2006-08-23 18:13:47.000000000 +0200
++++ cyrus-imapd-2.2.13/lib/Makefile.in	2006-08-23 18:13:56.182919747 +0200
+@@ -74,6 +74,8 @@
+ 
+ libdir = @libdir@
+ 
++IDLE = @WITH_IDLE@
++
+ BUILTSOURCES = imapopts.h imapopts.c
+ 
+ LIBCYR_HDRS = $(srcdir)/acl.h $(srcdir)/assert.h $(srcdir)/auth.h \
+@@ -132,7 +134,7 @@
+ 	$(RANLIB) libcyrus_min.a
+ 
+ imapopts.c: imapoptions $(srcdir)/../tools/config2header
+-	$(srcdir)/../tools/config2header CC=$(CC) $(srcdir)/imapopts.c $(srcdir)/imapopts.h < $(srcdir)/imapoptions
++	sed -e "s/%IDLE%/$(IDLE)/g" < $(srcdir)/imapoptions | $(srcdir)/../tools/config2header CC=$(CC) $(srcdir)/imapopts.c $(srcdir)/imapopts.h
+ 
+ imapopts.h: imapopts.c
+ 
+diff -urNad cyrus-imapd-2.2.13/lib/imapoptions cyrus-imapd-2.2.13/lib/imapoptions
+--- cyrus-imapd-2.2.13/lib/imapoptions	2006-08-23 18:13:47.000000000 +0200
++++ cyrus-imapd-2.2.13/lib/imapoptions	2006-08-23 18:13:56.182919747 +0200
+@@ -248,6 +248,9 @@
+ /* The password to use for authentication to the backend server hostname
+    (where hostname is the short hostname of the server) - Cyrus Murder */
+ 
++{ "idlemethod", "%IDLE%", STRINGLIST("no", "poll", "idled") }
++/* The idle backend to use for IDLE command. */
++
+ { "idlesocket", "{configdirectory}/socket/idle", STRING }
+ /* Unix domain socket that idled listens on. */
+ 
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/0020-upstream-client-literal-prefix.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/0020-upstream-client-literal-prefix.dpatch
@@ -0,0 +1,29 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 0020-upstream-client-literal-prefix.dpatch by Sven Mueller <sven@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Upstream patch: Prefix client responses by C:
+
+@DPATCH@
+diff -urNad cyrus-imapd-2.2.13/imtest/imtest.c cyrus-imapd-2.2.13/imtest/imtest.c
+--- cyrus-imapd-2.2.13/imtest/imtest.c	2006-10-03 20:48:22.000000000 +0200
++++ cyrus-imapd-2.2.13/imtest/imtest.c	2006-10-03 20:55:16.098628728 +0200
+@@ -1,7 +1,7 @@
+ /* imtest.c -- IMAP/POP3/NNTP/LMTP/SMTP/MUPDATE/MANAGESIEVE test client
+  * Ken Murchison (multi-protocol implementation)
+  * Tim Martin (SASL implementation)
+- * $Id: imtest.c,v 1.108 2006/05/25 15:23:07 murch Exp $
++ * $Id: imtest.c,v 1.109 2006/08/30 16:58:49 murch Exp $
+  *
+  * Copyright (c) 1998-2003 Carnegie Mellon University.  All rights reserved.
+  *
+@@ -1083,7 +1083,8 @@
+ 
+ 	    /* send to server */
+ 	    if (sendliteral) {
+-		printf("{%d+}\r\n", inbase64len);
++		printf("%s{%d+}\r\n",
++		       initial_response ? "" : "C: ", inbase64len);
+ 		prot_printf(pout, "{%d+}\r\n", inbase64len);
+ 		prot_flush(pout);
+ 	    }
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/08-clean_socket_closes.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/08-clean_socket_closes.dpatch
@@ -0,0 +1,90 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 08-clean_socket_closes.dpatch by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Cleanly close sockets
+
+@DPATCH@
+diff -urNad cyrus-imapd-2.2.13/imap/backend.c cyrus-imapd-2.2.13/imap/backend.c
+--- cyrus-imapd-2.2.13/imap/backend.c	2006-05-12 12:20:40.000000000 +0200
++++ cyrus-imapd-2.2.13/imap/backend.c	2006-05-12 12:22:01.565116257 +0200
+@@ -400,6 +400,7 @@
+ 	    syslog(LOG_ERR, "couldn't authenticate to backend server: %s",
+ 		   sasl_errstring(r, NULL, NULL));
+ 	    if (!ret_backend) free(ret);
++ 	    shutdown(sock, SHUT_RDWR);
+ 	    close(sock);
+ 	    ret = NULL;
+ 	}
+diff -urNad complete.dpatch/imap/fud.c complete.dpatch/imap/fud.c
+--- complete.dpatch/imap/fud.c	2005-11-10 21:12:04.000000000 +0100
++++ complete.dpatch/imap/fud.c	2005-11-11 00:01:58.076164940 +0100
+@@ -158,6 +158,15 @@
+     mboxlist_done();
+     closelog();
+     cyrus_done();
++
++    /* be nice to remote */
++    shutdown(0, SHUT_RD);
++    shutdown(1, SHUT_RD);
++    shutdown(2, SHUT_RD);
++    close(0);
++    close(1);
++    close(2);
++
+     exit(code);
+ }
+ 
+diff -urNad complete.dpatch/imap/imapd.c complete.dpatch/imap/imapd.c
+--- complete.dpatch/imap/imapd.c	2005-11-10 21:12:04.000000000 +0100
++++ complete.dpatch/imap/imapd.c	2005-11-11 00:04:47.146591300 +0100
+@@ -767,6 +767,10 @@
+ #ifdef HAVE_SSL
+     tls_shutdown_serverengine();
+ #endif
++    /* shutdown socket nicely */
++    cyrus_close_sock(0);
++    cyrus_close_sock(1);
++    cyrus_close_sock(2);
+ 
+     cyrus_done();
+ 
+diff -urNad complete.dpatch/imap/lmtpd.c complete.dpatch/imap/lmtpd.c
+--- complete.dpatch/imap/lmtpd.c	2004-12-17 17:32:15.000000000 +0100
++++ complete.dpatch/imap/lmtpd.c	2005-11-11 00:02:48.172254190 +0100
+@@ -553,6 +553,9 @@
+ 
+     cyrus_done();
+ 
++    /* shutdown socket nicely */
++    cyrus_reset_stdio();
++
+     exit(code);
+ }
+ 
+diff -urNad complete.dpatch/imap/pop3d.c complete.dpatch/imap/pop3d.c
+--- complete.dpatch/imap/pop3d.c	2005-11-10 21:07:23.000000000 +0100
++++ complete.dpatch/imap/pop3d.c	2005-11-11 00:03:22.702869236 +0100
+@@ -496,6 +496,9 @@
+ #endif
+ 
+     cyrus_done();
++    cyrus_close_sock(0);
++    cyrus_close_sock(1);
++    cyrus_close_sock(2);
+ 
+     exit(code);
+ }
+diff -urNad complete.dpatch/imap/proxyd.c complete.dpatch/imap/proxyd.c
+--- complete.dpatch/imap/proxyd.c	2005-11-10 21:12:04.000000000 +0100
++++ complete.dpatch/imap/proxyd.c	2005-11-11 00:04:04.761746266 +0100
+@@ -1382,6 +1382,9 @@
+ #endif
+ 
+     cyrus_done();
++    cyrus_close_sock(0);
++    cyrus_close_sock(1);
++    cyrus_close_sock(2);
+ 
+     exit(code);
+ }
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/0009-upstream-remove-redundant-wildcard-check.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/0009-upstream-remove-redundant-wildcard-check.dpatch
@@ -0,0 +1,56 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 0009-upstream-remove-redundant-wildcard-check by Sven Mueller
+##                                            <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: remove redundant check for wildcards in mailbox names
+## DP: (Wes Craig <wes@umich.edu>)
+
+@DPATCH@
+diff -urNad cyrus-imapd-2.2.13/imap/imapd.c cyrus-imapd-2.2.13/imap/imapd.c
+--- cyrus-imapd-2.2.13/imap/imapd.c	2006-05-12 12:18:02.000000000 +0200
++++ cyrus-imapd-2.2.13/imap/imapd.c	2006-05-12 12:18:43.442725508 +0200
+@@ -38,7 +38,7 @@
+  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+  */
+ 
+-/* $Id: imapd.c,v 1.498 2006/01/13 22:06:28 murch Exp $ */
++/* $Id: imapd.c,v 1.500 2006/05/10 15:41:44 murch Exp $ */
+ 
+ #include <config.h>
+ 
+@@ -3952,11 +3952,6 @@
+ 	}
+     }
+ 
+-    /* verify that the mailbox doesn't have a wildcard in it */
+-    for (p = oldmailboxname; !r && *p; p++) {
+-	if (*p == '*' || *p == '%') r = IMAP_MAILBOX_BADNAME;
+-    }
+-
+     /* attempt to rename the base mailbox */
+     if (!r) {
+ 	r = mboxlist_renamemailbox(oldmailboxname, newmailboxname, partition,
+diff -urNad cyrus-imapd-2.2.13/imap/mboxlist.c cyrus-imapd-2.2.13/imap/mboxlist.c
+--- cyrus-imapd-2.2.13/imap/mboxlist.c	2006-05-06 10:34:48.000000000 +0200
++++ cyrus-imapd-2.2.13/imap/mboxlist.c	2006-05-12 12:18:12.192660857 +0200
+@@ -40,7 +40,7 @@
+  *
+  */
+ /*
+- * $Id: mboxlist.c,v 1.241 2005/11/22 18:20:51 murch Exp $
++ * $Id: mboxlist.c,v 1.242 2006/05/10 15:41:52 murch Exp $
+  */
+ 
+ #include <config.h>
+@@ -476,10 +476,6 @@
+ 		free(acl);
+ 		return IMAP_PERMISSION_DENIED;
+ 	    }
+-	    /* disallow wildcards in userids with inboxes. */	     
+-	    if (strchr(mbox, '*') || strchr(mbox, '%') || strchr(mbox, '?')) {
+-		return IMAP_MAILBOX_BADNAME;
+-	    }
+ 
+ 	    /*
+ 	     * Users by default have all access to their personal mailbox(es),
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/61-64bit-quota.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/61-64bit-quota.dpatch
@@ -0,0 +1,668 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 60-64bit-quota.dpatch by Ondrej Sury <ondrej@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Add support for 64-bit quotas
+
+@DPATCH@
+diff -urNad cyrus-imapd-2.2.13/configure.in cyrus-imapd-2.2.13/configure.in
+--- cyrus-imapd-2.2.13/configure.in	2007-02-24 18:46:32.000000000 +0100
++++ cyrus-imapd-2.2.13/configure.in	2007-02-24 18:46:35.598277322 +0100
+@@ -107,6 +107,15 @@
+ dnl fi
+ AC_C_INLINE
+ 
++dnl Check if `long long int' is available
++AC_CHECK_SIZEOF(long long int)
++AC_CHECK_SIZEOF(unsigned long long int)
++if test "$ac_cv_sizeof_long_long_int" -eq 8 -a \
++        "$ac_cv_sizeof_unsigned_long_long_int" -eq 8; then
++  AC_DEFINE(HAVE_LONG_LONG_INT,[],[Does the compiler support long long int?])
++  AC_C_BIGENDIAN
++fi
++
+ CMU_C___ATTRIBUTE__
+ CMU_C_FPIC
+ 
+diff -urNad cyrus-imapd-2.2.13/imap/append.c cyrus-imapd-2.2.13/imap/append.c
+--- cyrus-imapd-2.2.13/imap/append.c	2006-11-13 19:21:27.000000000 +0100
++++ cyrus-imapd-2.2.13/imap/append.c	2007-02-24 18:46:35.599277223 +0100
+@@ -140,7 +140,7 @@
+     if (!r) {
+ 	if (m.quota.limit >= 0 && quotacheck >= 0 &&
+ 	    m.quota.used + quotacheck > 
+-	    ((unsigned) m.quota.limit * QUOTA_UNITS)) {
++	    ((uquota_t) m.quota.limit * QUOTA_UNITS)) {
+ 	    r = IMAP_QUOTA_EXCEEDED;
+ 	}
+     }
+@@ -208,7 +208,7 @@
+     if (!r) {
+ 	if (as->m.quota.limit >= 0 && quotacheck >= 0 &&
+ 	    as->m.quota.used + quotacheck > 
+-	    ((unsigned) as->m.quota.limit * QUOTA_UNITS)) {
++	    ((uquota_t) as->m.quota.limit * QUOTA_UNITS)) {
+ 	    quota_abort(&as->tid);
+ 	    mailbox_close(&as->m);
+ 	    r = IMAP_QUOTA_EXCEEDED;
+diff -urNad cyrus-imapd-2.2.13/imap/imapd.c cyrus-imapd-2.2.13/imap/imapd.c
+--- cyrus-imapd-2.2.13/imap/imapd.c	2007-02-24 18:46:32.000000000 +0100
++++ cyrus-imapd-2.2.13/imap/imapd.c	2007-02-24 18:46:35.602276928 +0100
+@@ -2664,10 +2664,10 @@
+  	     */
+  	    int warnsize = config_getint(IMAPOPT_QUOTAWARNKB);
+  	    if (warnsize <= 0 || warnsize >= imapd_mailbox->quota.limit ||
+- 	        (int)((imapd_mailbox->quota.limit * QUOTA_UNITS) -
+-		      imapd_mailbox->quota.used) < (warnsize * QUOTA_UNITS)) {
++ 	        ((uquota_t) (imapd_mailbox->quota.limit - warnsize)) * QUOTA_UNITS < 
++		imapd_mailbox->quota.used) {
+ 		usage = ((double) imapd_mailbox->quota.used * 100.0) / (double)
+-		    (imapd_mailbox->quota.limit * QUOTA_UNITS);
++		    ((uquota_t) imapd_mailbox->quota.limit * QUOTA_UNITS);
+ 		if (usage >= 100.0) {
+ 		    prot_printf(imapd_out, "* NO [ALERT] %s\r\n",
+ 				error_message(IMAP_NO_OVERQUOTA));
+@@ -4660,7 +4660,7 @@
+ 	printastring(name);
+ 	prot_printf(imapd_out, " (");
+ 	if (quota.limit >= 0) {
+-	    prot_printf(imapd_out, "STORAGE %lu %d",
++	    prot_printf(imapd_out, "STORAGE " UQUOTA_T_FMT " %d",
+ 			quota.used/QUOTA_UNITS, quota.limit);
+ 	}
+ 	prot_printf(imapd_out, ")\r\n");
+@@ -4722,7 +4722,7 @@
+ 		printastring(mailboxname);
+ 		prot_printf(imapd_out, " (");
+ 		if (mailbox.quota.limit >= 0) {
+-		    prot_printf(imapd_out, "STORAGE %lu %d",
++		    prot_printf(imapd_out, "STORAGE " UQUOTA_T_FMT " %d",
+ 				mailbox.quota.used/QUOTA_UNITS,
+ 				mailbox.quota.limit);
+ 		}
+diff -urNad cyrus-imapd-2.2.13/imap/mailbox.c cyrus-imapd-2.2.13/imap/mailbox.c
+--- cyrus-imapd-2.2.13/imap/mailbox.c	2007-02-24 18:46:31.000000000 +0100
++++ cyrus-imapd-2.2.13/imap/mailbox.c	2007-02-24 18:46:35.604276731 +0100
+@@ -84,6 +84,7 @@
+ #include "seen.h"
+ #include "util.h"
+ #include "xmalloc.h"
++#include "byteorder64.h"
+ 
+ static int mailbox_doing_reconstruct = 0;
+ #define zeromailbox(m) { memset(&m, 0, sizeof(struct mailbox)); \
+@@ -788,6 +789,13 @@
+     mailbox->last_uid =
+ 	ntohl(*((bit32 *)(mailbox->index_base+OFFSET_LAST_UID)));
+ 
++#ifdef HAVE_LONG_LONG_INT
++    if (mailbox->minor_version > 5) {
++	/* newer versions may use 64bit quotas now */
++        mailbox->quota_mailbox_used =
++            ntohll(*((bit64 *)(mailbox->index_base+OFFSET_QUOTA_MAILBOX_USED64)));
++    } else
++#endif
+     mailbox->quota_mailbox_used =
+ 	ntohl(*((bit32 *)(mailbox->index_base+OFFSET_QUOTA_MAILBOX_USED-quota_upgrade_offset)));
+ 
+@@ -1183,9 +1191,18 @@
+     *((bit32 *)(buf+OFFSET_EXISTS)) = htonl(mailbox->exists);
+     *((bit32 *)(buf+OFFSET_LAST_APPENDDATE)) = htonl(mailbox->last_appenddate);
+     *((bit32 *)(buf+OFFSET_LAST_UID)) = htonl(mailbox->last_uid);
+-    *((bit32 *)(buf+OFFSET_QUOTA_RESERVED_FIELD)) = htonl(0); /* RESERVED */
++
++    /* quotas may be 64bit now */
++#ifdef HAVE_LONG_LONG_INT
++    *((bit64 *)(buf+OFFSET_QUOTA_MAILBOX_USED64)) =
++	htonll(mailbox->quota_mailbox_used);
++#else	
++    /* zero the unused 32bits */
++    *((bit32 *)(buf+OFFSET_QUOTA_MAILBOX_USED64)) = htonl(0);
+     *((bit32 *)(buf+OFFSET_QUOTA_MAILBOX_USED)) =
+ 	htonl(mailbox->quota_mailbox_used);
++#endif
++
+     *((bit32 *)(buf+OFFSET_POP3_LAST_LOGIN)) = htonl(mailbox->pop3_last_login);
+     *((bit32 *)(buf+OFFSET_UIDVALIDITY)) = htonl(mailbox->uidvalidity);
+     *((bit32 *)(buf+OFFSET_DELETED)) = htonl(mailbox->deleted);
+@@ -1433,9 +1450,18 @@
+     *((bit32 *)(buf+OFFSET_EXISTS)) = htonl(mailbox->exists);
+     *((bit32 *)(buf+OFFSET_LAST_APPENDDATE)) = htonl(mailbox->last_appenddate);
+     *((bit32 *)(buf+OFFSET_LAST_UID)) = htonl(mailbox->last_uid);
+-    /* OFFSET_QUOTA_RESERVED_FIELD left as zero */
++
++    /* newer versions may use 64bit quotas */
++#ifdef HAVE_LONG_LONG_INT
++    *((bit64 *)(buf+OFFSET_QUOTA_MAILBOX_USED64)) =
++	htonll(mailbox->quota_mailbox_used);
++#else	
++    /* zero the unused 32bits */
++    *((bit32 *)(buf+OFFSET_QUOTA_MAILBOX_USED64)) = htonl(0);
+     *((bit32 *)(buf+OFFSET_QUOTA_MAILBOX_USED)) =
+ 	htonl(mailbox->quota_mailbox_used);
++#endif
++
+     *((bit32 *)(buf+OFFSET_POP3_LAST_LOGIN)) = htonl(mailbox->pop3_last_login);
+     *((bit32 *)(buf+OFFSET_UIDVALIDITY)) = htonl(mailbox->uidvalidity);
+     *((bit32 *)(buf+OFFSET_DELETED)) = htonl(mailbox->deleted);
+@@ -1611,7 +1637,8 @@
+     size_t fnamebuf_len;
+     FILE *newindex = NULL, *newcache = NULL;
+     unsigned long *deleted;
+-    unsigned numdeleted = 0, quotadeleted = 0;
++    unsigned numdeleted = 0;
++    uquota_t quotadeleted = 0;
+     unsigned numansweredflag = 0;
+     unsigned numdeletedflag = 0;
+     unsigned numflaggedflag = 0;
+@@ -1838,8 +1865,13 @@
+     *((bit32 *)(buf+OFFSET_FLAGGED)) = htonl(newflagged);
+ 
+     /* Fix up quota_mailbox_used */
++#ifdef HAVE_LONG_LONG_INT
++    *((bit64 *)(buf+OFFSET_QUOTA_MAILBOX_USED64)) =
++	htonll(ntohll(*((bit64 *)(buf+OFFSET_QUOTA_MAILBOX_USED64)))-quotadeleted);
++#else
+     *((bit32 *)(buf+OFFSET_QUOTA_MAILBOX_USED)) =
+       htonl(ntohl(*((bit32 *)(buf+OFFSET_QUOTA_MAILBOX_USED)))-quotadeleted);
++#endif
+     /* Fix up start offset if necessary */
+     if (mailbox->start_offset < INDEX_HEADER_SIZE) {
+ 	*((bit32 *)(buf+OFFSET_START_OFFSET)) = htonl(INDEX_HEADER_SIZE);
+@@ -1871,7 +1903,7 @@
+ 	if (!r) quota_commit(&tid);
+ 	else {
+ 	    syslog(LOG_ERR,
+-		   "LOSTQUOTA: unable to record free of %u bytes in quota %s",
++		   "LOSTQUOTA: unable to record free of " UQUOTA_T_FMT " bytes in quota %s",
+ 		   quotadeleted, mailbox->quota.root);
+ 	}
+     }
+@@ -2146,7 +2178,7 @@
+ 	r = quota_write(&mailbox->quota, &tid);
+ 	if (r) {
+ 	    syslog(LOG_ERR,
+-		   "LOSTQUOTA: unable to record free of %lu bytes in quota %s",
++		   "LOSTQUOTA: unable to record free of " UQUOTA_T_FMT " bytes in quota %s",
+ 		   mailbox->quota_mailbox_used, mailbox->quota.root);
+ 	}
+ 	else
+@@ -2265,7 +2297,7 @@
+ 	    strcmp(oldmailbox->quota.root, newmailbox->quota.root) != 0) {
+ 	    if (!r && newmailbox->quota.limit >= 0 &&
+ 		newmailbox->quota.used + oldmailbox->quota_mailbox_used >
+-		((unsigned) newmailbox->quota.limit * QUOTA_UNITS)) {
++		((uquota_t) newmailbox->quota.limit * QUOTA_UNITS)) {
+ 		r = IMAP_QUOTA_EXCEEDED;
+ 	    }
+ 	}
+@@ -2479,7 +2511,7 @@
+ 	    strcmp(oldmailbox.quota.root, newmailbox.quota.root) != 0) {
+ 	    if (!r && newmailbox.quota.limit >= 0 &&
+ 		newmailbox.quota.used + oldmailbox.quota_mailbox_used >
+-		((unsigned) newmailbox.quota.limit * QUOTA_UNITS)) {
++		((uquota_t) newmailbox.quota.limit * QUOTA_UNITS)) {
+ 		r = IMAP_QUOTA_EXCEEDED;
+ 	    }
+ 	}
+@@ -2632,7 +2664,7 @@
+ 	else if (r2 == IMAP_QUOTAROOT_NONEXISTENT) r2 = 0;
+ 	if (r2) {
+ 	    syslog(LOG_ERR,
+-	      "LOSTQUOTA: unable to record use of %lu bytes in quota %s",
++	      "LOSTQUOTA: unable to record use of " UQUOTA_T_FMT " bytes in quota %s",
+ 		   newmailbox.quota_mailbox_used, newmailbox.quota.root);
+ 	}
+     }
+diff -urNad cyrus-imapd-2.2.13/imap/mailbox.h cyrus-imapd-2.2.13/imap/mailbox.h
+--- cyrus-imapd-2.2.13/imap/mailbox.h	2006-11-13 19:21:27.000000000 +0100
++++ cyrus-imapd-2.2.13/imap/mailbox.h	2007-02-24 18:46:35.604276731 +0100
+@@ -45,6 +45,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <limits.h>
++#include <config.h>
+ 
+ #include "auth.h"
+ #include "quota.h"
+@@ -61,6 +62,10 @@
+ #error dont know what to use for bit32
+ #endif
+ 
++#ifdef HAVE_LONG_LONG_INT
++typedef unsigned long long int bit64;
++#endif
++
+ #define MAX_MAILBOX_NAME 490
+ #define MAX_MAILBOX_PATH 4096
+ 
+@@ -126,7 +131,7 @@
+     unsigned long exists;
+     time_t last_appenddate;
+     unsigned long last_uid;
+-    unsigned long quota_mailbox_used;
++    uquota_t quota_mailbox_used;
+     unsigned long pop3_last_login;
+     unsigned long uidvalidity;
+ 
+@@ -168,8 +173,8 @@
+ #define OFFSET_EXISTS 20
+ #define OFFSET_LAST_APPENDDATE 24
+ #define OFFSET_LAST_UID 28
+-#define OFFSET_QUOTA_RESERVED_FIELD 32  /* Reserved for 64bit quotas */
+-#define OFFSET_QUOTA_MAILBOX_USED 36
++#define OFFSET_QUOTA_MAILBOX_USED64 32  /* offset for 64bit quotas */
++#define OFFSET_QUOTA_MAILBOX_USED 36    /* offset for 32bit quotas */
+ #define OFFSET_POP3_LAST_LOGIN 40
+ #define OFFSET_UIDVALIDITY 44
+ #define OFFSET_DELETED 48      /* added for ACAP */
+diff -urNad cyrus-imapd-2.2.13/imap/mbdump.c cyrus-imapd-2.2.13/imap/mbdump.c
+--- cyrus-imapd-2.2.13/imap/mbdump.c	2007-02-24 18:46:32.000000000 +0100
++++ cyrus-imapd-2.2.13/imap/mbdump.c	2007-02-24 18:46:35.605276633 +0100
+@@ -507,7 +507,7 @@
+ {
+     struct buf file, data;
+     char c;
+-    int quotaused = 0;
++    uquota_t quotaused = 0;
+     int r = 0;
+     int curfile = -1;
+     const char *userid = NULL;
+diff -urNad cyrus-imapd-2.2.13/imap/mbexamine.c cyrus-imapd-2.2.13/imap/mbexamine.c
+--- cyrus-imapd-2.2.13/imap/mbexamine.c	2006-11-13 19:21:27.000000000 +0100
++++ cyrus-imapd-2.2.13/imap/mbexamine.c	2007-02-24 18:46:35.605276633 +0100
+@@ -266,7 +266,7 @@
+     printf("  Minor Version: %d\n", mailbox.minor_version);
+     printf("  Header Size: %ld bytes  Record Size: %ld bytes\n",
+ 	   mailbox.start_offset, mailbox.record_size);
+-    printf("  Number of Messages: %lu  Mailbox Size: %lu bytes\n",
++    printf("  Number of Messages: %lu  Mailbox Size: " UQUOTA_T_FMT " bytes\n",
+ 	   mailbox.exists, mailbox.quota_mailbox_used);
+     printf("  Last Append Date: (%ld) %s", mailbox.last_appenddate,
+ 	   ctime(&mailbox.last_appenddate));
+diff -urNad cyrus-imapd-2.2.13/imap/mboxlist.c cyrus-imapd-2.2.13/imap/mboxlist.c
+--- cyrus-imapd-2.2.13/imap/mboxlist.c	2007-02-24 18:46:31.000000000 +0100
++++ cyrus-imapd-2.2.13/imap/mboxlist.c	2007-02-24 18:46:35.606276534 +0100
+@@ -2536,7 +2536,7 @@
+ 	r = quota_write(&mailbox.quota, tid);
+ 	if (r) {
+ 	    syslog(LOG_ERR,
+-		   "LOSTQUOTA: unable to record free of %lu bytes in quota %s",
++		   "LOSTQUOTA: unable to record free of " UQUOTA_T_FMT " bytes in quota %s",
+ 		   mailbox.quota_mailbox_used, mailbox.quota.root);
+ 	}
+ 	free(mailbox.quota.root);
+diff -urNad cyrus-imapd-2.2.13/imap/quota.c cyrus-imapd-2.2.13/imap/quota.c
+--- cyrus-imapd-2.2.13/imap/quota.c	2007-02-24 18:46:31.000000000 +0100
++++ cyrus-imapd-2.2.13/imap/quota.c	2007-02-24 18:46:35.607276436 +0100
+@@ -107,7 +107,7 @@
+     struct quota quota;
+     int refcount;
+     int deleted;
+-    unsigned long newused;
++    uquota_t newused;
+ };
+ 
+ /* forward declarations */
+@@ -473,7 +473,7 @@
+ 	(*count)++;
+     }
+     if (quota[thisquota].quota.used != quota[thisquota].newused) {
+-	printf("%s: usage was %lu, now %lu\n", quota[thisquota].quota.root,
++	printf("%s: usage was " UQUOTA_T_FMT ", now " UQUOTA_T_FMT "\n", quota[thisquota].quota.root,
+ 	       quota[thisquota].quota.used, quota[thisquota].newused);
+ 	quota[thisquota].quota.used = quota[thisquota].newused;
+ 	r = quota_write(&quota[thisquota].quota, tid);
+@@ -539,12 +539,12 @@
+     int i;
+     char buf[MAX_MAILBOX_PATH+1];
+ 
+-    printf("   Quota  %% Used    Used Root\n");
++    printf("   Quota   %% Used     Used Root\n");
+ 
+     for (i = 0; i < quota_num; i++) {
+ 	if (quota[i].deleted) continue;
+ 	if (quota[i].quota.limit > 0) {
+-	    printf(" %7d %7ld", quota[i].quota.limit,
++	    printf(" %7d " QUOTA_REPORT_FMT , quota[i].quota.limit,
+ 		   ((quota[i].quota.used / QUOTA_UNITS) * 100) / quota[i].quota.limit);
+ 	}
+ 	else if (quota[i].quota.limit == 0) {
+@@ -557,6 +557,6 @@
+ 	(*quota_namespace.mboxname_toexternal)(&quota_namespace,
+ 					       quota[i].quota.root,
+ 					       "cyrus", buf);
+-	printf(" %7ld %s\n", quota[i].quota.used / QUOTA_UNITS, buf);
++	printf(" " QUOTA_REPORT_FMT " %s\n", quota[i].quota.used / QUOTA_UNITS, buf);
+     }
+ }
+diff -urNad cyrus-imapd-2.2.13/imap/quota.h cyrus-imapd-2.2.13/imap/quota.h
+--- cyrus-imapd-2.2.13/imap/quota.h	2006-11-13 19:21:27.000000000 +0100
++++ cyrus-imapd-2.2.13/imap/quota.h	2007-02-24 18:46:35.607276436 +0100
+@@ -45,18 +45,37 @@
+ #define INCLUDED_QUOTA_H
+ 
+ #include "cyrusdb.h"
++#include <config.h>
+ 
+ #define FNAME_QUOTADB "/quotas.db"
+ 
+ #define QUOTA_UNITS (1024)
+ 
++/* Define the proper quota type, it should either be a
++ * long or a long long int depending upon what the
++ * the compiler supports.
++ */
++#ifdef HAVE_LONG_LONG_INT
++typedef unsigned long long int uquota_t;
++typedef long long int quota_t;
++#define UQUOTA_T_FMT     "%llu"
++#define QUOTA_T_FMT      "%lld"
++#define QUOTA_REPORT_FMT "%8llu"
++#else
++typedef unsigned long uquota_t;
++typedef long quota_t;
++#define UQUOTA_T_FMT     "%lu"
++#define QUOTA_T_FMT      "%ld"
++#define QUOTA_REPORT_FMT "%8lu"
++#endif
++
+ extern struct db *qdb;
+ 
+ struct quota {
+     char *root;
+ 
+     /* Information in quota entry */
+-    unsigned long used;
++    uquota_t used;
+     int limit;			/* in QUOTA_UNITS */
+ };
+ 
+diff -urNad cyrus-imapd-2.2.13/imap/quota_db.c cyrus-imapd-2.2.13/imap/quota_db.c
+--- cyrus-imapd-2.2.13/imap/quota_db.c	2006-11-13 19:21:27.000000000 +0100
++++ cyrus-imapd-2.2.13/imap/quota_db.c	2007-02-24 18:46:35.608276338 +0100
+@@ -89,7 +89,7 @@
+ 
+     switch (r) {
+     case CYRUSDB_OK:
+-	sscanf(data, "%lu %d", &quota->used, &quota->limit);
++	sscanf(data, UQUOTA_T_FMT " %d", &quota->used, &quota->limit);
+ 	break;
+ 
+     case CYRUSDB_AGAIN:
+@@ -151,7 +151,7 @@
+     if (!qrlen) return IMAP_QUOTAROOT_NONEXISTENT;
+ 
+     len = snprintf(buf, sizeof(buf) - 1,
+-		   "%lu %d", quota->used, quota->limit);
++		   UQUOTA_T_FMT " %d", quota->used, quota->limit);
+     r = QDB->store(qdb, quota->root, qrlen, buf, len, tid);
+     
+     switch (r) {
+diff -urNad cyrus-imapd-2.2.13/imap/reconstruct.c cyrus-imapd-2.2.13/imap/reconstruct.c
+--- cyrus-imapd-2.2.13/imap/reconstruct.c	2007-02-24 18:46:31.000000000 +0100
++++ cyrus-imapd-2.2.13/imap/reconstruct.c	2007-02-24 18:46:35.608276338 +0100
+@@ -93,6 +93,7 @@
+ #include "retry.h"
+ #include "convert_code.h"
+ #include "util.h"
++#include "byteorder64.h"
+ 
+ extern int optind;
+ extern char *optarg;
+@@ -434,7 +435,7 @@
+     char *list_acl, *list_part;
+     int list_type;
+ 
+-    unsigned long new_quota = 0;
++    uquota_t new_quota = 0;
+ 
+     struct index_record message_index, old_index;
+     static struct index_record zero_index;
+@@ -690,7 +691,14 @@
+     *((bit32 *)(buf+OFFSET_EXISTS)) = htonl(new_exists);
+     *((bit32 *)(buf+OFFSET_LAST_APPENDDATE)) = htonl(mailbox.last_appenddate);
+     *((bit32 *)(buf+OFFSET_LAST_UID)) = htonl(mailbox.last_uid);
++
++    /* quotas may be 64bit now */
++#ifdef HAVE_LONG_LONG_INT
++    *((bit64 *)(buf+OFFSET_QUOTA_MAILBOX_USED64)) = htonll(new_quota);
++#else
+     *((bit32 *)(buf+OFFSET_QUOTA_MAILBOX_USED)) = htonl(new_quota);
++#endif
++
+     *((bit32 *)(buf+OFFSET_POP3_LAST_LOGIN)) = htonl(mailbox.pop3_last_login);
+     *((bit32 *)(buf+OFFSET_UIDVALIDITY)) = htonl(mailbox.uidvalidity);
+     *((bit32 *)(buf+OFFSET_DELETED)) = htonl(new_deleted);
+diff -urNad cyrus-imapd-2.2.13/lib/Makefile.in cyrus-imapd-2.2.13/lib/Makefile.in
+--- cyrus-imapd-2.2.13/lib/Makefile.in	2007-02-24 18:46:32.000000000 +0100
++++ cyrus-imapd-2.2.13/lib/Makefile.in	2007-02-24 18:46:35.609276239 +0100
+@@ -87,7 +87,7 @@
+ 	$(srcdir)/lsort.h $(srcdir)/stristr.h \
+ 	$(srcdir)/util.h $(srcdir)/xstrlcpy.h $(srcdir)/xstrlcat.h $(srcdir)/xmalloc.h $(srcdir)/imapurl.h \
+ 	$(srcdir)/cyrusdb.h $(srcdir)/iptostring.h $(srcdir)/rfc822date.h \
+-	$(srcdir)/libcyr_cfg.h
++	$(srcdir)/libcyr_cfg.h $(srcdir)/byteorder64.h
+ 
+ LIBCYR_OBJS = acl.o bsearch.o charset.o glob.o retry.o util.o \
+ 	libcyr_cfg.o mkgmtime.o prot.o parseaddr.o imclient.o imparse.o \
+@@ -95,7 +95,7 @@
+ 	chartable.o imapurl.o nonblock_@WITH_NONBLOCK@.o lock_@WITH_LOCK@.o \
+ 	gmtoff_@WITH_GMTOFF@.o map_@WITH_MAP@.o $(ACL) $(AUTH) \
+ 	@LIBOBJS@ @CYRUSDB_OBJS@ \
+-	iptostring.o xstrlcpy.o xstrlcat.o xmalloc.o wildmat.o
++	iptostring.o xstrlcpy.o xstrlcat.o xmalloc.o wildmat.o byteorder64.o
+ 
+ LIBCYRM_HDRS = $(srcdir)/hash.h $(srcdir)/mpool.h $(srcdir)/xstrlcpy.h $(srcdir)/xstrlcat.h $(srcdir)/xmalloc.h \
+ 	$(srcdir)/strhash.o $(srcdir)/libconfig.h \
+diff -urNad cyrus-imapd-2.2.13/lib/byteorder64.c cyrus-imapd-2.2.13/lib/byteorder64.c
+--- cyrus-imapd-2.2.13/lib/byteorder64.c	1970-01-01 01:00:00.000000000 +0100
++++ cyrus-imapd-2.2.13/lib/byteorder64.c	2007-02-24 18:46:35.609276239 +0100
+@@ -0,0 +1,95 @@
++/* byteorder64.c -- convert 64-bit values between host and network byte order
++ * 
++ * Copyright (c) 2004 Carnegie Mellon University.  All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ *
++ * 1. Redistributions of source code must retain the above copyright
++ *    notice, this list of conditions and the following disclaimer. 
++ *
++ * 2. Redistributions in binary form must reproduce the above copyright
++ *    notice, this list of conditions and the following disclaimer in
++ *    the documentation and/or other materials provided with the
++ *    distribution.
++ *
++ * 3. The name "Carnegie Mellon University" must not be used to
++ *    endorse or promote products derived from this software without
++ *    prior written permission. For permission or any other legal
++ *    details, please contact  
++ *      Office of Technology Transfer
++ *      Carnegie Mellon University
++ *      5000 Forbes Avenue
++ *      Pittsburgh, PA  15213-3890
++ *      (412) 268-4387, fax: (412) 268-7395
++ *      tech-transfer@andrew.cmu.edu
++ *
++ * 4. Redistributions of any form whatsoever must retain the following
++ *    acknowledgment:
++ *    "This product includes software developed by Computing Services
++ *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
++ *
++ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
++ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
++ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
++ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
++ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
++ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
++ *
++ * $Id: byteorder64.c,v 1.1.2.1 2004/08/09 18:51:21 ken3 Exp $
++ */
++
++#include <config.h>
++
++#if defined(HAVE_LONG_LONG_INT) && !defined(WORDS_BIGENDIAN)
++
++#include <netinet/in.h>
++
++/* Structure used to swap the bytes in a 64-bit unsigned long long. */
++union byteswap_64_u {
++    unsigned long long a;
++    uint32_t b[2];
++};
++
++/* Function to byteswap 64bit unsigned integers on
++ * little endian machines to big endian network order. 
++ * On big endian machines this will be a null macro.
++ * The macro htonll() is defined in byteorder64.h,
++ * and if needed refers to _htonll() here.
++ */
++unsigned long long _htonll(unsigned long long x)
++{
++    union byteswap_64_u u1;
++    union byteswap_64_u u2;
++
++    u1.a = x;
++
++    u2.b[0] = htonl(u1.b[1]);
++    u2.b[1] = htonl(u1.b[0]);
++
++    return u2.a;
++}
++
++
++/* Function to byteswap big endian 64bit unsigned integers
++ * back to little endian host order on little endian machines. 
++ * As above, on big endian machines this will be a null macro.
++ * The macro ntohll() is defined in byteorder64.h, and if needed,
++ * refers to _ntohll() here.
++ */
++unsigned long long _ntohll(unsigned long long x)
++{
++    union byteswap_64_u u1;
++    union byteswap_64_u u2;
++
++    u1.a = x;
++
++    u2.b[1] = ntohl(u1.b[0]);
++    u2.b[0] = ntohl(u1.b[1]);
++
++    return u2.a;
++}
++
++#endif /* defined(HAVE_LONG_LONG_INT) && !defined(WORDS_BIGENDIAN) */
+diff -urNad cyrus-imapd-2.2.13/lib/byteorder64.h cyrus-imapd-2.2.13/lib/byteorder64.h
+--- cyrus-imapd-2.2.13/lib/byteorder64.h	1970-01-01 01:00:00.000000000 +0100
++++ cyrus-imapd-2.2.13/lib/byteorder64.h	2007-02-24 18:46:35.609276239 +0100
+@@ -0,0 +1,65 @@
++/* byteorder64.h -- convert 64-bit values between host and network byte order
++ *
++ * Copyright (c) 2004 Carnegie Mellon University.  All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ *
++ * 1. Redistributions of source code must retain the above copyright
++ *    notice, this list of conditions and the following disclaimer. 
++ *
++ * 2. Redistributions in binary form must reproduce the above copyright
++ *    notice, this list of conditions and the following disclaimer in
++ *    the documentation and/or other materials provided with the
++ *    distribution.
++ *
++ * 3. The name "Carnegie Mellon University" must not be used to
++ *    endorse or promote products derived from this software without
++ *    prior written permission. For permission or any other legal
++ *    details, please contact  
++ *      Office of Technology Transfer
++ *      Carnegie Mellon University
++ *      5000 Forbes Avenue
++ *      Pittsburgh, PA  15213-3890
++ *      (412) 268-4387, fax: (412) 268-7395
++ *      tech-transfer@andrew.cmu.edu
++ *
++ * 4. Redistributions of any form whatsoever must retain the following
++ *    acknowledgment:
++ *    "This product includes software developed by Computing Services
++ *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
++ *
++ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
++ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
++ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
++ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
++ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
++ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
++ *
++ * $Id: byteorder64.h,v 1.1.2.2 2004/08/16 11:44:34 ken3 Exp $
++ */
++
++#ifndef _BYTEORDER64_H
++#define _BYTEORDER64_H
++
++#include <config.h>
++
++#ifdef HAVE_LONG_LONG_INT
++
++/* 64-bit host/network byte-order swap macros */
++#ifdef WORDS_BIGENDIAN
++#define htonll(x) (x)
++#define ntohll(x) (x)
++#else
++#define htonll(x) _htonll(x)
++#define ntohll(x) _ntohll(x)
++
++/* little-endian 64-bit host/network byte-order swap functions */
++extern unsigned long long _htonll(unsigned long long);
++extern unsigned long long _ntohll(unsigned long long);
++
++#endif /* WORDS_BIGENDIAN */
++#endif /* HAVE_LONG_LONG_INT */
++#endif /* _BYTEORDER64_H */
+diff -urNad cyrus-imapd-2.2.13/lib/prot.c cyrus-imapd-2.2.13/lib/prot.c
+--- cyrus-imapd-2.2.13/lib/prot.c	2006-11-13 19:21:27.000000000 +0100
++++ cyrus-imapd-2.2.13/lib/prot.c	2007-02-24 18:46:35.610276141 +0100
+@@ -871,6 +871,11 @@
+     char buf[30];
+     va_start(pvar, fmt);
+ 
++#ifdef HAVE_LONG_LONG_INT
++    long long int ll;
++    unsigned long long int ull;
++#endif
++
+     assert(s->write);
+ 
+     while ((percent = strchr(fmt, '%')) != 0) {
+@@ -894,6 +899,27 @@
+ 		prot_write(s, buf, strlen(buf));
+ 		break;
+ 
++#ifdef HAVE_LONG_LONG_INT
++            case 'l':
++	        switch (*++percent) {
++		case 'd':
++		    ll = va_arg(pvar, long long int);
++		    snprintf(buf, sizeof(buf), "%lld", ll);
++		    prot_write(s, buf, strlen(buf));
++		    break;
++
++		case 'u':
++		    ull = va_arg(pvar, unsigned long long int);
++		    snprintf(buf, sizeof(buf), "%llu", ull);
++		    prot_write(s, buf, strlen(buf));
++		    break;
++
++	        default:
++		    abort();
++		}
++		break;
++#endif
++
+ 	    default:
+ 		abort();
+ 	    }
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/40-rehash_fix_pathes.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/40-rehash_fix_pathes.dpatch
@@ -0,0 +1,36 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 40_rehash_fix_pathes.dpatch by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix paths in tools/rehash
+
+@DPATCH@
+diff -urNad cyrus-imapd-2.2.12/tools/rehash cyrus-imapd-2.2.12/tools/rehash
+--- cyrus-imapd-2.2.12/tools/rehash	2005-05-24 22:56:53.000000000 +0200
++++ cyrus-imapd-2.2.12/tools/rehash	2005-05-24 22:57:53.429121575 +0200
+@@ -170,7 +170,7 @@
+ $imapdconf = shift || "/etc/imapd.conf";
+ 
+ $yn = "y";
+-$sievedir = "/usr/sieve";
++$sievedir = "/var/spool/sieve";
+ $nosievedir = 0;
+ $hashispool = 0;
+ $virtdomains = 0;
+@@ -181,7 +181,7 @@
+     read_conf($conf);
+ }
+ 
+-if (! $confdir) { $confdir = "/var/imap"; }
++if (! $confdir) { $confdir = "/var/lib/cyrus"; }
+ 
+ if ($interactive) {
+     print "upgrade $confdir? ";
+@@ -555,6 +555,7 @@
+ 	      or die "couldn't rename .$i/$s/$t to $s/$t";
+ 	  }
+ 	  closedir MV;
++	  rmdir ".$i/$s" or die "could not remove .$i/$s"
+ 	}
+ 	closedir SUB;
+ 	rmdir ".$i" or die "could not remove .$i";
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/0005-upstream-fix-ctl_mboxlist-dump-undump.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/0005-upstream-fix-ctl_mboxlist-dump-undump.dpatch
@@ -0,0 +1,92 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 0005-upstream-fix-ctl_mboxlist-dump-undump.dpatch by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix a problem in ctl_mboxlist with remote mailboxes (it now also dumps
+## DP: and undumps mailbox type flags)
+
+@DPATCH@
+diff -urNad cyrus-imapd-2.2.13/doc/changes.html cyrus-imapd-2.2.13/doc/changes.html
+--- cyrus-imapd-2.2.13/doc/changes.html	2006-05-03 17:19:51.000000000 +0200
++++ cyrus-imapd-2.2.13/doc/changes.html	2006-05-03 17:26:24.115155499 +0200
+@@ -8,6 +8,12 @@
+ </head>
+ <body>
+ 
++<h1>Changes to the Cyrus IMAP Server since 2.2.13</h1> 
++<ul> 
++<li><tt>ctl_mboxlist</tt> now dumps/undumps the mailbox type flags,
++making it useful for remote mailboxes.</li>
++</ul>
++
+ <h1>Changes to the Cyrus IMAP Server since 2.2.12</h1> 
+ <ul> 
+ <li>Allow sieve scripts to be run on shared mailboxes (via <tt>sieve</tt>
+diff -urNad cyrus-imapd-2.2.13/imap/ctl_mboxlist.c cyrus-imapd-2.2.13/imap/ctl_mboxlist.c
+--- cyrus-imapd-2.2.13/imap/ctl_mboxlist.c	2006-05-03 17:19:51.000000000 +0200
++++ cyrus-imapd-2.2.13/imap/ctl_mboxlist.c	2006-05-03 17:26:24.129154183 +0200
+@@ -187,7 +187,7 @@
+     switch (d->op) {
+     case DUMP:
+ 	if(!d->partition || !strcmp(d->partition, part)) {
+-	    printf("%s\t%s\t%s\n", name, part, acl);
++	    printf("%s\t%d %s\t%s\n", name, mbtype, part, acl);
+ 	    if(d->purge) {
+ 		config_mboxlist_db->delete(mbdb, key, keylen, &(d->tid), 0);
+ 	    }
+@@ -490,7 +490,7 @@
+     while (fgets(buf, sizeof(buf), stdin)) {
+ 	char *name, *partition, *acl;
+ 	char *p;
+-	int tries = 0;
++	int mbtype = 0, tries = 0;
+ 	
+ 	line++;
+ 
+@@ -501,6 +501,12 @@
+ 	    continue;
+ 	}
+ 	*p++ = '\0';
++	if (isdigit((int) *p)) {
++	    /* new style dump */
++	    mbtype = strtol(p, &p, 10);
++	    /* skip trailing space */
++	    if (*p == ' ') p++;
++	}
+ 	partition = p;
+ 	for (; *p && *p != '\t'; p++) ;
+ 	if (!*p) {
+@@ -523,7 +529,7 @@
+ 	}
+ 
+ 	key = name; keylen = strlen(key);
+-	data = mboxlist_makeentry(0, partition, acl); datalen = strlen(data);
++	data = mboxlist_makeentry(mbtype, partition, acl); datalen = strlen(data);
+ 	
+ 	tries = 0;
+     retry:
+diff -urNad cyrus-imapd-2.2.13/man/ctl_mboxlist.8 cyrus-imapd-2.2.13/man/ctl_mboxlist.8
+--- cyrus-imapd-2.2.13/man/ctl_mboxlist.8	2006-05-03 17:19:51.000000000 +0200
++++ cyrus-imapd-2.2.13/man/ctl_mboxlist.8	2006-05-03 17:26:24.125154559 +0200
+@@ -104,7 +104,9 @@
+ .TP
+ .B \-d
+ Dump the contents of the database to standard output in a portable
+-flat-text format.
++flat-text format.  NOTE: In Cyrus versions 2.2.13 and earlier, the dump
++format did not include the mailbox type flags, breaking remote
++mailboxes (frontends, mupdate master) when undumped.
+ .TP
+ .B \-x
+ When performing a dump, remove the mailboxes dumped from the mailbox list
+@@ -115,7 +117,9 @@
+ .TP
+ .B \-u
+ Load the contents of the database from standard input.  The input MUST
+-be in the format output using the \fB\-d\fR option.
++be in the format output using the \fB\-d\fR option.  NOTE: Both the
++old and new formats can be loaded, but the old format will break
++remote mailboxes.
+ .TP
+ .B \-m
+ For backend servers in the Cyrus Murder, synchronize the local mailbox list
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/16-fix_mib.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/16-fix_mib.dpatch
@@ -0,0 +1,30 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 16-fix_mib.dpatch by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix MIB file for cyrus
+
+@DPATCH@
+diff -urNad complete.dpatch/master/CYRUS-MASTER.mib complete.dpatch/master/CYRUS-MASTER.mib
+--- complete.dpatch/master/CYRUS-MASTER.mib	2001-08-14 18:11:26.000000000 +0200
++++ complete.dpatch/master/CYRUS-MASTER.mib	2005-11-10 17:11:15.237608454 +0100
+@@ -1,12 +1,15 @@
+ CYRUS-MASTER-MIB DEFINITIONS ::= BEGIN
+ 
+ IMPORTS
+-    MODULE-IDENTITY, OBJECT-TYPE, Counter32
++    MODULE-IDENTITY, OBJECT-TYPE, Counter32, enterprises
+         FROM SNMPv2-SMI
+     DisplayString
+-        FROM SNMPv2-TC
+-    cmuCyrus
+-        FROM CMU-MIB;
++        FROM SNMPv2-TC;
++--    cmuCyrus
++--        FROM CMU-MIB;
++
++cmuMIB         OBJECT IDENTIFIER ::= { enterprises 3 }
++cmuCyrus       OBJECT IDENTIFIER ::= { cmuMIB 6 }
+ 
+ cyrusMasterMIB MODULE-IDENTITY
+     LAST-UPDATED "0010312300Z"		-- 2000 Oct 31
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/70-fix_readme_link.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/70-fix_readme_link.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 70-fix_readme_link.dpatch by Benjamin Seidenberg <astronut@dlgeek.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix a bad link in readme.html
+
+@DPATCH@
+diff -urNad cyrus-imapd-2.2.13~/doc/readme.html cyrus-imapd-2.2.13/doc/readme.html
+--- cyrus-imapd-2.2.13~/doc/readme.html	2006-05-05 21:04:27.000000000 -0400
++++ cyrus-imapd-2.2.13/doc/readme.html	2006-05-24 16:18:45.000000000 -0400
+@@ -56,7 +56,7 @@
+ <P> This system should be expected to have the same order-of-magnitude
+ installation complexity as a netnews system.  Maintenance should have
+ similar complexity, except administrators will have to deal with <A
+-HREF="cyradm.1.html">creation and deletion of users</A> and will have
++HREF="man/cyradm.1.html">creation and deletion of users</A> and will have
+ the option of managing quotas and access control lists.
+ 
+ <p>This package is distributed as a source only release. It is
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/24-configurable-referrals.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/24-configurable-referrals.dpatch
@@ -0,0 +1,56 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 24-configurable-referrals.dpatch by Benjamin Seidenberg <benjamin@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad cyrus-imapd-2.2.13~/imap/proxyd.c cyrus-imapd-2.2.13/imap/proxyd.c
+--- cyrus-imapd-2.2.13~/imap/proxyd.c	2008-04-15 13:12:51.542198785 +0200
++++ cyrus-imapd-2.2.13/imap/proxyd.c	2008-04-15 13:12:51.670209745 +0200
+@@ -1161,7 +1161,7 @@
+     
+     /* Cleanup Globals */
+     proxyd_cmdcnt = 0;
+-    disable_referrals = 0;
++    disable_referrals = config_getswitch(IMAPOPT_PROXYD_DISABLE_MAILBOX_REFERRALS);
+     supports_referrals = 0;
+     proxyd_userisadmin = 0;
+     proxyd_starttls_done = 0;
+@@ -2776,6 +2776,10 @@
+     prot_printf(proxyd_out, "* CAPABILITY ");
+     prot_printf(proxyd_out, CAPABILITY_STRING);
+ 
++    if (config_getswitch(IMAPOPT_PROXYD_DISABLE_MAILBOX_REFERRALS) == 0) {
++      prot_printf(proxyd_out, " MAILBOX-REFERRALS");
++    }
++		
+     if (config_getint(IMAPOPT_IMAPIDLEPOLL) > 0) {
+ 	prot_printf(proxyd_out, " IDLE");
+     }
+diff -urNad cyrus-imapd-2.2.13~/imap/version.h cyrus-imapd-2.2.13/imap/version.h
+--- cyrus-imapd-2.2.13~/imap/version.h	2008-04-15 13:12:50.766132285 +0200
++++ cyrus-imapd-2.2.13/imap/version.h	2008-04-15 13:12:51.670209745 +0200
+@@ -55,7 +55,7 @@
+ 
+ /* CAPABILITIES are now defined here, not including sasl ones */
+ #define CAPABILITY_STRING "IMAP4 IMAP4rev1 ACL QUOTA LITERAL+ " \
+-	"MAILBOX-REFERRALS NAMESPACE UIDPLUS ID " \
++	"NAMESPACE UIDPLUS ID " \
+ 	"NO_ATOMIC_RENAME UNSELECT " \
+ 	"CHILDREN MULTIAPPEND BINARY " \
+ 	"SORT THREAD=ORDEREDSUBJECT THREAD=REFERENCES " \
+diff -urNad cyrus-imapd-2.2.13~/lib/imapoptions cyrus-imapd-2.2.13/lib/imapoptions
+--- cyrus-imapd-2.2.13~/lib/imapoptions	2008-04-15 13:12:51.570201186 +0200
++++ cyrus-imapd-2.2.13/lib/imapoptions	2008-04-15 13:12:51.670209745 +0200
+@@ -668,6 +668,10 @@
+    connections that these referrals would cause, thus resulting in a higher
+    authentication load on the respective backend server. */
+ 
++{ "proxyd_disable_mailbox_referrals", 0, SWITCH }
++/* Set to true to disable the use of mailbox-referrals on the
++   proxy servers.*/
++
+ { "proxyservers", NULL, STRING }
+ /* A list of users and groups that are allowed to proxy for other
+    users, seperated by spaces.  Any user listed in this will be
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/26-local-getline.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/26-local-getline.dpatch
@@ -0,0 +1,88 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 26-local-getline.dpatch by Mathieu Parent <sathieu@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Rename conflicting function getline
+## DP: See http://bugs.debian.org/552865 and http://bugs.debian.org/552848
+
+@DPATCH@
+diff -urNad kolab-cyrus-imapd-2.2.13~/contrib/sieve-spamasssassin kolab-cyrus-imapd-2.2.13/contrib/sieve-spamasssassin
+--- kolab-cyrus-imapd-2.2.13~/contrib/sieve-spamasssassin	2002-05-10 00:00:46.000000000 +0200
++++ kolab-cyrus-imapd-2.2.13/contrib/sieve-spamasssassin	2009-11-11 19:52:40.000000000 +0100
+@@ -85,7 +85,7 @@
+ + /* spam support */
+ + 
+ + static int
+-+ getline (int s, char *buf, int len)
+++ local_getline (int s, char *buf, int len)
+ + {
+ +     char *bp = buf;
+ +     int ret = 1;
+@@ -129,8 +129,8 @@
+ +     int score;
+ +     int threshold;
+ + 
+-+     if (! getline (s, buf, sizeof (buf))) {
+-+ 	syslog (LOG_ERR, "read_response: response getline failed");
+++     if (! local_getline (s, buf, sizeof (buf))) {
+++ 	syslog (LOG_ERR, "read_response: response local_getline failed");
+ + 	return SIEVE_FAIL;
+ +     }
+ +     if (sscanf (buf, "SPAMD/%d.%d %d %*s", &major, &minor, &response) != 3) {
+@@ -143,8 +143,8 @@
+ + 		major, minor);
+ + 	return SIEVE_FAIL;
+ +     }
+-+     if (! getline (s, buf, sizeof (buf))) {
+-+ 	syslog (LOG_ERR, "read_response: header getline failed");
+++     if (! local_getline (s, buf, sizeof (buf))) {
+++ 	syslog (LOG_ERR, "read_response: header local_getline failed");
+ + 	return SIEVE_FAIL;
+ +     }
+ +     if (sscanf (buf, "Spam: %5s ; %d / %d", is_spam, &score, &threshold) != 3) {
+diff -urNad kolab-cyrus-imapd-2.2.13~/makedepend/def.h kolab-cyrus-imapd-2.2.13/makedepend/def.h
+--- kolab-cyrus-imapd-2.2.13~/makedepend/def.h	2003-02-13 21:15:43.000000000 +0100
++++ kolab-cyrus-imapd-2.2.13/makedepend/def.h	2009-11-11 19:51:34.000000000 +0100
+@@ -161,7 +161,7 @@
+ 
+ char			*copy();
+ char			*base_name();
+-char			*getline();
++char			*local_getline();
+ struct symtab		*slookup();
+ struct symtab		*isdefined();
+ struct symtab		*fdefined();
+diff -urNad kolab-cyrus-imapd-2.2.13~/makedepend/main.c kolab-cyrus-imapd-2.2.13/makedepend/main.c
+--- kolab-cyrus-imapd-2.2.13~/makedepend/main.c	2003-02-13 21:15:44.000000000 +0100
++++ kolab-cyrus-imapd-2.2.13/makedepend/main.c	2009-11-11 19:51:03.000000000 +0100
+@@ -548,7 +548,7 @@
+  * Get the next line.  We only return lines beginning with '#' since that
+  * is all this program is ever interested in.
+  */
+-char *getline(filep)
++char *local_getline(filep)
+ 	register struct filepointer	*filep;
+ {
+ 	register char	*p,	/* walking pointer */
+diff -urNad kolab-cyrus-imapd-2.2.13~/makedepend/parse.c kolab-cyrus-imapd-2.2.13/makedepend/parse.c
+--- kolab-cyrus-imapd-2.2.13~/makedepend/parse.c	2003-02-13 21:15:44.000000000 +0100
++++ kolab-cyrus-imapd-2.2.13/makedepend/parse.c	2009-11-11 19:51:19.000000000 +0100
+@@ -82,7 +82,7 @@
+ 	register int	type;
+ 	boolean recfailOK;
+ 
+-	while (line = getline(filep)) {
++	while (line = local_getline(filep)) {
+ 		switch(type = deftype(line, filep, file_red, file, TRUE)) {
+ 		case IF:
+ 		doif:
+@@ -204,7 +204,7 @@
+ 	register char	*line;
+ 	register int	type;
+ 
+-	while (line = getline(filep)) {
++	while (line = local_getline(filep)) {
+ 		switch(type = deftype(line, filep, file_red, file, FALSE)) {
+ 		case IF:
+ 		case IFFALSE:
+
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/35-masssievec_remove_unused_variable.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/35-masssievec_remove_unused_variable.dpatch
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 35_masssievec_remove_unused_variable.dpatch by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Remove the $nosievedir variable which is set once but never used.
+
+@DPATCH@
+diff -urNad cyrus-imapd-2.2.12/tools/masssievec cyrus-imapd-2.2.12/tools/masssievec
+--- cyrus-imapd-2.2.12/tools/masssievec	2005-05-24 22:52:49.000000000 +0200
++++ cyrus-imapd-2.2.12/tools/masssievec	2005-05-24 22:53:24.124865338 +0200
+@@ -86,7 +86,6 @@
+ 	    push @configs, $1;
+ 	}
+ 	if (/^sieveusehomedir:\s+(1|t|yes|on)/) {
+-	    $nosievedir = 1;
+ 	    print "you are storing sieve scripts in user's home directories, this script cannot deal with that\n";
+ 	    exit;
+ 	}
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/10-fix_potential_overflows.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/10-fix_potential_overflows.dpatch
@@ -0,0 +1,198 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10-fix_potential_overflows.dpatch by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fix potential buffer overflows
+
+@DPATCH@
+diff -urNad complete.dpatch/imap/ctl_mboxlist.c complete.dpatch/imap/ctl_mboxlist.c
+--- complete.dpatch/imap/ctl_mboxlist.c	2004-05-22 05:45:48.000000000 +0200
++++ complete.dpatch/imap/ctl_mboxlist.c	2005-11-10 20:38:08.142040412 +0100
+@@ -479,7 +479,7 @@
+     int r = 0;
+     char buf[16384];
+     int line = 0;
+-    char last_commit[MAX_MAILBOX_NAME];
++    char last_commit[MAX_MAILBOX_NAME+1];
+     char *key=NULL, *data=NULL;
+     int keylen, datalen;
+     int untilCommit = PER_COMMIT;
+diff -urNad complete.dpatch/imap/fud.c complete.dpatch/imap/fud.c
+--- complete.dpatch/imap/fud.c	2004-12-17 17:32:07.000000000 +0100
++++ complete.dpatch/imap/fud.c	2005-11-10 20:38:44.863358638 +0100
+@@ -119,9 +119,9 @@
+ 
+         while(1) {
+             /* For safety */
+-            memset(username,'\0',MAXLOGNAME + MAXDOMNAME);	
+-            memset(mbox,'\0',MAX_MAILBOX_NAME+1);
+-            memset(buf, '\0', MAXLOGNAME + MAX_MAILBOX_NAME + 1);
++            memset(username,'\0', sizeof(username));	
++            memset(mbox,'\0', sizeof(mbox));
++            memset(buf, '\0', sizeof(buf));
+ 
+ 	    if (signals_poll() == SIGHUP) {
+ 		/* caught a SIGHUP, return */
+diff -urNad complete.dpatch/imap/global.c complete.dpatch/imap/global.c
+--- complete.dpatch/imap/global.c	2004-11-23 18:40:15.000000000 +0100
++++ complete.dpatch/imap/global.c	2005-11-10 20:40:02.897537018 +0100
+@@ -467,7 +467,7 @@
+ {
+     struct namespace namespace;
+     char *acl;
+-    char bufuser[MAX_MAILBOX_NAME], inboxname[MAX_MAILBOX_NAME];
++    char bufuser[MAX_MAILBOX_NAME+1], inboxname[MAX_MAILBOX_NAME+1];
+     int r;
+ 
+     /* Set namespace */
+diff -urNad complete.dpatch/imap/idle_idled.c complete.dpatch/imap/idle_idled.c
+--- complete.dpatch/imap/idle_idled.c	2003-10-22 22:05:11.000000000 +0200
++++ complete.dpatch/imap/idle_idled.c	2005-11-10 20:40:56.266272619 +0100
+@@ -109,11 +109,11 @@
+     idle_remote.sun_family = AF_UNIX;
+     idle_sock = config_getstring(IMAPOPT_IDLESOCKET);
+     if (idle_sock) {	
+-	strcpy(idle_remote.sun_path, idle_sock);
++	strlcpy(idle_remote.sun_path, idle_sock, sizeof(idle_remote.sun_path));
+     }
+     else {
+-	strcpy(idle_remote.sun_path, config_dir);
+-	strcat(idle_remote.sun_path, FNAME_IDLE_SOCK);
++	strlcpy(idle_remote.sun_path, config_dir, sizeof(idle_remote.sun_path));
++	strlcat(idle_remote.sun_path, FNAME_IDLE_SOCK, sizeof(idle_remote.sun_path));
+     }
+     idle_remote_len = sizeof(idle_remote.sun_family) +
+ 	strlen(idle_remote.sun_path) + 1;
+diff -urNad complete.dpatch/imap/index.c complete.dpatch/imap/index.c
+--- complete.dpatch/imap/index.c	2005-02-14 17:42:08.000000000 +0100
++++ complete.dpatch/imap/index.c	2005-11-10 20:42:49.720157772 +0100
+@@ -3278,9 +3278,17 @@
+ 		cur->from = get_localpart_addr(from + CACHE_ITEM_SIZE_SKIP);
+ 		break;
+ 	    case SORT_SUBJECT:
+-		cur->xsubj = index_extract_subject(subj + CACHE_ITEM_SIZE_SKIP,
+-						   CACHE_ITEM_LEN(subj),
+-						   &cur->is_refwd);
++		 {
++		     int len = CACHE_ITEM_LEN(subj);
++		     char *t = xmalloc(len+1);
++		
++		     memcpy(t, subj + CACHE_ITEM_SIZE_SKIP, len);
++		     t[len] = '\0';
++		
++		     cur->xsubj = index_extract_subject(t, len, &cur->is_refwd);
++		
++		     free(t);
++		 }
+ 		cur->xsubj_hash = strhash(cur->xsubj);
+ 		break;
+ 	    case SORT_TO:
+diff -urNad complete.dpatch/imap/mboxlist.h complete.dpatch/imap/mboxlist.h
+--- complete.dpatch/imap/mboxlist.h	2004-03-17 19:07:49.000000000 +0100
++++ complete.dpatch/imap/mboxlist.h	2005-11-10 20:43:33.110906719 +0100
+@@ -73,7 +73,7 @@
+ 
+ /* each mailbox has the following data */
+ struct mbox_entry {
+-    char name[MAX_MAILBOX_NAME];
++    char name[MAX_MAILBOX_NAME+1];
+     int mbtype;
+     char partition[MAX_PARTITION_LEN];
+ 				/* holds remote machine for REMOTE mailboxes */
+diff -urNad complete.dpatch/imap/message.c complete.dpatch/imap/message.c
+--- complete.dpatch/imap/message.c	2005-11-10 18:19:03.000000000 +0100
++++ complete.dpatch/imap/message.c	2005-11-10 20:44:17.400567516 +0100
+@@ -795,7 +795,7 @@
+     /* Save header value */
+     len = hdrend - hdr;
+     message_ibuf_ensure(ibuf, len+2);
+-    strncpy(ibuf->end, hdr, len);
++    strncpy(ibuf->end, hdr, len+1);
+     ibuf->end += len;
+     *(ibuf->end)++ = '\r';
+     *(ibuf->end)++ = '\n';
+diff -urNad complete.dpatch/imap/mupdate.h complete.dpatch/imap/mupdate.h
+--- complete.dpatch/imap/mupdate.h	2003-12-10 17:07:03.000000000 +0100
++++ complete.dpatch/imap/mupdate.h	2005-11-10 20:44:52.257152442 +0100
+@@ -70,8 +70,8 @@
+     struct buf tag, cmd, arg1, arg2, arg3;
+ 
+     /* For client side mupdate_find calls */
+-    char mailbox_buf[MAX_MAILBOX_NAME];
+-    char server_buf[MAX_MAILBOX_NAME];
++    char mailbox_buf[MAX_MAILBOX_NAME+1];
++    char server_buf[MAX_MAILBOX_NAME+1];
+     char *acl_buf;
+     size_t acl_buf_len;
+     struct mupdate_mailboxdata mailboxdata_buf;
+diff -urNad complete.dpatch/imap/proxyd.c complete.dpatch/imap/proxyd.c
+--- complete.dpatch/imap/proxyd.c	2005-11-10 18:19:03.000000000 +0100
++++ complete.dpatch/imap/proxyd.c	2005-11-10 20:46:06.823846583 +0100
+@@ -1277,7 +1277,7 @@
+ 		 char **envp __attribute__((unused)))
+ {
+     socklen_t salen;
+-    char hbuf[NI_MAXHOST];
++    char hbuf[NI_MAXHOST+1];
+     struct sockaddr_storage proxyd_localaddr, proxyd_remoteaddr;
+     char localip[60], remoteip[60];
+     int niflags;
+diff -urNad complete.dpatch/imtest/imtest.c complete.dpatch/imtest/imtest.c
+--- complete.dpatch/imtest/imtest.c	2005-11-10 18:19:03.000000000 +0100
++++ complete.dpatch/imtest/imtest.c	2005-11-10 20:47:18.417831766 +0100
+@@ -1225,7 +1225,7 @@
+ 	
+ 	/* can't have this and a file for input */
+ 	sunsock.sun_family = AF_UNIX;
+-	strcpy(sunsock.sun_path, output_socket);
++	strlcpy(sunsock.sun_path, output_socket, sizeof(sunsock.sun_path));
+ 	unlink(output_socket);
+ 
+ 	listen_sock = socket(AF_UNIX, SOCK_STREAM, 0);
+diff -urNad complete.dpatch/master/master.c complete.dpatch/master/master.c
+--- complete.dpatch/master/master.c	2005-11-10 18:19:03.000000000 +0100
++++ complete.dpatch/master/master.c	2005-11-10 20:50:59.813138032 +0100
+@@ -222,13 +222,17 @@
+     return result;
+ }
+ 
+-void get_prog(char *path, unsigned size, char *const *cmd)
++void get_prog(char *path, unsigned int size, char *const *cmd)
+ {
+     if (cmd[0][0] == '/') {
+ 	/* master lacks strlcpy, due to no libcyrus */
+ 	snprintf(path, size, "%s", cmd[0]);
++	path[size-1] = '\0';
++    }
++    else {
++	snprintf(path, size, "%s/%s", SERVICE_PATH, cmd[0]);
++	path[size-1] = '\0';
+     }
+-    else snprintf(path, size, "%s/%s", SERVICE_PATH, cmd[0]);
+ }
+ 
+ void get_statsock(int filedes[2])
+diff -urNad complete.dpatch/master/masterconf.c complete.dpatch/master/masterconf.c
+--- complete.dpatch/master/masterconf.c	2003-11-25 18:37:19.000000000 +0100
++++ complete.dpatch/master/masterconf.c	2005-11-10 20:53:17.940602394 +0100
+@@ -133,7 +133,7 @@
+ 	} else {
+ 	    /* one word */
+ 	    for (i = 0; i < 255; i++) {
+-		if (isspace((int) *p)) break;
++		if ((!*p) || (isspace((int) *p))) break;
+ 		v[i] = *p++;
+ 	    }
+ 	}
+diff -urNad complete.dpatch/notifyd/notifyd.c complete.dpatch/notifyd/notifyd.c
+--- complete.dpatch/notifyd/notifyd.c	2004-12-17 17:32:25.000000000 +0100
++++ complete.dpatch/notifyd/notifyd.c	2005-11-10 20:55:15.058125035 +0100
+@@ -143,7 +143,7 @@
+ 	if (cp) nopt = strtol(cp, NULL, 10);
+ 	if (nopt < 0 || errno == ERANGE) cp = NULL;
+ 
+-	if (cp && nopt &&
++	if (cp && (nopt > 0) &&
+ 	    !(options = (char**) xrealloc(options, nopt * sizeof(char*)))) {
+ 	    fatal("xmalloc(): can't allocate options", EC_OSERR);
+ 	}
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/04-add_autogen.sh.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/04-add_autogen.sh.dpatch
@@ -0,0 +1,88 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04-add_autogen.sh.dpatch by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Add autogen.sh
+
+@DPATCH@
+diff -urNad cyrus-imapd-2.2.12/autogen.sh cyrus-imapd-2.2.12/autogen.sh
+--- cyrus-imapd-2.2.12/autogen.sh	1970-01-01 01:00:00.000000000 +0100
++++ cyrus-imapd-2.2.12/autogen.sh	2005-11-11 19:47:43.571058024 +0100
+@@ -0,0 +1,77 @@
++#!/bin/sh
++#
++# autogen.sh glue for CMU Cyrus IMAP
++# $Id: autogen.sh,v 1.16 2004/09/12 15:30:23 hmh Exp $
++#
++# Requires: automake 1.9, autoconf 2.57, dpkg-dev
++set -e
++
++# Refresh GNU autotools toolchain.
++echo Running GNU autotools toolchain...
++AUTOMAKEDIR=/usr/share/automake-1.9
++[ -n "$AUTOMAKEDIR" ] &&
++  for i in config.guess config.sub install-sh mkinstalldirs ; do
++	test -r ${AUTOMAKEDIR}/${i} && {
++		rm -f ${i} || true
++		cp ${AUTOMAKEDIR}/${i} .
++	}
++	chmod 755 ${i}
++  done
++
++aclocal-1.9 -I cmulocal
++autoheader
++#automake --verbose --foreign --add-missing
++autoconf
++
++# For the Debian build
++test -d debian && {
++	# Kill executable list first
++	#rm -f debian/executable.files
++
++	# Make sure our executable and removable lists won't be screwed up
++	#debclean && echo Cleaned buildtree just in case...
++
++	# refresh list of executable scripts, to avoid possible breakage if
++	# upstream tarball does not include the file or if it is mispackaged
++	# for whatever reason.
++	#echo Generating list of executable files...
++	#rm -f debian/executable.files
++	#find -type f -perm +111 ! -name '.*' -print  | sort > debian/executable.files
++
++	# even in Debian builds, copy them in, don't link them
++	rm -f config.sub config.guess
++	cp /usr/share/misc/config.sub .
++	cp /usr/share/misc/config.guess .
++
++	# Remove any files in upstream tarball that we don't have in the Debian
++	# package (because diff cannot remove files)
++	# THIS CRAP IS NOT EMBEDDED SPACE-SAFE!
++	version=`dpkg-parsechangelog | awk '/Version:/ { print $2 }' | sed -e 's/-[^-]\+$//'`
++	source=`dpkg-parsechangelog | awk '/Source:/ { print $2 }' | tr -d ' '`
++	#if test -r ../${source}_${version}.orig.tar.gz ; then
++	#	echo Generating list of files that should be removed...
++	#	rm -f debian/deletable.files
++	#	touch debian/deletable.files.new
++	#	mkdir debian/tmp
++	#	cd debian/tmp
++	#	tar -zxf ../../../${source}_${version}.orig.tar.gz
++	#	# et/ we handle directly
++	#	rm -fr */et/
++	#	cd ../..
++	#	for i in `find debian/tmp/ -type f ! -name '.*' -print | xargs` ; do
++	#	  if test -r ${i} ; then
++	#	     filename=`echo "${i}" | sed -e 's#.*debian/tmp/[^/]+/##'`
++	#	     test -r "${filename}" || echo "${filename}" >>debian/deletable.files.new
++	#	  fi
++	#	done
++	#	sort < debian/deletable.files.new > debian/deletable.files \
++	#		&& rm debian/deletable.files.new
++	#	rm -fr debian/tmp
++	#else
++	#	echo Emptying list of files that should be deleted...
++	#	rm -f debian/deletable.files
++	#	touch debian/deletable.files
++	#fi
++}
++
++exit 0
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/0007-upstream-remove-undump-size-limit.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/0007-upstream-remove-undump-size-limit.dpatch
@@ -0,0 +1,128 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 0007-upstream-remove-undump-size-limit by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: remove limit on the size of mailbox files that can be received by UNDUMP
+## DP: (write file directly to disk rather than reading the literal into memory)
+
+@DPATCH@
+diff -urNad cyrus-imapd-2.2.13/imap/mbdump.c cyrus-imapd-2.2.13/imap/mbdump.c
+--- cyrus-imapd-2.2.13/imap/mbdump.c	2006-05-12 12:15:44.000000000 +0200
++++ cyrus-imapd-2.2.13/imap/mbdump.c	2006-05-12 12:17:32.871354378 +0200
+@@ -1,5 +1,5 @@
+ /* mbdump.c -- Mailbox dump routines
+- * $Id: mbdump.c,v 1.30 2004/05/22 03:45:51 rjs3 Exp $
++ * $Id: mbdump.c,v 1.31 2006/05/11 17:43:18 murch Exp $
+  * Copyright (c) 1998-2003 Carnegie Mellon University.  All rights reserved.
+  *
+  * Redistribution and use in source and binary forms, with or without
+@@ -585,6 +585,10 @@
+     while(1) {
+ 	char fnamebuf[MAX_MAILBOX_PATH + 1024];
+ 	char *seen_file = NULL;
++	int isnowait, sawdigit;
++	unsigned long size;
++	unsigned long cutoff = ULONG_MAX / 10;
++	unsigned digit, cutlim = ULONG_MAX % 10;
+ 	
+       	c = getastring(pin, pout, &file);
+ 	if(c != ' ') {
+@@ -676,13 +680,43 @@
+ 
+ 	    continue;
+ 	}
+-	    
+-	c = getbastring(pin, pout, &data);
+-	if(c != ' ' && c != ')') {
++
++	/* read size of literal */
++	c = prot_getc(pin);
++	if (c != '{') {
+ 	    r = IMAP_PROTOCOL_ERROR;
+ 	    goto done;
+ 	}
+ 
++	size = isnowait = sawdigit = 0;
++	while ((c = prot_getc(pin)) != EOF && isdigit(c)) {
++	    sawdigit = 1;
++	    digit = c - '0';
++	    /* check for overflow */
++	    if (size > cutoff || (size == cutoff && digit > cutlim)) {
++                fatal("literal too big", EC_IOERR);
++            }
++	    size = size*10 + digit;
++	}
++	if (c == '+') {
++	    isnowait++;
++	    c = prot_getc(pin);
++	}
++	if (c == '}') {
++	    c = prot_getc(pin);
++	    if (c == '\r') c = prot_getc(pin);
++	}
++	if (!sawdigit || c != '\n') {
++	    r = IMAP_PROTOCOL_ERROR;
++	    goto done;
++	}
++
++	if (!isnowait) {
++	    /* Tell client to send the message */
++	    prot_printf(pout, "+ go ahead\r\n");
++	    prot_flush(pout);
++	}
++
+ 	if(userid && !strcmp(file.s, "SUBS")) {
+ 	    /* overwriting this outright is absolutely what we want to do */
+ 	    char *s = mboxlist_hash_usersubs(userid);
+@@ -742,7 +776,7 @@
+ 	    if(strncmp(file.s, "cyrus.", 6)) {
+ 		/* it doesn't match cyrus.*, so its a message file.
+ 		 * charge it against the quota */
+-		quotaused += data.len;
++		quotaused += size;
+ 	    }
+ 	}	
+ 
+@@ -760,10 +794,24 @@
+ 	    goto done;
+ 	}
+ 
+-	if(write(curfile,data.s,data.len) == -1) {
+-	    syslog(LOG_ERR, "IOERROR: writing %s: %m", fnamebuf);
+-	    r = IMAP_IOERROR;
+-	    goto done;
++	/* write data to file */
++	while (size) {
++	    char buf[4096+1];
++	    int n = prot_read(pin, buf, size > 4096 ? 4096 : size);
++	    if (!n) {
++		syslog(LOG_ERR,
++		       "IOERROR: reading message: unexpected end of file");
++		r = IMAP_IOERROR;
++		goto done;
++	    }
++
++	    size -= n;
++
++	    if (write(curfile, buf, n) != n) {
++		syslog(LOG_ERR, "IOERROR: writing %s: %m", fnamebuf);
++		r = IMAP_IOERROR;
++		goto done;
++	    }
+ 	}
+ 
+ 	close(curfile);
+@@ -777,7 +825,12 @@
+ 	    unlink(fnamebuf);
+ 	}
+ 	
+-	if(c == ')') break;
++	c = prot_getc(pin);
++	if (c == ')') break;
++	if (c != ' ') {
++	    r = IMAP_PROTOCOL_ERROR;
++	    goto done;
++	}
+     }
+     
+     if(!r && quotaused) {
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/0013-upstream-allow-report-above-4GB-mboxsize.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/0013-upstream-allow-report-above-4GB-mboxsize.dpatch
@@ -0,0 +1,33 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 0012-upstream-allow-report-above-4GB-mboxsize by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Upstream patch to allow reporting of mailbox sizes above 4GB
+
+@DPATCH@
+diff -urNad --exclude=CVS --exclude=.svn ./imap/annotate.c 66kS/cyrus-imapd-2.2.13/imap/annotate.c
+--- ./imap/annotate.c	2006-04-25 17:28:58.000000000 +0200
++++ 66kS/cyrus-imapd-2.2.13/imap/annotate.c	2006-06-08 13:46:52.018338460 +0200
+@@ -703,7 +703,13 @@
+     struct mailbox mailbox;
+     struct index_record record;
+     int r = 0, msg;
++#ifdef HAVE_LONG_LONG_INT
++    unsigned long long totsize = 0;
++# define SIZE_FMT "%llu"
++#else 
+     unsigned long totsize = 0;
++# define SIZE_FMT "%lu"
++#endif
+     char value[21];
+     struct annotation_data attrib;
+ 
+@@ -735,7 +741,7 @@
+ 
+     mailbox_close(&mailbox);
+ 
+-    if (r || snprintf(value, sizeof(value), "%lu", totsize) == -1)
++    if (r || snprintf(value, sizeof(value), SIZE_FMT, totsize) == -1)
+ 	return;
+ 
+     memset(&attrib, 0, sizeof(attrib));
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/0015-upstream-fix-logic-error-in-imapoptions.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/0015-upstream-fix-logic-error-in-imapoptions.dpatch
@@ -0,0 +1,28 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 0015-upstream-fix-logic-error-in-imapoptions.dpatch by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fix a small logical mistake in imapoptions description 
+
+@DPATCH@
+diff -urNad cyrus-imapd-2.2.13/lib/imapoptions cyrus-imapd-2.2.13/lib/imapoptions
+--- cyrus-imapd-2.2.13/lib/imapoptions	2006-06-04 21:47:19.000000000 +0200
++++ cyrus-imapd-2.2.13/lib/imapoptions	2006-06-06 17:51:14.392340472 +0200
+@@ -42,7 +42,7 @@
+ .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ .\" 
+-.\" $Id: imapoptions,v 1.36 2006/03/30 15:49:58 murch Exp $
++.\" $Id: imapoptions,v 1.37 2006/06/05 23:31:22 murch Exp $
+ .SH NAME
+ imapd.conf \- IMAP configuration file
+ .SH DESCRIPTION
+@@ -801,7 +801,7 @@
+ /* The cyrusdb backend to use for the subscriptions list. */
+ 
+ { "syslog_prefix", NULL, STRING }
+-/* String to be appended to the process name in syslog entries. */
++/* String to be prepended to the process name in syslog entries. */
+ 
+ { "temp_path", "/tmp", STRING }
+ /* The pathname to store temporary files in */
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/09-kerberos-ipv4-ipv6-kludge-removal.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/09-kerberos-ipv4-ipv6-kludge-removal.dpatch
@@ -0,0 +1,53 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 09-kerberos-ipv4-ipv6-kludge-removal.dpatch by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Remove a kludge which turned IPv4 addresses in IPv6 address space back
+## DP: into real IPv4 addresses.
+
+@DPATCH@
+diff -urNad complete.dpatch/imap/pop3d.c complete.dpatch/imap/pop3d.c
+--- complete.dpatch/imap/pop3d.c	2005-11-11 00:11:13.000000000 +0100
++++ complete.dpatch/imap/pop3d.c	2005-11-11 00:15:17.166894681 +0100
+@@ -522,41 +522,6 @@
+ }
+ 
+ #ifdef HAVE_KRB
+-/* translate IPv4 mapped IPv6 address to IPv4 address */
+-#ifdef IN6_IS_ADDR_V4MAPPED
+-static void sockaddr_unmapped(struct sockaddr *sa, socklen_t *len)
+-{
+-    struct sockaddr_in6 *sin6;
+-    struct sockaddr_in *sin4;
+-    uint32_t addr;
+-    int port;
+-
+-    if (sa->sa_family != AF_INET6)
+-	return;
+-    sin6 = (struct sockaddr_in6 *)sa;
+-    if (!IN6_IS_ADDR_V4MAPPED((&sin6->sin6_addr)))
+-	return;
+-    sin4 = (struct sockaddr_in *)sa;
+-    addr = *(uint32_t *)&sin6->sin6_addr.s6_addr[12];
+-    port = sin6->sin6_port;
+-    memset(sin4, 0, sizeof(struct sockaddr_in));
+-    sin4->sin_addr.s_addr = addr;
+-    sin4->sin_port = port;
+-    sin4->sin_family = AF_INET;
+-#ifdef HAVE_SOCKADDR_SA_LEN
+-    sin4->sin_len = sizeof(struct sockaddr_in);
+-#endif
+-    *len = sizeof(struct sockaddr_in);
+-}
+-#else
+-static void sockaddr_unmapped(struct sockaddr *sa __attribute__((unused)),
+-			      socklen_t *len __attribute__((unused)))
+-{
+-    return;
+-}
+-#endif
+-
+-
+ /*
+  * MIT's kludge of a kpop protocol
+  * Client does a krb_sendauth() first thing
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/0003-upstream_disallow_userprobes.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/0003-upstream_disallow_userprobes.dpatch
@@ -0,0 +1,207 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 0003-upstream_disallow_userprobes.dpatch by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Upstream: Disallow probing for known user names
+## DP: Changes behaviour to always return "Login failed" instead of returning
+## DP: "Unknown user" for unknown user names.
+
+@DPATCH@
+diff -urNad cyrus-imapd-2.2.13/imap/imapd.c cyrus-imapd-2.2.13/imap/imapd.c
+--- cyrus-imapd-2.2.13/imap/imapd.c	2006-03-31 20:18:13.000000000 +0200
++++ cyrus-imapd-2.2.13/imap/imapd.c	2006-05-03 16:02:02.685827405 +0200
+@@ -1785,6 +1785,9 @@
+ 
+ 	sleep(3);
+ 
++	/* Don't allow user probing */
++	if (r == SASL_NOUSER) r = SASL_BADAUTH;
++
+ 	if ((reply = sasl_errstring(r, NULL, NULL)) != NULL) {
+ 	    prot_printf(imapd_out, "%s NO Login failed: %s\r\n", tag, reply);
+ 	} else {
+@@ -1898,8 +1901,6 @@
+ 	    break;
+ 	default: 
+ 	    /* failed authentication */
+-	    errorstring = sasl_errstring(sasl_result, NULL, NULL);
+-
+ 	    syslog(LOG_NOTICE, "badlogin: %s %s [%s]",
+ 		   imapd_clienthost, authtype, sasl_errdetail(imapd_saslconn));
+ 
+@@ -1908,6 +1909,10 @@
+ 				VARIABLE_LISTEND);
+ 	    sleep(3);
+ 
++	    /* Don't allow user probing */
++	    if (sasl_result == SASL_NOUSER) sasl_result = SASL_BADAUTH;
++
++	    errorstring = sasl_errstring(sasl_result, NULL, NULL);
+ 	    if (errorstring) {
+ 		prot_printf(imapd_out, "%s NO %s\r\n", tag, errorstring);
+ 	    } else {
+diff -urNad cyrus-imapd-2.2.13/imap/nntpd.c cyrus-imapd-2.2.13/imap/nntpd.c
+--- cyrus-imapd-2.2.13/imap/nntpd.c	2006-03-31 20:18:13.000000000 +0200
++++ cyrus-imapd-2.2.13/imap/nntpd.c	2006-05-03 16:02:02.678828066 +0200
+@@ -2140,13 +2140,16 @@
+ 	    default:
+ 		code = 481;
+ 	    }
+-	    errorstring = sasl_errstring(sasl_result, NULL, NULL);
+ 
+ 	    syslog(LOG_NOTICE, "badlogin: %s %s [%s]",
+ 		   nntp_clienthost, mech, sasl_errdetail(nntp_saslconn));
+ 
+ 	    sleep(3);
+ 
++	    /* Don't allow user probing */
++	    if (sasl_result == SASL_NOUSER) sasl_result = SASL_BADAUTH;
++
++	    errorstring = sasl_errstring(sasl_result, NULL, NULL);
+ 	    if (errorstring) {
+ 		prot_printf(nntp_out, "%d %s\r\n", code, errorstring);
+ 	    } else {
+diff -urNad cyrus-imapd-2.2.13/imap/pop3d.c cyrus-imapd-2.2.13/imap/pop3d.c
+--- cyrus-imapd-2.2.13/imap/pop3d.c	2006-03-31 20:18:13.000000000 +0200
++++ cyrus-imapd-2.2.13/imap/pop3d.c	2006-05-03 16:02:02.679827971 +0200
+@@ -1027,15 +1027,18 @@
+     /* failed authentication */
+     if (sasl_result != SASL_OK)
+     {
++	syslog(LOG_NOTICE, "badlogin: %s APOP (%s) %s",
++	       popd_clienthost, popd_apop_chal,
++	       sasl_errdetail(popd_saslconn));
++	
+ 	sleep(3);      
+ 		
++	/* Don't allow user probing */
++	if (sasl_result == SASL_NOUSER) sasl_result = SASL_BADAUTH;
++		
+ 	prot_printf(popd_out, "-ERR [AUTH] authenticating: %s\r\n",
+ 		    sasl_errstring(sasl_result, NULL, NULL));
+ 
+-	syslog(LOG_NOTICE, "badlogin: %s APOP (%s) %s",
+-	       popd_clienthost, popd_apop_chal,
+-	       sasl_errdetail(popd_saslconn));
+-	
+ 	return;
+     }
+ 
+@@ -1292,11 +1295,6 @@
+ 	    break;
+ 	default:
+ 	    /* failed authentication */
+-	    sleep(3);
+-		
+-	    prot_printf(popd_out, "-ERR [AUTH] authenticating: %s\r\n",
+-			sasl_errstring(sasl_result, NULL, NULL));
+-
+ 	    if (authtype) {
+ 		syslog(LOG_NOTICE, "badlogin: %s %s %s",
+ 		       popd_clienthost, authtype,
+@@ -1305,6 +1303,14 @@
+ 		syslog(LOG_NOTICE, "badlogin: %s %s",
+ 		       popd_clienthost, authtype);
+ 	    }
++
++	    sleep(3);
++		
++	    /* Don't allow user probing */
++	    if (sasl_result == SASL_NOUSER) sasl_result = SASL_BADAUTH;
++		
++	    prot_printf(popd_out, "-ERR [AUTH] authenticating: %s\r\n",
++			sasl_errstring(sasl_result, NULL, NULL));
+ 	}
+ 	
+ 	reset_saslconn(&popd_saslconn);
+diff -urNad cyrus-imapd-2.2.13/imap/proxyd.c cyrus-imapd-2.2.13/imap/proxyd.c
+--- cyrus-imapd-2.2.13/imap/proxyd.c	2006-03-31 20:18:13.000000000 +0200
++++ cyrus-imapd-2.2.13/imap/proxyd.c	2006-05-03 16:02:02.681827782 +0200
+@@ -2106,7 +2106,7 @@
+     char c;
+     struct buf passwdbuf;
+     char *passwd;
+-    char *reply = 0;
++    const char *reply = 0;
+     int r;
+ 
+     if (proxyd_userid) {
+@@ -2180,17 +2180,19 @@
+ 				 strlen(canon_user),
+ 				 passwd,
+ 				 strlen(passwd)))!=SASL_OK) {
+-	const char *errorstring = sasl_errstring(r, NULL, NULL);
+-	if (reply) {
+-	    syslog(LOG_NOTICE, "badlogin: %s plaintext %s %s",
+-		   proxyd_clienthost, canon_user, reply);
+-	}
++	syslog(LOG_NOTICE, "badlogin: %s plaintext %s %s",
++	       proxyd_clienthost, canon_user, sasl_errdetail(proxyd_saslconn));
++
+ 	/* Apply penalty only if not under layer */
+ 	if (proxyd_starttls_done == 0)
+ 	    sleep(3);
+-	if (errorstring) {
++
++	/* Don't allow user probing */
++	if (r == SASL_NOUSER) r = SASL_BADAUTH;
++
++	if ((reply = sasl_errstring(r, NULL, NULL)) != NULL) {
+ 	    prot_printf(proxyd_out, "%s NO Login failed: %s\r\n", 
+-			tag, errorstring);
++			tag, reply);
+ 	} else {
+ 	    prot_printf(proxyd_out, "%s NO Login failed.", tag);
+ 	}
+@@ -2276,8 +2278,6 @@
+ 	    break;
+ 	default: 
+ 	    /* failed authentication */
+-	    errorstring = sasl_errstring(sasl_result, NULL, NULL);
+-
+ 	    syslog(LOG_NOTICE, "badlogin: %s %s [%s]",
+ 		   proxyd_clienthost, authtype, sasl_errdetail(proxyd_saslconn));
+ 
+@@ -2286,6 +2286,10 @@
+ 				VARIABLE_LISTEND);
+ 	    sleep(3);
+ 
++	    /* Don't allow user probing */
++	    if (sasl_result == SASL_NOUSER) sasl_result = SASL_BADAUTH;
++
++	    errorstring = sasl_errstring(sasl_result, NULL, NULL);
+ 	    if (errorstring) {
+ 		prot_printf(proxyd_out, "%s NO %s\r\n", tag, errorstring);
+ 	    } else {
+@@ -4253,13 +4257,13 @@
+ 						proxyd_userid, mailboxname);
+     if (!r) r = mlookup(mailboxname, &server, NULL, NULL);
+ 
+-    if(proxyd_userisadmin) {
++    if(!r && proxyd_userisadmin) {
+ 	/* If they are an admin, they won't retain that privledge if we
+ 	 * proxy for them, so we need to refer them -- even if they haven't
+ 	 * told us they're able to handle it. */
+ 	proxyd_refer(tag, server, name);
+-    } else {
+-	if (!r) s = proxyd_findserver(server);
++    } else if (!r) {
++	s = proxyd_findserver(server);
+ 
+ 	if (s) {
+ 	    prot_printf(s->out, "%s Getquotaroot {%d+}\r\n%s\r\n",
+@@ -4268,11 +4272,10 @@
+ 	} else {
+ 	    r = IMAP_SERVER_UNAVAILABLE;
+ 	}
++    }
+ 
+-	if (r) {
+-	    prot_printf(proxyd_out, "%s NO %s\r\n", tag, error_message(r));
+-	    return;
+-	}
++    if (r) {
++	prot_printf(proxyd_out, "%s NO %s\r\n", tag, error_message(r));
+     }
+ }
+ 
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/0014-upstream-fix-locks-during-reconstruction.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/0014-upstream-fix-locks-during-reconstruction.dpatch
@@ -0,0 +1,55 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 0014-upstream-fix-locks-during-reconstruction.dpatch by Benjamin Seidenberg <astronut@dlgeek.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Upstream: don't lock/unlock_pop when reconstructing
+
+@DPATCH@
+diff -urNad cyrus-imapd-2.2.13/imap/mailbox.c cyrus-imapd-2.2.13/imap/mailbox.c
+--- cyrus-imapd-2.2.13/imap/mailbox.c	2006-06-08 12:59:59.000000000 +0200
++++ cyrus-imapd-2.2.13/imap/mailbox.c	2006-06-08 13:00:01.083767966 +0200
+@@ -1,5 +1,5 @@
+ /* mailbox.c -- Mailbox manipulation routines
+- * $Id: mailbox.c,v 1.160 2006/05/10 16:27:18 murch Exp $
++ * $Id: mailbox.c,v 1.161 2006/06/02 18:56:52 murch Exp $
+  * Copyright (c) 1998-2003 Carnegie Mellon University.  All rights reserved.
+  *
+  * Redistribution and use in source and binary forms, with or without
+@@ -1391,11 +1391,14 @@
+ 	return r;
+     }
+ 
+-    r = mailbox_lock_pop(mailbox);
+-    if (r) {
+-	mailbox_unlock_index(mailbox);
+-	mailbox_unlock_header(mailbox);
+-	return r;
++    if (!mailbox_doing_reconstruct) {
++	/* If we're reconstructing, we don't open the existing cache file */
++	r = mailbox_lock_pop(mailbox);
++	if (r) {
++	    mailbox_unlock_index(mailbox);
++	    mailbox_unlock_header(mailbox);
++	    return r;
++	}
+     }
+ 
+     strlcpy(fnamebuf, mailbox->path, sizeof(fnamebuf));
+@@ -1499,7 +1502,7 @@
+ 	goto fail;
+     }
+ 
+-    mailbox_unlock_pop(mailbox);
++    if (!mailbox_doing_reconstruct) mailbox_unlock_pop(mailbox);
+     mailbox_unlock_index(mailbox);
+     mailbox_unlock_header(mailbox);
+     fclose(newindex);
+@@ -1507,7 +1510,7 @@
+     return 0;
+ 
+  fail:
+-    mailbox_unlock_pop(mailbox);
++    if (!mailbox_doing_reconstruct) mailbox_unlock_pop(mailbox);
+     mailbox_unlock_index(mailbox);
+     mailbox_unlock_header(mailbox);
+ 
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/0001-upstream-fix-segfault.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/0001-upstream-fix-segfault.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 0001-upstream-fix-segfault.dpatch by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix for imap/backend.c, upstream CVS edition 1.40
+
+@DPATCH@
+diff -urNad cyrus-imapd-2.2.13/imap/backend.c cyrus-imapd-2.2.13/imap/backend.c
+--- cyrus-imapd-2.2.13/imap/backend.c	2006-04-22 17:18:39.000000000 +0200
++++ cyrus-imapd-2.2.13/imap/backend.c	2006-05-02 22:08:32.024194651 +0200
+@@ -271,7 +271,7 @@
+     /* need to (re)establish connection to server or create one */
+     int sock = -1;
+     int r;
+-    int err = 0;
++    int err = -1;
+     struct addrinfo hints, *res0 = NULL, *res1 = NULL, *res;
+     struct sockaddr_un sunsock;
+     char buf[2048], *mechlist = NULL;
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/87-STARTTLS_vulnerability_fix.patch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/87-STARTTLS_vulnerability_fix.patch
@@ -0,0 +1,111 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 87-STARTTLS_vulnerability_fix.dpatch by Ondrej Sury <ondrej@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix CVE-2011-1926: STARTTLS plaintext command injection vulnerability (VU#555316)
+
+@DPATCH@
+--- a/imap/imapd.c
++++ b/imap/imapd.c
+@@ -1414,6 +1414,9 @@ void cmdloop()
+ 		if (c == '\r') c = prot_getc(imapd_in);
+ 		if (c != '\n') goto extraargs;
+ 
++		/* XXX  discard any input pipelined after STARTTLS */
++		prot_flush(imapd_in);
++
+ 		/* if we've already done SASL fail */
+ 		if (imapd_userid != NULL) {
+ 		    prot_printf(imapd_out, 
+--- a/imap/lmtpengine.c
++++ b/imap/lmtpengine.c
+@@ -1551,6 +1551,9 @@ void lmtpmode(struct lmtp_func *func,
+ 		sasl_ssf_t ssf;
+ 		char *auth_id;
+ 
++		/* XXX  discard any input pipelined after STARTTLS */
++		prot_flush(pin);
++
+ 		/* SASL and openssl have different ideas
+ 		   about whether ssf is signed */
+ 		layerp = &ssf;
+--- a/imap/mupdate.c
++++ b/imap/mupdate.c
+@@ -828,6 +828,9 @@ mupdate_docmd_result_t docmd(struct conn
+ 	if (!strcmp(c->cmd.s, "Starttls")) {
+ 	    CHECKNEWLINE(c, ch);
+ 	    
++	    /* XXX  discard any input pipelined after STARTTLS */
++	    prot_flush(c->pin);
++
+ 	    if (!tls_enabled()) {
+ 		/* we don't support starttls */
+ 		goto badcmd;
+--- a/imap/nntpd.c
++++ b/imap/nntpd.c
+@@ -1402,6 +1402,9 @@ static void cmdloop(void)
+ 		if (c == '\r') c = prot_getc(nntp_in);
+ 		if (c != '\n') goto extraargs;
+ 
++		/* XXX  discard any input pipelined after STARTTLS */
++		prot_flush(nntp_in);
++
+ 		cmd_starttls(0);
+ 	    }
+ 	    else if (!strcmp(cmd.s, "Stat")) {
+--- a/imap/pop3d.c
++++ b/imap/pop3d.c
+@@ -699,6 +699,9 @@ static void cmdloop(void)
+ 		prot_printf(popd_out,
+ 			    "-ERR STLS doesn't take any arguments\r\n");
+ 	    } else {
++		/* XXX  discard any input pipelined after STLS */
++		prot_flush(popd_in);
++
+ 		cmd_starttls(0);
+ 	    }
+ 	}
+--- a/lib/prot.c
++++ b/lib/prot.c
+@@ -533,10 +533,29 @@ int prot_fill(struct protstream *s)
+ }
+ 
+ /*
++ * If 's' is an input stream, discard any pending/buffered data.  Otherwise,
+  * Write out any buffered data in the stream 's'
+  */
+ int prot_flush(struct protstream *s) 
+ {
++    if (!s->write) {
++	int c, save_dontblock = s->dontblock;
++
++	/* Set stream to nonblocking mode */
++	if (!save_dontblock) nonblock(s->fd, (s->dontblock = 1));
++
++	/* Ingest any pending input */
++	while ((c = prot_fill(s)) != EOF);
++
++	/* Reset stream to previous blocking mode */
++	if (!save_dontblock) nonblock(s->fd, (s->dontblock = 0));
++
++	/* Discard any buffered input */
++	s->cnt = 0;
++
++	return 0;
++    }
++
+     return prot_flush_internal(s, 1);
+ }
+ 
+--- a/timsieved/parser.c
++++ b/timsieved/parser.c
+@@ -401,6 +401,9 @@ int parser(struct protstream *sieved_out
+       goto error;
+     }
+ 
++    /* XXX  discard any input pipelined after STARTTLS */
++    prot_flush(sieved_in);
++
+     if(referral_host)
+ 	goto do_referral;
+ 
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/19-fix_tls_ssl.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/19-fix_tls_ssl.dpatch
@@ -0,0 +1,78 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 19-fix_tls_errormessage.dpatch by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Make TLS/SSL error message more informative
+
+@DPATCH@
+diff -urNad complete.dpatch/imap/tls.c complete.dpatch/imap/tls.c
+--- complete.dpatch/imap/tls.c	2005-11-11 15:31:40.000000000 +0100
++++ complete.dpatch/imap/tls.c	2005-11-11 15:31:41.926478833 +0100
+@@ -166,7 +166,7 @@
+  * tim - this seems to just be giving logging messages
+  */
+ 
+-static void apps_ssl_info_callback(SSL * s, int where, int ret)
++static void apps_ssl_info_callback(const SSL * s, int where, int ret)
+ {
+     char   *str;
+     int     w;
+@@ -679,7 +679,7 @@
+     s_key_file = config_getstring(IMAPOPT_TLS_KEY_FILE);
+ 
+     if (!set_cert_stuff(s_ctx, s_cert_file, s_key_file)) {
+-	syslog(LOG_ERR,"TLS server engine: cannot load cert/key data");
++	syslog(LOG_ERR,"TLS server engine: cannot load cert/key data, may be a cert/key mismatch?");
+ 	return (-1);
+     }
+     SSL_CTX_set_tmp_rsa_callback(s_ctx, tmp_rsa_cb);
+@@ -1098,7 +1098,7 @@
+     
+     if (c_cert_file || c_key_file) {
+ 	if (!set_cert_stuff(c_ctx, c_cert_file, c_key_file)) {
+-	    syslog(LOG_ERR,"TLS client engine: cannot load cert/key data");
++	    syslog(LOG_ERR,"TLS client engine: cannot load cert/key data, may be a cert/key mismatch?");
+ 	    return (-1);
+ 	}
+     }
+diff -urNad complete.dpatch/imtest/imtest.c complete.dpatch/imtest/imtest.c
+--- complete.dpatch/imtest/imtest.c	2005-11-11 15:31:41.000000000 +0100
++++ complete.dpatch/imtest/imtest.c	2005-11-11 15:31:57.244983198 +0100
+@@ -63,6 +63,7 @@
+ 
+ #include <limits.h>
+ #include <unistd.h>
++#include <ctype.h>
+ 
+ #include <netinet/in.h>
+ #include <sys/un.h>
+@@ -418,7 +419,7 @@
+  * tim - this seems to just be giving logging messages
+  */
+ 
+-static void apps_ssl_info_callback(SSL * s, int where, int ret)
++static void apps_ssl_info_callback(const SSL * s, int where, int ret)
+ {
+     char   *str;
+     int     w;
+@@ -531,7 +532,7 @@
+     
+     if (c_cert_file || c_key_file)
+ 	if (!set_cert_stuff(tls_ctx, c_cert_file, c_key_file)) {
+-	    printf("TLS engine: cannot load cert/key data\n");
++	    printf("TLS engine: cannot load cert/key data, maybe a cert/key mismatch?\n");
+ 	    return IMTEST_FAIL;
+ 	}
+     SSL_CTX_set_tmp_rsa_callback(tls_ctx, tmp_rsa_cb);
+diff -urNad complete.dpatch/lib/imclient.c complete.dpatch/lib/imclient.c
+--- complete.dpatch/lib/imclient.c	2005-11-11 15:31:40.000000000 +0100
++++ complete.dpatch/lib/imclient.c	2005-11-11 15:31:41.928478637 +0100
+@@ -1733,7 +1733,7 @@
+ 
+     if (c_cert_file || c_key_file)
+ 	if (!set_cert_stuff(imclient->tls_ctx, c_cert_file, c_key_file)) {
+-	    printf("[ TLS engine: cannot load cert/key data ]\n");
++	    printf("[ TLS engine: cannot load cert/key data, might be a cert/key mismatch]\n");
+ 	    return -1;
+ 	}
+     SSL_CTX_set_tmp_rsa_callback(imclient->tls_ctx, tmp_rsa_cb);
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/11-fix_syslog_prefix.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/11-fix_syslog_prefix.dpatch
@@ -0,0 +1,68 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 11-fix_syslog_prefix.dpatch by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Make sure all programs log (to syslog) with "cyrus/<program>" as the
+## DP: log prefix.
+
+@DPATCH@
+diff -urNad complete.dpatch/imap/global.c complete.dpatch/imap/global.c
+--- complete.dpatch/imap/global.c	2005-11-11 13:12:47.000000000 +0100
++++ complete.dpatch/imap/global.c	2005-11-11 13:13:53.042398971 +0100
+@@ -93,6 +93,9 @@
+ struct cyrusdb_backend *config_ptscache_db;
+ #endif
+ 
++/* syslog prefix tag */
++static char syslog_prefix[20];
++
+ /* Called before a cyrus application starts (but after command line parameters
+  * are read) */
+ int cyrus_init(const char *alt_config, const char *ident, unsigned flags)
+@@ -120,7 +123,9 @@
+     
+     /* xxx we lose here since we can't have the prefix until we load the
+      * config file */
+-    openlog(config_ident, LOG_PID, SYSLOG_FACILITY);
++    strncpy(syslog_prefix, "cyrus/", sizeof(syslog_prefix));
++    strncat(syslog_prefix, ident, sizeof(syslog_prefix) - 7);
++    openlog(syslog_prefix, LOG_PID, SYSLOG_FACILITY);
+ 
+     /* Load configuration file.  This will set config_dir when it finds it */
+     config_read(alt_config);
+diff -urNad complete.dpatch/ptclient/ptexpire.c complete.dpatch/ptclient/ptexpire.c
+--- complete.dpatch/ptclient/ptexpire.c	2004-05-26 18:05:59.000000000 +0200
++++ complete.dpatch/ptclient/ptexpire.c	2005-11-11 13:15:41.839710005 +0100
+@@ -114,7 +114,7 @@
+ 
+     if (geteuid() == 0) fatal("must run as the Cyrus user", EC_USAGE);
+     
+-    openlog("ptexpire", LOG_PID, SYSLOG_FACILITY);
++    openlog("cyrus/ptexpire", LOG_PID, SYSLOG_FACILITY);
+ 
+     while ((opt = getopt(argc, argv, "C:E:")) != EOF) {
+ 	switch (opt) {
+diff -urNad complete.dpatch/ptclient/test.c complete.dpatch/ptclient/test.c
+--- complete.dpatch/ptclient/test.c	2003-10-22 20:50:29.000000000 +0200
++++ complete.dpatch/ptclient/test.c	2005-11-11 13:16:19.409019154 +0100
+@@ -57,7 +57,7 @@
+     cacheid=cache;
+   } else
+     cacheid=NULL;
+-  openlog("pttest", LOG_PID, SYSLOG_FACILITY);  
++  openlog("cyrus/pttest", LOG_PID, SYSLOG_FACILITY);  
+   
+   if (!auth_setid(argv[1],cacheid))
+     printf ("Auth_memberof(%s,%s) is %d\n", argv[1], argv[2],
+diff -urNad complete.dpatch/ptclient/test2.c complete.dpatch/ptclient/test2.c
+--- complete.dpatch/ptclient/test2.c	2003-10-22 20:50:29.000000000 +0200
++++ complete.dpatch/ptclient/test2.c	2005-11-11 13:16:39.749020971 +0100
+@@ -46,7 +46,7 @@
+ 
+ int main(void) {
+   char cacheid[16]="4224423";
+-  openlog("testr", LOG_PID, SYSLOG_FACILITY);
++  openlog("cyrus/testr", LOG_PID, SYSLOG_FACILITY);
+   
+   if (!auth_setid("cg2v@club.cc.cmu.edu",cacheid))
+     printf ("Auth_memberof(cg2v,cg2v:me) is %d\n",
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/25-update_install-sh.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/25-update_install-sh.dpatch
@@ -0,0 +1,530 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 25_update_install.sh.dpatch by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: update install-sh to a more recent version
+
+@DPATCH@
+diff -urN cyrus-imapd-2.2.12/install-sh cyrus-imapd-2.2.12~/install-sh
+--- cyrus-imapd-2.2.12/install-sh	2005-08-30 14:42:29.000000000 +0200
++++ cyrus-imapd-2.2.12~/install-sh	2005-08-30 14:36:59.000000000 +0200
+@@ -1,23 +1,52 @@
+ #!/bin/sh
+-#
+ # install - install a program, script, or datafile
+-# This comes from X11R5.
++
++scriptversion=2005-02-02.21
++
++# This originates from X11R5 (mit/util/scripts/install.sh), which was
++# later released in X11R6 (xc/config/util/install.sh) with the
++# following copyright and license.
++#
++# Copyright (C) 1994 X Consortium
++#
++# Permission is hereby granted, free of charge, to any person obtaining a copy
++# of this software and associated documentation files (the "Software"), to
++# deal in the Software without restriction, including without limitation the
++# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
++# sell copies of the Software, and to permit persons to whom the Software is
++# furnished to do so, subject to the following conditions:
++#
++# The above copyright notice and this permission notice shall be included in
++# all copies or substantial portions of the Software.
++#
++# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
++# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
++# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
++# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++#
++# Except as contained in this notice, the name of the X Consortium shall not
++# be used in advertising or otherwise to promote the sale, use or other deal-
++# ings in this Software without prior written authorization from the X Consor-
++# tium.
++#
++#
++# FSF changes to this file are in the public domain.
+ #
+ # Calling this script install-sh is preferred over install.sh, to prevent
+ # `make' implicit rules from creating a file called install from it
+ # when there is no Makefile.
+ #
+ # This script is compatible with the BSD install script, but was written
+-# from scratch.
+-#
+-
++# from scratch.  It can only install one file at a time, a restriction
++# shared with many OS's install programs.
+ 
+ # set DOITPROG to echo to test this script
+ 
+ # Don't use :- since 4.3BSD and earlier shells don't like it.
+ doit="${DOITPROG-}"
+ 
+-
+ # put in absolute paths if you don't have them in your path; or use env. vars.
+ 
+ mvprog="${MVPROG-mv}"
+@@ -29,210 +58,266 @@
+ rmprog="${RMPROG-rm}"
+ mkdirprog="${MKDIRPROG-mkdir}"
+ 
+-tranformbasename=""
+-transform_arg=""
+-instcmd="$mvprog"
+ chmodcmd="$chmodprog 0755"
+-chowncmd=""
+-chgrpcmd=""
+-stripcmd=""
++chowncmd=
++chgrpcmd=
++stripcmd=
+ rmcmd="$rmprog -f"
+ mvcmd="$mvprog"
+-src=""
+-dst=""
+-dir_arg=""
+-
+-while [ x"$1" != x ]; do
+-    case $1 in
+-	-c) instcmd="$cpprog"
+-	    shift
+-	    continue;;
+-
+-	-d) dir_arg=true
+-	    shift
+-	    continue;;
+-
+-	-m) chmodcmd="$chmodprog $2"
+-	    shift
+-	    shift
+-	    continue;;
+-
+-	-o) chowncmd="$chownprog $2"
+-	    shift
+-	    shift
+-	    continue;;
+-
+-	-g) chgrpcmd="$chgrpprog $2"
+-	    shift
+-	    shift
+-	    continue;;
+-
+-	-s) stripcmd="$stripprog"
+-	    shift
+-	    continue;;
+-
+-	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
+-	    shift
+-	    continue;;
+-
+-	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
+-	    shift
+-	    continue;;
+-
+-	*)  if [ x"$src" = x ]
+-	    then
+-		src=$1
+-	    else
+-		# this colon is to work around a 386BSD /bin/sh bug
+-		:
+-		dst=$1
+-	    fi
+-	    shift
+-	    continue;;
+-    esac
+-done
+-
+-if [ x"$src" = x ]
+-then
+-	echo "install:	no input file specified"
+-	exit 1
+-else
+-	true
+-fi
+-
+-if [ x"$dir_arg" != x ]; then
+-	dst=$src
+-	src=""
+-	
+-	if [ -d $dst ]; then
+-		instcmd=:
+-	else
+-		instcmd=mkdir
+-	fi
+-else
+-
+-# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
+-# might cause directories to be created, which would be especially bad 
+-# if $src (and thus $dsttmp) contains '*'.
+-
+-	if [ -f $src -o -d $src ]
+-	then
+-		true
+-	else
+-		echo "install:  $src does not exist"
+-		exit 1
+-	fi
+-	
+-	if [ x"$dst" = x ]
+-	then
+-		echo "install:	no destination specified"
+-		exit 1
+-	else
+-		true
+-	fi
+-
+-# If destination is a directory, append the input filename; if your system
+-# does not like double slashes in filenames, you may need to add some logic
+-
+-	if [ -d $dst ]
+-	then
+-		dst="$dst"/`basename $src`
+-	else
+-		true
+-	fi
+-fi
+-
+-## this sed command emulates the dirname command
+-dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
+-
+-# Make sure that the destination directory exists.
+-#  this part is taken from Noah Friedman's mkinstalldirs script
+-
+-# Skip lots of stat calls in the usual case.
+-if [ ! -d "$dstdir" ]; then
+-defaultIFS='	
+-'
+-IFS="${IFS-${defaultIFS}}"
+-
+-oIFS="${IFS}"
+-# Some sh's can't handle IFS=/ for some reason.
+-IFS='%'
+-set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
+-IFS="${oIFS}"
++src=
++dst=
++dir_arg=
++dstarg=
++no_target_directory=
++
++usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
++   or: $0 [OPTION]... SRCFILES... DIRECTORY
++   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
++   or: $0 [OPTION]... -d DIRECTORIES...
++
++In the 1st form, copy SRCFILE to DSTFILE.
++In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
++In the 4th, create DIRECTORIES.
++
++Options:
++-c         (ignored)
++-d         create directories instead of installing files.
++-g GROUP   $chgrpprog installed files to GROUP.
++-m MODE    $chmodprog installed files to MODE.
++-o USER    $chownprog installed files to USER.
++-s         $stripprog installed files.
++-t DIRECTORY  install into DIRECTORY.
++-T         report an error if DSTFILE is a directory.
++--help     display this help and exit.
++--version  display version info and exit.
++
++Environment variables override the default commands:
++  CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
++"
++
++while test -n "$1"; do
++  case $1 in
++    -c) shift
++        continue;;
++
++    -d) dir_arg=true
++        shift
++        continue;;
++
++    -g) chgrpcmd="$chgrpprog $2"
++        shift
++        shift
++        continue;;
++
++    --help) echo "$usage"; exit $?;;
++
++    -m) chmodcmd="$chmodprog $2"
++        shift
++        shift
++        continue;;
++
++    -o) chowncmd="$chownprog $2"
++        shift
++        shift
++        continue;;
++
++    -s) stripcmd=$stripprog
++        shift
++        continue;;
+ 
+-pathcomp=''
++    -t) dstarg=$2
++	shift
++	shift
++	continue;;
+ 
+-while [ $# -ne 0 ] ; do
+-	pathcomp="${pathcomp}${1}"
++    -T) no_target_directory=true
+ 	shift
++	continue;;
+ 
+-	if [ ! -d "${pathcomp}" ] ;
+-        then
+-		$mkdirprog "${pathcomp}"
+-	else
+-		true
+-	fi
++    --version) echo "$0 $scriptversion"; exit $?;;
+ 
+-	pathcomp="${pathcomp}/"
++    *)  # When -d is used, all remaining arguments are directories to create.
++	# When -t is used, the destination is already specified.
++	test -n "$dir_arg$dstarg" && break
++        # Otherwise, the last argument is the destination.  Remove it from $@.
++	for arg
++	do
++          if test -n "$dstarg"; then
++	    # $@ is not empty: it contains at least $arg.
++	    set fnord "$@" "$dstarg"
++	    shift # fnord
++	  fi
++	  shift # arg
++	  dstarg=$arg
++	done
++	break;;
++  esac
+ done
+-fi
+-
+-if [ x"$dir_arg" != x ]
+-then
+-	$doit $instcmd $dst &&
+-
+-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
+-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
+-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
+-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
+-else
+-
+-# If we're going to rename the final executable, determine the name now.
+-
+-	if [ x"$transformarg" = x ] 
+-	then
+-		dstfile=`basename $dst`
+-	else
+-		dstfile=`basename $dst $transformbasename | 
+-			sed $transformarg`$transformbasename
+-	fi
+-
+-# don't allow the sed command to completely eliminate the filename
+-
+-	if [ x"$dstfile" = x ] 
+-	then
+-		dstfile=`basename $dst`
+-	else
+-		true
+-	fi
+-
+-# Make a temp file name in the proper directory.
+-
+-	dsttmp=$dstdir/#inst.$$#
+ 
+-# Move or copy the file name to the temp name
+-
+-	$doit $instcmd $src $dsttmp &&
+-
+-	trap "rm -f ${dsttmp}" 0 &&
+-
+-# and set any options; do chmod last to preserve setuid bits
+-
+-# If any of these fail, we abort the whole thing.  If we want to
+-# ignore errors from any of these, just make sure not to ignore
+-# errors from the above "$doit $instcmd $src $dsttmp" command.
+-
+-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
+-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
+-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
+-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
+-
+-# Now rename the file to the real destination.
+-
+-	$doit $rmcmd -f $dstdir/$dstfile &&
+-	$doit $mvcmd $dsttmp $dstdir/$dstfile 
++if test -z "$1"; then
++  if test -z "$dir_arg"; then
++    echo "$0: no input file specified." >&2
++    exit 1
++  fi
++  # It's OK to call `install-sh -d' without argument.
++  # This can happen when creating conditional directories.
++  exit 0
++fi
+ 
+-fi &&
++for src
++do
++  # Protect names starting with `-'.
++  case $src in
++    -*) src=./$src ;;
++  esac
++
++  if test -n "$dir_arg"; then
++    dst=$src
++    src=
++
++    if test -d "$dst"; then
++      mkdircmd=:
++      chmodcmd=
++    else
++      mkdircmd=$mkdirprog
++    fi
++  else
++    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
++    # might cause directories to be created, which would be especially bad
++    # if $src (and thus $dsttmp) contains '*'.
++    if test ! -f "$src" && test ! -d "$src"; then
++      echo "$0: $src does not exist." >&2
++      exit 1
++    fi
++
++    if test -z "$dstarg"; then
++      echo "$0: no destination specified." >&2
++      exit 1
++    fi
++
++    dst=$dstarg
++    # Protect names starting with `-'.
++    case $dst in
++      -*) dst=./$dst ;;
++    esac
+ 
++    # If destination is a directory, append the input filename; won't work
++    # if double slashes aren't ignored.
++    if test -d "$dst"; then
++      if test -n "$no_target_directory"; then
++	echo "$0: $dstarg: Is a directory" >&2
++	exit 1
++      fi
++      dst=$dst/`basename "$src"`
++    fi
++  fi
++
++  # This sed command emulates the dirname command.
++  dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
++
++  # Make sure that the destination directory exists.
++
++  # Skip lots of stat calls in the usual case.
++  if test ! -d "$dstdir"; then
++    defaultIFS='
++	 '
++    IFS="${IFS-$defaultIFS}"
++
++    oIFS=$IFS
++    # Some sh's can't handle IFS=/ for some reason.
++    IFS='%'
++    set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
++    shift
++    IFS=$oIFS
++
++    pathcomp=
++
++    while test $# -ne 0 ; do
++      pathcomp=$pathcomp$1
++      shift
++      if test ! -d "$pathcomp"; then
++        $mkdirprog "$pathcomp"
++	# mkdir can fail with a `File exist' error in case several
++	# install-sh are creating the directory concurrently.  This
++	# is OK.
++	test -d "$pathcomp" || exit
++      fi
++      pathcomp=$pathcomp/
++    done
++  fi
++
++  if test -n "$dir_arg"; then
++    $doit $mkdircmd "$dst" \
++      && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
++      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
++      && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
++      && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
++
++  else
++    dstfile=`basename "$dst"`
++
++    # Make a couple of temp file names in the proper directory.
++    dsttmp=$dstdir/_inst.$$_
++    rmtmp=$dstdir/_rm.$$_
++
++    # Trap to clean up those temp files at exit.
++    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
++    trap '(exit $?); exit' 1 2 13 15
++
++    # Copy the file name to the temp name.
++    $doit $cpprog "$src" "$dsttmp" &&
++
++    # and set any options; do chmod last to preserve setuid bits.
++    #
++    # If any of these fail, we abort the whole thing.  If we want to
++    # ignore errors from any of these, just make sure not to ignore
++    # errors from the above "$doit $cpprog $src $dsttmp" command.
++    #
++    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
++      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
++      && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
++      && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
++
++    # Now rename the file to the real destination.
++    { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
++      || {
++	   # The rename failed, perhaps because mv can't rename something else
++	   # to itself, or perhaps because mv is so ancient that it does not
++	   # support -f.
++
++	   # Now remove or move aside any old file at destination location.
++	   # We try this two ways since rm can't unlink itself on some
++	   # systems and the destination file might be busy for other
++	   # reasons.  In this case, the final cleanup might fail but the new
++	   # file should still install successfully.
++	   {
++	     if test -f "$dstdir/$dstfile"; then
++	       $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
++	       || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
++	       || {
++		 echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
++		 (exit 1); exit 1
++	       }
++	     else
++	       :
++	     fi
++	   } &&
++
++	   # Now rename the file to the real destination.
++	   $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
++	 }
++    }
++  fi || { (exit 1); exit 1; }
++done
+ 
+-exit 0
++# The final little trick to "correctly" pass the exit status to the exit trap.
++{
++  (exit 0); exit 0
++}
++
++# Local variables:
++# eval: (add-hook 'write-file-hooks 'time-stamp)
++# time-stamp-start: "scriptversion="
++# time-stamp-format: "%:y-%02m-%02d.%02H"
++# time-stamp-end: "$"
++# End:
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/0004-upstream-fetchnews-timezone-dst-fix.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/0004-upstream-fetchnews-timezone-dst-fix.dpatch
@@ -0,0 +1,44 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 0004-upstream-fetchnews-timezone-dst-fix.dpatch by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Upstream: Fix fetchnews timezone handling with regards to DST
+## DP: (daylight saving time)
+
+@DPATCH@
+diff -urNad cyrus-imapd-2.2.13/imap/fetchnews.c cyrus-imapd-2.2.13/imap/fetchnews.c
+--- cyrus-imapd-2.2.13/imap/fetchnews.c	2006-03-31 20:18:13.000000000 +0200
++++ cyrus-imapd-2.2.13/imap/fetchnews.c	2006-05-03 16:07:42.020785607 +0200
+@@ -60,6 +60,7 @@
+ #include "cyrusdb.h"
+ #include "exitcodes.h"
+ #include "global.h"
++#include "gmtoff.h"
+ #include "lock.h"
+ #include "prot.h"
+ #include "xmalloc.h"
+@@ -388,6 +389,7 @@
+ 	       &ctime.tm_hour, &ctime.tm_min, &ctime.tm_sec);
+ 	ctime.tm_year -= 1900;
+ 	ctime.tm_mon--;
++	ctime.tm_isdst = -1;
+ 
+ 	/* read the previous timestamp */
+ 	if (!sfile[0]) {
+@@ -417,6 +419,7 @@
+ 	/* ask for new articles */
+ 	if (stamp) stamp -= 180; /* adjust back 3 minutes */
+ 	ptime = gmtime(&stamp);
++	ptime->tm_isdst = -1;
+ 	strftime(buf, sizeof(buf), datefmt, ptime);
+ 	prot_printf(pout, "NEWNEWS %s %s GMT\r\n", wildmat, buf);
+ 	
+@@ -433,7 +436,7 @@
+ 	   We can't change this, otherwise we'd be incompatible
+ 	   with an old localtime timestamp.
+ 	*/
+-	stamp -= timezone;
++	stamp += gmtoff_of(&ctime, stamp);
+     }
+ 
+     if (!newnews) {
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/0023-sort-illegal-dates-first.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/0023-sort-illegal-dates-first.dpatch
@@ -0,0 +1,88 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## filezzWItT.dpatch by Sven Mueller <sven@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad cyrus-imapd-2.2.13/imap/index.c cyrus-imapd-2.2.13/imap/index.c
+--- cyrus-imapd-2.2.13/imap/index.c	2007-02-27 05:01:09.000000000 +0100
++++ cyrus-imapd-2.2.13/imap/index.c	2007-02-27 05:03:44.276846274 +0100
+@@ -41,7 +41,7 @@
+  *
+  */
+ /*
+- * $Id: index.c,v 1.218 2005/06/02 15:47:58 ken3 Exp $
++ * $Id: index.c,v 1.218.2.2 2006/12/19 19:32:59 murch Exp $
+  */
+ #include <config.h>
+ 
+@@ -3285,7 +3285,8 @@
+ 		break;
+ 	    case SORT_DATE:
+ 		cur->date = message_parse_date(envtokens[ENV_DATE],
+-					       PARSE_TIME | PARSE_ZONE);
++					       PARSE_TIME | PARSE_ZONE
++					       | PARSE_NOCREATE);
+ 		break;
+ 	    case SORT_FROM:
+ 		cur->from = get_localpart_addr(from + CACHE_ITEM_SIZE_SKIP);
+@@ -3780,10 +3781,12 @@
+ 	case SORT_CC:
+ 	    ret = strcmp(md1->cc, md2->cc);
+ 	    break;
+-	case SORT_DATE:
+-	    ret = (md1->date && md2->date) ?
+-		numcmp(md1->date, md2->date) : numcmp(md1->msgno, md2->msgno);
++	case SORT_DATE: {
++	    time_t d1 = md1->date ? md1->date : INTERNALDATE(md1->msgno);
++	    time_t d2 = md2->date ? md2->date : INTERNALDATE(md2->msgno);
++	    ret = numcmp(d1, d2);
+ 	    break;
++	}
+ 	case SORT_FROM:
+ 	    ret = strcmp(md1->from, md2->from);
+ 	    break;
+diff -urNad cyrus-imapd-2.2.13/imap/message.c cyrus-imapd-2.2.13/imap/message.c
+--- cyrus-imapd-2.2.13/imap/message.c	2007-02-27 05:01:09.000000000 +0100
++++ cyrus-imapd-2.2.13/imap/message.c	2007-02-27 05:03:44.277846175 +0100
+@@ -41,7 +41,7 @@
+  */
+ 
+ /*
+- * $Id: message.c,v 1.99 2004/09/16 17:58:54 ken3 Exp $
++ * $Id: message.c,v 1.99.2.1 2006/12/19 18:57:48 murch Exp $
+  */
+ 
+ #include <config.h>
+@@ -1429,7 +1429,7 @@
+     if (t >= 0) return (t - zone_off * 60);
+     
+  baddate:
+-    return time(0);
++    return (flags & PARSE_NOCREATE) ? 0 : time(0);
+ }
+ 
+ /*
+diff -urNad cyrus-imapd-2.2.13/imap/message.h cyrus-imapd-2.2.13/imap/message.h
+--- cyrus-imapd-2.2.13/imap/message.h	2007-02-27 05:01:09.000000000 +0100
++++ cyrus-imapd-2.2.13/imap/message.h	2007-02-27 05:03:44.278846076 +0100
+@@ -1,5 +1,5 @@
+ /* message.h -- Message parsing
+- $Id: message.h,v 1.6 2003/02/13 20:15:28 rjs3 Exp $
++ $Id: message.h,v 1.6.6.1 2006/12/19 18:57:48 murch Exp $
+ 
+  * Copyright (c) 1998-2003 Carnegie Mellon University.  All rights reserved.
+  *
+@@ -61,9 +61,10 @@
+ 				  unsigned size));
+ 
+ /* Flags for parsing message date/time - to be bitwise OR'd */
+-#define PARSE_DATE	(1<<0)
++#define PARSE_DATE	(1<<0)  /* Default (always parsed) */
+ #define PARSE_TIME	(1<<1)
+ #define PARSE_ZONE	(1<<2)
++#define PARSE_NOCREATE	(1<<15) /* Don't create one if its missing/invalid */
+ 
+ extern time_t message_parse_date P((char *hdr, unsigned flags));
+ extern int message_parse_file P((FILE *infile, struct mailbox *mailbox,
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/0002-allow_invalid_id_acl_removal.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/0002-allow_invalid_id_acl_removal.dpatch
@@ -0,0 +1,51 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 0002-allow_invalid_id_acl_removal.dpatch by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Upstream: Allow removal of invalid ID ACLs
+
+@DPATCH@
+diff -urNad cyrus-imapd-2.2.13/lib/acl_afs.c cyrus-imapd-2.2.13/lib/acl_afs.c
+--- cyrus-imapd-2.2.13/lib/acl_afs.c	2005-03-12 23:09:22.000000000 +0100
++++ cyrus-imapd-2.2.13/lib/acl_afs.c	2006-05-03 15:27:47.049193574 +0200
+@@ -114,6 +114,7 @@
+ cyrus_acl_canonproc_t *canonproc;
+ void *canonrock;
+ {
++    const char *canonid;
+     char *newidentifier = 0;
+     char *newacl;
+     char *thisid, *nextid;
+@@ -122,9 +123,14 @@
+ 
+     /* Convert 'identifier' into canonical form */
+     if (*identifier == '-') {
+-	char *canonid = auth_canonifyid(identifier+1, 0);
++	canonid = auth_canonifyid(identifier+1, 0);
+ 	if (!canonid) {
+-	    return -1;
++	    if (access != 0L) {
++		return -1;
++	    } else {
++		/* trying to delete invalid/non-existent identifier */
++		canonid = identifier+1;
++	    }
+ 	}
+ 	newidentifier = xmalloc(strlen(canonid)+2);
+ 	newidentifier[0] = '-';
+@@ -135,9 +141,13 @@
+ 	}
+     }
+     else {
+-	identifier = auth_canonifyid(identifier, 0);
+-	if (!identifier) {
++	canonid = auth_canonifyid(identifier, 0);
++	if (canonid) {
++	    identifier = canonid;
++	} else if (access != 0L) {
+ 	    return -1;
++	} else {
++	    /* trying to delete invalid/non-existent identifier */
+ 	}
+ 	if (canonproc) {
+ 	    access = canonproc(canonrock, identifier, access);
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/0019-upstream-sieve_allowreferrals.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/0019-upstream-sieve_allowreferrals.dpatch
@@ -0,0 +1,650 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 0019-upstream-sieve_allowreferrals.dpatch by Sven Mueller <sven@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Upstream: patch sieve to allow referrals
+
+@DPATCH@
+diff -urNad cyrus-imapd-2.2.13/doc/changes.html cyrus-imapd-2.2.13/doc/changes.html
+--- cyrus-imapd-2.2.13/doc/changes.html	2006-08-31 16:46:21.000000000 +0200
++++ cyrus-imapd-2.2.13/doc/changes.html	2006-08-31 16:53:15.970326054 +0200
+@@ -1,6 +1,6 @@
+ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+-<!-- $Id: changes.html,v 1.102 2006/03/31 15:24:29 murch Exp $ -->
++<!-- $Id: changes.html,v 1.104 2006/08/30 16:29:10 murch Exp $ -->
+ <html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta name="generator" content="HTML Tidy, see www.w3.org" />
+@@ -14,6 +14,14 @@
+ making it useful for remote mailboxes.</li>
+ </ul>
+ 
++<h1>Changes to the Cyrus IMAP Server since 2.2.13</h1> 
++<ul> 
++<li><tt>ctl_mboxlist</tt> now dumps/undumps the mailbox type flags,
++making it useful for remote mailboxes.</li>
++<li>Added <tt>sieve_allowreferrals</tt> option to control whether
++<tt>timsieved</tt> issues referrals or proxys traffic to backends.</li>
++</ul>
++
+ <h1>Changes to the Cyrus IMAP Server since 2.2.12</h1> 
+ <ul> 
+ <li>Allow sieve scripts to be run on shared mailboxes (via <tt>sieve</tt>
+@@ -2034,7 +2042,7 @@
+ </ul>
+ 
+ <hr />
+-last modified: $Date: 2006/03/31 15:24:29 $ <br />
++last modified: $Date: 2006/08/30 16:29:10 $ <br />
+ <a href="index.html">Return</a> to the Cyrus IMAP Server Home Page
+ </body>
+ </html>
+diff -urNad cyrus-imapd-2.2.13/imap/backend.c cyrus-imapd-2.2.13/imap/backend.c
+--- cyrus-imapd-2.2.13/imap/backend.c	2006-08-31 16:46:21.000000000 +0200
++++ cyrus-imapd-2.2.13/imap/backend.c	2006-08-31 16:55:26.609576327 +0200
+@@ -39,7 +39,7 @@
+  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+  */
+ 
+-/* $Id: backend.c,v 1.41 2006/05/11 18:05:29 murch Exp $ */
++/* $Id: backend.c,v 1.42 2006/08/30 16:29:11 murch Exp $ */
+ 
+ #include <config.h>
+ 
+@@ -74,7 +74,8 @@
+ #include "util.h"
+ 
+ static char *ask_capability(struct protstream *pout, struct protstream *pin,
+-			    struct protocol_t *prot, unsigned long *capa)
++			    struct protocol_t *prot, unsigned long *capa,
++			    int banner)
+ {
+     char str[4096];
+     char *ret = NULL, *tmp;
+@@ -82,7 +83,7 @@
+ 
+     *capa = 0;
+     
+-    if (prot->capa_cmd.cmd) {
++    if (!banner && prot->capa_cmd.cmd) {
+ 	/* request capabilities of server */
+ 	prot_printf(pout, "%s\r\n", prot->capa_cmd.cmd);
+ 	prot_flush(pout);
+@@ -239,7 +240,7 @@
+ 	/* If we don't have a usable mech, do TLS and try again */
+     } while (r == SASL_NOMECH && CAPA(s, CAPA_STARTTLS) &&
+ 	     do_starttls(s, &prot->tls_cmd) != -1 &&
+-	     (*mechlist = ask_capability(s->out, s->in, prot, &s->capability)));
++	     (*mechlist = ask_capability(s->out, s->in, prot, &s->capability, 0)));
+ 
+     /* xxx unclear that this is correct */
+     free_callbacks(cb);
+@@ -378,20 +379,23 @@
+     ret->sock = sock;
+     prot_setflushonread(ret->in, ret->out);
+     
+-    if (prot->capa_cmd.cmd) {
+-	/* read the initial greeting */
+-	if (!prot_fgets(buf, sizeof(buf), ret->in)) {
+-	    syslog(LOG_ERR,
+-		   "backend_connect(): couldn't read initial greeting: %s",
+-		   ret->in->error ? ret->in->error : "(null)");
+-	    if (!ret_backend) free(ret);
+-	    close(sock);
+-	    return NULL;
+-	}
++    if (!prot->banner.is_capa) {
++	do { /* read the initial greeting */
++	    if (!prot_fgets(buf, sizeof(buf), ret->in)) {
++		syslog(LOG_ERR,
++		       "backend_connect(): couldn't read initial greeting: %s",
++		       ret->in->error ? ret->in->error : "(null)");
++		if (!ret_backend) free(ret);
++		close(sock);
++		return NULL;
++	    }
++	} while (strncasecmp(buf, prot->banner.resp,
++			     strlen(prot->banner.resp)));
+     }
+ 
+     /* get the capabilities */
+-    mechlist = ask_capability(ret->out, ret->in, prot, &ret->capability);
++    mechlist = ask_capability(ret->out, ret->in, prot, &ret->capability,
++			      prot->banner.is_capa);
+ 
+     /* now need to authenticate to backend server,
+        unless we're doing LMTP on a UNIX socket (deliver) */
+diff -urNad cyrus-imapd-2.2.13/imap/protocol.c cyrus-imapd-2.2.13/imap/protocol.c
+--- cyrus-imapd-2.2.13/imap/protocol.c	2006-08-31 16:44:13.000000000 +0200
++++ cyrus-imapd-2.2.13/imap/protocol.c	2006-08-31 16:53:15.973325759 +0200
+@@ -39,7 +39,7 @@
+  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+  */
+ 
+-/* $Id: protocol.c,v 1.13 2004/12/07 19:26:24 ken3 Exp $ */
++/* $Id: protocol.c,v 1.14 2006/08/30 16:29:11 murch Exp $ */
+ 
+ #include <config.h>
+ 
+@@ -89,8 +89,24 @@
+     return success;
+ }
+ 
++static char *sieve_parsesuccess(char *str, const char **status)
++{
++    char *success = NULL, *tmp;
++
++    if (!strncmp(str, "OK (", 4) &&
++	(tmp = strstr(str+4, "SASL \"")) != NULL) {
++	success = tmp+6; /* skip SASL " */
++	tmp = strstr(success, "\"");
++	*tmp = '\0'; /* clip " */
++    }
++
++    if (status) *status = NULL;
++    return success;
++}
++
+ struct protocol_t protocol[] = {
+     { "imap", "imap",
++      { 0, "* OK" },
+       { "C01 CAPABILITY", "C01 ", &imap_parsemechlist,
+ 	{ { " AUTH=", CAPA_AUTH },
+ 	  { " STARTTLS", CAPA_STARTTLS },
+@@ -103,6 +119,7 @@
+       { "N01 NOOP", "N01 OK" },
+       { "Q01 LOGOUT", "Q01 " } },
+     { "pop3", "pop",
++      { 0, "+OK " },
+       { "CAPA", ".", NULL,
+ 	{ { "SASL ", CAPA_AUTH },
+ 	  { "STLS", CAPA_STARTTLS },
+@@ -112,6 +129,7 @@
+       { "NOOP", "+OK" },
+       { "QUIT", "+OK" } },
+     { "nntp", "nntp",
++      { 0, "20" },
+       { "CAPABILITIES", ".", NULL,
+ 	{ { "SASL ", CAPA_AUTH },
+ 	  { "STARTTLS", CAPA_STARTTLS },
+@@ -121,6 +139,7 @@
+       { "DATE", "111" },
+       { "QUIT", "205" } },
+     { "lmtp", "lmtp",
++      { 0, "220 " },
+       { "LHLO murder", "250 ", NULL,
+ 	{ { "AUTH ", CAPA_AUTH },
+ 	  { "STARTTLS", CAPA_STARTTLS },
+@@ -132,11 +151,22 @@
+       { "NOOP", "250" },
+       { "QUIT", "221" } },
+     { "mupdate", "mupdate",
++      { 1, "* OK" },
+       { NULL, "* OK", NULL,
+ 	{ { "* AUTH ", CAPA_AUTH },
+ 	  { NULL, 0 } } },
+       { "S01 STARTTLS", "S01 OK", "S01 NO" },
+       { "A01 AUTHENTICATE", INT_MAX, 1, "A01 OK", "A01 NO", "", "*", NULL },
+       { "N01 NOOP", "N01 OK" },
+-      { "Q01 LOGOUT", "Q01 " } }
++      { "Q01 LOGOUT", "Q01 " } },
++    { "sieve", SIEVE_SERVICE_NAME,
++      { 1, "OK" },
++      { "CAPABILITY", "OK", NULL,
++	{ { "\"SASL\" ", CAPA_AUTH },
++	  { "\"STARTTLS\"", CAPA_STARTTLS },
++	  { NULL, 0 } } },
++      { "STARTTLS", "OK", "NO" },
++      { "AUTHENTICATE", INT_MAX, 1, "OK", "NO", NULL, "*", &sieve_parsesuccess },
++      { NULL, NULL, NULL },
++      { "LOGOUT", NULL, "OK" } }
+ };
+diff -urNad cyrus-imapd-2.2.13/imap/protocol.h cyrus-imapd-2.2.13/imap/protocol.h
+--- cyrus-imapd-2.2.13/imap/protocol.h	2006-08-31 16:44:13.000000000 +0200
++++ cyrus-imapd-2.2.13/imap/protocol.h	2006-08-31 16:53:15.973325759 +0200
+@@ -39,7 +39,7 @@
+  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+  */
+ 
+-/* $Id: protocol.h,v 1.5 2004/05/06 18:52:07 ken3 Exp $ */
++/* $Id: protocol.h,v 1.6 2006/08/30 16:29:11 murch Exp $ */
+ 
+ #ifndef _INCLUDED_PROTOCOL_H
+ #define _INCLUDED_PROTOCOL_H
+@@ -70,9 +70,13 @@
+ 
+ struct protocol_t;
+ 
++struct banner_t {
++    int is_capa;		/* banner is capability response */
++    char *resp;			/* end of banner response */
++};
++
+ struct capa_cmd_t {
+-    const char *cmd;		/* [OPTIONAL] capability command string
+-				   (NULL = capabilities in banner) */
++    const char *cmd;		/* [OPTIONAL] capability command string */
+     const char *resp;		/* end of capability response */
+     char *(*parse_mechlist)(const char *str, struct protocol_t *prot);
+ 				/* [OPTIONAL] parse capability string,
+@@ -95,6 +99,7 @@
+ struct protocol_t {
+     const char *service;	/* INET service name */
+     const char *sasl_service;	/* SASL service name */
++    struct banner_t banner;
+     struct capa_cmd_t capa_cmd;
+     struct tls_cmd_t tls_cmd;
+     struct sasl_cmd_t sasl_cmd;
+@@ -109,7 +114,8 @@
+     PROTOCOL_POP3,
+     PROTOCOL_NNTP,
+     PROTOCOL_LMTP,
+-    PROTOCOL_MUPDATE
++    PROTOCOL_MUPDATE,
++    PROTOCOL_SIEVE
+ };
+ 
+ #endif /* _INCLUDED_PROTOCOL_H */
+diff -urNad cyrus-imapd-2.2.13/imap/saslclient.c cyrus-imapd-2.2.13/imap/saslclient.c
+--- cyrus-imapd-2.2.13/imap/saslclient.c	2006-08-31 16:44:13.000000000 +0200
++++ cyrus-imapd-2.2.13/imap/saslclient.c	2006-08-31 16:53:15.972325858 +0200
+@@ -39,7 +39,7 @@
+  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+  */
+ 
+-/* $Id: saslclient.c,v 1.13 2004/07/07 19:49:05 rjs3 Exp $ */
++/* $Id: saslclient.c,v 1.14 2006/08/30 16:29:11 murch Exp $ */
+ 
+ #include <config.h>
+ 
+@@ -237,21 +237,24 @@
+     do {
+ 	char *p;
+ 
++	base64 = buf;
++	*base64 = '\0';
++
+ 	if (clientout) { /* response */
+ 	    /* convert to base64 */
+-	    base64 = buf;
+ 	    r = sasl_encode64(clientout, clientoutlen,
+ 			      base64, BASE64_BUF_SIZE, NULL);
+ 
+ 	    clientout = NULL;
++	}
+ 
+-	    /* send to server */
+-	    if (sendliteral) {
+-		prot_printf(pout, "{%d+}\r\n", strlen(base64));
+-		prot_flush(pout);
+-	    }
+-	    prot_printf(pout, "%s", base64);
++	/* send to server */
++	if (sendliteral) {
++	    prot_printf(pout, "{%d+}\r\n", strlen(base64));
++	    prot_flush(pout);
+ 	}
++	prot_printf(pout, "%s", base64);
++
+       noinitresp:
+ 	prot_printf(pout, "\r\n");
+ 	prot_flush(pout);
+@@ -281,10 +284,23 @@
+ 	    r = SASL_BADAUTH;
+ 	    break;
+ 	}
+-	else if (!strncasecmp(buf, sasl_cmd->cont, strlen(sasl_cmd->cont))) {
++	else if (sasl_cmd->cont &&
++		 !strncasecmp(buf, sasl_cmd->cont, strlen(sasl_cmd->cont))) {
+ 	    /* continue */
+ 	    base64 = buf + strlen(sasl_cmd->cont);
+ 	}
++	else if (!sasl_cmd->cont && buf[0] == '{') {
++	    unsigned int litsize = atoi(buf+1);
++
++	    /* get actual literal data */
++	    if (!prot_fgets(buf, AUTH_BUF_SIZE, pin)) {
++		if (sasl_result) *sasl_result = SASL_FAIL;
++		if (status) *status = "EOF from server";
++		return IMAP_SASL_PROTERR;
++	    }
++
++	    base64 = buf;
++	}
+ 	else {
+ 	    /* unknown response */
+ 	    if (status) *status = buf;
+diff -urNad cyrus-imapd-2.2.13/lib/imapoptions cyrus-imapd-2.2.13/lib/imapoptions
+--- cyrus-imapd-2.2.13/lib/imapoptions	2006-08-31 16:46:22.000000000 +0200
++++ cyrus-imapd-2.2.13/lib/imapoptions	2006-08-31 16:53:44.074560998 +0200
+@@ -42,7 +42,7 @@
+ .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ .\" 
+-.\" $Id: imapoptions,v 1.37 2006/06/05 23:31:22 murch Exp $
++.\" $Id: imapoptions,v 1.38 2006/08/30 16:29:11 murch Exp $
+ .SH NAME
+ imapd.conf \- IMAP configuration file
+ .SH DESCRIPTION
+@@ -853,6 +853,11 @@
+ /* If using the alternate IMAP namespace, the prefix for the other users
+    namespace.  The hierarchy delimiter will be automatically appended. */
+ 
++{ "sieve_allowreferrals", 1, SWITCH }
++/* If enabled, timsieved will issue referrals to clients when the
++   user's scripts reside on a remote server (in a Murder).
++   Otherwise, timsieved will proxy traffic to the remote server. */
++
+ # xxx badly worded
+ { "unix_group_enable", 1, SWITCH }
+ /* Should we look up groups when using auth_unix (disable this if you are
+diff -urNad cyrus-imapd-2.2.13/timsieved/Makefile.in cyrus-imapd-2.2.13/timsieved/Makefile.in
+--- cyrus-imapd-2.2.13/timsieved/Makefile.in	2006-08-31 16:44:13.000000000 +0200
++++ cyrus-imapd-2.2.13/timsieved/Makefile.in	2006-08-31 16:53:15.967326349 +0200
+@@ -1,5 +1,5 @@
+ # Makefile.in - timsieved makefile
+-# $Id: Makefile.in,v 1.24 2004/05/28 18:03:10 rjs3 Exp $
++# $Id: Makefile.in,v 1.25 2006/08/30 16:29:11 murch Exp $
+ # @configure_input@
+ # 
+ # Copyright (c) 1998-2000 Carnegie Mellon University.  All rights reserved.
+@@ -83,7 +83,7 @@
+ 	$(INSTALL) -m 755 timsieved $(DESTDIR)$(service_path)
+ 
+ OBJS= actions.o lex.o mystring.o scripttest.o timsieved.o parser.o \
+-	../imap/tls.o
++	../imap/tls.o ../imap/backend.o
+ 
+ timsieved: $(OBJS) $(SERVICE)
+ 	$(CC) $(LDFLAGS) -o timsieved \
+diff -urNad cyrus-imapd-2.2.13/timsieved/actions.c cyrus-imapd-2.2.13/timsieved/actions.c
+--- cyrus-imapd-2.2.13/timsieved/actions.c	2006-08-31 16:44:13.000000000 +0200
++++ cyrus-imapd-2.2.13/timsieved/actions.c	2006-08-31 16:53:15.967326349 +0200
+@@ -1,6 +1,6 @@
+ /* actions.c -- executes the commands for timsieved
+  * Tim Martin
+- * $Id: actions.c,v 1.38 2005/11/18 14:18:18 murch Exp $
++ * $Id: actions.c,v 1.39 2006/08/30 16:29:11 murch Exp $
+  */
+ /*
+  * Copyright (c) 1998-2003 Carnegie Mellon University.  All rights reserved.
+@@ -177,8 +177,9 @@
+     int mechcount;
+ 
+     /* implementation */
+-    prot_printf(conn, "\"IMPLEMENTATION\" \"Cyrus timsieved %s\"\r\n",
+-		CYRUS_VERSION);
++    prot_printf(conn,
++		"\"IMPLEMENTATION\" \"Cyrus timsieved%s %s\"\r\n",
++		config_mupdate_server ? " (Murder)" : "", CYRUS_VERSION);
+     
+     /* SASL */
+     if (!authenticated &&
+diff -urNad cyrus-imapd-2.2.13/timsieved/parser.c cyrus-imapd-2.2.13/timsieved/parser.c
+--- cyrus-imapd-2.2.13/timsieved/parser.c	2006-08-31 16:44:13.000000000 +0200
++++ cyrus-imapd-2.2.13/timsieved/parser.c	2006-08-31 16:53:15.968326251 +0200
+@@ -1,7 +1,7 @@
+ /* parser.c -- parser used by timsieved
+  * Tim Martin
+  * 9/21/99
+- * $Id: parser.c,v 1.39 2005/11/03 13:41:54 murch Exp $
++ * $Id: parser.c,v 1.40 2006/08/30 16:29:11 murch Exp $
+  */
+ /*
+  * Copyright (c) 1998-2003 Carnegie Mellon University.  All rights reserved.
+@@ -60,6 +60,7 @@
+ #include "libconfig.h"
+ #include "global.h"
+ #include "auth.h"
++#include "backend.h"
+ #include "mboxname.h"
+ #include "mboxlist.h"
+ #include "xmalloc.h"
+@@ -90,6 +91,7 @@
+ /* from elsewhere */
+ void fatal(const char *s, int code);
+ extern int sieved_logfd;
++extern struct backend *backend;
+ 
+ /* forward declarations */
+ static void cmd_logout(struct protstream *sieved_out,
+@@ -680,19 +682,20 @@
+       }
+ 
+       if(type & MBTYPE_REMOTE) {
+-	  /* It's a remote mailbox, we want to set up a referral */
+-	  if (sieved_domainfromip) {
+-	      char *authname, *p;
++	  /* It's a remote mailbox */
++	  if (config_getswitch(IMAPOPT_SIEVE_ALLOWREFERRALS)) {
++	      /* We want to set up a referral */
++	      if (sieved_domainfromip) {
++		  char *authname, *p;
+ 
+-	      /* get a new copy of the userid */
+-	      free(username);
+-	      username = xstrdup(canon_user);
++		  /* get a new copy of the userid */
++		  free(username);
++		  username = xstrdup(canon_user);
+ 
+-	      /* get the authid from SASL */
+-	      sasl_result=sasl_getprop(sieved_saslconn, SASL_AUTHUSER,
+-				       (const void **) &canon_user);
+-	      if (sasl_result!=SASL_OK)
+-		  {
++		  /* get the authid from SASL */
++		  sasl_result=sasl_getprop(sieved_saslconn, SASL_AUTHUSER,
++					   (const void **) &canon_user);
++		  if (sasl_result!=SASL_OK) {
+ 		      *errmsg = "Internal SASL error";
+ 		      syslog(LOG_ERR, "SASL: sasl_getprop SASL_AUTHUSER: %s",
+ 			     sasl_errstring(sasl_result, NULL, NULL));
+@@ -704,21 +707,46 @@
+ 		      ret = FALSE;
+ 		      goto cleanup;
+ 		  }
+-	      authname = xstrdup(canon_user);
++		  authname = xstrdup(canon_user);
+ 
+-	      if ((p = strchr(authname, '@'))) *p = '%';
+-	      if ((p = strchr(username, '@'))) *p = '%';
++		  if ((p = strchr(authname, '@'))) *p = '%';
++		  if ((p = strchr(username, '@'))) *p = '%';
+ 
+-	      referral_host =
+-		  (char*) xmalloc(strlen(authname)+1+strlen(username)+1+
+-				  strlen(server)+1);
+-	      sprintf((char*) referral_host, "%s;%s@%s",
+-		      authname, username, server);
++		  referral_host =
++		      (char*) xmalloc(strlen(authname)+1+strlen(username)+1+
++				      strlen(server)+1);
++		  sprintf((char*) referral_host, "%s;%s@%s",
++			  authname, username, server);
+ 
+-	      free(authname);
++		  free(authname);
++	      }
++	      else
++		  referral_host = xstrdup(server);
++	  }
++	  else {
++	      /* We want to set up a connection to the backend for proxying */
++	      const char *statusline = NULL;
++
++	      /* xxx hide the fact that we are storing partitions */
++	      if (server) {
++		  char *c;
++		  c = strchr(server, '!');
++		  if(c) *c = '\0';
++	      }
++
++	      backend = backend_connect(NULL, server, &protocol[PROTOCOL_SIEVE],
++					username, &statusline);
++
++	      if (!backend) {
++		  syslog(LOG_ERR, "couldn't authenticate to backend server");
++		  prot_printf(sieved_out, "NO \"%s\"\r\n",
++			      statusline ? statusline :
++			      "Authentication to backend server failed");
++		  prot_flush(sieved_out);
++
++		  goto cleanup;
++	      }
+ 	  }
+-	  else
+-	      referral_host = xstrdup(server);
+       } else if (actions_setuser(username) != TIMSIEVE_OK) {
+ 	  *errmsg = "internal error";
+ 	  syslog(LOG_ERR, "error in actions_setuser()");
+diff -urNad cyrus-imapd-2.2.13/timsieved/timsieved.c cyrus-imapd-2.2.13/timsieved/timsieved.c
+--- cyrus-imapd-2.2.13/timsieved/timsieved.c	2006-08-31 16:44:13.000000000 +0200
++++ cyrus-imapd-2.2.13/timsieved/timsieved.c	2006-08-31 16:53:15.968326251 +0200
+@@ -1,7 +1,7 @@
+ /* timsieved.c -- main file for timsieved (sieve script accepting program)
+  * Tim Martin
+  * 9/21/99
+- * $Id: timsieved.c,v 1.56 2005/11/18 14:18:35 murch Exp $
++ * $Id: timsieved.c,v 1.57 2006/08/30 16:29:11 murch Exp $
+  */
+ /*
+  * Copyright (c) 1998-2003 Carnegie Mellon University.  All rights reserved.
+@@ -82,6 +82,7 @@
+ 
+ #include "auth.h"
+ #include "acl.h"
++#include "backend.h"
+ #include "mboxlist.h"
+ #include "util.h"
+ 
+@@ -117,12 +118,24 @@
+     1, 1, &sieved_authstate, &sieved_userisadmin, NULL
+ };
+ 
++/* PROXY stuff */
++struct backend *backend = NULL;
++
++static void bitpipe(void);
++/* end PROXY stuff */
++
+ /*
+  * Cleanly shut down and exit
+  */
+ void shut_down(int code) __attribute__ ((noreturn));
+ void shut_down(int code)
+ {
++    /* close backend connection */
++    if (backend) {
++	backend_disconnect(backend, &protocol[PROTOCOL_SIEVE]);
++	free(backend);
++    }
++
+     /* close mailboxes */
+     mboxlist_close();
+     mboxlist_done();
+@@ -161,6 +174,14 @@
+ 
+     while (ret != TRUE)
+     {
++	if (backend) {
++	    /* create a pipe from client to backend */
++	    bitpipe();
++
++	    /* pipe has been closed */
++	    return;
++	}
++
+ 	ret = parser(sieved_out, sieved_in);
+     }
+ 
+@@ -202,7 +223,7 @@
+ 		 char **argv __attribute__((unused)),
+ 		 char **envp __attribute__((unused)))
+ {
+-    global_sasl_init(0, 1, mysasl_cb);
++    global_sasl_init(1, 1, mysasl_cb);
+ 
+     /* open mailboxes */
+     mboxlist_init(0);
+@@ -351,3 +372,79 @@
+ 
+     return SASL_OK;
+ }
++
++/* we've authenticated the client, we've connected to the backend.
++   now it's all up to them */
++static void bitpipe(void)
++{
++    struct protgroup *protin = protgroup_new(2);
++    struct protgroup *protout = NULL;
++    struct timeval timeout;
++    int n, shutdown = 0;
++    char buf[4096];
++
++    /* Reset protin to all zeros (to preserve memory allocation) */
++    protgroup_reset(protin);
++    protgroup_insert(protin, sieved_in);
++    protgroup_insert(protin, backend->in);
++
++    for (;;) {
++	/* check for shutdown file */
++	if (shutdown_file(buf, sizeof(buf))) {
++	    shutdown = 1;
++	    goto done;
++	}
++
++	/* Clear protout if needed */
++	protgroup_free(protout);
++	protout = NULL;
++
++	timeout.tv_sec = 60;
++	timeout.tv_usec = 0;
++
++	n = prot_select(protin, PROT_NO_FD, &protout, NULL, &timeout);
++	if (n == -1) {
++	    syslog(LOG_ERR, "prot_select() failed in bitpipe(): %m");
++	    fatal("prot_select() failed in bitpipe()", EC_TEMPFAIL);
++	}
++	if (n && protout) {
++	    struct protstream *ptmp;
++
++	    for (; n; n--) {
++		ptmp = protgroup_getelement(protout, n-1);
++
++		if (ptmp == sieved_in) {
++		    do {
++			int c = prot_read(sieved_in, buf, sizeof(buf));
++			if (c == 0 || c < 0) goto done;
++			prot_write(backend->out, buf, c);
++		    } while (sieved_in->cnt > 0);
++		    prot_flush(backend->out);
++		}
++		else if (ptmp == backend->in) {
++		    do {
++			int c = prot_read(backend->in, buf, sizeof(buf));
++			if (c == 0 || c < 0) goto done;
++			prot_write(sieved_out, buf, c);
++		    } while (backend->in->cnt > 0);
++		    prot_flush(sieved_out);
++		}
++		else {
++		    /* XXX shouldn't get here !!! */
++		    fatal("unknown protstream returned by prot_select in bitpipe()",
++			  EC_SOFTWARE);
++		}
++	    }
++	}
++    }
++
++
++ done:
++    /* ok, we're done. */
++    protgroup_free(protin);
++    protgroup_free(protout);
++
++    if (shutdown) prot_printf(sieved_out, "NO \"%s\"\r\n", buf);
++
++    return;
++}
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/12-fix_timeout_handling.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/12-fix_timeout_handling.dpatch
@@ -0,0 +1,457 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 12-fix_timeout_handling.dpatch by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fixes timeout handling
+
+@DPATCH@
+diff -urNad complete.dpatch/imap/signals.c complete.dpatch/imap/signals.c
+--- complete.dpatch/imap/signals.c	2005-02-14 17:26:50.000000000 +0100
++++ complete.dpatch/imap/signals.c	2005-11-11 14:10:07.056723830 +0100
+@@ -50,7 +50,7 @@
+ #include "xmalloc.h"
+ #include "exitcodes.h"
+ 
+-static int gotsignal = 0;
++static volatile int gotsignal = 0;
+ 
+ static void sighandler(int sig)
+ {
+diff -urNad complete.dpatch/lib/lock.h complete.dpatch/lib/lock.h
+--- complete.dpatch/lib/lock.h	2003-02-13 21:15:40.000000000 +0100
++++ complete.dpatch/lib/lock.h	2005-11-11 14:10:07.056723830 +0100
+@@ -53,6 +53,8 @@
+ 
+ #include <sys/stat.h>
+ 
++extern int lock_wait_time;
++
+ extern const char *lock_method_desc;
+ 
+ extern int lock_reopen P((int fd, const char *filename,
+diff -urNad complete.dpatch/lib/lock_fcntl.c complete.dpatch/lib/lock_fcntl.c
+--- complete.dpatch/lib/lock_fcntl.c	2003-02-13 21:15:40.000000000 +0100
++++ complete.dpatch/lib/lock_fcntl.c	2005-11-11 14:10:07.057723732 +0100
+@@ -47,11 +47,43 @@
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <errno.h>
++#include <syslog.h>
++#include <signal.h>
+ 
+ #include "lock.h"
+ 
+ const char *lock_method_desc = "fcntl";
+ 
++int lock_wait_time = LOCK_GIVEUP_TIMER_DEFAULT;
++
++/* Signal handling. We REQUIRE SYSV abort-syscall behaviour */
++
++static volatile int lock_gotsigalrm = 0;
++void lock_sigalrm_handler(int sig __attribute__((unused)))
++{
++    lock_gotsigalrm = 1;
++}
++
++static int setsigalrm(int enable)
++{
++    struct sigaction action;
++
++    sigemptyset(&action.sa_mask);
++    action.sa_flags = SA_RESETHAND;
++
++    if(enable) {
++	action.sa_handler = lock_sigalrm_handler;
++    } else {
++	action.sa_handler = SIG_IGN;
++    }
++    if (sigaction(SIGALRM, &action, NULL) < 0) {
++	syslog(LOG_ERR, "installing SIGALRM handler: sigaction: %m");
++	return -1;
++    }
++    lock_gotsigalrm = 0;
++    return 0;
++}
++
+ /*
+  * Block until we obtain an exclusive lock on the file descriptor 'fd',
+  * opened for reading and writing on the file named 'filename'.  If
+@@ -65,12 +97,10 @@
+  * 'failaction' is provided, it is filled in with a pointer to a fixed
+  * string naming the action that failed.
+  *
++ * We use POSIX semanthics and alarm() to avoid deadlocks
++ *
+  */
+-int lock_reopen(fd, filename, sbuf, failaction)
+-int fd;
+-const char *filename;
+-struct stat *sbuf;
+-const char **failaction;
++int lock_reopen (int fd, const char *filename, struct stat *sbuf, const char **failaction)
+ {
+     int r;
+     struct flock fl;
+@@ -79,6 +109,8 @@
+ 
+     if (!sbuf) sbuf = &sbufspare;
+ 
++    setsigalrm(1);
++    alarm(lock_wait_time);
+     for (;;) {
+ 	fl.l_type= F_WRLCK;
+ 	fl.l_whence = SEEK_SET;
+@@ -86,8 +118,10 @@
+ 	fl.l_len = 0;
+ 	r = fcntl(fd, F_SETLKW, &fl);
+ 	if (r == -1) {
+-	    if (errno == EINTR) continue;
+-	    if (failaction) *failaction = "locking";
++	    if (errno == EINTR && !lock_gotsigalrm) continue;
++ 	    if (failaction) *failaction = "locking";
++	    alarm(0);
++	    setsigalrm(0);
+ 	    return -1;
+ 	}
+ 
+@@ -100,10 +134,16 @@
+ 	    fl.l_start = 0;
+ 	    fl.l_len = 0;
+ 	    r = fcntl(fd, F_SETLKW, &fl);
++	    alarm(0);
++	    setsigalrm(0);
+ 	    return -1;
+ 	}
+ 
+-	if (sbuf->st_ino == sbuffile.st_ino) return 0;
++	if (sbuf->st_ino == sbuffile.st_ino) {
++	    alarm(0);
++	    setsigalrm(0);
++	    return 0;
++	}
+ 
+ 	newfd = open(filename, O_RDWR);
+ 	if (newfd == -1) {
+@@ -113,11 +153,15 @@
+ 	    fl.l_start = 0;
+ 	    fl.l_len = 0;
+ 	    r = fcntl(fd, F_SETLKW, &fl);
++	    alarm(0);
++	    setsigalrm(0);
+ 	    return -1;
+ 	}
+ 	dup2(newfd, fd);
+ 	close(newfd);
+     }
++    alarm(0);
++    setsigalrm(0);
+ }
+ 
+ /*
+@@ -125,22 +169,32 @@
+  * Returns 0 for success, -1 for failure, with errno set to an
+  * appropriate error code.
+  */
+-int lock_blocking(fd)
+-int fd;
++int lock_blocking(int fd)
+ {
+     int r;
+     struct flock fl;
+ 
++    setsigalrm(1);
++    alarm(lock_wait_time);
+     for (;;) {
+ 	fl.l_type= F_WRLCK;
+ 	fl.l_whence = SEEK_SET;
+ 	fl.l_start = 0;
+ 	fl.l_len = 0;
+ 	r = fcntl(fd, F_SETLKW, &fl);
+-	if (r != -1) return 0;
+-	if (errno == EINTR) continue;
++	if (r != -1) {
++	    alarm(0);
++	    setsigalrm(0);
++	    return 0;
++	}
++	if (errno == EINTR && !lock_gotsigalrm) continue;
++	alarm(0);
++	setsigalrm(0);
+ 	return -1;
+     }
++    alarm(0);
++    setsigalrm(0);
++    return 0;
+ }
+ 
+ /*
+@@ -148,22 +202,32 @@
+  * Returns 0 for success, -1 for failure, with errno set to an
+  * appropriate error code.
+  */
+-int lock_shared(fd)
+-int fd;
++int lock_shared(int fd)
+ {
+     int r;
+     struct flock fl;
+ 
++    setsigalrm(1);
++    alarm(lock_wait_time);
+     for (;;) {
+ 	fl.l_type= F_RDLCK;
+ 	fl.l_whence = SEEK_SET;
+ 	fl.l_start = 0;
+ 	fl.l_len = 0;
+ 	r = fcntl(fd, F_SETLKW, &fl);
+-	if (r != -1) return 0;
+-	if (errno == EINTR) continue;
++	if (r != -1) {
++	    alarm(0);
++	    setsigalrm(0);
++	    return 0;
++	}
++	if (errno == EINTR && !lock_gotsigalrm) continue;
++	alarm(0);
++	setsigalrm(0);
+ 	return -1;
+     }
++    alarm(0);
++    setsigalrm(0);
++    return 0;
+ }
+ 
+ /*
+@@ -171,8 +235,7 @@
+  * Returns 0 for success, -1 for failure, with errno set to an
+  * appropriate error code.
+  */
+-int lock_nonblocking(fd)
+-int fd;
++int lock_nonblocking(int fd)
+ {
+     int r;
+     struct flock fl;
+@@ -187,10 +250,13 @@
+ 	if (errno == EINTR) continue;
+ 	return -1;
+     }
++    return 0;
+ }
+ 
+ /*
+- * Release any lock on 'fd'.  Always returns success.
++ * Release any lock on 'fd'
++ * Returns 0 for success, -1 for failure, with errno set to an
++ * appropriate error code.
+  */
+ int lock_unlock(int fd)
+ { 
+@@ -209,5 +275,6 @@
+         /* xxx help! */
+         return -1;
+     }
++    return 0;
+ }
+ 
+diff -urNad complete.dpatch/lib/lock_flock.c complete.dpatch/lib/lock_flock.c
+--- complete.dpatch/lib/lock_flock.c	2003-02-13 21:15:41.000000000 +0100
++++ complete.dpatch/lib/lock_flock.c	2005-11-11 14:10:07.057723732 +0100
+@@ -46,6 +46,8 @@
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ #include <errno.h>
++#include <syslog.h>
++#include <signal.h>
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
+@@ -54,6 +56,36 @@
+ 
+ const char *lock_method_desc = "flock";
+ 
++int lock_wait_time = LOCK_GIVEUP_TIMER_DEFAULT;
++
++/* Signal handling. We REQUIRE SYSV abort-syscall behaviour */
++
++static volatile int lock_gotsigalrm = 0;
++void lock_sigalrm_handler(int sig __attribute__((unused)))
++{
++    lock_gotsigalrm = 1;
++}
++
++static int setsigalrm(int enable)
++{
++    struct sigaction action;
++
++    sigemptyset(&action.sa_mask);
++    action.sa_flags = SA_RESETHAND;
++
++    if(enable) {
++	action.sa_handler = lock_sigalrm_handler;
++    } else {
++	action.sa_handler = SIG_IGN;
++    }
++    if (sigaction(SIGALRM, &action, NULL) < 0) {
++	syslog(LOG_ERR, "installing SIGALRM handler: sigaction: %m");
++	return -1;
++    }
++    lock_gotsigalrm = 0;
++    return 0;
++}
++
+ /*
+  * Block until we obtain an exclusive lock on the file descriptor 'fd',
+  * opened for reading and writing on the file named 'filename'.  If
+@@ -67,12 +99,10 @@
+  * 'failaction' is provided, it is filled in with a pointer to a fixed
+  * string naming the action that failed.
+  *
++ * We use POSIX semanthics and alarm() to avoid deadlocks
++ *
+  */
+-int lock_reopen(fd, filename, sbuf, failaction)
+-int fd;
+-const char *filename;
+-struct stat *sbuf;
+-const char **failaction;
++int lock_reopen(int fd, const char *filename, struct stat *sbuf, const char **failaction)
+ {
+     int r;
+     struct stat sbuffile, sbufspare;
+@@ -80,11 +110,15 @@
+ 
+     if (!sbuf) sbuf = &sbufspare;
+ 
++    setsigalrm(1);
++    alarm(lock_wait_time);
+     for (;;) {
+ 	r = flock(fd, LOCK_EX);
+ 	if (r == -1) {
+-	    if (errno == EINTR) continue;
++	    if (errno == EINTR && !lock_gotsigalrm) continue;
+ 	    if (failaction) *failaction = "locking";
++	    alarm(0);
++	    setsigalrm(0);
+ 	    return -1;
+ 	}
+ 
+@@ -93,20 +127,32 @@
+ 	if (r == -1) {
+ 	    if (failaction) *failaction = "stating";
+ 	    flock(fd, LOCK_UN);
++	    alarm(0);
++	    setsigalrm(0);
+ 	    return -1;
+ 	}
+ 
+-	if (sbuf->st_ino == sbuffile.st_ino) return 0;
++	if (sbuf->st_ino == sbuffile.st_ino) {
++	    alarm(0);
++	    setsigalrm(0);
++	    return 0;
++	}
++ 
+ 
+ 	newfd = open(filename, O_RDWR);
+ 	if (newfd == -1) {
+ 	    if (failaction) *failaction = "opening";
+ 	    flock(fd, LOCK_UN);
++	    alarm(0);
++	    setsigalrm(0);
+ 	    return -1;
+ 	}
+ 	dup2(newfd, fd);
+ 	close(newfd);
+     }
++    alarm(0);
++    setsigalrm(0);
++    return 0;
+ }
+ 
+ /*
+@@ -114,17 +160,27 @@
+  * Returns 0 for success, -1 for failure, with errno set to an
+  * appropriate error code.
+  */
+-int lock_blocking(fd)
+-int fd;
++int lock_blocking(int fd)
+ {
+     int r;
+ 
++    setsigalrm(1);
++    alarm(lock_wait_time);
+     for (;;) {
+ 	r = flock(fd, LOCK_EX);
+-	if (r != -1) return 0;
+-	if (errno == EINTR) continue;
++	if (r != -1) {
++	    alarm(0);
++	    setsigalrm(0);
++	    return 0;
++	}
++	if (errno == EINTR && !lock_gotsigalrm) continue;
++	alarm(0);
++	setsigalrm(0);
+ 	return -1;
+     }
++    alarm(0);
++    setsigalrm(0);
++    return 0;
+ }
+ 
+ /*
+@@ -132,17 +188,27 @@
+  * Returns 0 for success, -1 for failure, with errno set to an
+  * appropriate error code.
+  */
+-int lock_shared(fd)
+-int fd;
++int lock_shared(int fd)
+ {
+     int r;
+ 
++    setsigalrm(1);
++    alarm(lock_wait_time);
+     for (;;) {
+ 	r = flock(fd, LOCK_SH);
+-	if (r != -1) return 0;
+-	if (errno == EINTR) continue;
++	if (r != -1) {
++	    alarm(0);
++	    setsigalrm(0);
++	    return 0;
++	}
++	if (errno == EINTR && !lock_gotsigalrm) continue;
++	alarm(0);
++	setsigalrm(0);
+ 	return -1;
+     }
++    alarm(0);
++    setsigalrm(0);
++    return 0;
+ }
+ 
+ /*
+@@ -164,7 +230,9 @@
+ }
+ 
+ /*
+- * Release any lock on 'fd'.  Always returns success.
++ * Release any lock on 'fd'.
++ * Returns 0 for success, -1 for failure, with errno set to an
++ * appropriate error code.
+  */
+ int lock_unlock(int fd)
+ {
+@@ -174,8 +242,8 @@
+         r = flock(fd, LOCK_UN);
+         if (r != -1) return 0;
+         if (errno == EINTR) continue;
+-        /* xxx help! */
+         return -1;
+     }
++    return 0;
+ }
+ 
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/0025-upstream-fix-cve-2009-3235.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/0025-upstream-fix-cve-2009-3235.dpatch
@@ -0,0 +1,73 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 0025_upstream-fix-cve-2009-3235.dpatch by Henrique de Moraes Holschuh <hmh@debian.org>
+##
+## DP: Fixes for CVE 2009-3235 (multiple Sieve buffer overruns, remote exploitable)
+## DP: taken from upstream CVS, Debian bug #547947
+
+@DPATCH@
+diff -urNad cyrus-imapd-2.2.13~/sieve/bc_eval.c cyrus-imapd-2.2.13/sieve/bc_eval.c
+--- cyrus-imapd-2.2.13~/sieve/bc_eval.c	2009-09-23 09:18:50.557332445 -0300
++++ cyrus-imapd-2.2.13/sieve/bc_eval.c	2009-09-23 09:20:15.831016330 -0300
+@@ -440,7 +440,7 @@
+ 	int comparator=ntohl(bc[i+3].value);
+ 	int apart=ntohl(bc[i+4].value);
+ 	int count=0;
+-	char scount[3];
++	char scount[21];
+ 	int isReg = (match==B_REGEX);
+ 	int ctag = 0;
+ 	regex_t *reg;
+@@ -574,7 +574,7 @@
+      
+ 	if  (match == B_COUNT)
+ 	{
+-	    sprintf(scount, "%u", count);
++	    snprintf(scount, sizeof(scount), "%u", count);
+ 	    /* search through all the data */ 
+ 	    currd=datai+2;
+ 	    for (z=0; z<numdata && !res; z++)
+@@ -608,7 +608,7 @@
+ 	int relation=ntohl(bc[i+2].value);
+ 	int comparator=ntohl(bc[i+3].value);
+ 	int count=0;	
+-	char scount[3];
++	char scount[21];
+ 	int isReg = (match==B_REGEX);
+ 	int ctag = 0;
+ 	regex_t *reg;
+@@ -689,7 +689,7 @@
+ 	
+ 	if  (match == B_COUNT )
+ 	{
+-	    sprintf(scount, "%u", count);
++	    snprintf(scount, sizeof(scount), "%u", count);
+ 	    /*search through all the data*/ 
+ 	    currd=datai+2;
+ 	    for (z=0; z<numdata && !res; z++)
+diff -urNad cyrus-imapd-2.2.13~/sieve/script.c cyrus-imapd-2.2.13/sieve/script.c
+--- cyrus-imapd-2.2.13~/sieve/script.c	2009-09-23 09:18:51.474832314 -0300
++++ cyrus-imapd-2.2.13/sieve/script.c	2009-09-23 09:18:51.627330879 -0300
+@@ -526,9 +526,9 @@
+     if ((ret != SIEVE_OK) && interp->err) {
+ 	char buf[1024];
+ 	if (lastaction == -1) /* we never executed an action */
+-	    sprintf(buf, "%s", errmsg ? errmsg : sieve_errstr(ret));
++	    snprintf(buf, sizeof(buf), "%s", errmsg ? errmsg : sieve_errstr(ret));
+ 	else
+-	    sprintf(buf, "%s: %s", action_to_string(lastaction),
++	    snprintf(buf, sizeof(buf), "%s: %s", action_to_string(lastaction),
+ 		    errmsg ? errmsg : sieve_errstr(ret));
+  
+ 	ret |= interp->execute_err(buf, interp->interp_context,
+diff -urNad cyrus-imapd-2.2.13~/sieve/sieve.y cyrus-imapd-2.2.13/sieve/sieve.y
+--- cyrus-imapd-2.2.13~/sieve/sieve.y	2009-09-23 09:18:50.557332445 -0300
++++ cyrus-imapd-2.2.13/sieve/sieve.y	2009-09-23 09:18:51.627330879 -0300
+@@ -923,7 +923,7 @@
+ 	else if (!strcmp(r, "ne")) {return NE;}
+ 	else if (!strcmp(r, "eq")) {return EQ;}
+ 	else{
+-	  sprintf(errbuf, "flag '%s': not a valid relational operation", r);
++	  snprintf(errbuf, sizeof(errbuf), "flag '%s': not a valid relational operation", r);
+ 	  yyerror(errbuf);
+ 	  return -1;
+ 	}
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/0090-fix-casts.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/0090-fix-casts.dpatch
@@ -0,0 +1,123 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 0090-fix-casts.dpatch by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix compile-time warnings about casts from pointer to integer 
+## DP: of different size.
+
+@DPATCH@
+diff -urNad --exclude=CVS --exclude=.svn ./imap/squat_build.c cyrus-imapd-2.2.13/imap/squat_build.c
+--- ./imap/squat_build.c	2006-04-25 17:28:58.000000000 +0200
++++ cyrus-imapd-2.2.13/imap/squat_build.c	2006-06-08 14:33:06.966146056 +0200
+@@ -479,7 +479,7 @@
+     for (i = 0; i < VECTOR_SIZE(t->entries); i++) {
+       SquatWordTableEntry* e = &(t->entries[i]);
+       
+-      if (e->leaf_presence != NULL && ((int)e->leaf_presence & 1) == 0) {
++      if (e->leaf_presence != NULL && ((int)e->leaf_presence_singleton & 1) == 0) {
+         free(e->leaf_presence);
+       }
+     }
+@@ -568,7 +568,7 @@
+ 
+   if (word_entry == NULL) {
+     /* We are in "per document" mode. */
+-    if (((int)e->leaf_presence & 1) != 0) {
++    if (((int)e->leaf_presence_singleton & 1) != 0) {
+       /* We currently have a singleton here. */
+       int oldch = e->leaf_presence_singleton >> 1;
+ 
+@@ -787,7 +787,7 @@
+ 
+       word[0] = (char)i;
+ 
+-      if (((int)e->leaf_presence & 1) != 0) {
++      if (((int)e->leaf_presence_singleton & 1) != 0) {
+ 	/* Got a singleton at this branch point. Just output the single word. */
+         word[1] = (char)(e->leaf_presence_singleton >> 1);
+         e->leaf_presence = NULL; /* clear the leaf out */
+diff -urNad --exclude=CVS --exclude=.svn ./imap/tls.c cyrus-imapd-2.2.13/imap/tls.c
+--- ./imap/tls.c	2006-04-25 17:28:58.000000000 +0200
++++ cyrus-imapd-2.2.13/imap/tls.c	2006-06-08 14:28:13.259629963 +0200
+@@ -717,14 +717,22 @@
+ 	return (ret);
+ 
+     if (cmd == (BIO_CB_READ | BIO_CB_RETURN)) {
+-	printf("read from %08X [%08lX] (%d bytes => %ld (0x%X))",
+-	       (unsigned int) bio, (long unsigned int) argp,
++#if __WORDSIZE == 64
++	printf("read from %016zX [%016zX] (%d bytes => %ld (0x%X))",
++#else
++	printf("read from %08zX [%08zX] (%d bytes => %ld (0x%X))",
++#endif
++	       (size_t) bio, (size_t) argp,
+ 	       argi, ret, (unsigned int) ret);
+ 	tls_dump(argp, (int) ret);
+ 	return (ret);
+     } else if (cmd == (BIO_CB_WRITE | BIO_CB_RETURN)) {
+-	printf("write to %08X [%08lX] (%d bytes => %ld (0x%X))",
+-	       (unsigned int) bio, (long unsigned int)argp,
++#if __WORDSIZE == 64
++	printf("write to %016zX [%016zX] (%d bytes => %ld (0x%X))",
++#else
++	printf("write to %08zX [%08zX] (%d bytes => %ld (0x%X))",
++#endif
++	       (size_t) bio, (size_t)argp,
+ 	       argi, ret, (unsigned int) ret);
+ 	tls_dump(argp, (int) ret);
+     }
+diff -urNad --exclude=CVS --exclude=.svn ./master/master.c cyrus-imapd-2.2.13/master/master.c
+--- ./master/master.c	2006-04-25 17:28:58.000000000 +0200
++++ cyrus-imapd-2.2.13/master/master.c	2006-06-08 14:28:13.259629963 +0200
+@@ -1304,7 +1304,6 @@
+ 
+ void add_service(const char *name, struct entry *e, void *rock)
+ {
+-    int ignore_err = (int) rock;
+     char *cmd = xstrdup(masterconf_getstring(e, "cmd", ""));
+     int prefork = masterconf_getint(e, "prefork", 0);
+     int babysit = masterconf_getswitch(e, "babysit", 0);
+@@ -1324,7 +1323,7 @@
+ 	snprintf(buf, sizeof(buf),
+ 		 "unable to find command or port for service '%s'", name);
+ 
+-	if (ignore_err) {
++	if (rock != NULL) {
+ 	    syslog(LOG_WARNING, "WARNING: %s -- ignored", buf);
+ 	    return;
+ 	}
+@@ -1340,7 +1339,7 @@
+ 	/* must have empty/same service name, listen and proto */
+ 	if ((!Services[i].name || !strcmp(Services[i].name, name)) &&
+ 	    (!Services[i].listen || !strcmp(Services[i].listen, listen)) &&
+-	    (!Services[i].proto || !strcmp(Services[i].proto, proto)))
++	    ((Services[i].proto==NULL) || !strcmp(Services[i].proto, proto)))
+ 	    break;
+     }
+ 
+@@ -1349,7 +1348,7 @@
+ 	char buf[256];
+ 	snprintf(buf, sizeof(buf), "multiple entries for service '%s'", name);
+ 
+-	if (ignore_err) {
++	if (rock != NULL) {
+ 	    syslog(LOG_WARNING, "WARNING: %s -- ignored", buf);
+ 	    return;
+ 	}
+@@ -1438,7 +1437,6 @@
+ 
+ void add_event(const char *name, struct entry *e, void *rock)
+ {
+-    int ignore_err = (int) rock;
+     char *cmd = xstrdup(masterconf_getstring(e, "cmd", ""));
+     int period = 60 * masterconf_getint(e, "period", 0);
+     int at = masterconf_getint(e, "at", -1), hour, min;
+@@ -1450,7 +1448,7 @@
+ 	snprintf(buf, sizeof(buf),
+ 		 "unable to find command or port for event '%s'", name);
+ 
+-	if (ignore_err) {
++	if (rock != NULL) {
+ 	    syslog(LOG_WARNING, "WARNING: %s -- ignored", buf);
+ 	    return;
+ 	}
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/fix-authentication-bypass-in-nntpd.patch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/fix-authentication-bypass-in-nntpd.patch
@@ -0,0 +1,174 @@
+From 77903669e04c9788460561dd0560b9c916519594 Mon Sep 17 00:00:00 2001
+From: Bron Gondwana <brong@opera.com>
+Date: Tue, 04 Oct 2011 19:34:59 +0000
+Subject: Secunia SA46093 - make sure nntp authentication completes
+
+Discovered by Stefan Cornelius, Secunia Research
+
+The vulnerability is caused due to the access restriction for certain
+commands only checking whether or not variable "nntp_userid" is non-NULL,
+without performing additional checks to verify that a complete, successful
+authentication actually took place. The variable "nntp_userid" can be set to
+point to a string holding the username (changing it to a non-NULL, thus
+allowing attackers to bypass the checks) by sending an "AUTHINFO USER"
+command. The variable is not reset to NULL until e.g. a wrong "AUTHINFO
+PASS" command is received. This can be exploited to bypass the
+authentication mechanism and allows access to e.g. the "NEWNEWS" or the
+"LIST NEWSGROUPS" commands by sending an "AUTHINFO USER" command without a
+following "AUTHINFO PASS" command.
+---
+--- a/imap/nntpd.c
++++ b/imap/nntpd.c
+@@ -316,7 +316,7 @@ struct backend *proxyd_findserver(const
+     if (!ret || !ret->timeout) {
+ 	/* need to (re)establish connection to server or create one */
+ 	ret = backend_connect(ret, server, &protocol[PROTOCOL_NNTP],
+-			      nntp_userid ? nntp_userid : "anonymous", NULL);
++			      nntp_authstate ? nntp_userid : "anonymous", NULL);
+ 	if(!ret) return NULL;
+ 
+ 	/* set the id */
+@@ -872,7 +872,7 @@ static void cmdloop(void)
+     
+ 	/* Only Authinfo/Capabilities/Check/Head/Help/Ihave/List Active/
+ 	   Mode/Quit/Starttls/Stat/Takethis allowed when not logged in */
+-	if (!nntp_userid && !allowanonymous &&
++	if (!nntp_authstate && !allowanonymous &&
+ 	    !strchr("ACHILMQST", cmd.s[0])) goto nologin;
+ 
+ 	switch (cmd.s[0]) {
+@@ -913,7 +913,7 @@ static void cmdloop(void)
+ 				"501 Unrecognized AUTHINFO command\r\n");
+ 	    }
+ 	    else if (!(nntp_capa & MODE_READ)) goto noperm;
+-	    else if (!nntp_userid && !allowanonymous) goto nologin;
++	    else if (!nntp_authstate && !allowanonymous) goto nologin;
+ 	    else if (!strcmp(cmd.s, "Article")) {
+ 		char curgroup[MAX_MAILBOX_NAME+1], *msgid;
+ 
+@@ -1056,7 +1056,7 @@ static void cmdloop(void)
+ 		cmd_help();
+ 	    }
+ 	    else if (!(nntp_capa & MODE_READ)) goto noperm;
+-	    else if (!nntp_userid && !allowanonymous) goto nologin;
++	    else if (!nntp_authstate && !allowanonymous) goto nologin;
+ 	    else if (!strcmp(cmd.s, "Hdr")) {
+ 		char curgroup[MAX_MAILBOX_NAME+1], *msgid;
+ 
+@@ -1138,7 +1138,7 @@ static void cmdloop(void)
+ 		cmd_list(arg1.len ? arg1.s : NULL, arg2.len ? arg2.s : NULL);
+ 	    }
+ 	    else if (!(nntp_capa & MODE_READ)) goto noperm;
+-	    else if (!nntp_userid && !allowanonymous) goto nologin;
++	    else if (!nntp_authstate && !allowanonymous) goto nologin;
+ 	    else if (!strcmp(cmd.s, "Last")) {
+ 		if (c == '\r') c = prot_getc(nntp_in);
+ 		if (c != '\n') goto extraargs;
+@@ -1411,7 +1411,7 @@ static void cmdloop(void)
+ 		mode = ARTICLE_STAT;
+ 		goto article;
+ 	    }
+-	    else if (!nntp_userid && !allowanonymous) goto nologin;
++	    else if (!nntp_authstate && !allowanonymous) goto nologin;
+ 	    else if (!strcmp(cmd.s, "Slave")) {	
+ 		if (c == '\r') c = prot_getc(nntp_in);
+ 		if (c != '\n') goto extraargs;
+@@ -1840,7 +1840,7 @@ static void cmd_capabilities(char *keywo
+     if (mechcount) prot_printf(nntp_out, "%s", mechlist);
+ 
+     /* add the reader capabilities/extensions */
+-    if ((nntp_capa & MODE_READ) && (nntp_userid || allowanonymous)) {
++    if ((nntp_capa & MODE_READ) && (nntp_authstate || allowanonymous)) {
+ 	prot_printf(nntp_out, "READER\r\n");
+ 	prot_printf(nntp_out, "POST\r\n");
+ 	if (config_getswitch(IMAPOPT_ALLOWNEWNEWS))
+@@ -1858,7 +1858,7 @@ static void cmd_capabilities(char *keywo
+ 
+     /* add the LIST variants */
+     prot_printf(nntp_out, "LIST ACTIVE%s\r\n",
+-		((nntp_capa & MODE_READ) && (nntp_userid || allowanonymous)) ?
++	        ((nntp_capa & MODE_READ) && (nntp_authstate || allowanonymous)) ?
+ 		" HEADERS NEWSGROUPS OVERVIEW.FMT" : "");
+ 
+     prot_printf(nntp_out, ".\r\n");
+@@ -2287,7 +2287,7 @@ static void cmd_help(void)
+ {
+     prot_printf(nntp_out, "100 Supported commands:\r\n");
+ 
+-    if ((nntp_capa & MODE_READ) && (nntp_userid || allowanonymous)) {
++    if ((nntp_capa & MODE_READ) && (nntp_authstate || allowanonymous)) {
+ 	prot_printf(nntp_out, "\tARTICLE [ message-id | number ]\r\n"
+ 		    "\t\tRetrieve entirety of the specified article.\r\n");
+     }
+@@ -2302,7 +2302,7 @@ static void cmd_help(void)
+ 	prot_printf(nntp_out, "\tAUTHINFO PASS password\r\n"
+ 		    "\t\tPresent clear-text password for authentication.\r\n");
+     }
+-    if ((nntp_capa & MODE_READ) && (nntp_userid || allowanonymous)) {
++    if ((nntp_capa & MODE_READ) && (nntp_authstate || allowanonymous)) {
+ 	prot_printf(nntp_out, "\tBODY [ message-id | number ]\r\n"
+ 		    "\t\tRetrieve body of the specified article.\r\n");
+     }
+@@ -2312,7 +2312,7 @@ static void cmd_help(void)
+ 	prot_printf(nntp_out, "\tCHECK message-id\r\n"
+ 		    "\t\tCheck if the server wants the specified article.\r\n");
+     }
+-    if ((nntp_capa & MODE_READ) && (nntp_userid || allowanonymous)) {
++    if ((nntp_capa & MODE_READ) && (nntp_authstate || allowanonymous)) {
+ 	prot_printf(nntp_out, "\tDATE\r\n"
+ 		    "\t\tRequest the current server UTC date and time.\r\n");
+ 	prot_printf(nntp_out, "\tGROUP group\r\n"
+@@ -2329,13 +2329,13 @@ static void cmd_help(void)
+ 	prot_printf(nntp_out, "\tIHAVE message-id\r\n"
+ 		    "\t\tPresent/transfer the specified article to the server.\r\n");
+     }
+-    if ((nntp_capa & MODE_READ) && (nntp_userid || allowanonymous)) {
++    if ((nntp_capa & MODE_READ) && (nntp_authstate || allowanonymous)) {
+ 	prot_printf(nntp_out, "\tLAST\r\n"
+ 		    "\t\tSelect the previous article.\r\n");
+     }
+     prot_printf(nntp_out, "\tLIST [ ACTIVE wildmat ]\r\n"
+ 		"\t\tList the (subset of) valid newsgroups.\r\n");
+-    if ((nntp_capa & MODE_READ) && (nntp_userid || allowanonymous)) {
++    if ((nntp_capa & MODE_READ) && (nntp_authstate || allowanonymous)) {
+ 	prot_printf(nntp_out, "\tLIST HEADERS [ MSGID | RANGE ]\r\n"
+ 		    "\t\tList the headers and metadata items available via HDR.\r\n");
+ 	prot_printf(nntp_out, "\tLIST NEWSGROUPS [wildmat]\r\n"
+@@ -2368,7 +2368,7 @@ static void cmd_help(void)
+ 	prot_printf(nntp_out, "\tTAKETHIS message-id\r\n"
+ 		    "\t\tTransfer the specified article to the server.\r\n");
+     }
+-    if ((nntp_capa & MODE_READ) && (nntp_userid || allowanonymous)) {
++    if ((nntp_capa & MODE_READ) && (nntp_authstate || allowanonymous)) {
+ 	prot_printf(nntp_out, "\tXPAT header message-id|range wildmat\r\n"
+ 		    "\t\tList the specified article(s) in which the contents\r\n"
+ 		    "\t\tof the specified header/metadata matches the wildmat.\r\n");
+@@ -2573,7 +2573,8 @@ static void cmd_list(char *arg1, char *a
+ 	strcpy(pattern, newsprefix);
+ 	strcat(pattern, "*");
+ 	list_cb(NULL, 0, 0, NULL);
+-	mboxlist_findall(NULL, pattern, 0, nntp_userid, nntp_authstate,
++	mboxlist_findall(NULL, pattern, 0,
++			 nntp_authstate ? nntp_userid : NULL, nntp_authstate,
+ 			 list_cb, &lrock);
+ 
+ 	/* proxy to the backends */
+@@ -2597,7 +2598,7 @@ static void cmd_list(char *arg1, char *a
+ 	prot_printf(nntp_out, "502 Permission denied\r\n");
+ 	return;
+     }
+-    else if (!nntp_userid && !allowanonymous) {
++    else if (!nntp_authstate && !allowanonymous) {
+ 	prot_printf(nntp_out, "480 Authentication required\r\n");
+ 	return;
+     }
+@@ -2634,7 +2635,8 @@ static void cmd_list(char *arg1, char *a
+ 	strcpy(pattern, newsprefix);
+ 	strcat(pattern, "*");
+ 	list_cb(NULL, 0, 0, NULL);
+-	mboxlist_findall(NULL, pattern, 0, nntp_userid, nntp_authstate,
++	mboxlist_findall(NULL, pattern, 0,
++			 nntp_authstate ? nntp_userid : NULL, nntp_authstate,
+ 			 list_cb, &lrock);
+ 
+ 	/* proxy to the backends */
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/CVE-2011-3481.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/CVE-2011-3481.dpatch
@@ -0,0 +1,56 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## CVE-2011-3481.dpatch by Nico Golde <nion@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' cyrus-imapd-2.2-2.2.13~/imap/index.c cyrus-imapd-2.2-2.2.13/imap/index.c
+--- cyrus-imapd-2.2-2.2.13~/imap/index.c	2005-06-02 15:47:58.000000000 +0000
++++ cyrus-imapd-2.2-2.2.13/imap/index.c	2012-01-01 18:20:51.000000000 +0000
+@@ -191,6 +191,8 @@
+ static void index_thread_print(Thread *threads, int usinguid);
+ static void index_thread_ref(unsigned *msgno_list, int nmsg, int usinguid);
+ 
++static void massage_header(char *hdr);
++
+ /* NOTE: Make sure these are listed in CAPABILITY_STRING */
+ static const struct thread_algorithm thread_algs[] = {
+     { "ORDEREDSUBJECT", index_thread_orderedsubj },
+@@ -3695,21 +3697,33 @@
+ {
+     char *refstr, *ref, *in_reply_to;
+     int refsize = REFGROWSIZE;
+-    char buf[100];
++    static char *buf;
++    static unsigned bufsize;
++    unsigned size = strlen(headers);
++
++    if (bufsize < size+2) {
++	bufsize = size+100;
++	buf = xrealloc(buf, bufsize);
++    }
+ 
+     /* get msgid */
+     msgdata->msgid = find_msgid(envtokens[ENV_MSGID], NULL);
+      /* if we don't have one, create one */
+     if (!msgdata->msgid) {
+-	snprintf(buf, sizeof(buf), "<Empty-ID: %u>", msgdata->msgno);
++	snprintf(buf, bufsize, "<Empty-ID: %u>", msgdata->msgno);
+ 	msgdata->msgid = xstrdup(buf);
+     }
+ 
++    /* Copy headers to the buffer */
++    memcpy(buf, headers, size);
++    buf[size] = '\0';
++
+     /* grab the References header */
+-    if ((refstr = stristr(headers, "references:"))) {
++    if ((refstr = stristr(buf, "references:"))) {
+ 	/* allocate some space for refs */
+ 	msgdata->ref = (char **) xmalloc(refsize * sizeof(char *));
+ 	/* find references */
++	massage_header(refstr);
+ 	while ((ref = find_msgid(refstr, &refstr)) != NULL) {
+ 	    /* reallocate space for this msgid if necessary */
+ 	    if (msgdata->nref == refsize) {
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/01-fix_Makefile.in.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/01-fix_Makefile.in.dpatch
@@ -0,0 +1,162 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01-fix_Makefile.in.dpatch by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix all Makefile.in files as necessary
+
+@DPATCH@
+diff -urNad complete.dpatch/Makefile.in complete.dpatch/Makefile.in
+--- complete.dpatch/Makefile.in	2005-02-14 17:43:44.000000000 +0100
++++ complete.dpatch/Makefile.in	2005-11-10 16:34:20.133821819 +0100
+@@ -41,7 +41,7 @@
+ # 
+ 
+ SUBDIRS = man @PRE_SUBDIRS@ lib @SIEVE_SUBDIRS@ @SERVER_SUBDIRS@ \
+-	imtest @SNMP_SUBDIRS@ @EXTRA_SUBDIRS@
++	imtest perl @SNMP_SUBDIRS@ @EXTRA_SUBDIRS@
+ DISTSUBDIRS = doc
+ 
+ srcdir = @srcdir@
+diff -urNad complete.dpatch/imap/Makefile.in complete.dpatch/imap/Makefile.in
+--- complete.dpatch/imap/Makefile.in	2004-05-28 20:03:02.000000000 +0200
++++ complete.dpatch/imap/Makefile.in	2005-11-10 16:34:20.133821819 +0100
+@@ -72,7 +72,7 @@
+ LIBS = $(IMAP_LIBS) $(IMAP_COM_ERR_LIBS)
+ DEPLIBS = ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
+ 
+-CFLAGS = @CFLAGS@
++CFLAGS = @CFLAGS@ @WARNERROR@
+ LDFLAGS = @LDFLAGS@ @COM_ERR_LDFLAGS@ 
+ 
+ SHELL = /bin/sh
+diff -urNad complete.dpatch/installsieve/Makefile.in complete.dpatch/installsieve/Makefile.in
+--- complete.dpatch/installsieve/Makefile.in	2003-10-22 20:50:11.000000000 +0200
++++ complete.dpatch/installsieve/Makefile.in	2005-11-10 16:34:20.134821720 +0100
+@@ -48,7 +48,7 @@
+ 
+ DEFS = @DEFS@
+ CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @CPPFLAGS@ @SASLFLAGS@
+-CFLAGS = @CFLAGS@
++CFLAGS = @CFLAGS@ @WARNERROR@
+ LDFLAGS = @LDFLAGS@
+ 
+ INSTALL = @INSTALL@
+diff -urNad complete.dpatch/lib/Makefile.in complete.dpatch/lib/Makefile.in
+--- complete.dpatch/lib/Makefile.in	2004-05-28 20:03:04.000000000 +0200
++++ complete.dpatch/lib/Makefile.in	2005-11-10 16:34:20.134821720 +0100
+@@ -62,7 +62,7 @@
+ LIBS = @LIBS@
+ 
+ MAKEDEPEND_CFLAGS = @CFLAGS@
+-CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@
++CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@ @WARNERROR@ -fPIC
+ LDFLAGS = @LDFLAGS@
+ 
+ SHELL = /bin/sh
+diff -urNad complete.dpatch/master/Makefile.in complete.dpatch/master/Makefile.in
+--- complete.dpatch/master/Makefile.in	2004-12-17 17:32:24.000000000 +0100
++++ complete.dpatch/master/Makefile.in	2005-11-10 16:34:20.134821720 +0100
+@@ -57,7 +57,7 @@
+ CPPFLAGS = -I.. -I$(srcdir)/../lib -I$(srcdir)/../imap @CPPFLAGS@ @COM_ERR_CPPFLAGS@
+ DEPLIBS = @DEPLIBS@
+ 
+-CFLAGS = @CFLAGS@
++CFLAGS = @CFLAGS@ @WARNERROR@
+ LDFLAGS = @LDFLAGS@ @COM_ERR_LDFLAGS@
+ LIBS = ../lib/libcyrus_min.a @LIB_UCDSNMP@ @LIBS@ @COM_ERR_LIBS@
+ 
+diff -urNad complete.dpatch/notifyd/Makefile.in complete.dpatch/notifyd/Makefile.in
+--- complete.dpatch/notifyd/Makefile.in	2004-05-28 20:03:06.000000000 +0200
++++ complete.dpatch/notifyd/Makefile.in	2005-11-10 16:34:20.135821621 +0100
+@@ -54,7 +54,7 @@
+ 
+ DEFS = @DEFS@ @LOCALDEFS@
+ CPPFLAGS = -I.. -I$(srcdir)/../sieve -I$(srcdir)/../imap -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
+-CFLAGS = @CFLAGS@
++CFLAGS = @CFLAGS@ @WARNERROR@
+ LDFLAGS = @LDFLAGS@
+ 
+ prefix = @prefix@
+diff -urNad complete.dpatch/perl/Makefile.in complete.dpatch/perl/Makefile.in
+--- complete.dpatch/perl/Makefile.in	2003-10-22 20:50:17.000000000 +0200
++++ complete.dpatch/perl/Makefile.in	2005-11-10 16:34:20.135821621 +0100
+@@ -82,9 +82,9 @@
+ 			   BDB_LIB="$(BDB_LIB)" BDB_INC="$(BDB_INC)" \
+ 			   OPENSSL_LIB="$(OPENSSL_LIB)" OPENSSL_INC="$(OPENSSL_INC)" \
+ 			   SASL_LIB="$(SASL_LIB)" SASL_INC="$(SASL_INC)" CC="$(CC)" \
+-			     $(PERL) Makefile.PL PREFIX=$(prefix); \
++			     $(PERL) Makefile.PL INSTALLDIRS=vendor; \
+ 			fi; \
+-			$(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) all) || exit 1; \
++			$(MAKE) $(MFLAGS) LD_RUN_PATH= DESTDIR=$(DESTDIR) all) || exit 1; \
+ 	done
+ 
+ install::
+diff -urNad complete.dpatch/perl/sieve/Makefile.in complete.dpatch/perl/sieve/Makefile.in
+--- complete.dpatch/perl/sieve/Makefile.in	2003-10-22 20:50:24.000000000 +0200
++++ complete.dpatch/perl/sieve/Makefile.in	2005-11-10 16:34:20.135821621 +0100
+@@ -84,9 +84,9 @@
+ 			   BDB_LIB="$(BDB_LIB)" BDB_INC="$(BDB_INC)" \
+ 			   OPENSSL_LIB="$(OPENSSL_LIB)" OPENSSL_INC="$(OPENSSL_INC)" \
+ 			   SASL_LIB="$(SASL_LIB)" SASL_INC="$(SASL_INC)" CC="$(CC)" \
+-			     $(PERL) Makefile.PL PREFIX=$(prefix); \
++			     $(PERL) Makefile.PL INSTALLDIRS=vendor; \
+ 			fi; \
+-			$(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) all) || exit 1; \
++			$(MAKE) $(MFLAGS) LD_RUN_PATH= DESTDIR=$(DESTDIR) all) || exit 1; \
+ 	done
+ 
+ install::
+diff -urNad complete.dpatch/perl/sieve/lib/Makefile.in complete.dpatch/perl/sieve/lib/Makefile.in
+--- complete.dpatch/perl/sieve/lib/Makefile.in	2004-05-28 20:03:07.000000000 +0200
++++ complete.dpatch/perl/sieve/lib/Makefile.in	2005-11-10 16:34:20.136821523 +0100
+@@ -57,7 +57,7 @@
+ DEPLIBS = ../../../lib/libcyrus.a ../../../lib/libcyrus_min.a @DEPLIBS@
+ 
+ MAKEDEPEND_CFLAGS = @CFLAGS@
+-CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@
++CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@ -fPIC
+ LDFLAGS = @LDFLAGS@
+ 
+ SHELL = /bin/sh
+diff -urNad complete.dpatch/sieve/Makefile.in complete.dpatch/sieve/Makefile.in
+--- complete.dpatch/sieve/Makefile.in	2004-05-28 20:03:09.000000000 +0200
++++ complete.dpatch/sieve/Makefile.in	2005-11-10 16:34:20.136821523 +0100
+@@ -40,7 +40,7 @@
+ DEFS = @DEFS@
+ CPPFLAGS = -I.. -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
+ MAKEDEPEND_CFLAGS = @CFLAGS@
+-CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@
++CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@ -fPIC
+ LDFLAGS = @LDFLAGS@
+ 
+ MAKEDEPEND = @MAKEDEPEND@
+@@ -51,6 +51,7 @@
+ LIBS = libsieve.a $(IMAP_LIBS) $(IMAP_COM_ERR_LIBS)
+ DEPLIBS=../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
+ 
++BINARIES = sievec sieved
+ BUILT_SOURCES = addr.c addr.h addr-lex.c \
+ 	sieve.c sieve.h sieve-lex.c \
+ 	sieve_err.h sieve_err.c
+@@ -114,7 +115,7 @@
+ 	$(COMPILE_ET) $(srcdir)/sieve_err.et
+ 
+ clean:
+-	rm -f test *~ *.o *.a Makefile.bak makedepend.log
++	rm -f test *~ *.o *.a Makefile.bak makedepend.log $(BINARIES)
+ 
+ distclean: clean
+ 	rm -f Makefile
+diff -urNad complete.dpatch/timsieved/Makefile.in complete.dpatch/timsieved/Makefile.in
+--- complete.dpatch/timsieved/Makefile.in	2004-05-28 20:03:10.000000000 +0200
++++ complete.dpatch/timsieved/Makefile.in	2005-11-10 16:34:20.136821523 +0100
+@@ -54,7 +54,7 @@
+ 
+ DEFS = @DEFS@ @LOCALDEFS@
+ CPPFLAGS = -I.. -I$(srcdir)/../sieve -I$(srcdir)/../imap -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
+-CFLAGS = @CFLAGS@
++CFLAGS = @CFLAGS@ @WARNERROR@
+ LDFLAGS = @LDFLAGS@
+ 
+ prefix = @prefix@
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/05-fix_programnames.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/05-fix_programnames.dpatch
@@ -0,0 +1,579 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 05-fix_programnames_in_manpages.dpatch by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fix some minor things in manpages, fix program names in manpages and
+## DP: program sources
+
+@DPATCH@
+diff -urNad complete.dpatch/imap/deliver.c complete.dpatch/imap/deliver.c
+--- complete.dpatch/imap/deliver.c	2005-11-11 15:33:59.000000000 +0100
++++ complete.dpatch/imap/deliver.c	2005-11-11 15:34:00.393958651 +0100
+@@ -99,7 +99,7 @@
+ static void usage()
+ {
+     fprintf(stderr, 
+-	    "421-4.3.0 usage: deliver [-C <alt_config> ] [-m mailbox]"
++	    "421-4.3.0 usage: cyrdeliver [-C <alt_config> ] [-m mailbox]"
+ 	    " [-a auth] [-r return_path] [-l] [-D]\r\n");
+     fprintf(stderr, "421 4.3.0 %s\n", CYRUS_VERSION);
+     exit(EC_USAGE);
+diff -urNad complete.dpatch/imap/quota.c complete.dpatch/imap/quota.c
+--- complete.dpatch/imap/quota.c	2005-11-11 15:33:59.000000000 +0100
++++ complete.dpatch/imap/quota.c	2005-11-11 15:34:00.393958651 +0100
+@@ -208,7 +208,7 @@
+ void usage(void)
+ {
+     fprintf(stderr,
+-	    "usage: quota [-C <alt_config>] [-d <domain>] [-f] [prefix]...\n");
++	    "usage: cyrquota [-C <alt_config>] [-d <domain>] [-f] [prefix]...\n");
+     exit(EC_USAGE);
+ }    
+ 
+diff -urNad complete.dpatch/imap/reconstruct.c complete.dpatch/imap/reconstruct.c
+--- complete.dpatch/imap/reconstruct.c	2005-11-11 15:33:59.000000000 +0100
++++ complete.dpatch/imap/reconstruct.c	2005-11-11 15:34:00.394958554 +0100
+@@ -345,8 +345,8 @@
+ void usage(void)
+ {
+     fprintf(stderr,
+-	    "usage: reconstruct [-C <alt_config>] [-p partition] [-rfx] mailbox...\n");
+-    fprintf(stderr, "       reconstruct [-C <alt_config>] -m\n");
++	    "usage: cyrreconstruct [-C <alt_config>] [-p partition] [-rfx] mailbox...\n");
++    fprintf(stderr, "       cyrreconstruct [-C <alt_config>] -m\n");
+     exit(EC_USAGE);
+ }    
+ 
+diff -urNad complete.dpatch/man/chk_cyrus.8 complete.dpatch/man/chk_cyrus.8
+--- complete.dpatch/man/chk_cyrus.8	2005-11-11 15:33:59.000000000 +0100
++++ complete.dpatch/man/chk_cyrus.8	2005-11-11 15:34:00.394958554 +0100
+@@ -83,4 +83,4 @@
+ .B /etc/imapd.conf
+ .SH SEE ALSO
+ .PP
+-\fBimapd.conf(5)\fR, \fBmaster(8)\fR
++\fBimapd.conf(5)\fR, \fBcyrmaster(8)\fR
+diff -urNad complete.dpatch/man/ctl_cyrusdb.8 complete.dpatch/man/ctl_cyrusdb.8
+--- complete.dpatch/man/ctl_cyrusdb.8	2005-11-11 15:33:59.000000000 +0100
++++ complete.dpatch/man/ctl_cyrusdb.8	2005-11-11 15:34:00.394958554 +0100
+@@ -94,4 +94,4 @@
+ .B /etc/imapd.conf
+ .SH SEE ALSO
+ .PP
+-\fBimapd.conf(5)\fR, \fBmaster(8)\fR
++\fBimapd.conf(5)\fR, \fBcyrmaster(8)\fR
+diff -urNad complete.dpatch/man/ctl_deliver.8 complete.dpatch/man/ctl_deliver.8
+--- complete.dpatch/man/ctl_deliver.8	2005-11-11 15:33:59.000000000 +0100
++++ complete.dpatch/man/ctl_deliver.8	2005-11-11 15:34:00.395958456 +0100
+@@ -78,4 +78,4 @@
+ .B /etc/imapd.conf
+ .SH SEE ALSO
+ .PP
+-\fBimapd.conf(5)\fR, \fBmaster(8)\fR
++\fBimapd.conf(5)\fR, \fBcyrmaster(8)\fR
+diff -urNad complete.dpatch/man/ctl_mboxlist.8 complete.dpatch/man/ctl_mboxlist.8
+--- complete.dpatch/man/ctl_mboxlist.8	2005-11-11 15:33:59.000000000 +0100
++++ complete.dpatch/man/ctl_mboxlist.8	2005-11-11 15:34:00.395958456 +0100
+@@ -138,4 +138,4 @@
+ .B /etc/imapd.conf
+ .SH SEE ALSO
+ .PP
+-\fBimapd.conf(5)\fR, \fBmaster(8)\fR
++\fBimapd.conf(5)\fR, \fBcyrmaster(8)\fR
+diff -urNad complete.dpatch/man/cyr_expire.8 complete.dpatch/man/cyr_expire.8
+--- complete.dpatch/man/cyr_expire.8	2005-11-11 15:33:59.000000000 +0100
++++ complete.dpatch/man/cyr_expire.8	2005-11-11 15:34:00.395958456 +0100
+@@ -90,4 +90,4 @@
+ .B /etc/imapd.conf
+ .SH SEE ALSO
+ .PP
+-\fBimapd.conf(5)\fR, \fBmaster(8)\fR
++\fBimapd.conf(5)\fR, \fBcyrmaster(8)\fR
+diff -urNad complete.dpatch/man/cyrus.conf.5 complete.dpatch/man/cyrus.conf.5
+--- complete.dpatch/man/cyrus.conf.5	2005-11-11 15:33:59.000000000 +0100
++++ complete.dpatch/man/cyrus.conf.5	2005-11-11 15:34:00.396958358 +0100
+@@ -44,9 +44,9 @@
+ cyrus.conf \- Cyrus configuration file
+ .SH DESCRIPTION
+ \fB/etc/cyrus.conf\fR 
+-is the configuration file for the Cyrus \fBmaster\fR process.  It
++is the configuration file for the Cyrus \fBcyrmaster\fR process.  It
+ defines the startup procedures, services and events to be spawned by
+-\fBmaster\fR.
++\fBcyrmaster\fR.
+ .PP
+ The \fB/etc/cyrus.conf\fR file consists of a series of entries divided
+ into sections of the form
+@@ -105,7 +105,7 @@
+ \fR[ \fIhost\fR \fB: \fR] \fIport\fR
+ .br
+ .sp
+-where \fIpath\fR is the explicit path to a UNIX socket, \fIhost\fR is
++where \fIpath\fR is the explicit (absolute) path to a UNIX socket, \fIhost\fR is
+ either the hostname or bracket-enclosed IP address of a network
+ interface, and \fIport\fR is either a port number or service name (as listed
+ in \fB/etc/services\fR).
+@@ -125,12 +125,22 @@
+ The number of instances of this service to always have running and
+ waiting for a connection (for faster initial response time).  This
+ integer value is optional.
++.br
++.sp
++For datagram-based services (udp), the maximum value of prefork is 1.
+ .IP "\fBmaxchild=\fR-1" 5
+ The maximum number of instances of this service to spawn.  A value of
+ -1 means unlimited.  This integer value is optional.
+ .IP "\fBmaxfds=\fR256" 5
+ The maximum number of file descriptors to which to limit this process.
+ This integer value is optional.
++.IP "\fBmaxforkrate=\fR0" 5
++Maximum number of forks per second for this service.  A value of zero
++means unlimited fork rate.  This integer value is optional.
++.IP "\fBbabysit=\fR0" 5
++Set to non-zero to guarantee that at least one child will always be
++available for new connections.  The value of maxchild is ignored if all
++children are busy and babysit is active.  This integer value is optional.
+ .SS EVENTS
+ This section lists processes that should be run at specific intervals,
+ similar to cron jobs.  This section is typically used to perform
+@@ -177,6 +187,6 @@
+ still have separate access control rules.
+ .SH SEE ALSO
+ .PP
+-\fBmaster(8)\fR, \fBimapd(8)\fR, \fBpop3d(8)\fR, \fBlmtpd(8)\fR,
++\fBcyrmaster(8)\fR, \fBimapd(8)\fR, \fBpop3d(8)\fR, \fBlmtpd(8)\fR,
+ \fBtimsieved(8)\fR, \fBidled(8)\fR, \fBnotifyd(8)\fR, \fBctl_cyrusdb(8)\fR,
+ \fBctl_deliver(8)\fR, \fBtls_prune(8)\fR, \fBhosts_access(5)\fR
+diff -urNad complete.dpatch/man/deliver.8 complete.dpatch/man/deliver.8
+--- complete.dpatch/man/deliver.8	2005-11-11 15:33:59.000000000 +0100
++++ complete.dpatch/man/deliver.8	2005-11-11 15:34:00.396958358 +0100
+@@ -1,5 +1,5 @@
+ .\" -*- nroff -*-
+-.TH DELIVER 8 "Project Cyrus" CMU
++.TH CYRDELIVER 8 "Project Cyrus" CMU
+ .\" 
+ .\" Copyright (c) 1998-2000 Carnegie Mellon University.  All rights reserved.
+ .\"
+@@ -41,9 +41,9 @@
+ .\" 
+ .\" $Id: deliver.8,v 1.18 2004/06/21 18:40:10 rjs3 Exp $
+ .SH NAME
+-deliver \- deliver mail to an IMAP mailbox
++cyrdeliver \- deliver mail to an IMAP mailbox
+ .SH SYNOPSIS
+-.B deliver
++.B cyrdeliver
+ [
+ .B \-C
+ .I config-file
+@@ -76,7 +76,7 @@
+ .I userid
+ ]...
+ .br
+-.B deliver
++.B cyrdeliver
+ [
+ .B \-C
+ .I config-file
+@@ -146,7 +146,7 @@
+ .B \-l
+ Accept messages using the LMTP protocol.
+ .SH NOTES
+-Depending on the setting of \fBreject8bit\fR in \fBimapd.conf(5)\fR, deliver
++Depending on the setting of \fBreject8bit\fR in \fBimapd.conf(5)\fR, cyrdeliver
+ either rejects messages with 8-bit-set characters in the headers or 
+ changes these characters to `X'.
+ This is because such characters can't be interpreted since the
+diff -urNad complete.dpatch/man/fud.8 complete.dpatch/man/fud.8
+--- complete.dpatch/man/fud.8	2005-11-11 15:33:59.000000000 +0100
++++ complete.dpatch/man/fud.8	2005-11-11 15:34:00.396958358 +0100
+@@ -61,7 +61,7 @@
+ ]
+ .SH DESCRIPTION
+ .B FUD
+-is a long lived datagram daemon started from master that provides
++is a long lived datagram daemon started from cyrmaster that provides
+ information about when a user last
+ read their mail, when mail last arrived in a user's mailbox, and how
+ many messages are recent for that user.
+diff -urNad complete.dpatch/man/idled.8 complete.dpatch/man/idled.8
+--- complete.dpatch/man/idled.8	2005-11-11 15:33:59.000000000 +0100
++++ complete.dpatch/man/idled.8	2005-11-11 15:34:00.397958261 +0100
+@@ -56,7 +56,7 @@
+ to report the changes to the client.
+ .I Idled
+ is usually started from
+-.I master.
++.I cyrmaster.
+ .PP
+ .I Idled
+ reads its configuration options out of the
+@@ -75,4 +75,4 @@
+ .B /etc/imapd.conf
+ .SH SEE ALSO
+ .PP
+-\fBimapd.conf(5)\fR, \fBmaster(8)\fR
++\fBimapd.conf(5)\fR, \fBcyrmaster(8)\fR
+diff -urNad complete.dpatch/man/imapd.8 complete.dpatch/man/imapd.8
+--- complete.dpatch/man/imapd.8	2005-11-11 15:33:59.000000000 +0100
++++ complete.dpatch/man/imapd.8	2005-11-11 15:34:00.397958261 +0100
+@@ -72,7 +72,7 @@
+ is an IMAP4rev1 server.
+ It accepts commands on its standard input and responds on its standard output.
+ It MUST be invoked by
+-.IR master (8)
++.IR cyrmaster (8)
+ with those descriptors attached to a remote client connection.
+ .PP
+ .I Imapd
+@@ -148,4 +148,4 @@
+ .B /etc/imapd.conf
+ .SH SEE ALSO
+ .PP
+-\fBimapd.conf(5)\fR, \fBmaster(8)\fR
++\fBimapd.conf(5)\fR, \fBcyrmaster(8)\fR
+diff -urNad complete.dpatch/man/lmtpd.8 complete.dpatch/man/lmtpd.8
+--- complete.dpatch/man/lmtpd.8	2005-11-11 15:33:59.000000000 +0100
++++ complete.dpatch/man/lmtpd.8	2005-11-11 15:34:00.397958261 +0100
+@@ -68,7 +68,7 @@
+ is an LMTP server used to deliver mail to the IMAP mailstore.
+ It accepts commands on its standard input and responds on its standard output.
+ It MUST be invoked by
+-.IR master (8)
++.IR cyrmaster (8)
+ with those descriptors attached to a remote client connection.
+ .PP
+ .I Lmtpd
+@@ -101,4 +101,4 @@
+ .B /etc/imapd.conf
+ .SH SEE ALSO
+ .PP
+-\fBimapd.conf(5)\fR, \fBmaster(8)\fR
++\fBimapd.conf(5)\fR, \fBcyrmaster(8)\fR
+diff -urNad complete.dpatch/man/master.8 complete.dpatch/man/master.8
+--- complete.dpatch/man/master.8	2005-11-11 15:33:59.000000000 +0100
++++ complete.dpatch/man/master.8	2005-11-11 15:34:00.398958163 +0100
+@@ -1,5 +1,5 @@
+ .\" -*- nroff -*-
+-.TH MASTER 8 "Project Cyrus" CMU
++.TH CYRMASTER 8 "Project Cyrus" CMU
+ .\" 
+ .\" Copyright (c) 1996-2000 Carnegie Mellon University.  All rights reserved.
+ .\"
+@@ -41,9 +41,9 @@
+ .\" 
+ .\" $Id: master.8,v 1.13 2004/12/17 16:32:23 ken3 Exp $
+ .SH NAME
+-master \- master Cyrus process
++cyrmaster \- master Cyrus process
+ .SH SYNOPSIS
+-.B master
++.B cyrmaster
+ [
+ .B \-C
+ .I alternate imapd.conf
+@@ -79,7 +79,7 @@
+ .I snmp agentx socket
+ ]
+ .SH DESCRIPTION
+-.I Master
++.I cyrmaster
+ is the process that controls all of the Cyrus processes. This process
+ is responsible for creating all imapd, pop3d, lmtpd and sieved child
+ processes. This process also initializes the Berkeley DB code and
+@@ -92,12 +92,12 @@
+ .SH OPTIONS
+ .TP
+ .BI \-C " alternate imapd.conf"
+-Specifies an alternate imapd.conf for use by master (note that this will
+-not affect any sub-processes spawned by master, you should specify those
++Specifies an alternate imapd.conf for use by cyrmaster (note that this will
++not affect any sub-processes spawned by cyrmaster, you should specify those
+ specifically in the respective entries in cyrus.conf).
+ .TP
+ .BI \-M " alternate cyrus.conf"
+-Specifies an alternate cyrus.conf for use by master.
++Specifies an alternate cyrus.conf for use by cyrmaster.
+ .TP
+ .BI \-l " listen queue backlog"
+ Increase the listen queue backlog. By default, the listen queue is set
+@@ -113,7 +113,7 @@
+ .BI \-p " pidfile"
+ Use
+ .I pidfile
+-as the pidfile.  If not specified, defaults to /var/run/cyrus-master.pid
++as the pidfile.  If not specified, defaults to /var/run/cyrmaster.pid
+ .TP
+ .BI \-P " snmp agentx ping interval"
+ Sets the amount on time in seconds the subagent will try and reconnect to the
+@@ -132,12 +132,12 @@
+ Requires net-snmp 5.0 or higher.
+ .SH CONFIGURATION
+ Upon execution,
+-.I master
++.I cyrmaster
+ reads its configuration information out of the
+ .IR cyrus.conf (5)
+ file.
+ .PP
+-.I Master
++.I cyrmaster
+ rereads its configuration file when it receives a hangup signal,
+ SIGHUP.  Services and events may be added, deleted or modified when the
+ configuration file is reread.  Any active services removed from the
+@@ -146,9 +146,18 @@
+ The environment variable \fBCYRUS_VERBOSE\fR can be set to log additional
+ debugging information. Setting the value to 1 results in base level logging. 
+ Setting it higher results in more log messages being generated.
++.SH BUGS
++Services do not always go away silently when removed through a SIGHUP.  If
++there are workers of the removed service still running, messages to syslog
++about broken pipes and accept() failures are to be expected.
++.PP
++The in-memory list of services is not cleaned up ever, so a cyrmaster daemon
++that has been sent an extremely high amount of SIGHUP signals to
++add/remove/modify services will lose performance eventually.  Restarting
++cyrmaster fixes this.
+ .SH FILES
+ .TP
+-.B /etc/cyrus.conf, /etc/imapd.conf, /var/run/cyrus-master.pid
++.B /etc/cyrus.conf, /etc/imapd.conf, /var/run/cyrmaster.pid
+ .SH SEE ALSO
+ .PP
+ \fBcyrus.conf(5)\fR, \fBimapd.conf(5)\fR, \fBimapd(8)\fR,
+diff -urNad complete.dpatch/man/nntpd.8 complete.dpatch/man/nntpd.8
+--- complete.dpatch/man/nntpd.8	2005-11-11 15:33:59.000000000 +0100
++++ complete.dpatch/man/nntpd.8	2005-11-11 15:34:00.398958163 +0100
+@@ -74,7 +74,7 @@
+ is a NNTP server.
+ It accepts commands on its standard input and responds on its standard output.
+ It MUST invoked by
+-.IR master (8)
++.IR cyrmaster (8)
+ with those descriptors attached to a remote client connection.
+ .PP
+ .I Nntpd
+@@ -142,4 +142,4 @@
+ .B /etc/imapd.conf
+ .SH SEE ALSO
+ .PP
+-\fBimapd.conf(5)\fR, \fBmaster(8)\fR
++\fBimapd.conf(5)\fR, \fBcyrmaster(8)\fR
+diff -urNad complete.dpatch/man/notifyd.8 complete.dpatch/man/notifyd.8
+--- complete.dpatch/man/notifyd.8	2005-11-11 15:33:59.000000000 +0100
++++ complete.dpatch/man/notifyd.8	2005-11-11 15:34:00.398958163 +0100
+@@ -62,7 +62,7 @@
+ ]
+ .SH DESCRIPTION
+ .B Notifyd
+-is a daemon started from master(8) that handles notification requests on
++is a daemon started from cyrmaster(8) that handles notification requests on
+ behalf of lmtpd(8).
+ .B Notifyd
+ accepts the request and performs the notification using the method
+@@ -122,4 +122,4 @@
+ Cyrus Master process configuration file.
+ .SH SEE ALSO
+ .PP
+-\fBimapd.conf(5)\fR, \fBcyrus.conf\fR, \fBmaster(8)\fR, \fBlmtpd(8)\fR
++\fBimapd.conf(5)\fR, \fBcyrus.conf\fR, \fBcyrmaster(8)\fR, \fBlmtpd(8)\fR
+diff -urNad complete.dpatch/man/pop3d.8 complete.dpatch/man/pop3d.8
+--- complete.dpatch/man/pop3d.8	2005-11-11 15:33:59.000000000 +0100
++++ complete.dpatch/man/pop3d.8	2005-11-11 15:34:00.399958065 +0100
+@@ -71,7 +71,7 @@
+ is a POP3 server.
+ It accepts commands on its standard input and responds on its standard output.
+ It MUST invoked by
+-.IR master (8)
++.IR cyrmaster (8)
+ with those descriptors attached to a remote client connection.
+ .PP
+ .I Pop3d
+@@ -121,4 +121,4 @@
+ .B /etc/imapd.conf
+ .SH SEE ALSO
+ .PP
+-\fBimapd.conf(5)\fR, \fBmaster(8)\fR
++\fBimapd.conf(5)\fR, \fBcyrmaster(8)\fR
+diff -urNad complete.dpatch/man/quota.8 complete.dpatch/man/quota.8
+--- complete.dpatch/man/quota.8	2005-11-11 15:33:59.000000000 +0100
++++ complete.dpatch/man/quota.8	2005-11-11 15:34:00.399958065 +0100
+@@ -1,5 +1,5 @@
+ .\" -*- nroff -*-
+-.TH QUOTA 8 "Project Cyrus" CMU
++.TH CYRQUOTA 8 "Project Cyrus" CMU
+ .\" 
+ .\" Copyright (c) 1998-2000 Carnegie Mellon University.  All rights reserved.
+ .\"
+@@ -41,9 +41,9 @@
+ .\" 
+ .\" $Id: quota.8,v 1.11 2003/10/22 18:50:13 rjs3 Exp $
+ .SH NAME
+-quota \- report and optionally fix quota usage
++cyrquota \- report and optionally fix quota usage
+ .SH SYNOPSIS
+-.B quota
++.B cyrquota
+ [
+ .B \-C
+ .I config-file
+@@ -59,12 +59,12 @@
+ .IR mailbox-prefix ...
+ ]
+ .SH DESCRIPTION
+-.I Quota
++.I cyrquota
+ generates a report listing quota roots, giving their limits and usage.
+ If the
+ .I \-f
+ option is given, 
+-.I quota
++.I cyrquota
+ first fixes any inconsistencies in the quota subsystem, such as
+ mailboxes with the wrong quota root or quota roots with the wrong
+ quota usage reported.
+@@ -79,14 +79,14 @@
+ prefixes.
+ .PP
+ Running
+-.I quota
++.I cyrquota
+ with both the 
+ .I \-f
+ option and
+ .I mailbox-prefix
+ arguments is not recommended.
+ .PP
+-.I Quota
++.I cyrquota
+ reads its configuration options out of the
+ .IR imapd.conf (5)
+ file unless specified otherwise by \fB-C\fR.
+diff -urNad complete.dpatch/man/reconstruct.8 complete.dpatch/man/reconstruct.8
+--- complete.dpatch/man/reconstruct.8	2005-11-11 15:33:59.000000000 +0100
++++ complete.dpatch/man/reconstruct.8	2005-11-11 15:34:00.399958065 +0100
+@@ -1,5 +1,5 @@
+ .\" -*- nroff -*-
+-.TH RECONSTRUCT 8 "Project Cyrus" CMU
++.TH CYRRECONSTRUCT 8 "Project Cyrus" CMU
+ .\" 
+ .\" Copyright (c) 1998-2000 Carnegie Mellon University.  All rights reserved.
+ .\"
+@@ -41,9 +41,9 @@
+ .\" 
+ .\" $Id: reconstruct.8,v 1.19 2004/10/13 18:07:49 shadow Exp $
+ .SH NAME
+-reconstruct \- reconstruct mailboxes
++cyrreconstruct \- reconstruct mailboxes
+ .SH SYNOPSIS
+-.B reconstruct
++.B cyrreconstruct
+ [
+ .B \-C
+ .I config-file
+@@ -63,14 +63,14 @@
+ ]
+ .IR mailbox ...
+ .br
+-.B reconstruct
++.B cyrreconstruct
+ [
+ .B \-C
+ .I config-file
+ ]
+ .B \-m
+ .SH DESCRIPTION
+-.I Reconstruct
++.I cyrreconstruct
+ rebuilds one or more IMAP mailboxes.  When invoked with the
+ .B \-m
+ switch, it rebuilds the master
+@@ -78,17 +78,17 @@
+ almost any sort of data corruption.
+ .PP
+ If
+-.I Reconstruct
++.I cyrreconstruct
+ can find existing header and index files, it attempts to preserve any
+ data in them that is not derivable from the message files themselves.
+ The state 
+-.I reconstruct
++.I cyrreconstruct
+ attempts to preserve includes the flag names, flag state, and
+ internaldate.
+-.I Reconstruct
++.I cyrreconstruct
+ derives all other information from the message files.
+ .PP
+-.I Reconstruct
++.I cyrreconstruct
+ reads its configuration options out of the
+ .IR imapd.conf (5)
+ file unless specified otherwise by \fB-C\fR.  Any mailbox directory
+@@ -96,12 +96,12 @@
+ .I partition-news
+ configuration option is assumed to be in news format.
+ .PP
+-.I Reconstruct
++.I cyrreconstruct
+ does not adjust the quota usage recorded in any quota
+ root files.  After running
+-.IR reconstruct ,
++.IR cyrreconstruct ,
+ it is advisable to run
+-.IR quota (8)
++.IR cyrquota (8)
+ with the
+ .I \-f
+ switch in order to fix the quota root files.
+diff -urNad complete.dpatch/man/smmapd.8 complete.dpatch/man/smmapd.8
+--- complete.dpatch/man/smmapd.8	2005-11-11 15:33:59.000000000 +0100
++++ complete.dpatch/man/smmapd.8	2005-11-11 15:34:00.400957968 +0100
+@@ -67,7 +67,7 @@
+ It accepts commands on its standard input and responds on its standard
+ output.
+ It MUST be invoked by
+-.IR master (8)
++.IR cyrmaster (8)
+ with those descriptors attached to a remote client connection.
+ .PP
+ .B SMMAPD
+diff -urNad complete.dpatch/man/timsieved.8 complete.dpatch/man/timsieved.8
+--- complete.dpatch/man/timsieved.8	2005-11-11 15:33:59.000000000 +0100
++++ complete.dpatch/man/timsieved.8	2005-11-11 15:34:00.400957968 +0100
+@@ -53,7 +53,7 @@
+ is a server that allows users to remotly manage their sieve scripts kept on the server.
+ It accepts commands on its standard input and responds on its standard output.
+ It MUST be invoked by
+-.IR master (8)
++.IR cyrmaster (8)
+ with those descriptors attached to a remote client connection.
+ .PP
+ .I Timsieved
+@@ -70,4 +70,4 @@
+ .B /etc/imapd.conf
+ .SH SEE ALSO
+ .PP
+-\fBimapd.conf(5)\fR, \fBmaster(8)\fR
++\fBimapd.conf(5)\fR, \fBcyrmaster(8)\fR
+diff -urNad complete.dpatch/man/tls_prune.8 complete.dpatch/man/tls_prune.8
+--- complete.dpatch/man/tls_prune.8	2005-11-11 15:33:59.000000000 +0100
++++ complete.dpatch/man/tls_prune.8	2005-11-11 15:34:00.400957968 +0100
+@@ -67,4 +67,4 @@
+ .B /etc/imapd.conf
+ .SH SEE ALSO
+ .PP
+-\fBimapd.conf(5)\fR, \fBmaster(8)\fR
++\fBimapd.conf(5)\fR, \fBcyrmaster(8)\fR
+diff -urNad complete.dpatch/sieve/md5.c complete.dpatch/sieve/md5.c
+--- complete.dpatch/sieve/md5.c	2000-01-05 05:51:51.000000000 +0100
++++ complete.dpatch/sieve/md5.c	2005-11-11 15:34:48.633248090 +0100
+@@ -31,7 +31,7 @@
+ 
+ #include "md5global.h"
+ #include "md5.h"
+-#include "hmac-md5.h"
++#include "sasl/hmac-md5.h"
+ 
+ /* Constants for MD5Transform routine.
+ */
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/CVE-2011-3208.patch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/CVE-2011-3208.patch
@@ -0,0 +1,19 @@
+From 0f8f026699829b65733c3081657b24e2174f4f4d Mon Sep 17 00:00:00 2001
+From: Bron Gondwana <brong@opera.com>
+Date: Thu, 08 Sep 2011 17:57:38 +0000
+Subject: CVE-2011-3208 - fix buffer overflow in nntpd
+
+---
+--- a/imap/nntpd.c
++++ b/imap/nntpd.c
+@@ -4084,7 +4084,9 @@ static struct wildmat *split_wildmats(ch
+ 	else if (*c == '@') wild[n].not = -1;	/* absolute not (feeding) */
+ 	else wild[n].not = 0;
+ 
+-	strcpy(p, wild[n].not ? c + 1 : c);
++	strncpy(p, wild[n].not ? c + 1 : c, pattern+sizeof(pattern) - p);
++	pattern[sizeof(pattern)-1] = '\0';
++
+ 	wild[n++].pat = xstrdup(pattern);
+     } while (c != str);
+     wild[n].pat = NULL;
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/21-fix_config-parsing.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/21-fix_config-parsing.dpatch
@@ -0,0 +1,37 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 21-fix_config-parsing.dpatch by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix parsing of master.conf
+
+@DPATCH@
+diff -urNad cyrus-imapd-2.2.13~/master/masterconf.c cyrus-imapd-2.2.13/master/masterconf.c
+--- cyrus-imapd-2.2.13~/master/masterconf.c	2008-04-15 13:11:50.700985663 +0200
++++ cyrus-imapd-2.2.13/master/masterconf.c	2008-04-15 13:11:50.852998693 +0200
+@@ -150,8 +150,13 @@
+     const char *val = masterconf_getstring(e, key, NULL);
+ 
+     if (!val) return def;
+-    if (!isdigit((int) *val) && 
+-	(*val != '-' || !isdigit((int) val[1]))) return def;
++    if (!isdigit((int) *val) &&
++        (*val != '-' || !isdigit((int) val[1]))) {
++	syslog(LOG_DEBUG, "value '%s' for '%s' does not look like a number.",
++	     val, key);
++      return def;
++    }
++
+     return atoi(val);
+ }
+ 
+@@ -169,6 +174,10 @@
+ 	     (val[0] == 'o' && val[1] == 'n') || val[0] == 't') {
+ 	return 1;
+     }
++
++    syslog(LOG_DEBUG, "cannot interpret value '%s' for key '%s'. use y/n.",
++	   val, key);
++
+     return def;
+ }
+ 
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/99-berkelydb-4.8.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/99-berkelydb-4.8.dpatch
@@ -0,0 +1,37 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
+@DPATCH@
+--- a/cmulocal/berkdb.m4
++++ b/cmulocal/berkdb.m4
+@@ -213,7 +213,12 @@ AC_DEFUN([CYRUS_BERKELEY_DB_CHK_LIB],
+ 	fi
+ 
+ 	saved_LIBS=$LIBS
+-        for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
++        for dbname in \
++		      db-4.7 db4.7 db47 \
++		      db-4.8 db4.8 db48 \
++		      db-4.6 db4.6 db46 \
++		      db-4.5 db4.5 db45 \
++		      db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
+           do
+ 	    LIBS="$saved_LIBS -l$dbname"
+ 	    AC_TRY_LINK([#include <db.h>],
+--- a/lib/cyrusdb_berkeley.c
++++ b/lib/cyrusdb_berkeley.c
+@@ -173,7 +173,15 @@ static int init(const char *dbdir, int m
+ 	syslog(LOG_WARNING,
+ 	       "DBERROR: invalid berkeley_locks_max value, using internal default");
+     } else {
++#if DB_VERSION_MAJOR >= 4
++	r = dbenv->set_lk_max_locks(dbenv, opt);
++	if (!r)
++	    r = dbenv->set_lk_max_lockers(dbenv, opt);
++	if (!r)
++	    r = dbenv->set_lk_max_objects(dbenv, opt);
++#else
+ 	r = dbenv->set_lk_max(dbenv, opt);
++#endif
+ 	if (r) {
+ 	    dbenv->err(dbenv, r, "set_lk_max");
+ 	    syslog(LOG_ERR, "DBERROR: set_lk_max(): %s", db_strerror(r));
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/0017-upstream-no-body-empty-string-instead-of-null.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/0017-upstream-no-body-empty-string-instead-of-null.dpatch
@@ -0,0 +1,52 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 0017-upstream-no-body-empty-string-instead-of-null by murch@andrew.cmu.edu
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: return an empty string for empty body parts instead of NULL
+
+@DPATCH@
+diff -urNad cyrus-imapd-2.2.13/lib/charset.c cyrus-imapd-2.2.13/lib/charset.c
+--- cyrus-imapd-2.2.13/lib/charset.c	2005-03-12 23:09:22.000000000 +0100
++++ cyrus-imapd-2.2.13/lib/charset.c	2006-08-06 19:55:36.020854674 +0200
+@@ -39,7 +39,7 @@
+  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+  */
+ /*
+- * $Id: charset.c,v 1.44 2003/10/22 18:50:12 rjs3 Exp $
++ * $Id: charset.c,v 1.45 2006/06/14 12:44:05 murch Exp $
+  */
+ #include <config.h>
+ #include <ctype.h>
+@@ -861,24 +861,22 @@
+ 	return (char *) msg_base;
+ 
+     case ENCODING_QP:
+-	if (alloced < len)
+-	    *retval = xrealloc(*retval, len);
+-	*outlen = charset_readqp(&state, *retval, len);
+-	return (*outlen ? *retval : NULL);
++	state.rawproc = charset_readqp;
++	break;
+ 
+     case ENCODING_BASE64:
+-	if (alloced < len)
+-	    *retval = xrealloc(*retval, len);
+-	*outlen = charset_readbase64(&state, *retval, len);
+-	return (*outlen ? *retval : NULL);
++	state.rawproc = charset_readbase64;
++	break;
+ 
+     default:
+ 	/* Don't know encoding--nothing can match */
+ 	return NULL;
+     }
+ 
+-    /* should never get here */
+-    return NULL;
++    if (alloced < len+1) *retval = xrealloc(*retval, len+1);
++    *outlen = (*state.rawproc)(&state, *retval, len);
++    (*retval)[*outlen] = '\0';
++    return *retval;
+ }
+ 
+ /*
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/07-update_aclocal_and_configure.in.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/07-update_aclocal_and_configure.in.dpatch
@@ -0,0 +1,52 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 07-update_aclocal.m4.dpatch by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: update aclocal.m4 and configure.in
+
+@DPATCH@
+diff -urNad complete.dpatch/configure.in complete.dpatch/configure.in
+--- complete.dpatch/configure.in	2005-01-19 00:46:00.000000000 +0100
++++ complete.dpatch/configure.in	2005-11-10 18:42:37.579406942 +0100
+@@ -51,6 +51,11 @@
+ AC_CONFIG_HEADER(config.h)
+ AC_CANONICAL_HOST
+ 
++dnl Useful for maintainer mode stuff
++WARNERROR=-W
++AC_ARG_ENABLE(warnings-are-errors,[  --enable-warnings-are-errors   add -Werror to most gcc calls], [ if test "$enableval" != "no" ; then WARNERROR=-Werror ; fi ])
++AC_SUBST(WARNERROR)
++
+ dnl Useful hook for distributions
+ AC_ARG_WITH(extraident,[  --with-extraident=STRING   use STRING as extra version information],
+ 	[AC_DEFINE_UNQUOTED(EXTRA_IDENT,"$withval", [Extra version information for imap/version.h])])
+@@ -94,10 +99,12 @@
+ AC_ISC_POSIX
+ AC_PROG_AWK
+ AC_C_CONST
+-AC_SYS_LONG_FILE_NAMES
+-if test $ac_cv_sys_long_file_names = no; then
+-	AC_MSG_ERROR(The Cyrus IMAPD requires support for long file names)
+-fi
++dnl fakeroot sometimes fails this test
++dnl and Debian always supports long filenames anyway
++dnl AC_SYS_LONG_FILE_NAMES
++dnl if test $ac_cv_sys_long_file_names = no; then
++dnl	AC_MSG_ERROR(The Cyrus IMAPD requires support for long file names)
++dnl fi
+ AC_C_INLINE
+ 
+ CMU_C___ATTRIBUTE__
+@@ -1202,7 +1209,11 @@
+     SQUAT_ENGINE = 1,
+ 
+     /* should we have long LMTP error messages? */
+-    LMTP_LONG_ERROR_MSGS = 1
++    LMTP_LONG_ERROR_MSGS = 1,
++
++    /* default time to wait, in seconds, before giving up
++     * trying to lock something */
++    LOCK_GIVEUP_TIMER_DEFAULT = 100
+ };
+ 
+ #endif /* _CYRUS_IMAPD_CONFIG_H_ */
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/06-disable_runpath.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/06-disable_runpath.dpatch
@@ -0,0 +1,38 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 06-disable_runpath.dpatch by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: disable runpath
+
+@DPATCH@
+diff -urNad complete.dpatch/cmulocal/cyrus.m4 complete.dpatch/cmulocal/cyrus.m4
+--- complete.dpatch/cmulocal/cyrus.m4	2003-10-08 22:35:24.000000000 +0200
++++ complete.dpatch/cmulocal/cyrus.m4	2005-11-10 18:33:44.832750394 +0100
+@@ -3,6 +3,7 @@
+ dnl $Id: cyrus.m4,v 1.4 2003/10/08 20:35:24 rjs3 Exp $
+ dnl tjs@andrew.cmu.edu 6-may-1998
+ dnl
++dnl Debian fix (hmh@debian.org): We don't want runpath set in Debian
+ 
+ dnl It would be good if ANDREW_ADD_LIBPATH could detect if something was
+ dnl already there and not redundantly add it if it is.
+@@ -30,16 +31,8 @@
+ ])
+ 
+ dnl runpath initialization
++dnl (disabled by hmh@debian.org
+ AC_DEFUN([CMU_GUESS_RUNPATH_SWITCH], [
+    # CMU GUESS RUNPATH SWITCH
+-  AC_CACHE_CHECK(for runpath switch, andrew_runpath_switch, [
+-    # first, try -R
+-    SAVE_LDFLAGS="${LDFLAGS}"
+-    LDFLAGS="-R /usr/lib"
+-    AC_TRY_LINK([],[],[andrew_runpath_switch="-R"], [
+-  	LDFLAGS="-Wl,-rpath,/usr/lib"
+-    AC_TRY_LINK([],[],[andrew_runpath_switch="-Wl,-rpath,"],
+-    [andrew_runpath_switch="none"])
+-    ])
+-  LDFLAGS="${SAVE_LDFLAGS}"
+-  ])])
++    andrew_runpath_switch="none"
++])
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/0012-upstream-sasl-2.2.22-comapatibility-fix.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/0012-upstream-sasl-2.2.22-comapatibility-fix.dpatch
@@ -0,0 +1,32 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 0012-upstream-sasl-2.2.22-comapatibility-fix.dpatch by Benjamin Seidenberg <astronut@dlgeek.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Upstream compatibility fix for SASL 2.1.22
+
+@DPATCH@
+diff -urNad cyrus-imapd-2.2.13~/imtest/imtest.c cyrus-imapd-2.2.13/imtest/imtest.c
+--- cyrus-imapd-2.2.13~/imtest/imtest.c	2006-05-05 21:04:25.000000000 -0400
++++ cyrus-imapd-2.2.13/imtest/imtest.c	2006-05-25 17:49:37.000000000 -0400
+@@ -1,7 +1,7 @@
+ /* imtest.c -- IMAP/POP3/NNTP/LMTP/SMTP/MUPDATE/MANAGESIEVE test client
+  * Ken Murchison (multi-protocol implementation)
+  * Tim Martin (SASL implementation)
+- * $Id: imtest.c,v 1.107 2006/01/20 20:31:23 jeaton Exp $
++ * $Id: imtest.c,v 1.108 2006/05/25 15:23:07 murch Exp $
+  *
+  * Copyright (c) 1998-2003 Carnegie Mellon University.  All rights reserved.
+  *
+@@ -886,6 +886,12 @@
+     }
+     
+     if (*str != '\r') {
++	/* trim CRLF */
++	char *p = str + strlen(str) - 1;
++	if (p >= str && *p == '\n') *p-- = '\0';
++	if (p >= str && *p == '\r') *p-- = '\0';
++
++	/* alloc space for decoded response */
+ 	len = strlen(str) + 1;
+ 	*line = malloc(len);
+ 	if ((*line) == NULL) {
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/13-master_process_handling.dpatch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/13-master_process_handling.dpatch
@@ -0,0 +1,233 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 13-master_process_handling.dpatch by Sven Mueller <debian@incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes process (child) handling in master process
+
+@DPATCH@
+diff -urNad cyrus-imapd-2.2-2.2.13~/master/master.c cyrus-imapd-2.2-2.2.13/master/master.c
+--- cyrus-imapd-2.2-2.2.13~/master/master.c	2007-06-18 09:19:16.000000000 -0400
++++ cyrus-imapd-2.2-2.2.13/master/master.c	2007-06-18 09:21:44.000000000 -0400
+@@ -162,6 +162,8 @@
+ static struct centry *ctable[child_table_size];
+ static struct centry *cfreelist;
+ 
++static int child_mourning_time = 2;    /* Time in seconds to remember child
++					  after processing SIGCHLD */
+ static int janitor_frequency = 1;	/* Janitor sweeps per second */
+ static int janitor_position;		/* Entry to begin at in next sweep */
+ static struct timeval janitor_mark;	/* Last time janitor did a sweep */
+@@ -186,9 +188,9 @@
+ int become_cyrus(void)
+ {
+     struct passwd *p;
+-    int newuid, newgid;
++    uid_t newuid, newgid;
+     int result;
+-    static int uid = 0;
++    static uid_t uid = 0;
+ 
+     if (uid) return setuid(uid);
+ 
+@@ -915,7 +917,7 @@
+ 		}
+ 	    }
+ 	    c->service_state = SERVICE_STATE_DEAD;
+-	    c->janitor_deadline = time(NULL) + 2;
++	    c->janitor_deadline = time(NULL) + child_mourning_time;
+ 	} else {
+ 	    /* weird. Are we multithreaded now? we don't know this child */
+ 	    syslog(LOG_WARNING,
+@@ -924,7 +926,7 @@
+ 	    c = get_centry();
+ 	    c->pid = pid;
+ 	    c->service_state = SERVICE_STATE_DEAD;
+-	    c->janitor_deadline = time(NULL) + 2;
++	    c->janitor_deadline = time(NULL) + child_mourning_time;
+ 	    c->si = SERVICE_NONE;
+ 	    c->next = ctable[pid % child_table_size];
+ 	    ctable[pid % child_table_size] = c;
+@@ -1079,6 +1081,36 @@
+     }
+ }
+ 
++/*
++ * Receives a message from a service.
++ *
++ * Returns zero if all goes well
++ * 1 if no msg available
++ * 2 if bad message received (incorrectly sized)
++ * -1 on error (errno set)
++ */
++int read_msg(int fd, struct notify_message *msg)
++{
++    ssize_t r;
++    size_t off = 0;
++    int s = sizeof(struct notify_message);
++    
++    while (s > 0) {
++        do
++            r = read(fd, msg + off, s);
++        while ((r == -1) && (errno == EINTR));
++        if (r <= 0) break;
++        s -= r;
++        off += r;
++    }
++    if ( ((r == 0) && (off == 0)) ||
++         ((r == -1) && (errno == EAGAIN)) )
++        return 1;
++    if (r == -1) return -1;
++    if (s != 0) return 2;
++    return 0;
++}
++
+ void process_msg(const int si, struct notify_message *msg) 
+ {
+     struct centry *c;
+@@ -1391,8 +1423,9 @@
+ 	snprintf(buf, sizeof(buf),
+ 		 "cannot find executable for service '%s'", name);
+ 	
+-	/* if it is not, we're misconfigured, die. */
+-	fatal(buf, EX_CONFIG);
++	/* if it is not, we just skip it */
++	syslog(LOG_WARNING, "WARNING: %s -- ignored", buf);
++	return;
+     }
+ 
+     Services[i].maxforkrate = maxforkrate;
+@@ -1404,7 +1437,7 @@
+ 	Services[i].desired_workers = prefork;
+ 	Services[i].babysit = babysit;
+ 	Services[i].max_workers = atoi(max);
+-	if (Services[i].max_workers == -1) {
++	if (Services[i].max_workers < 0) {
+ 	    Services[i].max_workers = INT_MAX;
+ 	}
+     } else {
+@@ -1412,6 +1445,7 @@
+ 	if (prefork > 1) prefork = 1;
+ 	Services[i].desired_workers = prefork;
+ 	Services[i].max_workers = 1;
++	Services[i].babysit = 0;
+     }
+     free(max);
+  
+@@ -1450,7 +1484,7 @@
+     if (!strcmp(cmd,"")) {
+ 	char buf[256];
+ 	snprintf(buf, sizeof(buf),
+-		 "unable to find command or port for event '%s'", name);
++		 "unable to find command for event '%s'", name);
+ 
+ 	if (rock != NULL) {
+ 	    syslog(LOG_WARNING, "WARNING: %s -- ignored", buf);
+@@ -1504,7 +1538,7 @@
+ 
+     rl.rlim_cur = x;
+     rl.rlim_max = x;
+-    if (setrlimit(RLIMIT_NUMFDS, &rl) < 0) {
++    if (setrlimit(RLIMIT_NUMFDS, &rl) < 0 && x != RLIM_INFINITY) {
+ 	syslog(LOG_ERR, "setrlimit: Unable to set file descriptors limit to %ld: %m", x);
+ 
+ #ifdef HAVE_GETRLIMIT
+@@ -1519,11 +1553,9 @@
+     }
+ 
+ 
+-    if (verbose > 1) {
+-	r = getrlimit(RLIMIT_NUMFDS, &rl);
+-	syslog(LOG_DEBUG, "set maximum file descriptors to %ld/%ld", rl.rlim_cur,
+-	       rl.rlim_max);
+-    }
++    if (verbose > 1 && getrlimit(RLIMIT_NUMFDS, &rl) >=0)
++	syslog(LOG_DEBUG, "set maximum file descriptors to %ld/%ld",
++		rl.rlim_cur, rl.rlim_max);
+ #else
+     }
+ #endif /* HAVE_GETRLIMIT */
+@@ -1557,13 +1589,18 @@
+ 		       Services[i].stat[0], Services[i].stat[1]);
+ 
+ 	    /* Only free the service info on the primary */
+-	    if(Services[i].associate == 0) {
++	    if (Services[i].associate == 0) {
++		free(Services[i].name);
+ 		free(Services[i].listen);
+ 		free(Services[i].proto);
+ 	    }
++	    Services[i].name = NULL;
+ 	    Services[i].listen = NULL;
+ 	    Services[i].proto = NULL;
+ 	    Services[i].desired_workers = 0;
++	    Services[i].nforks = 0;
++	    Services[i].nactive = 0;
++	    Services[i].nconnections = 0;
+ 
+ 	    /* send SIGHUP to all children */
+ 	    for (j = 0 ; j < child_table_size ; j++ ) {
+@@ -1646,9 +1683,9 @@
+     p = getenv("CYRUS_VERBOSE");
+     if (p) verbose = atoi(p) + 1;
+ #ifdef HAVE_NETSNMP
+-    while ((opt = getopt(argc, argv, "C:M:p:l:Ddj:P:x:")) != EOF) {
++    while ((opt = getopt(argc, argv, "C:M:p:l:DdjJ:P:x:")) != EOF) {
+ #else
+-    while ((opt = getopt(argc, argv, "C:M:p:l:Ddj:")) != EOF) {
++    while ((opt = getopt(argc, argv, "C:M:p:l:DdjJ:")) != EOF) {
+ #endif
+ 	switch (opt) {
+ 	case 'C': /* alt imapd.conf file */
+@@ -1681,8 +1718,15 @@
+ 	    /* Janitor frequency */
+ 	    janitor_frequency = atoi(optarg);
+ 	    if(janitor_frequency < 1)
+-		fatal("The janitor period must be at least 1 second", EX_CONFIG);
++		fatal("The janitor frequency must be at least once per second", EX_CONFIG);
+ 	    break;   
++       case 'J':
++           /* Janitor delay before cleanup of a child */
++           child_mourning_time = atoi(optarg);
++           if(child_mourning_time < 1)
++               fatal("The janitor's mourning time interval must be at least 1 second",
++                       EX_CONFIG);
++           break;
+ #ifdef HAVE_NETSNMP
+ 	case 'P': /* snmp AgentXPingInterval */
+ 	    agentxpinginterval = atoi(optarg);
+@@ -2058,13 +2102,19 @@
+ 	    int j;
+ 
+ 	    if (FD_ISSET(x, &rfds)) {
+-		r = read(x, &msg, sizeof(msg));
+-		if (r != sizeof(msg)) {
+-		    syslog(LOG_ERR, "got incorrectly sized response from child: %x", i);
++		while ((r = read_msg(x, &msg)) == 0)
++		    process_msg(i, &msg);
++	
++		if (r == 2) {
++		    syslog(LOG_ERR,
++			"got incorrectly sized response from child: %x", i);
++		    continue;
++		}
++		if (r < 0) {
++		    syslog(LOG_ERR,
++			"error while receiving message from child %x: %m", i);
+ 		    continue;
+ 		}
+-		
+-		process_msg(i, &msg);
+ 	    }
+ 
+ 	    if (Services[i].exec &&
+diff -urNad cyrus-imapd-2.2-2.2.13~/master/master.h cyrus-imapd-2.2-2.2.13/master/master.h
+--- cyrus-imapd-2.2-2.2.13~/master/master.h	2004-12-17 11:32:24.000000000 -0500
++++ cyrus-imapd-2.2-2.2.13/master/master.h	2007-06-18 09:19:18.000000000 -0400
+@@ -43,6 +43,7 @@
+ extern struct service *Services;
+ extern int allocservices;
+ extern int nservices;
++void sighandler_setup(void);
+ 
+ /*
+  * Description of multiple address family support from
--- cyrus-imapd-2.2-2.2.13.orig/debian/patches/88-fix_infinite_loop_in_index.c.patch
+++ cyrus-imapd-2.2-2.2.13/debian/patches/88-fix_infinite_loop_in_index.c.patch
@@ -0,0 +1,42 @@
+Check for infinite loop on corrupted index files
+
+Mark Cave-Ayland reported a corrupted index file
+causing 100% CPU usage by imapd.
+
+This patch checks for the cause (last_uid being
+less than the current uid) and syslogs a warning
+while dropping out of the loop.
+--- a/imap/index.c
++++ b/imap/index.c
+@@ -503,7 +503,16 @@ int oldexists;
+ 	    else {
+ 		oldseen = (*old == ':');
+ 		oldnext = 0;
+-		if (!*old) oldnext = mailbox->last_uid+1;
++		if (!*old) {
++		    oldnext = mailbox->last_uid+1;
++		    /* just in case the index is corrupted, don't
++		     * loop forever */
++		    if (oldnext < uid) {
++			syslog(LOG_ERR, "index corrupted, needs reconstruct %s",
++			       mailbox->name);
++			oldnext = uid;
++		    }
++		}
+ 		else old++;
+ 		while (cyrus_isdigit((int) *old)) {
+ 		    oldnext = oldnext * 10 + *old++ - '0';
+@@ -521,6 +530,13 @@ int oldexists;
+ 		newnext = 0;
+ 		if (!*new) {
+ 		    newnext = mailbox->last_uid+1;
++		    /* just in case the index is corrupted, don't
++		     * loop forever */
++		    if (newnext < uid) {
++			syslog(LOG_ERR, "index corrupted, needs reconstruct %s",
++			       mailbox->name);
++			newnext = uid;
++		    }
+ 		    neweof++;
+ 		}
+ 		else new++;
--- cyrus-imapd-2.2-2.2.13.orig/debian/examples/editsieve
+++ cyrus-imapd-2.2-2.2.13/debian/examples/editsieve
@@ -0,0 +1,252 @@
+#!/bin/bash 
+#
+# This script is copyright 2006 Sven Mueller <cyrus@incase.de>
+# Released under the terms of the GNU General public license
+# (GPL) version 2
+# Before distributing changed versions of the script, please ask
+# the original author to include your changes into the original
+# distribution files. Thanks.
+#
+umask 077
+
+# generic defaults
+
+DEFAULTDOMAIN=incase.de
+DEFAULTHOST=localhost
+DEFAULTCONFDIR="${HOME}/.editsieve"
+
+# report usage help
+function usage () {
+	echo "Usage: $0 -h"
+	echo "       $0 --help"
+	echo "       $0 [-c <confdir>] [-n <scriptname>] [-d <domain>|--domain <domain>] "
+	echo "               [-p <password>] [-s <server>] <user>"
+	echo "Parameters:"
+	echo "  -h|--help                     : Display this help"
+	echo "  -c <dir> | --confdir <dir>    : Directory to store configuration and other"
+	echo "                                  data in (like the user's sieve script)."
+	echo "                                  The directory will be created if necessary."
+	echo "                                  Default: ${DEFAULTCONFDIR}"
+	echo "  -d <domain>|--domain <domain> : Specify domain for the user."
+	echo "                                  Default: ${DEFAULTDOMAIN}"
+	echo "  -n <script>|--name <script>   : Use <script> as the name of the script to"
+	if [ "$SCRIPTNAME" ]; then
+	    echo "                                  handle. Default: ${SCRIPTNAME}"
+	else
+	    echo "                                  handle. Default: <user>_<domain>"
+	fi
+	echo "  -s <host> | --server <host>   : Use <host> as the host to connect to."
+	echo "                                  Default: ${DEFAULTHOST}" 
+	echo "  -p <pwd> | --password <pwd>   : Deprecated: Define password to pass to"
+	echo "                                  sieveshell (also on commandline). Using this"
+	echo "                                  option might be convenient, but it is a"
+	echo "                                  security risk. Default: Let sieveshell ask"
+	echo "  <user>                        : User for which to edit the"
+	echo "                                  sieve script. If specified as"
+	echo "                                  user@do.main, use do.main as "
+	echo "                                  the users domain."
+	echo "Note that a conflict between the domain specified with the"
+	echo "--domain parameter and a user specified in @do.main notation"
+	echo "will cause this script to abort."
+	echo 
+}
+
+# Set initial values
+
+USER=""
+CONFDIR="${DEFAULTCONFDIR}"
+HOST="${DEFAULTHOST}"
+
+while [ $# -gt 0 ]; do
+	case "${1}" in
+		-d|--domain)
+			DOMAIN="${2}"
+			shift
+			shift
+			;;
+		-c|--confdir)
+			CONFDIR="${2}"
+			shift
+			shift
+			;;
+		-n|--script|--name)
+			SCRIPTNAME="${2}"
+			shift
+			shift
+			;;
+		-p|--pass*)
+			PASSWORD="-p ${2}"
+			echo "WARNING: Passing passwords on the commandline is a potential security hazard."
+			shift
+			shift
+			;;
+		-s|--server|--host)
+			HOST="$2"
+			shift
+			shift
+			;;
+		-h|--help)
+			usage
+			exit 0
+			;;
+		*)
+			# If USER had already been set, reaching this point
+			# means a second user was named. If so: report an error
+			# and show usage help.
+			if [ "${USER}" != "" ]; then
+				usage
+				echo ""
+				echo "ERROR: Multiple users specified" >&2
+				exit 1
+			fi
+			USER=$1
+			shift
+			;;
+	esac
+done
+
+# check wether a username had been specified
+if [ "${USER}" = "" ]; then
+	echo "ERROR: No user specified" >&2
+	usage
+	exit 1
+fi
+
+# If we can't create files inside ${CONFDIR}, try to create a directory named ${CONFDIR}
+if ! touch "${CONFDIR}"/testfile; then
+	if [ -e "${CONFDIR}" ]; then
+		echo "ERROR: ${CONFDIR} exists, but is no directory or link to a directory"
+		exit 1
+	fi
+	if ! mkdir "${CONFDIR}" ; then
+		echo "ERROR: ${CONFDIR} doesn't exist and can't be created"
+		exit 1
+	fi
+else
+	rm -f "${CONFDIR}/testfile"
+fi
+
+# check wether the domain had been specified
+if [ "${DOMAIN}" = "" ]; then
+	# if the user was specified as user@domain, use the domainpart from there
+	if echo "${USER}" | grep -q "@" ; then
+		DOMAIN=`echo "${USER}" | sed -e 's/.*@//'`
+		USER=`echo "${USER}" | sed -e 's/@.*//'`
+	else
+		# if no domain was specified and the username didn't include the domain,
+		# use the default domain.
+		DOMAIN="${DEFAULTDOMAIN}"
+	fi
+else
+	# DOMAIN had been specified. Check for username in user@domain form
+	if echo "${USER}" | grep -q "@" ; then
+		# Yes, user was specified as user@domain
+		UDOMAIN=`echo "${USER}" | sed -e 's/.*@//'`
+		USER=`echo "${USER}" | sed -e 's/@.*//'`
+		# check wether the domain specified using the --domain switch
+		# conflicts with the one given using the user@domain notation
+		if [ "${UDOMAIN}" != "${DOMAIN}" ]; then
+			# yes they conflict: Abort with suitable error message
+			echo "ERROR: Domain part specified in username but conflicts with"\
+			     "domain specified in -d parameter" >&2
+			exit 1
+		fi
+	fi
+fi
+
+# Set SCRIPTNAME to ${USER}_${DOMAIN} if not already set
+SCRIPTNAME="${SCRIPTNAME:-${USER}_${DOMAIN}}"
+
+echo "Trying to fetch script for ${USER}@${DOMAIN} from ${HOST}"
+if sieveshell -a "${USER}@${DOMAIN}" -u "${USER}@${DOMAIN}" \
+              ${PASSWOIRD} -e "get ${SCRIPTNAME} ${CONFDIR}/${SCRIPTNAME}" ${HOST}
+then
+	# fetch was successfull, keep a copy for later
+	cp -f "${CONFDIR}/${SCRIPTNAME}" "${CONFDIR}/${SCRIPTNAME}.orig"
+else
+	# an error occured while downloading.
+	echo WARNING: Unable to download script >&2 
+	if [ ! -f "${CONFDIR}/${SCRIPTNAME}" ]; then
+	        # there is no pre-existing script in $CONFDIR, 
+		# create a default script
+		echo starting with a default script. >&2
+		# <<-EOF is like <<EOF except that it removes
+		# as much whitespace from the beginning of lines
+		# as there is in the first line
+		cat > "${CONFDIR}/${SCRIPTNAME}" <<-EOF
+		# Mail rules for ${USER}@${DOMAIN}
+		#
+		# load fileinto extension
+		require ["fileinto"];
+		#
+		# file spam into special folder
+		if header :contains "X-Spam-Flag" "YES"
+		{
+		        fileinto "INBOX.Z_SPAM.suspected";
+		        stop;
+		}
+		#
+		EOF
+		echo -n "" > "${CONFDIR}/${SCRIPTNAME}.orig"
+	else
+		echo "${CONFDIR}/${SCRIPTNAME}.orig exists, using it." >&2
+	fi
+fi
+SYNTAXOK=0
+# if $EDITOR is non-empty, use that to call the editor.
+# otherwise, use vi
+EDITOR="${EDITOR:-vi}"
+while [ "$SYNTAXOK" = "0" ]; do
+	"${EDITOR}" "${CONFDIR}/${SCRIPTNAME}"
+	echo "trying to compile rules file"
+	if /usr/lib/cyrus/bin/sievec -C /etc/imapd.conf "${CONFDIR}/${SCRIPTNAME}" "${CONFDIR}/${SCRIPTNAME}.bc" ; then
+		# all fine, sievec was able to compile the script, syntax is thus OK
+		rm "${CONFDIR}/${SCRIPTNAME}.bc"
+		SYNTAXOK=1
+	else
+		# There was some error compiling the script, askü user what to do
+		echo "ERROR: Compiling the script failed."
+		echo "Press 'e'+return (or just return) to edit the file again,"
+		echo "Press 's'+return for a shell (returns to editor after shell exits)"
+		echo "Predd 'a'+return or CTRL-C to abort."
+		echo "Press 'i'+return to ignore"
+		VALID=0
+		while [ "$VALID" = "0" ]; do
+			read a || exit 1
+			if [ "$a" = "i" ] || [ "$a" = "I" ]; then
+				# asume sievec had no problem
+				VALID=1
+				SYNTAXOK=1
+			elif  [ "$a" = "s" ] || [ "$a" = "S" ]; then
+				VALID=1
+				echo "The edited file can be found in ${CONFDIR}/${SCRIPTNAME}"
+				echo "After the shell terminates, you will be returned to the editor"
+				bash
+			elif [ "$a" = "a" ] || [ "$a" = "A" ]; then
+				exit 1
+			elif [ "$a" = "e" ] || [ "$a" = "E" ] || [ "$a" = "" ]; then
+				VALID=1
+			else
+				echo "INVALID CHOICE, try again."
+			fi
+		done
+	fi
+done
+echo "copying file ${SCRIPTNAME} to ${SCRIPTNAME}.edited"
+cp "${CONFDIR}/${SCRIPTNAME}" "${CONFDIR}/${SCRIPTNAME}.edited"
+# check wether the file changed at all. If not, we can skip uploading
+echo trying diff
+if diff -q "${CONFDIR}/${SCRIPTNAME}.orig" "${CONFDIR}/${SCRIPTNAME}"; then
+	echo "Sieve rules unchanged, no upload needed."
+else
+	echo "Sieve rules changed, uploading and activating new file."
+	echo "${USER}@${DOMAIN}"
+	if sieveshell -a "${USER}@${DOMAIN}" -u "${USER}@${DOMAIN}" -e "put ${CONFDIR}/${SCRIPTNAME}
+activate ${SCRIPTNAME}" ${HOST} ; then
+		rm -f "${CONFDIR}/${SCRIPTNAME}.edited" ; echo "Upload OK"
+	else
+		echo "Upload failed! Leaving edited file in ${SCRIPTNAME}.edited"
+	fi
+	rm "${CONFDIR}/${SCRIPTNAME}.orig"
+fi
+
--- cyrus-imapd-2.2-2.2.13.orig/debian/examples/syncldap2cyrus.pl
+++ cyrus-imapd-2.2-2.2.13/debian/examples/syncldap2cyrus.pl
@@ -0,0 +1,324 @@
+#!/usr/bin/perl -w
+use strict;
+use vars qw($opt_a $opt_f $opt_n $opt_r);
+use Getopt::Std;
+use Net::LDAP;
+use Cyrus::IMAP::Admin;
+
+# Requires: Getopt::Std, Net::LDAP, Cyrus::IMAP::Admin
+# Debian pkgs: libnet-ldap-perl, libcyrus-imap-perl21
+
+# Script Title : syncldap2cyrus.pl
+# Written By   : Stuart Young (aka Cef) <cef@optus.net>
+# Last Modified: Mon Mar 14 23:59:14 UTC 2005
+# Description:
+#  syncldap2cyrus.pl retrieves a list of usernames from an LDAP server
+#  and then tries to create a user mailbox in Cyrus, and then any
+#  secondary mailboxes under that. The idea is that you could run this
+#  via cron or manually every time you add a user to your LDAP server,
+#  and they would then have a Cyrus mailbox. This script also has a
+#  report mode that shows you any users in LDAP that do not have a
+#  Cyrus mailbox, and vice versa.
+
+# Notes:
+#  This script is FREE. There is no support. If it breaks, you get to
+#  keep all the pieces.
+#  Please do not complain about the quality or style of this script,
+#  or you will be ignored.
+#  If you want to add SSL/TLS and/or inbuilt SASL support, go for it!
+#  Yes I know it will use a lot of memory if there are lots of users
+#  and/or mailboxes. Live with it, or rewrite it - your call.
+
+sub Usage ()
+{
+  return <<END;
+usage: syncldap2cyrus.pl [-a|-f|-n|-r]
+
+ -a : Add all users from LDAP to Cyrus
+ -f : Force creation of mailboxes even if they have errors (implies -a)
+ -n : Do not add users to Cyrus, just display (implies -a)
+ -r : Report on differences between LDAP and Cyrus only (implies -n)
+END
+}
+
+# No options, give a Usage message
+(scalar(@ARGV)) or
+  die Usage();
+
+getopts('afnr');
+
+# Get options
+my $addcyrus = 1;
+my $forcecreate = 0;
+my $report = 0;
+my $go = 0;
+
+if (defined($opt_a))
+{
+  $go = 1;
+}
+if (defined($opt_f))
+{
+  $go = 1;
+  $forcecreate = 1;
+}
+if (defined($opt_n))
+{
+  $go = 1;
+  $addcyrus = 0;
+}
+if (defined($opt_r))
+{
+  $go = 1;
+  $report = 1;
+  $addcyrus = 0;
+}
+
+# No regognised options, give a usage message
+if ($go == 0)
+{
+  die Usage();
+}
+
+# Settings - should come from config file(s) at some point
+
+# Debug mode, normally 0
+my $debug = 0;
+# Cyrus Host to connect to
+my $cyrus_host = 'localhost';
+# Cyrus admin user & password
+my $cyrus_admin = 'cyrus';
+my $cyrus_pass = 'secret';
+# Cyrus Unix Seperator - allow .'s in names (unixhierarchysep in cyrus)
+my $cyrus_unix_sep = 0;
+# LDAP server uri
+my $ldap_uri = 'ldap://localhost/';
+# LDAP bind domain & password
+my $ldap_bind_domain = 'cn=Manager, dc=example, dc=com';
+my $ldap_bind_pass = 'secret';
+# LDAP search base
+my $ldap_search_base = 'ou=People, dc=example, dc=com';
+# LDAP search scope
+my $ldap_search_scope = 'sub';
+# LDAP user attribute to return.
+my $ldap_user_attr = 'uid';
+# LDAP search query. Where possible, use $ldap_attr here to avoid
+# problems when changing the query
+my $ldap_search_query = "($ldap_user_attr=*)";
+# List of mailboxes to create for each user
+my @mboxlist = ('Trash', 'Sent', 'Spam', 'Drafts');
+
+# General vars
+my $count = 0;
+my $realuser = '';
+my $done = 0;
+
+# Connect to LDAP and bind
+my $ldap = Net::LDAP->new($ldap_uri) or
+  die "Can't connect to LDAP server at " . $ldap_uri;
+my $mesg = $ldap->bind ($ldap_bind_domain, password => $ldap_bind_pass);
+
+$mesg = $ldap->search ( base => $ldap_search_base,
+                        scope => $ldap_search_scope,
+                        filter => $ldap_search_query,
+                        attr => $ldap_user_attr );
+
+$mesg->code && die "LDAP error: " . $mesg->error;
+
+# Connect to Cyrus via IMAP
+my $client = 0;
+my $rc = 0;
+my $sepchar = '.';
+
+$client = Cyrus::IMAP::Admin->new("$cyrus_host");
+if ($debug == 1)
+{
+  print "Connecting to Cyrus using user: ". $cyrus_admin. "\n";
+}
+$rc = $client->authenticate(-user => $cyrus_admin, -password => $cyrus_pass) or
+  die "Can't authenticate to Cyrus on $cyrus_host as user: ". $cyrus_admin. "\n";
+if ($cyrus_unix_sep == 1)
+{
+  $sepchar = '/';
+}
+my $prefix = "user".$sepchar;
+
+# Populate the LDAP user list - Very messy but works
+my $ldaprawdata = '';
+my $ldapfieldattr = '';
+my $ldapfielddata = '';
+my $ldaphref = $mesg->as_struct;
+my @ldapuserlist = ();
+foreach (keys %$ldaphref)
+{
+  $ldaprawdata = $$ldaphref{$_};
+  my @ldapsortattr = sort keys %$ldaprawdata;
+  foreach $ldapfieldattr (@ldapsortattr)
+  {
+    next if ( $ldapfieldattr =~ /;binary$/ );
+    my $ldapfielddata = @$ldaprawdata{$ldapfieldattr};
+    if ($debug == 1)
+    {
+      print "$ldapfieldattr = @$ldapfielddata\n";
+    }
+    if ( $ldapfieldattr eq $ldap_user_attr )
+    {
+      $ldapuserlist[$count] = "@$ldapfielddata";
+    }
+  }
+  $count += 1;
+}
+
+my $maildata = '';
+my @mailboxes = $client->list('%', $prefix);
+my @cyrusmboxes = ();
+if ($debug == 1)
+{
+  print "\nThere are ".@ldapuserlist," LDAP users\n";
+  print "\nThere are ".@mailboxes," Cyrus mailboxes\n";
+}
+
+$count = 0;
+
+# Populate the Cyrus mailbox list
+foreach $maildata (@mailboxes)
+{
+  # Note: Element 0 = full mailbox name/path
+  if ($addcyrus == 0 && $report == 0)
+  {
+    print "Cyrus: @{$maildata}[0]\n";
+  }
+  # Remove the Cyrus user part
+  $cyrusmboxes[$count] = substr(@{$maildata}[0],length($prefix),length(@{$maildata}[0]));
+  $count += 1;
+}
+
+my $item = '';
+my %seen = ();
+my @answer = ();
+
+if ($report == 1)
+{
+  $item = '';
+  %seen = ();
+  @answer = ();
+  $count = 0;
+  # Which users are in Cyrus but not in LDAP?
+  @seen{@ldapuserlist} = ();
+  foreach $item (@cyrusmboxes)
+  {
+    push (@answer, $item) unless exists $seen{$item};
+  }
+  foreach $item (@answer)
+  {
+    print "In Cyrus but not LDAP: ". $item ."\n";
+    $count += 1;
+  }
+
+  $item = '';
+  %seen = ();
+  @answer = ();
+  # Which mailboxes are in LDAP, but not in Cyrus?
+  @seen{@cyrusmboxes} = ();
+  foreach $item (@ldapuserlist)
+  {
+    push (@answer, $item) unless exists $seen{$item};
+  }
+  foreach $item (@answer)
+  {
+    print "In LDAP but not Cyrus: ". $item ."\n";
+    $count += 1;
+  }
+  if ($count == 0 && $debug == 1)
+  {
+    print "No differences.\n";
+  }
+}
+else
+{
+  # Iterate over the LDAP user list
+  $count = 0;
+  foreach $realuser (@ldapuserlist) 
+  {
+    if ($addcyrus == 0)
+    {
+      # Display matching ldap record
+      print "LDAP : $realuser\n";
+    }
+    elsif ($addcyrus == 1)
+    {
+      $done = 0;
+      # We check if the Cyrus mailbox exists first, and if not, create it
+      # We ALWAYS check each individual user mailbox too, in case the list
+      # in the var @mailboxes gets updated
+      if ($client->list("$prefix$realuser") && $forcecreate == 0)
+      {
+        if ($debug == 1)
+        {
+          print "Mailbox already exists for $realuser\n";
+        }
+      }
+      elsif ($client->create("$prefix$realuser"))
+      {
+        $done += 1;
+        if ($client->setacl("$prefix$realuser", ${cyrus_admin} => "cd"))
+        {
+          if ($debug == 1)
+          {
+            print "Admin permissions set on $prefix$realuser\n"
+          }
+        }
+        else
+        {
+          print STDERR "Couldn't set $cyrus_admin\'s ACL on mailbox $prefix$realuser\: " . $client->error . "\n";
+          if ($forcecreate == 0)
+          {
+            exit 1;
+          }
+        }
+      }
+      else
+      {
+        print STDERR "Couldn't create mailbox $prefix$realuser\: " . $client->error . "\n";
+        if ($forcecreate == 0)
+        {
+          exit 1;
+        }
+      }
+      foreach my $mailbox ( @mboxlist )
+      {
+        if ($client->list("$prefix$realuser$sepchar$mailbox"))
+        {
+          if ($debug)
+          {
+            print "Mailbox $mailbox already exists for $realuser\n";
+          }
+        }
+        elsif ($client->create("$prefix$realuser$sepchar" . ${mailbox}))
+        {
+          $done += 1;
+        }
+        else
+        {
+          print STDERR  "Couldn't create mailbox $prefix$realuser$sepchar" . ${mailbox}.": " . $client->error . "\n";
+          if ($forcecreate == 0)
+          {
+            exit 1;
+          }
+        }
+      }
+      if ($done > 0)
+      {
+        print "User $realuser\'s mailboxes created successfully\n";
+        $count += 1;
+      }
+    }
+  }
+  if ($count > 0)
+  {
+    print "Created $count user mailboxes\n";
+  }
+}
+
+$mesg = $ldap->unbind;
+exit 0;
--- cyrus-imapd-2.2-2.2.13.orig/debian/examples/imapcreate.pl
+++ cyrus-imapd-2.2-2.2.13/debian/examples/imapcreate.pl
@@ -0,0 +1,167 @@
+#!/usr/bin/perl -w
+# 
+# imapcreate: create IMAP mailboxes with quotas
+#			 Reads user names from standard input.
+# originally found on http://cyrus-utils.sourceforge.net
+# © 2001 Garry Mills  
+# 
+# enhanced by Clément "nodens" Hermann <clement.hermann@free.fr>
+#
+# I'd like to consider this as GPL'd (cf www.gnu.org), but won't add any
+# copyright without the original author's consent.
+# last modification : 2004/11/23
+# Changes : 
+# 2005/03/31	- Finally found out the original author's name.
+# 2004/11/23	- removed LOGIN as a default mech, now use cyrus' default
+#		- Added --auth option to specify mech
+#
+# TODO : fix STDIN collision when reading password AND mailboxes name from STDIN
+# 
+use Getopt::Long;
+use Cyrus::IMAP::Admin;
+use strict;
+
+# CLI options
+my ($debug,$user,$pass,$quota,@part,$useunixhierarchy,@mailboxes,$delete,$cyrus,$authmech);
+
+sub usage {
+  print "imapcreate - create IMAP mailboxes with quotas\n";
+  print "  usage:\n";
+  print "	imapcreate [-d] [-u user] [--auth mechanism] [-p pass] [-m mailbox1[,mailbox2][,mailbox<n>]] [-q quota] [-t partition:list]\n";
+  print "	[-s] [-v] <server>\n";
+  print "\n";
+  print "if -s is set, we'll use the unix hierarchy separator (see imapd.conf(1))\n";
+  print "if -d is set, we'll delete mailboxes instead of creating them\n";
+  print "You can use M or ,m to specify quotas. e.g. 10M. By default,\n";
+  print "the quota is expressed in Kbytes.\n";
+  print "If no password is submitted with -p, we'll prompt for one.\n";
+  print "if no mailbox name is specified with -m, read user names from standard input\n";
+  print "if -v is set, we'll run in debug mode, and print information on stdout\n";
+  print "\n";
+  print "The default mechanism is used for authentication. If you need another\nmechanism, (try LOGIN), use --auth <mechanism> option\n";
+  print "\n";
+  print "  example: \n";
+  print "	imapcreate -u cyradm -m foo,bar,joe -q 50000 -t p1:p2 mail.testing.umanitoba.ca\n";
+  print "\n";
+  exit 0;
+}
+
+# Create a mailbox... usage : &CreateMailBox(user,partition[,quota]).
+# You have to be authentified already. We use "$cyrus" as the connection name.
+# partition can be 'default'
+sub CreateMailBox {
+	my $mbuser = $_[0];
+	my $mbpart = $_[1];
+	my $mbquota = $_[2];
+	
+	print "Creating $mbuser on $mbpart\n" if $debug;
+	if ($mbpart eq 'default') {
+	$cyrus->createmailbox($mbuser);
+	}
+	else {
+	$cyrus->createmailbox($mbuser, $mbpart);
+	}
+	warn $cyrus->error if $cyrus->error;
+	
+	# Set the quota
+	if ($mbquota) {
+	print "Setting quota for $mbuser to $mbquota\n" if $debug;
+	$cyrus->setquota($mbuser, 'STORAGE', $mbquota);
+	warn $cyrus->error if $cyrus->error;
+	}
+}
+
+# Delete a mailbox. Usage: $DeleteMailBox($user)
+# Assuming we use $user as the admin.
+sub DeleteMailBox {
+	my $mbuser = $_[0];
+	my $delacl = "c";
+	
+	print "Deleting $mbuser\n" if $debug;
+	$cyrus->setaclmailbox($mbuser, $user, $delacl);
+	$cyrus->deletemailbox($mbuser);
+	warn $cyrus->error if $cyrus->error;
+}
+
+GetOptions( "d|delete" => \$delete, 
+	    "u|user=s" => \$user, 
+	    "auth=s" => \$authmech, 
+	    "p|pass=s" => \$pass, 
+	    "m|mailboxes=s" => \@mailboxes, 
+	    "q|quota=s" => \$quota,
+	    "s|UnixHierarchy" => \$useunixhierarchy, 
+	    "t|part=s" => \@part, 
+	    "v|verbose" => \$debug );
+
+@part = split(/:/, join(':', @part));
+push @part, 'default' unless @part;
+my $pn = 0;
+@mailboxes = split(/,/, join(',', @mailboxes));
+
+my $server = shift(@ARGV) if (@ARGV);
+usage unless $server;
+
+# quotas formatting:
+if ($quota) {
+	if ($quota =~ /^(\d+)([mk]?)$/i) {
+		my $numb = $1;
+		my $letter = $2;
+		if ($letter =~ /^m$/i) {
+			$quota = $numb * 1024;
+			print "debug: quota=$quota\n" if $debug;
+		} elsif ($letter =~ /^k$/i) {
+			$quota = $numb;
+			print "debug: quota=$quota\n" if $debug;
+		} else {
+			die "malformed quota: $quota (must be at least one digit eventually followed by m, M, k or K\n";
+#			$quota = $numb;
+#			print "debug: quota=$quota\n" if $debug;
+		}
+	} else {
+		die "malformed quota: $quota (must be at least one digit eventually followed by m, M, k or K\n";
+	}
+}
+
+# Authenticate
+$cyrus = Cyrus::IMAP::Admin->new($server);
+
+if ($authmech) {
+	$cyrus->authenticate(-mechanism => $authmech, 
+			-user => $user,
+	 		-password => $pass);
+} else {
+	$cyrus->authenticate(
+			-user => $user,
+	 		-password => $pass);
+}	
+die $cyrus->error if $cyrus->error;
+
+# if there isn't any mailbox defined yet, get them from standard input
+if (! (defined $mailboxes[0])) { 
+	# For all users
+	while (<>) {
+		chomp;
+		my $mbox = $_;
+		push @mailboxes, $mbox;
+	}
+}
+
+# create/delete mailboxes for each user
+foreach my $mailbox (@mailboxes) {
+	if ($useunixhierarchy) {
+	$mailbox = 'user/' . $mailbox;
+	} else {
+	$mailbox = 'user.' . $mailbox;
+	}
+
+	if ($delete) {
+		&DeleteMailBox($mailbox)
+	} else {
+		# Select the partition
+		my $pt = $part[$pn];
+		$pn += 1;
+		$pn = 0 unless $pn < @part;
+		&CreateMailBox($mailbox,$pt,$quota)
+	}
+}
+
--- cyrus-imapd-2.2-2.2.13.orig/debian/examples/README.imapcreate.pl
+++ cyrus-imapd-2.2-2.2.13/debian/examples/README.imapcreate.pl
@@ -0,0 +1,23 @@
+Launching the script without any parameters will show a short help. It
+should be pretty self-explanatory.
+
+Here are some examples on how the script could be invoked:
+
+- this will read the file list.txt, and create the mailboxes listed in it
+  with a 50MB quota:
+
+  cat list.txt | ./imapcreate.pl -u cyradm -p 'cyrpass' -q 50M mail.example.com
+
+- this will create a mailbox for john, using the Unix Hierarchy separator,
+  no quota, in verbose mode:
+
+  ./imapcreate.pl -u cyradm -m john -s -v mail.example.com
+
+  the output would look like this:
+
+  Creating user.john on default
+
+This script is far from being perfect, but it works great for me. feel free
+to e-mail me about it, to report bugs, to send patches etc:
+
+clement.hermann@free.fr
--- cyrus-imapd-2.2-2.2.13.orig/debian/examples/mboxtocyrus
+++ cyrus-imapd-2.2-2.2.13/debian/examples/mboxtocyrus
@@ -0,0 +1,69 @@
+#!/bin/sh
+#
+# Script to import mbox-format mailboxes to Cyrus folders
+# Requires formail (from procmail)
+#
+# Note: As this runs cyrdeliver directly, you'll need to be
+#       a member of the mail group for it to work.
+#
+# Note2: Make sure the user 'postman' is listed as an lmtp_admin
+# that is allowed to proxy.
+#
+# Use this script at your own risk! I'm not responsible if
+# it trashes your mail system :)
+#
+# By Michael-John Turner <mj@debian.org>
+#
+# Changelog:
+#   Fri Dec  1 21:19:19 SAST 2000 
+#      - Incorporate some modifications from Tomas Pospisek <tpo@spin.ch>
+#
+
+USER=$1
+MAILBOX=$2
+CYRUSFOLDER=$3
+CYRDELIVER=/usr/sbin/cyrdeliver
+FORMAIL=/usr/bin/formail
+
+if ! [ -x "$FORMAIL" ]; then
+	echo ""
+	echo "formail (from procmail) is required to run this script"
+	echo ""
+	exit 1
+fi
+
+
+# This assumes id prints group names within parentheses
+if ! `id | grep -q "(mail)"`; then
+	echo ""
+	echo "You must be a member of the mail group to run this script"
+	echo ""
+	exit 1
+fi
+
+
+if [ "$USER" = "" ]; then
+	echo ""
+	echo "syntax: $0 user [mbox] [cyrus folder]"
+	echo ""
+	echo "If no mbox is specified, the user and mbox name are taken to be the same"
+	echo "If no cyrus folder is specified, the INBOX is used"
+	echo ""
+	exit 2
+fi
+
+
+
+if [ "$MAILBOX" = "" ]; then
+	MAILBOX=$USER
+fi
+
+if [ "$CYRUSFOLDER" = "" ]; then
+	echo "Adding mailbox '$MAILBOX' to Cyrus INBOX of user '$USER'..."
+	$FORMAIL -I "From " < $MAILBOX -s $CYRDELIVER $USER
+ else
+	echo "Adding mailbox '$MAILBOX' to Cyrus folder '$CYRUSFOLDER' of user '$USER'..."
+	$FORMAIL -I "From " < $MAILBOX -s $CYRDELIVER -a postman -m $CYRUSFOLDER $USER
+fi
+
+
--- cyrus-imapd-2.2-2.2.13.orig/debian/examples/README
+++ cyrus-imapd-2.2-2.2.13/debian/examples/README
@@ -0,0 +1,14 @@
+This directory contains some sample files that may be of use with Cyrus.
+
+mboxtocyrus	A script to import mbox format mailboxes into Cyrus
+		(by Michael-John Turner <mj@debian.org>
+
+syncldap2cyrus.pl retrieves a list of usernames from an LDAP server and
+                  then tries to create a user mailbox in Cyrus, and then
+		  any secondary mailboxes under that. The idea is that
+		  you could run this via cron or manually every time you
+		  add a user to your LDAP server, and they would then
+		  have a Cyrus mailbox. This script also has a report
+		  mode that shows you any users in LDAP that do not have
+		  a Cyrus mailbox, and vice versa.
+		(by Stuart Young (aka Cef) <cef@optus.net>)