[pkg-kolab] r58 - in trunk/kolab-cyrus-imapd: . experimental
experimental/debian experimental/debian/examples
experimental/debian/patches experimental/debian/po
experimental/upstream
Steffen Joeris
white-guest at costa.debian.org
Mon Jan 2 14:52:39 UTC 2006
Author: white-guest
Date: 2006-01-02 14:48:54 +0000 (Mon, 02 Jan 2006)
New Revision: 58
Added:
trunk/kolab-cyrus-imapd/experimental/
trunk/kolab-cyrus-imapd/experimental/debian/
trunk/kolab-cyrus-imapd/experimental/debian/README.Debian
trunk/kolab-cyrus-imapd/experimental/debian/README.Debian.database
trunk/kolab-cyrus-imapd/experimental/debian/README.Debian.debug
trunk/kolab-cyrus-imapd/experimental/debian/README.Debian.simpleinstall
trunk/kolab-cyrus-imapd/experimental/debian/README.exim
trunk/kolab-cyrus-imapd/experimental/debian/README.postfix
trunk/kolab-cyrus-imapd/experimental/debian/README.sendmail
trunk/kolab-cyrus-imapd/experimental/debian/TODO.Debian
trunk/kolab-cyrus-imapd/experimental/debian/UPGRADE.Debian
trunk/kolab-cyrus-imapd/experimental/debian/arbitronsort.8
trunk/kolab-cyrus-imapd/experimental/debian/changelog
trunk/kolab-cyrus-imapd/experimental/debian/compat
trunk/kolab-cyrus-imapd/experimental/debian/control
trunk/kolab-cyrus-imapd/experimental/debian/copyright
trunk/kolab-cyrus-imapd/experimental/debian/cyradm-16x16.xpm
trunk/kolab-cyrus-imapd/experimental/debian/cyradm-32x32.xpm
trunk/kolab-cyrus-imapd/experimental/debian/cyrdump.8
trunk/kolab-cyrus-imapd/experimental/debian/cyrus-db-types.upgrading_from_1.5.txt
trunk/kolab-cyrus-imapd/experimental/debian/cyrus-makedirs
trunk/kolab-cyrus-imapd/experimental/debian/cyrus-makedirs.8
trunk/kolab-cyrus-imapd/experimental/debian/cyrus.conf
trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-admin.README.Debian
trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-admin.dirs
trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-admin.files
trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-admin.linda
trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-admin.lintian
trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-admin.manpages
trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-admin.menu
trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-clients.README.Debian
trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-clients.dirs
trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-clients.manpages
trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-common.NEWS
trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-common.contrib
trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-common.cron.daily
trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-common.cyrus22.default
trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-common.cyrus22.init
trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-common.dirs
trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-common.docs
trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-common.files
trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-common.linda
trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-common.links
trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-common.lintian
trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-common.manpages
trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-common.postinst
trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-common.postrm
trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-common.prerm
trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-common.templates
trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-dev.dirs
trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-dev.files
trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-dev.links
trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-doc.doc-base
trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-doc.docs
trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-doc.links
trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-imapd.dirs
trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-imapd.files
trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-imapd.links
trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-imapd.manpages
trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-murder.files
trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-murder.links
trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-nntpd.dirs
trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-nntpd.files
trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-nntpd.links
trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-nntpd.manpages
trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-pop3d.dirs
trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-pop3d.files
trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-pop3d.links
trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-pop3d.manpages
trunk/kolab-cyrus-imapd/experimental/debian/deletable.files
trunk/kolab-cyrus-imapd/experimental/debian/examples/
trunk/kolab-cyrus-imapd/experimental/debian/examples/README
trunk/kolab-cyrus-imapd/experimental/debian/examples/README.imapcreate.pl
trunk/kolab-cyrus-imapd/experimental/debian/examples/imapcreate.pl
trunk/kolab-cyrus-imapd/experimental/debian/examples/mboxtocyrus
trunk/kolab-cyrus-imapd/experimental/debian/examples/syncldap2cyrus.pl
trunk/kolab-cyrus-imapd/experimental/debian/executable.files
trunk/kolab-cyrus-imapd/experimental/debian/get-backtrace.gdb
trunk/kolab-cyrus-imapd/experimental/debian/imap.pam
trunk/kolab-cyrus-imapd/experimental/debian/imapd.conf
trunk/kolab-cyrus-imapd/experimental/debian/libcyrus-imap-perl22.files
trunk/kolab-cyrus-imapd/experimental/debian/libcyrus-imap-perl22.lintian
trunk/kolab-cyrus-imapd/experimental/debian/libcyrus-imap-perl22.manpages
trunk/kolab-cyrus-imapd/experimental/debian/license.html
trunk/kolab-cyrus-imapd/experimental/debian/lmtp.pam
trunk/kolab-cyrus-imapd/experimental/debian/logcheck.ignore
trunk/kolab-cyrus-imapd/experimental/debian/mupdate.pam
trunk/kolab-cyrus-imapd/experimental/debian/nntp.pam
trunk/kolab-cyrus-imapd/experimental/debian/patches/
trunk/kolab-cyrus-imapd/experimental/debian/patches/00list
trunk/kolab-cyrus-imapd/experimental/debian/patches/01-fix_Makefile.in.dpatch
trunk/kolab-cyrus-imapd/experimental/debian/patches/02-add_mkinstalldirs.dpatch
trunk/kolab-cyrus-imapd/experimental/debian/patches/03-fix_docs.dpatch
trunk/kolab-cyrus-imapd/experimental/debian/patches/04-add_autogen.sh.dpatch
trunk/kolab-cyrus-imapd/experimental/debian/patches/05-fix_programnames.dpatch
trunk/kolab-cyrus-imapd/experimental/debian/patches/06-disable_runpath.dpatch
trunk/kolab-cyrus-imapd/experimental/debian/patches/07-update_aclocal_and_configure.in.dpatch
trunk/kolab-cyrus-imapd/experimental/debian/patches/08-clean_socket_closes.dpatch
trunk/kolab-cyrus-imapd/experimental/debian/patches/09-kerberos-ipv4-ipv6-kludge-removal.dpatch
trunk/kolab-cyrus-imapd/experimental/debian/patches/10-fix_potential_overflows.dpatch
trunk/kolab-cyrus-imapd/experimental/debian/patches/100-kolab-imapd.dpatch
trunk/kolab-cyrus-imapd/experimental/debian/patches/101-fix_Makefile.in.dpatch
trunk/kolab-cyrus-imapd/experimental/debian/patches/105-cyradm.sh.dpatch
trunk/kolab-cyrus-imapd/experimental/debian/patches/11-fix_syslog_prefix.dpatch
trunk/kolab-cyrus-imapd/experimental/debian/patches/110-Admin.pm.dpatch
trunk/kolab-cyrus-imapd/experimental/debian/patches/12-fix_timeout_handling.dpatch
trunk/kolab-cyrus-imapd/experimental/debian/patches/120-kolab-Shell.pm.dpatch
trunk/kolab-cyrus-imapd/experimental/debian/patches/13-master_process_handling.dpatch
trunk/kolab-cyrus-imapd/experimental/debian/patches/130-kolab-imapd.c.dpatch
trunk/kolab-cyrus-imapd/experimental/debian/patches/14-xmalloc.dpatch
trunk/kolab-cyrus-imapd/experimental/debian/patches/140-kolab-mbox.dpatch
trunk/kolab-cyrus-imapd/experimental/debian/patches/15-munge_8bit.dpatch
trunk/kolab-cyrus-imapd/experimental/debian/patches/16-fix_mib.dpatch
trunk/kolab-cyrus-imapd/experimental/debian/patches/17-fix_tail_syntax_in_xversion.h.dpatch
trunk/kolab-cyrus-imapd/experimental/debian/patches/18-fix_strlen_return_type.dpatch
trunk/kolab-cyrus-imapd/experimental/debian/patches/19-fix_tls_ssl.dpatch
trunk/kolab-cyrus-imapd/experimental/debian/patches/20-drac_auth.dpatch
trunk/kolab-cyrus-imapd/experimental/debian/patches/21-fix_config-parsing.dpatch
trunk/kolab-cyrus-imapd/experimental/debian/patches/22-imapd_index_check.dpatch
trunk/kolab-cyrus-imapd/experimental/debian/patches/25-update_install-sh.dpatch
trunk/kolab-cyrus-imapd/experimental/debian/patches/30-update_perlcalling.sh.dpatch
trunk/kolab-cyrus-imapd/experimental/debian/patches/35-masssievec_remove_unused_variable.dpatch
trunk/kolab-cyrus-imapd/experimental/debian/patches/40-rehash_fix_pathes.dpatch
trunk/kolab-cyrus-imapd/experimental/debian/patches/45-kolab2-annotations.dpatch
trunk/kolab-cyrus-imapd/experimental/debian/patches/50-FTBFS-gcc-4.0-fix.dpatch
trunk/kolab-cyrus-imapd/experimental/debian/patches/51-multiple_mupdate_err.h-fix.dpatch
trunk/kolab-cyrus-imapd/experimental/debian/patches/60-lower-poptimeout-minimum.dpatch
trunk/kolab-cyrus-imapd/experimental/debian/patches/61-64bit-quota.dpatch
trunk/kolab-cyrus-imapd/experimental/debian/patches/65-sieveshell-enhancements.dpatch
trunk/kolab-cyrus-imapd/experimental/debian/patches/98-use_Debian_config.guess_config.sub.dpatch
trunk/kolab-cyrus-imapd/experimental/debian/patches/99-update-autoconf.dpatch
trunk/kolab-cyrus-imapd/experimental/debian/po/
trunk/kolab-cyrus-imapd/experimental/debian/po/POTFILES.in
trunk/kolab-cyrus-imapd/experimental/debian/po/de.po
trunk/kolab-cyrus-imapd/experimental/debian/po/fr.po
trunk/kolab-cyrus-imapd/experimental/debian/po/it.po
trunk/kolab-cyrus-imapd/experimental/debian/po/ja.po
trunk/kolab-cyrus-imapd/experimental/debian/po/nl.po
trunk/kolab-cyrus-imapd/experimental/debian/po/pt_BR.po
trunk/kolab-cyrus-imapd/experimental/debian/po/templates.pot
trunk/kolab-cyrus-imapd/experimental/debian/pop.pam
trunk/kolab-cyrus-imapd/experimental/debian/rules
trunk/kolab-cyrus-imapd/experimental/debian/sieve.pam
trunk/kolab-cyrus-imapd/experimental/debian/watch
trunk/kolab-cyrus-imapd/experimental/upstream/
trunk/kolab-cyrus-imapd/experimental/upstream/cyrus22-imapd_2.2.12.orig.tar.gz
Log:
* initial commit of experimental cyrus with patches
* here are some dirty packages
* this should be tested first
Added: trunk/kolab-cyrus-imapd/experimental/debian/README.Debian
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/README.Debian 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/README.Debian 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,330 @@
+Cyrus IMAP for Debian
+$Id: README.Debian 5 2005-03-12 23:19:45Z 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. Outdated documentation will
+cause you much grief, so beware of that when hunting anywhere else than the
+Cyrus mailinglist for information.
+
+Information about updated packages for Debian stable (i.e. of updates that
+are not necessarily security updates) is available at
+http://people.debian.org/~hmh/
+
+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 not included in the Debian package; 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 probably
+ have to do so for postfix to deliver to Cyrus, for example.
+
+3. Removal of netnews support
+
+ Netnews support as it were is dead. Cyrus 2.2 has a brand new approach,
+ and the stuff in Cyrus 2.2 is not functional, and thus removed from this
+ package.
+
+4. Debian Cyrus IMAPd logs with facility MAIL instead of LOCAL6. Also, it
+ prefixes *all* log output with "cyrus/" (e.g.: imapd logs appear as
+ "cyrus/imapd[#####]" instead of "imapd[#####]"). This last change was
+ accepted upstream for Cyrus 2.2.
+
+5. 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 cyrus22-imapd or
+ cyrus22-pop3d 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.
+
+
+General notes and hints:
+------------------------
+
+ o *** ALWAYS READ /usr/share/doc/cyrus22-common/NEWS.Debian *** after
+ you upgrade the package.
+
+ 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
+
+ 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.
+
+ 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) 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/cyrus22-common/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/cyrus22-common/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 semanthics, and full mmap
+ support.
+
+ o Ext2 is slow on very large directories (right now), and sync medatada
+ 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 like
+ that. xfs is probably the best one.
+
+ o You may want to enable/disable synchronous metadata writes to your mail
+ store dirs (check /usr/share/doc/cyrus22-doc/html/install.html for more
+ info, in package cyrus22-docs). 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 use pop3, or something else enabled by default in cyrus.conf,
+ 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 #151925 for more details
+ (http://bugs.debian.org/151925). 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
+----------
+
+ o Group lookups in LDAP (through nss-ldap) will not work well. See Debian
+ bug #156671.
+
+
+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
+----------------------------
+
+There aren't many. Patchset numbers as provided by the cvsps utility in its
+default configuration are used to denote patches taken from upstream CVS in the
+changelog. Less important patches from upstream CVS (such as documentation
+updates) are applied without adding a changelog entry.
+
+
+THANKS
+------
+
+Thanks go to the CMU crew for producing Cyrus IMAPd in the first place;
+Michael-John Turner <mj at debian.org> for maintaining the v1.5 branch and setting
+the groundstones for the v2.1 package; David Parker <david at neongoat.com> and
+David D. Kilzer <ddkilzer at 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 at paniq.net> for stress testing the daemons, and useful
+feedback; and Gilles Bouthenot <gilles.bouthenot at fcomte.iufm.fr> for good
+feedback.
+
+ -- Henrique de Moraes Holschuh <hmh at debian.org>
Added: trunk/kolab-cyrus-imapd/experimental/debian/README.Debian.database
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/README.Debian.database 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/README.Debian.database 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,122 @@
+Cyrus IMAP for Debian: Database backend conversion
+$Id: README.Debian.database 5 2005-03-12 23:19:45Z 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 cyrus22-common"
+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 db3* utilities to clean any stray locks, or try a reboot).
+
+Step-by-step conversion guide:
+
+1. Stop the Cyrus system
+ /etc/init.d/cyrus22 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.
+
+ The SUBS and SEEN databases are different: there are many of them (one
+ for every mail folder of every user for SEEN; one for every user for
+ SUBS) and you need to convert every single one of them.
+
+ SUBS /var/lib/cyrus/...../*.subs
+ SEEN /var/lib/cyrus/...../*.seen
+
+ 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 you give 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 cyrus22-common
+
+4. Start Cyrus, if not started by step 3
+ /etc/init.d/cyrus22 start
+
+WHY THERE IS NO AUTOMATED UPGRADE SCRIPT: Because I dislike people who do not
+read docs, and one Debian user asked me exactly the wrong thing (about
+cyrus21-imapd) while I was in the middle of writing said script AND I am quite
+short on time lately: it is much faster to write a doc than to write and test
+the script. So, now everyone will need to read the docs to get Cyrus working
+again. I am not holding back the skiplist change for that script anymore.
+
+Maybe someday I will finish the upgrade script. Maybe someone else will write
+one (I will certainly include it in the package, if it is good enough). Don't
+hold your breath, though.
+
+ -- Henrique de Moraes Holschuh <hmh at debian.org>
Added: trunk/kolab-cyrus-imapd/experimental/debian/README.Debian.debug
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/README.Debian.debug 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/README.Debian.debug 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,121 @@
+Cyrus IMAP for Debian, debugging procedures
+$Id: README.Debian.debug 5 2005-03-12 23:19:45Z sven $
+-------------------------------------------
+
+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/cyrus22, 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.
+
+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 cyrus22-imapd
+
+2. Download and rebuild Cyrus with debug information:
+ apt-get source cyrus22-imapd
+ cd cyrus22-imapd-*
+ 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 you run apt-get update, apt will probably 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/cyrus22 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 at debian.org>
Added: trunk/kolab-cyrus-imapd/experimental/debian/README.Debian.simpleinstall
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/README.Debian.simpleinstall 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/README.Debian.simpleinstall 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,173 @@
+Cyrus IMAP for Debian, Simple Install Guide
+$Id: README.Debian.simpleinstall 5 2005-03-12 23:19:45Z 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 (cyrus22-common'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/cyrus22 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 cyrus22-admin 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.
+
+ 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/cyrus22-common/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 at debian.org>
Added: trunk/kolab-cyrus-imapd/experimental/debian/README.exim
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/README.exim 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/README.exim 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,66 @@
+Setting up Cyrus IMAPd for Exim
+$Id: README.exim 5 2005-03-12 23:19:45Z sven $
+===========================================================
+
+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 check_local_user in
+ conf.d/router/900_exim4-config_local_user, and change the LOCAL_DELIVERY
+ macro in conf.d/main/01_exim4-config_listmacrosdefs to
+ LOCAL_DELIVERY=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
+
Added: trunk/kolab-cyrus-imapd/experimental/debian/README.postfix
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/README.postfix 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/README.postfix 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,143 @@
+Setting up Cyrus IMAPd for Postfix (Debian)
+$Id: README.postfix 5 2005-03-12 23:19:45Z sven $
+===========================================================
+
+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/cyrus22 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).
+
+Also, remember to set the tcpwrapper permissions up (/etc/hosts.allow and
+/etc/hosts.deny), or Cyrus might refuse the connections.
+
+To configure Postfix' lmtp transport to authenticate using SASL, do the
+following:
+
+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!
Added: trunk/kolab-cyrus-imapd/experimental/debian/README.sendmail
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/README.sendmail 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/README.sendmail 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,69 @@
+Setting up Cyrus IMAPd for Sendmail (Debian)
+$Id: README.sendmail 5 2005-03-12 23:19:45Z 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 at priv.onet.pl> says:
+http://www.polbox.com/a/anfi/sendmail/localNalias.html
+ Cyrus Aliases
+ It allows to use user at CYRUS redirections in virtusertable,
+ aliases and .forward file e.g. I use the following ~anfi/.forward:
+ anfi at CYRUS
+
+http://www.polbox.com/a/anfi/sendmail/localtab.html
+ Local Table
+
+http://www.polbox.com/a/anfi/sendmail/rtcyrus.html
+ Real Time Cyrus Integration [requires sendmail patch]
+ 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 at home.de"] "vactest!";
+}
+
+
+Pierre Gambarotto <pierre.gambarotto at 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.
Added: trunk/kolab-cyrus-imapd/experimental/debian/TODO.Debian
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/TODO.Debian 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/TODO.Debian 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,62 @@
+Todo list
+---------
+
+$Id: TODO.Debian 83 2005-03-22 15:35:48Z sven $
+
+EXTRA HIGH
+o --name for start-stop-daemon
+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 Reenable idled support (requires idled as a babysat service first)
+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)
Added: trunk/kolab-cyrus-imapd/experimental/debian/UPGRADE.Debian
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/UPGRADE.Debian 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/UPGRADE.Debian 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,155 @@
+Upgrading cyrus-imapd to cyrus2-imapd on Debian
+(thanks to David D. Kilzer <ddkilzer at theracingworld.com> for this document)
+-----------------------------------------------
+
+For more information, see README.Debian[.gz] in /usr/share/doc/cyrus22-common/
+and the web page below, part of the cyrus-utils project at SourceForge:
+
+ http://cyrus-utils.sourceforge.net/faq
+
+Upgrading form 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.6 below. In a later version of this package,
+we will give more detailed information on upgrades.
+
+NOTE: The default value of the dracinterval imapd.conf option changed from
+the old default value of 5 to 0 as it had been documented to be for ages.
+
+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 cyrus22. 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 scripts 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
+==========================
+
+This document describes the procedure for upgrading from the old cyrus-imapd
+(v1.5.x) package to the new cyrus22-imapd (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 cyrus22 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.
+
+ # apt-get --purge remove cyrus-common cyrus-admin cyrus-imapd cyrus-pop3d \
+ cyrus-nntpd
+
+ 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 cyrus22-imapd 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.
+
+ cyrus22-common [required]
+ cyrus22-admin [required]
+ cyrus22-imapd [optional; must have one of imapd or pop3d]
+ cyrus22-pop3d [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/cyrus22 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 db2 files used by Cyrus from to db4.2.
+
+ # 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/cyrus22-common/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 at 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/cyrus22.
+
+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).
Added: trunk/kolab-cyrus-imapd/experimental/debian/arbitronsort.8
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/arbitronsort.8 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/arbitronsort.8 2006-01-02 14:48:54 UTC (rev 58)
@@ -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
Added: trunk/kolab-cyrus-imapd/experimental/debian/changelog
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/changelog 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/changelog 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,124 @@
+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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at incase.de> Fri, 18 Mar 2005 13:34:09 +0100
+
Added: trunk/kolab-cyrus-imapd/experimental/debian/compat
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/compat 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/compat 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1 @@
+4
Added: trunk/kolab-cyrus-imapd/experimental/debian/control
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/control 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/control 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,304 @@
+Source: cyrus22-imapd
+Section: mail
+Priority: extra
+Maintainer: Henrique de Moraes Holschuh <hmh at debian.org>
+Uploaders: Sven Mueller <debian at incase.de>, Benjamin Seidenberg <astronut at dlgeek.net>
+Standards-Version: 3.6.1
+Build-Depends: debhelper (>= 4.1.68), tcl8.3-dev, libwrap0-dev, libpam0g-dev, libdb4.2-dev (>= 4.2.52), libssl-dev, libzephyr-dev, libsasl2-dev (>= 2.1.9), comerr-dev, drac-dev (>= 1.11-7), libsnmp9-dev | libsnmp5-dev, perl (>= 5.6.0-16), xutils, flex, bison, autotools-dev, po-debconf, dpatch
+Build-Depends-Indep: transfig, gs, groff
+
+Package: cyrus22-common
+Architecture: any
+Depends: postfix | mail-transport-agent, adduser (>= 3.34), dpkg (>> 1.9.0), netbase (>= 4.07), gawk, ${shlibs:Depends}, ${perl:Depends}, ${misc:Depends}
+Recommends: cyrus22-imapd | cyrus22-pop3d | cyrus22-murder | cyrus22-nntpd | cyrus22-admin
+Suggests: cyrus22-clients, cyrus22-admin, cyrus22-imapd, cyrus22-pop3d, cyrus22-murder, cyrus22-nntpd, cyrus22-doc, sasl2-bin, apt-listchanges (>= 2.35)
+Conflicts: suidmanager (<< 0.50), cyrus-common, cyrus21-common
+Replaces: cyrus21-common
+Description: Cyrus mail system (common files)
+ Cyrus is a fully-featured IMAP daemon, with a number of features not
+ found in other IMAP implementations, including:
+ o Designed to handle massive quantities of mail
+ o No need for users to have login accounts
+ o Virtual domain support
+ o Support for POP3 in addition to IMAP
+ o Sieve server-side email filtering
+ o Servers don't run as root
+ o Easy support for mail quotas
+ o SSL support, including secure IMAP
+ o DRAC support for pop/imap-before-smtp
+ o IPv6 support
+ o NNTP support
+ For more information, see http://asg.web.cmu.edu/cyrus/.
+ .
+ Note: Cyrus doesn't support reading from and storing mail in your
+ 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: cyrus22-doc
+Architecture: all
+Provides: cyrus22-docs
+Replaces: cyrus22-docs
+Conflicts: cyrus22-docs
+Description: Cyrus mail system (documentation files)
+ Cyrus is a fully-featured IMAP daemon, with a number of features not
+ found in other IMAP implementations, including:
+ o Designed to handle massive quantities of mail
+ o No need for users to have login accounts
+ o Virtual domain support
+ o Support for POP3 in addition to IMAP
+ o Sieve server-side email filtering
+ o Servers don't run as root
+ o Easy support for mail quotas
+ o SSL support, including secure IMAP
+ o DRAC support for pop/imap-before-smtp
+ o IPv6 support
+ o NNTP support
+ For more information, see http://asg.web.cmu.edu/cyrus/.
+ .
+ Note: Cyrus doesn't support reading from and storing mail in your
+ standard mail spool - it stores mail in a separate directory in its
+ own MH-like format.
+ .
+ This package contains documentation for the Cyrus IMAPd suite.
+
+Package: cyrus22-imapd
+Architecture: any
+Depends: cyrus22-common (= ${Source-Version}), ${shlibs:Depends}
+Provides: imap-server
+Conflicts: imap-server
+Replaces: cyrus21-imapd
+Description: Cyrus mail system (IMAP support)
+ Cyrus is a fully-featured IMAP daemon, with a number of features not
+ found in other IMAP implementations, including:
+ o Designed to handle massive quantities of mail
+ o No need for users to have login accounts
+ o Virtual domain support
+ o Support for POP3 in addition to IMAP
+ o Sieve server-side email filtering
+ o Servers don't run as root
+ o Easy support for mail quotas
+ o SSL support, including secure IMAP
+ o DRAC support for pop/imap-before-smtp
+ o IPv6 support
+ o NNTP support
+ For more information, see http://asg.web.cmu.edu/cyrus/.
+ .
+ Note: Cyrus doesn't support reading from and storing mail in your
+ standard mail spool - it stores mail in a separate directory in its
+ own MH-like format.
+ .
+ This package contains support for IMAP (Internet Mail Access
+ Protocol).
+
+Package: cyrus22-pop3d
+Architecture: any
+Depends: cyrus22-common (= ${Source-Version}), ${shlibs:Depends}
+Provides: pop3-server
+Conflicts: pop3-server
+Replaces: cyrus21-pop3d
+Description: Cyrus mail system (POP3 support)
+ Cyrus is a fully-featured IMAP daemon, with a number of features not
+ found in other IMAP implementations, including:
+ o Designed to handle massive quantities of mail
+ o No need for users to have login accounts
+ o Virtual domain support
+ o Support for POP3 in addition to IMAP
+ o Sieve server-side email filtering
+ o Servers don't run as root
+ o Easy support for mail quotas
+ o SSL support, including secure IMAP
+ o DRAC support for pop/imap-before-smtp
+ o IPv6 support
+ o NNTP support
+ For more information, see http://asg.web.cmu.edu/cyrus/.
+ .
+ Note: Cyrus doesn't support reading from and storing mail in your
+ standard mail spool - it stores mail in a separate directory in its
+ own MH-like format.
+ .
+ This package contains support for POP3 (Post Office Protocol).
+
+Package: cyrus22-admin
+Architecture: all
+Depends: libcyrus-imap-perl22 (>= ${Source-Version})
+Suggests: sasl2-bin
+Conflicts: cyrus-admin
+Replaces: cyrus21-admin
+Description: Cyrus mail system (administration tool)
+ Cyrus is a fully-featured IMAP daemon, with a number of features not
+ found in other IMAP implementations, including:
+ o Designed to handle massive quantities of mail
+ o No need for users to have login accounts
+ o Virtual domain support
+ o Support for POP3 in addition to IMAP
+ o Sieve server-side email filtering
+ o Servers don't run as root
+ o Easy support for mail quotas
+ o SSL support, including secure IMAP
+ o DRAC support for pop/imap-before-smtp
+ o IPv6 support
+ o NNTP support
+ For more information, see http://asg.web.cmu.edu/cyrus/.
+ .
+ Note: Cyrus doesn't support reading from and storing mail in your
+ standard mail spool - it stores mail in a separate directory in its
+ own MH-like format.
+ .
+ This package contains the cyradm tool which can be used to administer
+ both local and remote Cyrus mail systems. It also contains sieveshell
+ and its deprecated cousin installsieve, which can be used to manage
+ sieve scripts.
+
+Package: cyrus22-murder
+Architecture: any
+Depends: cyrus22-common (= ${Source-Version}), ${shlibs:Depends}
+Recommends: cyrus22-imapd (= ${Source-Version}), cyrus22-pop3d (= ${Source-Version})
+Replaces: cyrus21-murder
+Description: Cyrus mail system (proxies and aggregator)
+ Cyrus is a fully-featured IMAP daemon, with a number of features not
+ found in other IMAP implementations, including:
+ o Designed to handle massive quantities of mail
+ o No need for users to have login accounts
+ o Virtual domain support
+ o Support for POP3 in addition to IMAP
+ o Sieve server-side email filtering
+ o Servers don't run as root
+ o Easy support for mail quotas
+ o SSL support, including secure IMAP
+ o DRAC support for pop/imap-before-smtp
+ o IPv6 support
+ o NNTP support
+ For more information, see http://asg.web.cmu.edu/cyrus/.
+ .
+ Note: Cyrus doesn't support reading from and storing mail in your
+ standard mail spool - it stores mail in a separate directory in its
+ own MH-like format.
+ .
+ This package contains Cyrus 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.
+
+Package: cyrus22-nntpd
+Architecture: any
+Depends: cyrus22-common (= ${Source-Version}), ${shlibs:Depends}
+Provides: news-transport-system
+Conflicts: news-transport-system
+Description: Cyrus mail system (NNTP support)
+ Cyrus is a fully-featured IMAP daemon, with a number of features not
+ found in other IMAP implementations, including:
+ o Designed to handle massive quantities of mail
+ o No need for users to have login accounts
+ o Support for POP3 in addition to IMAP
+ o Virtual domain support
+ o Sieve server-side email filtering
+ o Servers don't run as root
+ o Easy support for mail quotas
+ o SSL support, including secure IMAP
+ o DRAC support for pop/imap-before-smtp
+ o IPv6 support
+ o NNTP support
+ For more information, see http://asg.web.cmu.edu/cyrus/.
+ .
+ Note: Cyrus doesn't support reading from and storing mail in your
+ standard mail spool - it stores mail in a separate directory in its
+ own MH-like format.
+ .
+ This package contains support for NNTP (Network News Transfer Protocol).
+
+
+Package: cyrus22-clients
+Architecture: any
+Depends: ${shlibs:Depends}
+Conflicts: cyrus21-clients
+Provides: cyrus21-clients
+Replaces: cyrus21-clients
+Description: Cyrus mail system (test clients)
+ Cyrus is a fully-featured IMAP daemon, with a number of features not
+ found in other IMAP implementations, including:
+ o Designed to handle massive quantities of mail
+ o No need for users to have login accounts
+ o Support for POP3 in addition to IMAP
+ o Virtual domain support
+ o Sieve server-side email filtering
+ o Servers don't run as root
+ o Easy support for mail quotas
+ o SSL support, including secure IMAP
+ o DRAC support for pop/imap-before-smtp
+ o IPv6 support
+ o NNTP support
+ For more information, see http://asg.web.cmu.edu/cyrus/.
+ .
+ Note: Cyrus doesn't support reading from and storing mail in your
+ standard mail spool - it stores mail in a separate directory in its
+ own MH-like format.
+ .
+ This package contains the mupdatetest, sivtest, smtptest, lmtptest,
+ imtest and pop3test tools which can be used to interactivily talk to
+ a mupdate, sieve, smtp, lmtp, imap or pop3 server.
+ The clients are fully SASL-enabled for authentication.
+
+Package: cyrus22-dev
+Architecture: any
+Section: devel
+Depends: libcyrus-imap-perl22 (>= ${Source-Version}), cyrus22-common (= ${Source-Version}), libsasl2-dev (>= 2.1.9)
+Conflicts: cyrus-dev, cyrus21-dev, libdb3-dev (<< 3.2.9-15), libdb2-dev (<< 2.7.7.0-6), libdb4.2-dev (<<4.2.52)
+Description: Cyrus mail system (developer files)
+ Cyrus is a fully-featured IMAP daemon, with a number of features not
+ found in other IMAP implementations, including:
+ o Designed to handle massive quantities of mail
+ o No need for users to have login accounts
+ o Support for POP3 in addition to IMAP
+ o Virtual domain support
+ o Sieve server-side email filtering
+ o Servers don't run as root
+ o Easy support for mail quotas
+ o SSL support, including secure IMAP
+ o DRAC support for pop/imap-before-smtp
+ o IPv6 support
+ o NNTP support
+ For more information, see http://asg.web.cmu.edu/cyrus/.
+ .
+ Note: Cyrus doesn't support reading from and storing mail in your
+ standard mail spool - it stores mail in a separate directory in its
+ own MH-like format.
+ .
+ This package contains header files and the static library needed
+ to develop IMAP applications that interface with Cyrus.
+
+Package: libcyrus-imap-perl22
+Architecture: any
+Depends: ${perl:Depends}, ${shlibs: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
+ Cyrus is a fully-featured IMAP daemon, with a number of features not
+ found in other IMAP implementations, including:
+ o Designed to handle massive quantities of mail
+ o No need for users to have login accounts
+ o Support for POP3 in addition to IMAP
+ o Virtual domain support
+ o Sieve server-side email filtering
+ o Servers don't run as root
+ o Easy support for mail quotas
+ o SSL support, including secure IMAP
+ o DRAC support for pop/imap-before-smtp
+ o IPv6 support
+ o NNTP support
+ For more information, see http://asg.web.cmu.edu/cyrus/.
+ .
+ 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.
Added: trunk/kolab-cyrus-imapd/experimental/debian/copyright
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/copyright 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/copyright 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,75 @@
+$Id: copyright 210 2005-11-23 16:29:59Z astronut $
+
+This package was debianized by Henrique de Moraes Holschuh <hmh at debian.org> on
+Wed Sep 12 09:35:30 BRT 2001, based on previous work by Michael-John Turner
+<mj at debian.org> and David Parker <david at neongoat.com>.
+
+The Debian packaging of Cyrus IMAPd v2.2 is:
+ Copyright (c) 2002-2004 by Henrique de Moraes Holschuh <hmh at debian.org>,
+ Sven Mueller <debian at incase.de>,
+ Benjamin Seidenberg <astronut at dlgeek.net>
+ and distributed in the same license as the upstream source it applies to.
+
+Upstream sources are at: ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/.
+
+Upstream Author: Carnegie Mellon University <cyrus-bugs+ at 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 at 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 at 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)
+
Added: trunk/kolab-cyrus-imapd/experimental/debian/cyradm-16x16.xpm
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/cyradm-16x16.xpm 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/cyradm-16x16.xpm 2006-01-02 14:48:54 UTC (rev 58)
@@ -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%"
+};
Added: trunk/kolab-cyrus-imapd/experimental/debian/cyradm-32x32.xpm
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/cyradm-32x32.xpm 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/cyradm-32x32.xpm 2006-01-02 14:48:54 UTC (rev 58)
@@ -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#�:.#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"
+};
Added: trunk/kolab-cyrus-imapd/experimental/debian/cyrdump.8
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/cyrdump.8 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/cyrdump.8 2006-01-02 14:48:54 UTC (rev 58)
@@ -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.
Added: trunk/kolab-cyrus-imapd/experimental/debian/cyrus-db-types.upgrading_from_1.5.txt
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/cyrus-db-types.upgrading_from_1.5.txt 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/cyrus-db-types.upgrading_from_1.5.txt 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,6 @@
+DBENGINE BerkeleyDB3.2
+DUPLICATE db3_nosync
+MBOX db3
+SEEN db3
+SUBS flat
+TLS db3_nosync
Added: trunk/kolab-cyrus-imapd/experimental/debian/cyrus-makedirs
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/cyrus-makedirs 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/cyrus-makedirs 2006-01-02 14:48:54 UTC (rev 58)
@@ -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 at debian.org.
+# Released under the terms of the GNU General Public License (GPL) version 2
+#
+# $Id: cyrus-makedirs 5 2005-03-12 23:19:45Z 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/cyrus22 ] && . /etc/default/cyrus22
+
+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 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
+chown -R cyrus:mail "$confdir"
+
+# Now, create the spool partitions
+for i in $partitions ; do
+ echo "Creating 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."
+ chown -R cyrus:mail "$i"
+ # and kill any squatter indexes
+ [ $killsquat -ne 0 ] && find "$i" -name 'cyrus.squat' -type f -exec 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
+ chown -R cyrus:mail "$sievedir"
+}
+
+[ "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/cyrus22 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 -exec chattr +S "{}" \;
+ ;;
+ ext3)
+ echo "Setting attributes to -S -j for ${partsys%% *}..."
+ find "${partsys%% *}" -type d -exec chattr -S -j "{}" \;
+ ;;
+ esac
+ partsys="${partsys#* }"
+done
+
+exit 0
Property changes on: trunk/kolab-cyrus-imapd/experimental/debian/cyrus-makedirs
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/kolab-cyrus-imapd/experimental/debian/cyrus-makedirs.8
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/cyrus-makedirs.8 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/cyrus-makedirs.8 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,49 @@
+.\" Hey, EMACS: -*- nroff -*-
+.\" $Id: cyrus-makedirs.8 5 2005-03-12 23:19:45Z sven $
+.\"
+.\" 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/cyrus22
+.SH AUTHOR
+This manual page was written by Henrique de Moraes Holschuh <hmh at debian.org>,
+for the Debian GNU/Linux system (but may be used by others).
Added: trunk/kolab-cyrus-imapd/experimental/debian/cyrus.conf
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/cyrus.conf 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/cyrus.conf 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,82 @@
+# 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 120 2005-05-01 03:23:18Z sven $
+
+START {
+ # do not delete this entry!
+ recover cmd="/usr/sbin/ctl_cyrusdb -r"
+
+ # this is only necessary if using idled for IMAP IDLE
+ # this is NOT to be enabled right now in Debian builds
+ #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/ctl_deliver -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/ctl_deliver -E 3" at=0401
+
+ # this is only necessary if caching TLS sessions
+ tlsprune cmd="/usr/sbin/tls_prune" at=0401
+}
+
Added: trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-admin.README.Debian
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-admin.README.Debian 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-admin.README.Debian 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,9 @@
+Cyrus IMAP for Debian, admin utilities
+$Id: cyrus22-admin.README.Debian 5 2005-03-12 23:19:45Z sven $
+---------------------
+
+Refer to the cyrus22-doc 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 at debian.org>
Added: trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-admin.dirs
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-admin.dirs 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-admin.dirs 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1 @@
+usr/bin
Added: trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-admin.files
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-admin.files 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-admin.files 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,4 @@
+usr/bin/cyradm
+usr/bin/sieveshell
+usr/bin/installsieve
+usr/share/icons/*
Added: trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-admin.linda
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-admin.linda 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-admin.linda 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,2 @@
+Tag: interp-minus-n-fails
+Data: usr/bin/cyradm
Added: trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-admin.lintian
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-admin.lintian 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-admin.lintian 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1 @@
+cyrus22-admin: shell-script-fails-syntax-check ./usr/bin/cyradm
Added: trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-admin.manpages
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-admin.manpages 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-admin.manpages 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,3 @@
+man/sieveshell.1
+perl/imap/blib/man1/cyradm.1p
+debian/tmp/usr/share/man/man1/installsieve.1
Added: trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-admin.menu
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-admin.menu 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-admin.menu 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,6 @@
+?package(cyrus22-admin):needs="text" section="Apps/System/Admin"\
+ hints="Mail,Admin,Cyrus"\
+ title="Cyrus 2.2 cyradm (cyrus at 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"
Added: trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-clients.README.Debian
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-clients.README.Debian 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-clients.README.Debian 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,9 @@
+Cyrus IMAP for Debian, generic SASL-enabled protocol clients
+$Id: cyrus22-clients.README.Debian 5 2005-03-12 23:19:45Z sven $
+---------------------
+
+Refer to the cyrus22-doc 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 at debian.org>
Added: trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-clients.dirs
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-clients.dirs 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-clients.dirs 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1 @@
+usr/bin
Added: trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-clients.manpages
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-clients.manpages 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-clients.manpages 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1 @@
+man/*test.1
Added: trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-common.NEWS
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-common.NEWS 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-common.NEWS 2006-01-02 14:48:54 UTC (rev 58)
@@ -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 at 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 at 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 at 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 at 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 at debian.org> Fri, 4 Jul 2003 10:10:53 -0300
Added: trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-common.contrib
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-common.contrib 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-common.contrib 2006-01-02 14:48:54 UTC (rev 58)
@@ -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
Added: trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-common.cron.daily
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-common.cron.daily 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-common.cron.daily 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,67 @@
+#!/bin/sh
+# Cyrus IMAPd daily maintenance script
+# Copyright (c) 2002,2003 by Henrique M. Holschuh
+# $Id: cyrus22-common.cron.daily 5 2005-03-12 23:19:45Z 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/cyrus22 ] && . /etc/default/cyrus22
+umask 022
+
+# 1. backup mailbox database
+[ -x /usr/sbin/ctl_mboxlist ] && {
+ [ -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
Added: trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-common.cyrus22.default
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-common.cyrus22.default 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-common.cyrus22.default 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,30 @@
+# Defaults for Cyrus IMAPd 2.2 scripts
+# $Id: cyrus22-common.cyrus22.default 5 2005-03-12 23:19:45Z sven $
+# sourced by /etc/init.d/cyrus22, /usr/sbin/cyrus-makedirs
+# installed at /etc/default/cyrus22 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
+
+# Check spool condition with chk_cyrus on daily cronjob
+# Set to 1 to enable, default is disabled
+#CHKCYRUS=0
Added: trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-common.cyrus22.init
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-common.cyrus22.init 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-common.cyrus22.init 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,230 @@
+#! /bin/sh
+#
+### BEGIN INIT INFO
+# Provides: cyrus22-common
+# Required-Start: $syslog $network
+# Required-Stop: $syslog $network
+# Default-Start: 2 3 4 5
+# Default-Stop: S 0 1 6
+# Short-Description: common init system for cyrus22 IMAP/POP3 daemons.
+# Description: common init system for cyrus22 IMAP/POP3 daemons.
+# start central cyrus22 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 at debian.org>
+# Various modifications done by Sven Mueller <debian at incase.de>
+# Distributed under the GPL version 2
+#
+# $Id: cyrus22-common.cyrus22.init 181 2005-11-13 19:15:03Z sven $
+
+# Make sure we get sane results on borked locales
+LC_ALL=C
+export LC_ALL
+
+# Overridable defaults
+unset CYRUS_VERBOSE
+unset LISTENQUEUE
+[ -r /etc/default/cyrus22 ] && . /etc/default/cyrus22
+
+[ "x${CYRUS_VERBOSE}" != "x" ] && export CYRUS_VERBOSE
+OPTIONS="-d"
+[ "x${LISTENQUEUE}" != "x" ] && OPTIONS="-l ${LISTENQUEUE} ${OPTIONS}"
+
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DAEMON=/usr/sbin/cyrmaster
+NAME=cyrmaster
+DESC="Cyrus IMAPd"
+
+test -x ${DAEMON} || exit 0
+
+set -e
+
+START="--start --quiet --pidfile /var/run/${NAME}.pid --exec ${DAEMON} -- ${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 [ ! -f /var/run/${NAME}.pid ]; 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 > /var/run/${NAME}.pid
+ return 0
+ fi
+ fi
+ if [ -s /var/run/${NAME}.pid ] && kill -0 `cat /var/run/${NAME}.pid`; then
+ 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 > /var/run/${NAME}.pid
+ return 0
+ else
+ # no process and/or no PID file, return failure
+ 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/cyrus22-common/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/cyrus22-common/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 \
+ --quiet --startas $DAEMON >/dev/null 2>&1 ; then
+ echo "$NAME."
+ rm -f /var/run/${NAME}.pid
+ 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 /var/run/${NAME}.pid
+ exit 0
+ fi
+ fi
+ ;;
+ reload|force-reload)
+ echo "Reloading $DESC configuration files."
+ if start-stop-daemon --stop --signal 1 --quiet \
+ --pidfile /var/run/$NAME.pid --exec $DAEMON >/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
+ 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
Property changes on: trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-common.cyrus22.init
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-common.dirs
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-common.dirs 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-common.dirs 2006-01-02 14:48:54 UTC (rev 58)
@@ -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
Added: trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-common.docs
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-common.docs 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-common.docs 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,2 @@
+debian/UPGRADE.Debian
+debian/README.*
Added: trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-common.files
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-common.files 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-common.files 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,21 @@
+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/cyr_expire
+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
Added: trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-common.linda
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-common.linda 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-common.linda 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,2 @@
+Tag: postinst-db-input
+
Added: trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-common.links
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-common.links 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-common.links 2006-01-02 14:48:54 UTC (rev 58)
@@ -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
Added: trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-common.lintian
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-common.lintian 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-common.lintian 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,2 @@
+cyrus22-common: no-debconf-config
+cyrus22-common: postinst-uses-db-input
Added: trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-common.manpages
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-common.manpages 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-common.manpages 2006-01-02 14:48:54 UTC (rev 58)
@@ -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
Added: trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-common.postinst
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-common.postinst 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-common.postinst 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,156 @@
+#! /bin/sh
+# postinst script for cyrus22-common
+# Copyright (c) 2002 by Henrique de Moraes Holschuh
+# Distributed under the GNU General Public License version 2
+# $Id: cyrus22-common.postinst 5 2005-03-12 23:19:45Z 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 --system --ingroup mail --home /var/spool/cyrus \
+ --shell /bin/sh --disabled-password \
+ --gecos "Cyrus Mailsystem User" cyrus >/dev/null 2>&1 || {
+ 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 cyrus22-common." >&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
+ /usr/sbin/cyrus-makedirs --cleansquat
+
+ # 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 cyrus22-common/warnbackendchange || true
+ db_go || true
+ else
+ cp -p /usr/lib/cyrus/cyrus-db-types.txt /usr/lib/cyrus/cyrus-db-types.active
+ db_fset cyrus22-common/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 cyrus22-common/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/cyrus22 ] && {
+ update-rc.d cyrus22 defaults >/dev/null
+ invoke-rc.d cyrus22 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
Property changes on: trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-common.postinst
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-common.postrm
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-common.postrm 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-common.postrm 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,71 @@
+#! /bin/sh
+# postrm script for cyrus22-common
+# Copyright (c) 2002 by Henrique de Moraes Holschuh
+# Distributed under the GNU General Public License version 2
+# $Id: cyrus22-common.postrm 5 2005-03-12 23:19:45Z sven $
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# debconf hook
+. /usr/share/debconf/confmodule
+
+# 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
+
+ # Should we remove our precious data?
+ db_title "Cyrus IMAPd 2.2" || true
+ db_fset cyrus22-common/removespools seen false || true
+ db_input high cyrus22-common/removespools || true
+ db_go || true
+
+ db_get cyrus22-common/removespools
+ [ "${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
+ }
+
+ update-rc.d cyrus22 remove >/dev/null
+ ;;
+
+ upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+
+ ;;
+
+ *)
+ 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
Property changes on: trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-common.postrm
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-common.prerm
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-common.prerm 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-common.prerm 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,43 @@
+#! /bin/sh
+# prerm script for cyrus22-common
+# Copyright (c) 2002 by Henrique de Moraes Holschuh
+# Distributed under the GNU General Public License version 2
+# $Id: cyrus22-common.prerm 5 2005-03-12 23:19:45Z sven $
+#
+# 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 cyrus22 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
+
+
Property changes on: trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-common.prerm
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-common.templates
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-common.templates 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-common.templates 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,25 @@
+Template: cyrus22-common/warnbackendchange
+Type: note
+_Description: Database backends have changed!
+ Comparation 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/cyrus22-common/README.Debian.database
+ for more information. Do not start cyrmaster until you have converted
+ the databases to the new format.
+
+Template: cyrus22-common/removespools
+Type: boolean
+Default: false
+_Description: Remove the Cyrus spools, and user sieve scripts?
+ Should I remove the Cyrus mail and news spools, as well as the user's
+ sieve scripts, 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.
Added: trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-dev.dirs
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-dev.dirs 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-dev.dirs 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,2 @@
+usr/include/cyrus
+usr/lib
Added: trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-dev.files
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-dev.files 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-dev.files 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,3 @@
+usr/lib/*.a
+usr/include/cyrus/*
+usr/share/man/man3/imclient*
Added: trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-dev.links
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-dev.links 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-dev.links 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1 @@
+usr/share/doc/cyrus22-common usr/share/doc/cyrus22-dev
Added: trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-doc.doc-base
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-doc.doc-base 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-doc.doc-base 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,10 @@
+Document: cyrus22-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: mail
+
+Format: HTML
+Index: /usr/share/doc/cyrus22-doc/html/index.html
+Files: /usr/share/doc/cyrus22-doc/html/*.html
Added: trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-doc.docs
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-doc.docs 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-doc.docs 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,2 @@
+debian/UPGRADE.Debian
+debian/README.*
Added: trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-doc.links
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-doc.links 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-doc.links 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1 @@
+usr/share/doc/cyrus22-doc usr/share/doc/cyrus22-common/docs
Added: trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-imapd.dirs
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-imapd.dirs 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-imapd.dirs 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,2 @@
+usr/sbin
+usr/lib/cyrus
Added: trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-imapd.files
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-imapd.files 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-imapd.files 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,3 @@
+etc/pam.d/imap
+usr/lib/cyrus/bin/imapd
+usr/sbin/squatter
Added: trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-imapd.links
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-imapd.links 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-imapd.links 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1 @@
+usr/share/doc/cyrus22-common usr/share/doc/cyrus22-imapd
Added: trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-imapd.manpages
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-imapd.manpages 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-imapd.manpages 2006-01-02 14:48:54 UTC (rev 58)
@@ -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
Added: trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-murder.files
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-murder.files 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-murder.files 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,3 @@
+etc/pam.d/mupdate
+usr/lib/cyrus/bin/*proxyd
+usr/lib/cyrus/bin/mupdate*
Added: trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-murder.links
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-murder.links 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-murder.links 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1 @@
+usr/share/doc/cyrus22-common usr/share/doc/cyrus22-murder
Added: trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-nntpd.dirs
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-nntpd.dirs 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-nntpd.dirs 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,2 @@
+usr/sbin
+usr/lib/cyrus
Added: trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-nntpd.files
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-nntpd.files 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-nntpd.files 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,3 @@
+etc/pam.d/nntp
+usr/lib/cyrus/bin/fetchnews
+usr/lib/cyrus/bin/nntpd
Added: trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-nntpd.links
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-nntpd.links 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-nntpd.links 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1 @@
+usr/share/doc/cyrus22-common usr/share/doc/cyrus22-nntpd
Added: trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-nntpd.manpages
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-nntpd.manpages 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-nntpd.manpages 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,2 @@
+man/fetchnews.8
+man/nntpd.8
Added: trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-pop3d.dirs
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-pop3d.dirs 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-pop3d.dirs 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1 @@
+usr/lib/cyrus
Added: trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-pop3d.files
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-pop3d.files 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-pop3d.files 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,4 @@
+etc/pam.d/pop
+usr/sbin/pop3*
+usr/lib/cyrus/bin/pop3d
+usr/share/man/man8/pop3d*
Added: trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-pop3d.links
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-pop3d.links 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-pop3d.links 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1 @@
+usr/share/doc/cyrus22-common usr/share/doc/cyrus22-pop3d
Added: trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-pop3d.manpages
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-pop3d.manpages 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/cyrus22-pop3d.manpages 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1 @@
+man/pop3d.8
Added: trunk/kolab-cyrus-imapd/experimental/debian/deletable.files
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/deletable.files 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/deletable.files 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,100 @@
+config.guess
+config.sub
+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
Added: trunk/kolab-cyrus-imapd/experimental/debian/examples/README
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/examples/README 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/examples/README 2006-01-02 14:48:54 UTC (rev 58)
@@ -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 at 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 at optus.net>)
Added: trunk/kolab-cyrus-imapd/experimental/debian/examples/README.imapcreate.pl
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/examples/README.imapcreate.pl 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/examples/README.imapcreate.pl 2006-01-02 14:48:54 UTC (rev 58)
@@ -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 at free.fr
Added: trunk/kolab-cyrus-imapd/experimental/debian/examples/imapcreate.pl
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/examples/imapcreate.pl 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/examples/imapcreate.pl 2006-01-02 14:48:54 UTC (rev 58)
@@ -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 at 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, at part,$useunixhierarchy, at 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 );
+
+ at part = split(/:/, join(':', @part));
+push @part, 'default' unless @part;
+my $pn = 0;
+ at 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)
+ }
+}
+
Added: trunk/kolab-cyrus-imapd/experimental/debian/examples/mboxtocyrus
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/examples/mboxtocyrus 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/examples/mboxtocyrus 2006-01-02 14:48:54 UTC (rev 58)
@@ -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 at debian.org>
+#
+# Changelog:
+# Fri Dec 1 21:19:19 SAST 2000
+# - Incorporate some modifications from Tomas Pospisek <tpo at 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
+
+
Property changes on: trunk/kolab-cyrus-imapd/experimental/debian/examples/mboxtocyrus
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/kolab-cyrus-imapd/experimental/debian/examples/syncldap2cyrus.pl
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/examples/syncldap2cyrus.pl 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/examples/syncldap2cyrus.pl 2006-01-02 14:48:54 UTC (rev 58)
@@ -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 at 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 ". at ldapuserlist," LDAP users\n";
+ print "\nThere are ". at 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;
Added: trunk/kolab-cyrus-imapd/experimental/debian/executable.files
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/executable.files 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/executable.files 2006-01-02 14:48:54 UTC (rev 58)
@@ -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/cyrus22-common.cyrus22.init
+./debian/cyrus22-common.postinst
+./debian/cyrus22-common.postrm
+./debian/cyrus22-common.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
Added: trunk/kolab-cyrus-imapd/experimental/debian/get-backtrace.gdb
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/get-backtrace.gdb 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/get-backtrace.gdb 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,4 @@
+c
+bt
+quit
+
Added: trunk/kolab-cyrus-imapd/experimental/debian/imap.pam
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/imap.pam 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/imap.pam 2006-01-02 14:48:54 UTC (rev 58)
@@ -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.
+#
+
+ at include common-auth
+ at include common-account
Added: trunk/kolab-cyrus-imapd/experimental/debian/imapd.conf
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/imapd.conf 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/imapd.conf 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,315 @@
+# Debian Cyrus imapd.conf
+# $Id: imapd.conf 95 2005-04-08 00:10:54Z 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/cyrus22-doc/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. The default is
+# to assume the user knows what he is doing, and not downcase anything.
+#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) in addition to those in the
+# admins: entry 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/cyrus-global.pem
+
+# File containing the private key belonging to the global server certificate.
+#tls_key_file: /etc/ssl/private/cyrus-global.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.
+#tls_imap_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.
+#tls_imap_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.
+#tls_pop3_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.
+#tls_pop3_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.
+#tls_lmtp_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.
+#tls_lmtp_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.
+#tls_sieve_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.
+#tls_sieve_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. The format of the string is described
+# in ciphers(1). THIS DISABLES THE WEAK 'FOR EXPORT' CRAP!
+tls_cipher_list: TLSv1:SSLv3:SSLv2:!NULL:!EXPORT:!DES:!LOW:@STRENGTH
+
+# Require a client certificate for ALL services (imap, pop3, lmtp, sieve).
+#tls_require_cert: false
+
+# Require a client certificate for imap ONLY.
+#tls_imap_require_cert: false
+
+# Require a client certificate for pop3 ONLY.
+#tls_pop3_require_cert: false
+
+# Require a client certificate for lmtp ONLY.
+#tls_lmtp_require_cert: false
+
+# Require a client certificate for sieve ONLY.
+#tls_sieve_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
+
+# 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/cyrus22-common/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 &
Added: trunk/kolab-cyrus-imapd/experimental/debian/libcyrus-imap-perl22.files
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/libcyrus-imap-perl22.files 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/libcyrus-imap-perl22.files 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,2 @@
+usr/lib/perl*
+usr/share/perl*
Added: trunk/kolab-cyrus-imapd/experimental/debian/libcyrus-imap-perl22.lintian
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/libcyrus-imap-perl22.lintian 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/libcyrus-imap-perl22.lintian 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1 @@
+libcyrus-imap-perl21: package-installs-nonbinary-perl-in-usr-lib-perl5
Added: trunk/kolab-cyrus-imapd/experimental/debian/libcyrus-imap-perl22.manpages
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/libcyrus-imap-perl22.manpages 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/libcyrus-imap-perl22.manpages 2006-01-02 14:48:54 UTC (rev 58)
@@ -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
Added: trunk/kolab-cyrus-imapd/experimental/debian/license.html
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/license.html 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/license.html 2006-01-02 14:48:54 UTC (rev 58)
@@ -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>
+
+<FONT FACE="geneva, arial, helvetica, times" SIZE=-2>
+<A HREF="/whatsnew.html">
+What's New</a></FONT>
+
+<FONT FACE="geneva, arial, helvetica, times" SIZE=-2>
+<A HREF="/jobs.html">
+Jobs</a></FONT>
+
+<FONT FACE="geneva, arial, helvetica, times" SIZE=-2>
+<A HREF="/search.html">
+Search</a></FONT>
+
+<FONT FACE="geneva, arial, helvetica, times" SIZE=-2>
+<A HREF="mailto:andrew2-webmaster+ at andrew.cmu.edu">
+Contact Us</a></FONT> <BR>
+
+
+<FONT FACE="geneva, arial, helvetica, times" SIZE=-1>
+<A HREF="/cyrus/download">
+<b>Download Software</b></a></FONT>
+
+<FONT FACE="geneva, arial, helvetica, times" SIZE=-1>
+<A HREF="/cyrus/mailing-list.html">
+<b>Mailing lists</b></a></FONT>
+
+<FONT FACE="geneva, arial, helvetica, times" SIZE=-1>
+<A HREF="/cyrus">
+Project Cyrus Home</a></FONT>
+<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+ at andrew.cmu.edu">cyrus-bugs at andrew.cmu.edu</a></tt>.
+<br>
+Please direct any licensing issues to <tt><a
+ href="mailto:tech-transfer+ at andrew.cmu.edu">tech-transfer at 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 at 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+ at andrew.cmu.edu"><tt>cyrus-bugs+ at 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+ at andrew.cmu.edu">cyrus-bugs at andrew.cmu.edu</a></tt>.
+<br>
+Please direct any licensing issues to <tt><a
+ href="mailto:tech-transfer+ at andrew.cmu.edu">tech-transfer at 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>
+
Added: trunk/kolab-cyrus-imapd/experimental/debian/lmtp.pam
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/lmtp.pam 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/lmtp.pam 2006-01-02 14:48:54 UTC (rev 58)
@@ -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.
+#
+
+ at include common-auth
+ at include common-account
Added: trunk/kolab-cyrus-imapd/experimental/debian/logcheck.ignore
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/logcheck.ignore 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/logcheck.ignore 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,53 @@
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +skiplist: recovered
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +skiplist: checkpointed
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +duplicate_prune: pruning
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +duplicate_prune: purged
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +executed
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +accepted connection
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +telling master
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +mydelete:
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +(bad)?login:
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +starttls: [[:alnum:]]+ with cipher
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +(\[[a-z0-9]+\] )?STARTTLS( negotiation)? failed:
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +DIGEST-MD5 server step
+cyrus/ctl_cyrusdb\[[0-9]+\]: +(done +)?recovering cyrus databases
+cyrus/ctl_cyrusdb\[[0-9]+\]: +archiving
+cyrus/ctl_cyrusdb\[[0-9]+\]: +checkpointing
+cyrus/ctl_cyrusdb\[[0-9]+\]: +done checkpointing
+cyrus/ctl_deliver\[[0-9]+\]: +duplicate_prune: pruning back
+cyrus/ctl_deliver\[[0-9]+\]: +duplicate_prune: purged
+cyrus/tls_prune\[[0-9]+\]: +(tls_prune: )?purged
+cyrus/master\[[0-9]+\]: +ready for work
+cyrus/master\[[0-9]+\]: +about to exec
+cyrus/master\[[0-9]+\]: +process started
+cyrus/master\[[0-9]+\]: +process [0-9]+ exited, status 0$
+cyrus/master\[[0-9]+\]: +service [a-zA-Z0-9]+ now has [0-9]+ workers
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +pop3s failed:
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +lmtp connection preauth'd as postman
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +dupelim: eliminated duplicate message to
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +duplicate_check:
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +duplicate_mark:
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +mystore: committing txn
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +mystore: starting txn
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +sieve parse error
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +sieve: discarded
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +abort_txn: aborting txn
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +delete: starting txn
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +open: user .* opened
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +mycommit: committing txn
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +myfetch: reusing txn
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +myfetch: starting txn
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +mystore: reusing txn
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +seen_db: user .* opened
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +Connection reset by peer, closing connection
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +SQUAT failed
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +SQUAT returned [0-9]+ messages
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +idle for too long, closing connection
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +annotatemore_store
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +created stage directory
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +imaps TLS negotiation failed
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +synchronizing mailbox
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +mailbox list synchronization
+cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +unready for connections
+cyrus/squatter\[[0-9]+\]: +(done )?(indexing|skipping) mailbox
+cyrus/notifyd\[[0-9]+\]: do_notify using method
Added: trunk/kolab-cyrus-imapd/experimental/debian/mupdate.pam
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/mupdate.pam 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/mupdate.pam 2006-01-02 14:48:54 UTC (rev 58)
@@ -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.
+#
+
+ at include common-auth
+ at include common-account
Added: trunk/kolab-cyrus-imapd/experimental/debian/nntp.pam
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/nntp.pam 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/nntp.pam 2006-01-02 14:48:54 UTC (rev 58)
@@ -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.
+#
+
+ at include common-auth
+ at include common-account
Added: trunk/kolab-cyrus-imapd/experimental/debian/patches/00list
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/patches/00list 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/patches/00list 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,40 @@
+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
+20-drac_auth.dpatch
+21-fix_config-parsing.dpatch
+22-imapd_index_check.dpatch
+25-update_install-sh.dpatch
+30-update_perlcalling.sh.dpatch
+35-masssievec_remove_unused_variable.dpatch
+40-rehash_fix_pathes.dpatch
+45-kolab2-annotations.dpatch
+50-FTBFS-gcc-4.0-fix.dpatch
+51-multiple_mupdate_err.h-fix.dpatch
+61-64bit-quota.dpatch
+65-sieveshell-enhancements.dpatch
+98-use_Debian_config.guess_config.sub.dpatch
+99-update-autoconf.dpatch
+100-kolab-imapd.dpatch
+101-fix_Makefile.in.dpatch
+105-cyradm.sh.dpatch
+110-Admin.pm.dpatch
+120-kolab-Shell.pm.dpatch
+130-kolab-imapd.c.dpatch
+140-kolab-mbox.dpatch
Added: trunk/kolab-cyrus-imapd/experimental/debian/patches/01-fix_Makefile.in.dpatch
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/patches/01-fix_Makefile.in.dpatch 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/patches/01-fix_Makefile.in.dpatch 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,150 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01-fix_Makefile.in.dpatch by Sven Mueller <debian at incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix all Makefile.in files as necessary
+
+ at DPATCH@
+diff -urNad complete.dpatch/Makefile.in /tmp/dpep.hthEz2/complete.dpatch/Makefile.in
+--- complete.dpatch/Makefile.in 2005-02-14 17:43:44.000000000 +0100
++++ /tmp/dpep.hthEz2/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 /tmp/dpep.hthEz2/complete.dpatch/imap/Makefile.in
+--- complete.dpatch/imap/Makefile.in 2004-05-28 20:03:02.000000000 +0200
++++ /tmp/dpep.hthEz2/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 /tmp/dpep.hthEz2/complete.dpatch/installsieve/Makefile.in
+--- complete.dpatch/installsieve/Makefile.in 2003-10-22 20:50:11.000000000 +0200
++++ /tmp/dpep.hthEz2/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/master/Makefile.in /tmp/dpep.hthEz2/complete.dpatch/master/Makefile.in
+--- complete.dpatch/master/Makefile.in 2004-12-17 17:32:24.000000000 +0100
++++ /tmp/dpep.hthEz2/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 /tmp/dpep.hthEz2/complete.dpatch/notifyd/Makefile.in
+--- complete.dpatch/notifyd/Makefile.in 2004-05-28 20:03:06.000000000 +0200
++++ /tmp/dpep.hthEz2/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 /tmp/dpep.hthEz2/complete.dpatch/perl/Makefile.in
+--- complete.dpatch/perl/Makefile.in 2003-10-22 20:50:17.000000000 +0200
++++ /tmp/dpep.hthEz2/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 /tmp/dpep.hthEz2/complete.dpatch/perl/sieve/Makefile.in
+--- complete.dpatch/perl/sieve/Makefile.in 2003-10-22 20:50:24.000000000 +0200
++++ /tmp/dpep.hthEz2/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 /tmp/dpep.hthEz2/complete.dpatch/perl/sieve/lib/Makefile.in
+--- complete.dpatch/perl/sieve/lib/Makefile.in 2004-05-28 20:03:07.000000000 +0200
++++ /tmp/dpep.hthEz2/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 /tmp/dpep.hthEz2/complete.dpatch/sieve/Makefile.in
+--- complete.dpatch/sieve/Makefile.in 2004-05-28 20:03:09.000000000 +0200
++++ /tmp/dpep.hthEz2/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 /tmp/dpep.hthEz2/complete.dpatch/timsieved/Makefile.in
+--- complete.dpatch/timsieved/Makefile.in 2004-05-28 20:03:10.000000000 +0200
++++ /tmp/dpep.hthEz2/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@
Property changes on: trunk/kolab-cyrus-imapd/experimental/debian/patches/01-fix_Makefile.in.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/kolab-cyrus-imapd/experimental/debian/patches/02-add_mkinstalldirs.dpatch
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/patches/02-add_mkinstalldirs.dpatch 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/patches/02-add_mkinstalldirs.dpatch 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,161 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02-add_mkinstalldirs.dpatch by Sven Mueller <debian at incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: add mkinstalldirs
+
+ at DPATCH@
+diff -urNad complete.dpatch/mkinstalldirs /tmp/dpep.rSX3y1/complete.dpatch/mkinstalldirs
+--- complete.dpatch/mkinstalldirs 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.rSX3y1/complete.dpatch/mkinstalldirs 2005-11-10 16:36:11.547841465 +0100
+@@ -0,0 +1,150 @@
++#! /bin/sh
++# mkinstalldirs --- make directory hierarchy
++
++scriptversion=2005-02-02.21
++
++# Original author: Noah Friedman <friedman at prep.ai.mit.edu>
++# Created: 1993-05-16
++# Public domain.
++#
++# This file is maintained in Automake, please report
++# bugs to <bug-automake at gnu.org> or send patches to
++# <automake-patches at 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 at 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:
Property changes on: trunk/kolab-cyrus-imapd/experimental/debian/patches/02-add_mkinstalldirs.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/kolab-cyrus-imapd/experimental/debian/patches/03-fix_docs.dpatch
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/patches/03-fix_docs.dpatch 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/patches/03-fix_docs.dpatch 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,61 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+_# 03-fix_docs.dpatch by Sven Mueller <debian at incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix FAQ and virtual domains installation docs
+
+ at DPATCH@
+diff -urNad complete.dpatch/doc/faq.html /tmp/dpep.kSS9gk/complete.dpatch/doc/faq.html
+--- complete.dpatch/doc/faq.html 2005-11-10 21:12:04.000000000 +0100
++++ /tmp/dpep.kSS9gk/complete.dpatch/doc/faq.html 2005-11-10 21:12:05.457868786 +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 complete.dpatch/doc/install-virtdomains.html /tmp/dpep.kSS9gk/complete.dpatch/doc/install-virtdomains.html
+--- complete.dpatch/doc/install-virtdomains.html 2005-11-10 21:12:04.000000000 +0100
++++ /tmp/dpep.kSS9gk/complete.dpatch/doc/install-virtdomains.html 2005-11-10 21:12:05.457868786 +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 at domain</tt> cross-realm login syntax. The
++<tt>user at 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 complete.dpatch/lib/imapoptions /tmp/dpep.kSS9gk/complete.dpatch/lib/imapoptions
+--- complete.dpatch/lib/imapoptions 2005-11-10 21:12:04.000000000 +0100
++++ /tmp/dpep.kSS9gk/complete.dpatch/lib/imapoptions 2005-11-10 21:13:13.246208162 +0100
+@@ -184,7 +184,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 at defaultdomain" specify two different users.
++ Please check install-virtdomains.html for details. */
+
+ { "defaultpartition", "default", STRING }
+ /* The partition name used by default for new mailboxes. */
+@@ -436,7 +440,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
Property changes on: trunk/kolab-cyrus-imapd/experimental/debian/patches/03-fix_docs.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/kolab-cyrus-imapd/experimental/debian/patches/04-add_autogen.sh.dpatch
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/patches/04-add_autogen.sh.dpatch 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/patches/04-add_autogen.sh.dpatch 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,88 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04-add_autogen.sh.dpatch by Sven Mueller <debian at incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Add autogen.sh
+
+ at DPATCH@
+diff -urNad cyrus-imapd-2.2.12/autogen.sh /tmp/dpep.Ck5bWN/cyrus-imapd-2.2.12/autogen.sh
+--- cyrus-imapd-2.2.12/autogen.sh 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ck5bWN/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
Property changes on: trunk/kolab-cyrus-imapd/experimental/debian/patches/04-add_autogen.sh.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/kolab-cyrus-imapd/experimental/debian/patches/05-fix_programnames.dpatch
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/patches/05-fix_programnames.dpatch 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/patches/05-fix_programnames.dpatch 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,579 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 05-fix_programnames_in_manpages.dpatch by Sven Mueller <debian at 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
+
+ at DPATCH@
+diff -urNad complete.dpatch/imap/deliver.c /tmp/dpep.8HKnp3/complete.dpatch/imap/deliver.c
+--- complete.dpatch/imap/deliver.c 2005-11-11 15:33:59.000000000 +0100
++++ /tmp/dpep.8HKnp3/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 /tmp/dpep.8HKnp3/complete.dpatch/imap/quota.c
+--- complete.dpatch/imap/quota.c 2005-11-11 15:33:59.000000000 +0100
++++ /tmp/dpep.8HKnp3/complete.dpatch/imap/quota.c 2005-11-11 15:34:00.393958651 +0100
+@@ -196,7 +196,7 @@
+
+ void usage(void)
+ {
+- fprintf(stderr, "usage: quota [-C <alt_config>] [-d <domain>] [-f] [prefix]...\n");
++ fprintf(stderr, "usage: cyrquota [-C <alt_config>] [-d <domain>] [-f] [prefix]...\n");
+ exit(EC_USAGE);
+ }
+
+diff -urNad complete.dpatch/imap/reconstruct.c /tmp/dpep.8HKnp3/complete.dpatch/imap/reconstruct.c
+--- complete.dpatch/imap/reconstruct.c 2005-11-11 15:33:59.000000000 +0100
++++ /tmp/dpep.8HKnp3/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 /tmp/dpep.8HKnp3/complete.dpatch/man/chk_cyrus.8
+--- complete.dpatch/man/chk_cyrus.8 2005-11-11 15:33:59.000000000 +0100
++++ /tmp/dpep.8HKnp3/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 /tmp/dpep.8HKnp3/complete.dpatch/man/ctl_cyrusdb.8
+--- complete.dpatch/man/ctl_cyrusdb.8 2005-11-11 15:33:59.000000000 +0100
++++ /tmp/dpep.8HKnp3/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 /tmp/dpep.8HKnp3/complete.dpatch/man/ctl_deliver.8
+--- complete.dpatch/man/ctl_deliver.8 2005-11-11 15:33:59.000000000 +0100
++++ /tmp/dpep.8HKnp3/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 /tmp/dpep.8HKnp3/complete.dpatch/man/ctl_mboxlist.8
+--- complete.dpatch/man/ctl_mboxlist.8 2005-11-11 15:33:59.000000000 +0100
++++ /tmp/dpep.8HKnp3/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 /tmp/dpep.8HKnp3/complete.dpatch/man/cyr_expire.8
+--- complete.dpatch/man/cyr_expire.8 2005-11-11 15:33:59.000000000 +0100
++++ /tmp/dpep.8HKnp3/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 /tmp/dpep.8HKnp3/complete.dpatch/man/cyrus.conf.5
+--- complete.dpatch/man/cyrus.conf.5 2005-11-11 15:33:59.000000000 +0100
++++ /tmp/dpep.8HKnp3/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 /tmp/dpep.8HKnp3/complete.dpatch/man/deliver.8
+--- complete.dpatch/man/deliver.8 2005-11-11 15:33:59.000000000 +0100
++++ /tmp/dpep.8HKnp3/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 /tmp/dpep.8HKnp3/complete.dpatch/man/fud.8
+--- complete.dpatch/man/fud.8 2005-11-11 15:33:59.000000000 +0100
++++ /tmp/dpep.8HKnp3/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 /tmp/dpep.8HKnp3/complete.dpatch/man/idled.8
+--- complete.dpatch/man/idled.8 2005-11-11 15:33:59.000000000 +0100
++++ /tmp/dpep.8HKnp3/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 /tmp/dpep.8HKnp3/complete.dpatch/man/imapd.8
+--- complete.dpatch/man/imapd.8 2005-11-11 15:33:59.000000000 +0100
++++ /tmp/dpep.8HKnp3/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 /tmp/dpep.8HKnp3/complete.dpatch/man/lmtpd.8
+--- complete.dpatch/man/lmtpd.8 2005-11-11 15:33:59.000000000 +0100
++++ /tmp/dpep.8HKnp3/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 /tmp/dpep.8HKnp3/complete.dpatch/man/master.8
+--- complete.dpatch/man/master.8 2005-11-11 15:33:59.000000000 +0100
++++ /tmp/dpep.8HKnp3/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 /tmp/dpep.8HKnp3/complete.dpatch/man/nntpd.8
+--- complete.dpatch/man/nntpd.8 2005-11-11 15:33:59.000000000 +0100
++++ /tmp/dpep.8HKnp3/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 /tmp/dpep.8HKnp3/complete.dpatch/man/notifyd.8
+--- complete.dpatch/man/notifyd.8 2005-11-11 15:33:59.000000000 +0100
++++ /tmp/dpep.8HKnp3/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 /tmp/dpep.8HKnp3/complete.dpatch/man/pop3d.8
+--- complete.dpatch/man/pop3d.8 2005-11-11 15:33:59.000000000 +0100
++++ /tmp/dpep.8HKnp3/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 /tmp/dpep.8HKnp3/complete.dpatch/man/quota.8
+--- complete.dpatch/man/quota.8 2005-11-11 15:33:59.000000000 +0100
++++ /tmp/dpep.8HKnp3/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 /tmp/dpep.8HKnp3/complete.dpatch/man/reconstruct.8
+--- complete.dpatch/man/reconstruct.8 2005-11-11 15:33:59.000000000 +0100
++++ /tmp/dpep.8HKnp3/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 /tmp/dpep.8HKnp3/complete.dpatch/man/smmapd.8
+--- complete.dpatch/man/smmapd.8 2005-11-11 15:33:59.000000000 +0100
++++ /tmp/dpep.8HKnp3/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 /tmp/dpep.8HKnp3/complete.dpatch/man/timsieved.8
+--- complete.dpatch/man/timsieved.8 2005-11-11 15:33:59.000000000 +0100
++++ /tmp/dpep.8HKnp3/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 /tmp/dpep.8HKnp3/complete.dpatch/man/tls_prune.8
+--- complete.dpatch/man/tls_prune.8 2005-11-11 15:33:59.000000000 +0100
++++ /tmp/dpep.8HKnp3/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 /tmp/dpep.8HKnp3/complete.dpatch/sieve/md5.c
+--- complete.dpatch/sieve/md5.c 2000-01-05 05:51:51.000000000 +0100
++++ /tmp/dpep.8HKnp3/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.
+ */
Property changes on: trunk/kolab-cyrus-imapd/experimental/debian/patches/05-fix_programnames.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/kolab-cyrus-imapd/experimental/debian/patches/06-disable_runpath.dpatch
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/patches/06-disable_runpath.dpatch 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/patches/06-disable_runpath.dpatch 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,38 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 06-disable_runpath.dpatch by Sven Mueller <debian at incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: disable runpath
+
+ at DPATCH@
+diff -urNad complete.dpatch/cmulocal/cyrus.m4 /tmp/dpep.1tmcI8/complete.dpatch/cmulocal/cyrus.m4
+--- complete.dpatch/cmulocal/cyrus.m4 2003-10-08 22:35:24.000000000 +0200
++++ /tmp/dpep.1tmcI8/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 at andrew.cmu.edu 6-may-1998
+ dnl
++dnl Debian fix (hmh at 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 at 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"
++])
Property changes on: trunk/kolab-cyrus-imapd/experimental/debian/patches/06-disable_runpath.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/kolab-cyrus-imapd/experimental/debian/patches/07-update_aclocal_and_configure.in.dpatch
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/patches/07-update_aclocal_and_configure.in.dpatch 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/patches/07-update_aclocal_and_configure.in.dpatch 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,1926 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 07-update_aclocal.m4.dpatch by Sven Mueller <debian at incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: update aclocal.m4 and configure.in
+
+ at DPATCH@
+diff -urNad complete.dpatch/aclocal.m4 /tmp/dpep.IJ03bC/complete.dpatch/aclocal.m4
+--- complete.dpatch/aclocal.m4 2005-02-14 18:59:22.000000000 +0100
++++ /tmp/dpep.IJ03bC/complete.dpatch/aclocal.m4 2005-11-10 18:42:30.706082197 +0100
+@@ -1,7 +1,7 @@
+-# generated automatically by aclocal 1.7.2 -*- Autoconf -*-
++# generated automatically by aclocal 1.9.5 -*- Autoconf -*-
+
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
+-# Free Software Foundation, Inc.
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
++# 2005 Free Software Foundation, Inc.
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -11,1850 +11,12 @@
+ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ # PARTICULAR PURPOSE.
+
+-# isc-posix.m4 serial 2 (gettext-0.11.2)
+-dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
+-dnl This file is free software, distributed under the terms of the GNU
+-dnl General Public License. As a special exception to the GNU General
+-dnl Public License, this file may be distributed as part of a program
+-dnl that contains a configuration script generated by Autoconf, under
+-dnl the same distribution terms as the rest of that program.
+-
+-# This file is not needed with autoconf-2.53 and newer. Remove it in 2005.
+-
+-# This test replaces the one in autoconf.
+-# Currently this macro should have the same name as the autoconf macro
+-# because gettext's gettext.m4 (distributed in the automake package)
+-# still uses it. Otherwise, the use in gettext.m4 makes autoheader
+-# give these diagnostics:
+-# configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX
+-# configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX
+-
+-undefine([AC_ISC_POSIX])
+-
+-AC_DEFUN([AC_ISC_POSIX],
+- [
+- dnl This test replaces the obsolescent AC_ISC_POSIX kludge.
+- AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"])
+- ]
+-)
+-
+-dnl
+-dnl $Id: c-attribute.m4,v 1.3 2003/10/08 20:35:24 rjs3 Exp $
+-dnl
+-
+-dnl
+-dnl Test for __attribute__
+-dnl
+-
+-AC_DEFUN([CMU_C___ATTRIBUTE__], [
+-AC_MSG_CHECKING(for __attribute__)
+-AC_CACHE_VAL(ac_cv___attribute__, [
+-AC_TRY_COMPILE([
+-#include <stdlib.h>
+-],
+-[
+-static void foo(void) __attribute__ ((noreturn));
+-
+-static void
+-foo(void)
+-{
+- exit(1);
+-}
+-],
+-ac_cv___attribute__=yes,
+-ac_cv___attribute__=no)])
+-if test "$ac_cv___attribute__" = "yes"; then
+- AC_DEFINE(HAVE___ATTRIBUTE__, 1, [define if your compiler has __attribute__])
+-fi
+-AC_MSG_RESULT($ac_cv___attribute__)
+-])
+-
+-
+-dnl
+-dnl $Id: c-fpic.m4,v 1.2 2003/10/08 20:35:24 rjs3 Exp $
+-dnl
+-
+-dnl
+-dnl Test for -fPIC
+-dnl
+-
+-AC_DEFUN([CMU_C_FPIC], [
+-AC_MSG_CHECKING(if compiler supports -fPIC)
+-AC_CACHE_VAL(ac_cv_fpic, [
+-save_CFLAGS=$CFLAGS
+-CFLAGS="${CFLAGS} -fPIC"
+-AC_TRY_COMPILE([
+-#include <stdlib.h>
+-],
+-[
+-static void
+-foo(void)
+-{
+- exit(1);
+-}
+-],
+-ac_cv_fpic=yes,
+-ac_cv_fpic=no)
+-CFLAGS=$save_CFLAGS
+-])
+-if test "$ac_cv_fpic" = "yes"; then
+- FPIC_CFLAGS="-fPIC"
+-else
+- FPIC_CFLAGS=""
+-fi
+-AC_MSG_RESULT($ac_cv_fpic)
+-])
+-
+-
+-dnl
+-dnl Additional macros for configure.in packaged up for easier theft.
+-dnl $Id: cyrus.m4,v 1.4 2003/10/08 20:35:24 rjs3 Exp $
+-dnl tjs at andrew.cmu.edu 6-may-1998
+-dnl
+-
+-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.
+-
+-dnl add -L(arg), and possibly (runpath switch)(arg), to LDFLAGS
+-dnl (so the runpath for shared libraries is set).
+-AC_DEFUN([CMU_ADD_LIBPATH], [
+- # this is CMU ADD LIBPATH
+- if test "$andrew_runpath_switch" = "none" ; then
+- LDFLAGS="-L$1 ${LDFLAGS}"
+- else
+- LDFLAGS="-L$1 $andrew_runpath_switch$1 ${LDFLAGS}"
+- fi
+-])
+-
+-dnl add -L(1st arg), and possibly (runpath switch)(1st arg), to (2nd arg)
+-dnl (so the runpath for shared libraries is set).
+-AC_DEFUN([CMU_ADD_LIBPATH_TO], [
+- # this is CMU ADD LIBPATH TO
+- if test "$andrew_runpath_switch" = "none" ; then
+- $2="-L$1 ${$2}"
+- else
+- $2="-L$1 ${$2} $andrew_runpath_switch$1"
+- fi
+-])
+-
+-dnl runpath initialization
+-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}"
+- ])])
+-
+-dnl bsd_sockets.m4--which socket libraries do we need?
+-dnl Derrick Brashear
+-dnl from Zephyr
+-dnl $Id: bsd_sockets.m4,v 1.9 2003/10/08 20:35:24 rjs3 Exp $
+-
+-dnl Hacked on by Rob Earhart to not just toss stuff in LIBS
+-dnl It now puts everything required for sockets into LIB_SOCKET
+-
+-AC_DEFUN([CMU_SOCKETS], [
+- save_LIBS="$LIBS"
+- LIB_SOCKET=""
+- AC_CHECK_FUNC(connect, :,
+- AC_CHECK_LIB(nsl, gethostbyname,
+- LIB_SOCKET="-lnsl $LIB_SOCKET")
+- AC_CHECK_LIB(socket, connect,
+- LIB_SOCKET="-lsocket $LIB_SOCKET")
+- )
+- LIBS="$LIB_SOCKET $save_LIBS"
+- AC_CHECK_FUNC(res_search, :,
+- AC_CHECK_LIB(resolv, res_search,
+- LIB_SOCKET="-lresolv $LIB_SOCKET")
+- )
+- LIBS="$LIB_SOCKET $save_LIBS"
+- AC_CHECK_FUNCS(dn_expand dns_lookup)
+- LIBS="$save_LIBS"
+- AC_SUBST(LIB_SOCKET)
+- ])
+-
+-dnl See whether we can use IPv6 related functions
+-dnl contributed by Hajimu UMEMOTO
+-
+-AC_DEFUN([IPv6_CHECK_FUNC], [
+-AC_CHECK_FUNC($1, [dnl
+- ac_cv_lib_socket_$1=no
+- ac_cv_lib_inet6_$1=no
+-], [dnl
+- AC_CHECK_LIB(socket, $1, [dnl
+- LIBS="$LIBS -lsocket"
+- ac_cv_lib_inet6_$1=no
+- ], [dnl
+- AC_MSG_CHECKING([whether your system has IPv6 directory])
+- AC_CACHE_VAL(ipv6_cv_dir, [dnl
+- 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])dnl
+- AC_MSG_RESULT($ipv6_cv_dir)
+- if test $ipv6_cv_dir = no; then
+- ac_cv_lib_inet6_$1=no
+- else
+- if test x$ipv6_libinet6 = x; then
+- ipv6_libinet6=no
+- SAVELDFLAGS="$LDFLAGS"
+- LDFLAGS="$LDFLAGS -L$ipv6_cv_dir/lib"
+- fi
+- AC_CHECK_LIB(inet6, $1, [dnl
+- if test $ipv6_libinet6 = no; then
+- ipv6_libinet6=yes
+- LIBS="$LIBS -linet6"
+- fi],)dnl
+- if test $ipv6_libinet6 = no; then
+- LDFLAGS="$SAVELDFLAGS"
+- fi
+- fi])dnl
+-])dnl
+-ipv6_cv_$1=no
+-if test $ac_cv_func_$1 = yes -o $ac_cv_lib_socket_$1 = yes \
+- -o $ac_cv_lib_inet6_$1 = yes
+-then
+- ipv6_cv_$1=yes
+-fi
+-if test $ipv6_cv_$1 = no; then
+- if test $1 = getaddrinfo; then
+- for ipv6_cv_pfx in o n; do
+- AC_EGREP_HEADER(${ipv6_cv_pfx}$1, netdb.h,
+- [AC_CHECK_FUNC(${ipv6_cv_pfx}$1)])
+- if eval test X\$ac_cv_func_${ipv6_cv_pfx}$1 = Xyes; then
+- AC_DEFINE(HAVE_GETADDRINFO,[],[Do we have a getaddrinfo?])
+- ipv6_cv_$1=yes
+- break
+- fi
+- done
+- fi
+-fi
+-if test $ipv6_cv_$1 = yes; then
+- ifelse([$2], , :, [$2])
+-else
+- ifelse([$3], , :, [$3])
+-fi])
+-
+-
+-dnl See whether we have ss_family in sockaddr_storage
+-AC_DEFUN([IPv6_CHECK_SS_FAMILY], [
+-AC_MSG_CHECKING([whether you have ss_family in struct sockaddr_storage])
+-AC_CACHE_VAL(ipv6_cv_ss_family, [dnl
+-AC_TRY_COMPILE([#include <sys/types.h>
+-#include <sys/socket.h>],
+- [struct sockaddr_storage ss; int i = ss.ss_family;],
+- [ipv6_cv_ss_family=yes], [ipv6_cv_ss_family=no])])dnl
+-if test $ipv6_cv_ss_family = yes; then
+- ifelse([$1], , AC_DEFINE(HAVE_SS_FAMILY,[],[Is there an ss_family in sockaddr_storage?]), [$1])
+-else
+- ifelse([$2], , :, [$2])
+-fi
+-AC_MSG_RESULT($ipv6_cv_ss_family)])
+-
+-
+-dnl whether you have sa_len in struct sockaddr
+-AC_DEFUN([IPv6_CHECK_SA_LEN], [
+-AC_MSG_CHECKING([whether you have sa_len in struct sockaddr])
+-AC_CACHE_VAL(ipv6_cv_sa_len, [dnl
+-AC_TRY_COMPILE([#include <sys/types.h>
+-#include <sys/socket.h>],
+- [struct sockaddr sa; int i = sa.sa_len;],
+- [ipv6_cv_sa_len=yes], [ipv6_cv_sa_len=no])])dnl
+-if test $ipv6_cv_sa_len = yes; then
+- ifelse([$1], , AC_DEFINE(HAVE_SOCKADDR_SA_LEN,[],[Does sockaddr have an sa_len?]), [$1])
+-else
+- ifelse([$2], , :, [$2])
+-fi
+-AC_MSG_RESULT($ipv6_cv_sa_len)])
+-
+-
+-dnl See whether sys/socket.h has socklen_t
+-AC_DEFUN([IPv6_CHECK_SOCKLEN_T], [
+-AC_MSG_CHECKING(for socklen_t)
+-AC_CACHE_VAL(ipv6_cv_socklen_t, [dnl
+-AC_TRY_LINK([#include <sys/types.h>
+-#include <sys/socket.h>],
+- [socklen_t len = 0;],
+- [ipv6_cv_socklen_t=yes], [ipv6_cv_socklen_t=no])])dnl
+-if test $ipv6_cv_socklen_t = yes; then
+- ifelse([$1], , AC_DEFINE(HAVE_SOCKLEN_T,[],[Do we have a socklen_t?]), [$1])
+-else
+- ifelse([$2], , :, [$2])
+-fi
+-AC_MSG_RESULT($ipv6_cv_socklen_t)])
+-
+-
+-dnl $Id: berkdb.m4,v 1.19 2005/01/06 20:24:52 shadow Exp $
+-
+-AC_DEFUN([CMU_DB_INC_WHERE1], [
+-saved_CPPFLAGS=$CPPFLAGS
+-CPPFLAGS="$saved_CPPFLAGS -I$1"
+-AC_TRY_COMPILE([#include <db.h>],
+-[DB *db;
+-db_create(&db, NULL, 0);
+-db->open(db, "foo.db", NULL, DB_UNKNOWN, DB_RDONLY, 0644);],
+-ac_cv_found_db_inc=yes,
+-ac_cv_found_db_inc=no)
+-CPPFLAGS=$saved_CPPFLAGS
+-])
+-
+-AC_DEFUN([CMU_DB_INC_WHERE], [
+- for i in $1; do
+- AC_MSG_CHECKING(for db headers in $i)
+- CMU_DB_INC_WHERE1($i)
+- CMU_TEST_INCPATH($i, db)
+- if test "$ac_cv_found_db_inc" = "yes"; then
+- ac_cv_db_where_inc=$i
+- AC_MSG_RESULT(found)
+- break
+- else
+- AC_MSG_RESULT(not found)
+- fi
+- done
+-])
+-
+-#
+-# Test for lib files
+-#
+-
+-AC_DEFUN([CMU_DB3_LIB_WHERE1], [
+-AC_REQUIRE([CMU_AFS])
+-AC_REQUIRE([CMU_KRB4])
+-saved_LIBS=$LIBS
+- LIBS="$saved_LIBS -L$1 -ldb-3"
+-AC_TRY_LINK([#include <db.h>],
+-[db_env_create(NULL, 0);],
+-[ac_cv_found_db_3_lib=yes],
+-ac_cv_found_db_3_lib=no)
+-LIBS=$saved_LIBS
+-])
+-AC_DEFUN([CMU_DB4_LIB_WHERE1], [
+-AC_REQUIRE([CMU_AFS])
+-AC_REQUIRE([CMU_KRB4])
+-saved_LIBS=$LIBS
+-LIBS="$saved_LIBS -L$1 -ldb-4"
+-AC_TRY_LINK([#include <db.h>],
+-[db_env_create(NULL, 0);],
+-[ac_cv_found_db_4_lib=yes],
+-ac_cv_found_db_4_lib=no)
+-LIBS=$saved_LIBS
+-])
+-
+-AC_DEFUN([CMU_DB_LIB_WHERE], [
+- for i in $1; do
+- AC_MSG_CHECKING(for db libraries in $i)
+-if test "$enable_db4" = "yes"; then
+- CMU_DB4_LIB_WHERE1($i)
+- CMU_TEST_LIBPATH($i, [db-4])
+- ac_cv_found_db_lib=$ac_cv_found_db_4_lib
+-else
+- CMU_DB3_LIB_WHERE1($i)
+- CMU_TEST_LIBPATH($i, [db-3])
+- ac_cv_found_db_lib=$ac_cv_found_db_3_lib
+-fi
+- if test "$ac_cv_found_db_lib" = "yes" ; then
+- ac_cv_db_where_lib=$i
+- AC_MSG_RESULT(found)
+- break
+- else
+- AC_MSG_RESULT(not found)
+- fi
+- done
+-])
+-
+-AC_DEFUN([CMU_USE_DB], [
+-AC_ARG_WITH(db,
+- [ --with-db=PREFIX Compile with db support],
+- [if test "X$with_db" = "X"; then
+- with_db=yes
+- fi])
+-AC_ARG_WITH(db-lib,
+- [ --with-db-lib=dir use db libraries in dir],
+- [if test "$withval" = "yes" -o "$withval" = "no"; then
+- AC_MSG_ERROR([No argument for --with-db-lib])
+- fi])
+-AC_ARG_WITH(db-include,
+- [ --with-db-include=dir use db headers in dir],
+- [if test "$withval" = "yes" -o "$withval" = "no"; then
+- AC_MSG_ERROR([No argument for --with-db-include])
+- fi])
+-AC_ARG_ENABLE(db4,
+- [ --enable-db4 use db 4.x libraries])
+-
+- if test "X$with_db" != "X"; then
+- if test "$with_db" != "yes"; then
+- ac_cv_db_where_lib=$with_db/lib
+- ac_cv_db_where_inc=$with_db/include
+- fi
+- fi
+-
+- if test "X$with_db_lib" != "X"; then
+- ac_cv_db_where_lib=$with_db_lib
+- fi
+- if test "X$ac_cv_db_where_lib" = "X"; then
+- CMU_DB_LIB_WHERE(/usr/athena/lib /usr/lib /usr/local/lib)
+- fi
+-
+- if test "X$with_db_include" != "X"; then
+- ac_cv_db_where_inc=$with_db_include
+- fi
+- if test "X$ac_cv_db_where_inc" = "X"; then
+- CMU_DB_INC_WHERE(/usr/athena/include /usr/local/include)
+- fi
+-
+- AC_MSG_CHECKING(whether to include db)
+- if test "X$ac_cv_db_where_lib" = "X" -o "X$ac_cv_db_where_inc" = "X"; then
+- ac_cv_found_db=no
+- AC_MSG_RESULT(no)
+- else
+- ac_cv_found_db=yes
+- AC_MSG_RESULT(yes)
+- DB_INC_DIR=$ac_cv_db_where_inc
+- DB_LIB_DIR=$ac_cv_db_where_lib
+- DB_INC_FLAGS="-I${DB_INC_DIR}"
+- if test "$enable_db4" = "yes"; then
+- DB_LIB_FLAGS="-L${DB_LIB_DIR} -ldb-4"
+- else
+- DB_LIB_FLAGS="-L${DB_LIB_DIR} -ldb-3"
+- fi
+- dnl Do not force configure.in to put these in CFLAGS and LIBS unconditionally
+- dnl Allow makefile substitutions....
+- AC_SUBST(DB_INC_FLAGS)
+- AC_SUBST(DB_LIB_FLAGS)
+- if test "X$RPATH" = "X"; then
+- RPATH=""
+- fi
+- case "${host}" in
+- *-*-linux*)
+- if test "X$RPATH" = "X"; then
+- RPATH="-Wl,-rpath,${DB_LIB_DIR}"
+- else
+- RPATH="${RPATH}:${DB_LIB_DIR}"
+- fi
+- ;;
+- *-*-hpux*)
+- if test "X$RPATH" = "X"; then
+- RPATH="-Wl,+b${DB_LIB_DIR}"
+- else
+- RPATH="${RPATH}:${DB_LIB_DIR}"
+- fi
+- ;;
+- *-*-irix*)
+- if test "X$RPATH" = "X"; then
+- RPATH="-Wl,-rpath,${DB_LIB_DIR}"
+- else
+- RPATH="${RPATH}:${DB_LIB_DIR}"
+- fi
+- ;;
+- *-*-solaris2*)
+- if test "$ac_cv_prog_gcc" = yes; then
+- if test "X$RPATH" = "X"; then
+- RPATH="-Wl,-R${DB_LIB_DIR}"
+- else
+- RPATH="${RPATH}:${DB_LIB_DIR}"
+- fi
+- else
+- RPATH="${RPATH} -R${DB_LIB_DIR}"
+- fi
+- ;;
+- esac
+- AC_SUBST(RPATH)
+- fi
+- ])
+-
+-
+-
+-dnl ---- CUT HERE ---
+-
+-dnl These are the Cyrus Berkeley DB macros. In an ideal world these would be
+-dnl identical to the above.
+-
+-dnl They are here so that they can be shared between Cyrus IMAPd
+-dnl and Cyrus SASL with relative ease.
+-
+-dnl The big difference between this and the ones above is that we don't assume
+-dnl that we know the name of the library, and we try a lot of permutations
+-dnl instead. We also assume that DB4 is acceptable.
+-
+-dnl When we're done, there will be a BDB_LIBADD and a BDB_INCADD which should
+-dnl be used when necessary. We should probably be smarter about our RPATH
+-dnl handling.
+-
+-dnl Call these with BERKELEY_DB_CHK.
+-
+-dnl We will also set $dblib to "berkeley" if we are successful, "no" otherwise.
+-
+-dnl this is unbelievably painful due to confusion over what db-3 should be
+-dnl named and where the db-3 header file is located. arg.
+-AC_DEFUN([CYRUS_BERKELEY_DB_CHK_LIB],
+-[
+- BDB_SAVE_LDFLAGS=$LDFLAGS
+-
+- if test -d $with_bdb_lib; then
+- CMU_ADD_LIBPATH_TO($with_bdb_lib, LDFLAGS)
+- CMU_ADD_LIBPATH_TO($with_bdb_lib, BDB_LIBADD)
+- 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"
+- AC_TRY_LINK([#include <db.h>],
+- [db_create(NULL, NULL, 0);],
+- BDB_LIBADD="$BDB_LIBADD -l$dbname"; dblib="berkeley"; dbname=db,
+- dblib="no")
+- if test "$dblib" = "berkeley"; then break; fi
+- done
+- if test "$dblib" = "no"; then
+- LIBS="$saved_LIBS -ldb"
+- AC_TRY_LINK([#include <db.h>],
+- [db_open(NULL, 0, 0, 0, NULL, NULL, NULL);],
+- BDB_LIBADD="$BDB_LIBADD -ldb"; dblib="berkeley"; dbname=db,
+- dblib="no")
+- fi
+- LIBS=$saved_LIBS
+-
+- LDFLAGS=$BDB_SAVE_LDFLAGS
+-])
+-
+-AC_DEFUN([CYRUS_BERKELEY_DB_OPTS],
+-[
+-AC_ARG_WITH(bdb-libdir,
+- [ --with-bdb-libdir=DIR Berkeley DB lib files are in DIR],
+- with_bdb_lib=$withval,
+- [ test "${with_bdb_lib+set}" = set || with_bdb_lib=none])
+-AC_ARG_WITH(bdb-incdir,
+- [ --with-bdb-incdir=DIR Berkeley DB include files are in DIR],
+- with_bdb_inc=$withval,
+- [ test "${with_bdb_inc+set}" = set || with_bdb_inc=none ])
+-])
+-
+-AC_DEFUN([CYRUS_BERKELEY_DB_CHK],
+-[
+- AC_REQUIRE([CYRUS_BERKELEY_DB_OPTS])
+-
+- 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
+-
+- dnl Note that FreeBSD puts it in a wierd place
+- dnl (but they should use with-bdb-incdir)
+- AC_CHECK_HEADER(db.h,
+- [CYRUS_BERKELEY_DB_CHK_LIB()],
+- dblib="no")
+-
+- CPPFLAGS=$cmu_save_CPPFLAGS
+-])
+-
+-dnl $Id: common.m4,v 1.11 2003/10/08 20:35:24 rjs3 Exp $
+-
+-AC_DEFUN([CMU_TEST_LIBPATH], [
+-changequote(<<, >>)
+-define(<<CMU_AC_CV_FOUND>>, translit(ac_cv_found_$2_lib, <<- *>>, <<__p>>))
+-changequote([, ])
+-if test "$CMU_AC_CV_FOUND" = "yes"; then
+- if test \! -r "$1/lib$2.a" -a \! -r "$1/lib$2.so" -a \! -r "$1/lib$2.sl"; then
+- CMU_AC_CV_FOUND=no
+- fi
+-fi
+-])
+-
+-AC_DEFUN([CMU_TEST_INCPATH], [
+-changequote(<<, >>)
+-define(<<CMU_AC_CV_FOUND>>, translit(ac_cv_found_$2_inc, [ *], [_p]))
+-changequote([, ])
+-if test "$CMU_AC_CV_FOUND" = "yes"; then
+- if test \! -r "$1/$2.h"; then
+- CMU_AC_CV_FOUND=no
+- fi
+-fi
+-])
+-
+-dnl CMU_CHECK_HEADER_NOCACHE(HEADER-FILE, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
+-AC_DEFUN([CMU_CHECK_HEADER_NOCACHE],
+-[dnl Do the transliteration at runtime so arg 1 can be a shell variable.
+-ac_safe=`echo "$1" | sed 'y%./+-%__p_%'`
+-AC_MSG_CHECKING([for $1])
+-AC_TRY_CPP([#include <$1>], eval "ac_cv_header_$ac_safe=yes",
+- eval "ac_cv_header_$ac_safe=no")
+-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+- AC_MSG_RESULT(yes)
+- ifelse([$2], , :, [$2])
+-else
+- AC_MSG_RESULT(no)
+-ifelse([$3], , , [$3
+-])dnl
+-fi
+-])
+-
+-dnl afs.m4--AFS libraries, includes, and dependencies
+-dnl $Id: afs.m4,v 1.28 2004/04/29 22:00:07 cg2v Exp $
+-dnl Chaskiel Grundman
+-dnl based on kerberos_v4.m4
+-dnl Derrick Brashear
+-dnl from KTH krb and Arla
+-
+-AC_DEFUN([CMU_AFS_INC_WHERE1], [
+-cmu_save_CPPFLAGS=$CPPFLAGS
+-CPPFLAGS="$cmu_save_CPPFLAGS -I$1"
+-AC_TRY_COMPILE([#include <afs/param.h>],
+-[#ifndef SYS_NAME
+-choke me
+-#endif
+-int foo;],
+-ac_cv_found_afs_inc=yes,
+-ac_cv_found_afs_inc=no)
+-CPPFLAGS=$cmu_save_CPPFLAGS
+-])
+-
+-AC_DEFUN([CMU_AFS_LIB_WHERE1], [
+-save_LIBS="$LIBS"
+-save_LDFLAGS="$LDFLAGS"
+-
+-LIBS="-lauth $1/afs/util.a $LIB_SOCKET $LIBS"
+-LDFLAGS="-L$1 -L$1/afs $LDFLAGS"
+-dnl suppress caching
+-AC_TRY_LINK([],[afsconf_Open();], ac_cv_found_afs_lib=yes, ac_cv_found_afs_lib=no)
+-LIBS="$save_LIBS"
+-LDFLAGS="$save_LDFLAGS"
+-])
+-
+-AC_DEFUN([CMU_AFS_WHERE], [
+- for i in $1; do
+- AC_MSG_CHECKING(for AFS in $i)
+- CMU_AFS_INC_WHERE1("$i/include")
+- ac_cv_found_lwp_inc=$ac_cv_found_afs_inc
+- CMU_TEST_INCPATH($i/include, lwp)
+- ac_cv_found_afs_inc=$ac_cv_found_lwp_inc
+- if test "$ac_cv_found_afs_inc" = "yes"; then
+- CMU_AFS_LIB_WHERE1("$i/lib")
+- if test "$ac_cv_found_afs_lib" = "yes"; then
+- ac_cv_afs_where=$i
+- AC_MSG_RESULT(found)
+- break
+- else
+- AC_MSG_RESULT(not found)
+- fi
+- else
+- AC_MSG_RESULT(not found)
+- fi
+- done
+-])
+-
+-AC_DEFUN([CMU_AFS], [
+-AC_REQUIRE([CMU_SOCKETS])
+-AC_REQUIRE([CMU_LIBSSL])
+-AC_ARG_WITH(AFS,
+- [ --with-afs=PREFIX Compile with AFS support],
+- [if test "X$with_AFS" = "X"; then
+- with_AFS=yes
+- fi])
+-
+- if test "X$with_AFS" != "X"; then
+- ac_cv_afs_where=$with_AFS
+- fi
+- if test "X$ac_cv_afs_where" = "X"; then
+- CMU_AFS_WHERE(/usr/afsws /usr/local /usr/athena /Library/OpenAFS/Tools)
+- fi
+-
+- AC_MSG_CHECKING(whether to include AFS)
+- if test "X$ac_cv_afs_where" = "Xno" -o "X$ac_cv_afs_where" = "X"; then
+- ac_cv_found_afs=no
+- AC_MSG_RESULT(no)
+- else
+- ac_cv_found_afs=yes
+- AC_MSG_RESULT(yes)
+- AFS_INC_DIR="$ac_cv_afs_where/include"
+- AFS_LIB_DIR="$ac_cv_afs_where/lib"
+- AFS_TOP_DIR="$ac_cv_afs_where"
+- AFS_INC_FLAGS="-I${AFS_INC_DIR}"
+- AFS_LIB_FLAGS="-L${AFS_LIB_DIR} -L${AFS_LIB_DIR}/afs"
+- cmu_save_LIBS="$LIBS"
+- cmu_save_CPPFLAGS="$CPPFLAGS"
+- CPPFLAGS="$CPPFLAGS ${AFS_INC_FLAGS}"
+- cmu_save_LDFLAGS="$LDFLAGS"
+- LDFLAGS="$cmu_save_LDFLAGS ${AFS_LIB_FLAGS}"
+-
+- AC_CHECK_HEADERS(afs/stds.h)
+-
+- AC_MSG_CHECKING([if libdes is needed])
+- AC_TRY_LINK([],[des_quad_cksum();],AFS_DES_LIB="",AFS_DES_LIB="maybe")
+- if test "X$AFS_DES_LIB" != "X"; then
+- LIBS="$cmu_save_LIBS -ldes"
+- AC_TRY_LINK([], [des_quad_cksum();],AFS_DES_LIB="yes")
+- if test "X$AFS_DES_LIB" = "Xyes"; then
+- AC_MSG_RESULT([yes])
+- AFS_LIBDES="-ldes"
+- AFS_LIBDESA="${AFS_LIB_DIR}/libdes.a"
+- else
+- LIBS="$cmu_save_LIBS $LIBSSL_LIB_FLAGS"
+- AC_TRY_LINK([],
+- [des_quad_cksum();],AFS_DES_LIB="libcrypto")
+- if test "X$AFS_DES_LIB" = "Xlibcrypto"; then
+- AC_MSG_RESULT([libcrypto])
+- AFS_LIBDES="$LIBSSL_LIB_FLAGS"
+- AFS_LIBDESA="$LIBSSL_LIB_FLAGS"
+- else
+- AC_MSG_RESULT([unknown])
+- AC_MSG_ERROR([Could not use -ldes])
+- fi
+- fi
+- else
+- AC_MSG_RESULT([no])
+- fi
+-
+-
+- AFS_CLIENT_LIBS_STATIC="${AFS_LIB_DIR}/afs/libvolser.a ${AFS_LIB_DIR}/afs/libvldb.a ${AFS_LIB_DIR}/afs/libkauth.a ${AFS_LIB_DIR}/afs/libprot.a ${AFS_LIB_DIR}/libubik.a ${AFS_LIB_DIR}/afs/libauth.a ${AFS_LIB_DIR}/librxkad.a ${AFS_LIB_DIR}/librx.a ${AFS_LIB_DIR}/afs/libsys.a ${AFS_LIB_DIR}/librx.a ${AFS_LIB_DIR}/liblwp.a ${AFS_LIBDESA} ${AFS_LIB_DIR}/afs/libcmd.a ${AFS_LIB_DIR}/afs/libcom_err.a ${AFS_LIB_DIR}/afs/util.a"
+- AFS_KTC_LIBS_STATIC="${AFS_LIB_DIR}/afs/libauth.a ${AFS_LIB_DIR}/afs/libsys.a ${AFS_LIB_DIR}/librx.a ${AFS_LIB_DIR}/liblwp.a ${AFS_LIBDESA} ${AFS_LIB_DIR}/afs/libcom_err.a ${AFS_LIB_DIR}/afs/util.a"
+- AFS_CLIENT_LIBS="-lvolser -lvldb -lkauth -lprot -lubik -lauth -lrxkad -lrx ${AFS_LIB_DIR}/afs/libsys.a -lrx -llwp ${AFS_LIBDES} -lcmd -lcom_err ${AFS_LIB_DIR}/afs/util.a"
+- AFS_RX_LIBS="-lauth -lrxkad -lrx ${AFS_LIB_DIR}/afs/libsys.a -lrx -llwp ${AFS_LIBDES} -lcmd -lcom_err ${AFS_LIB_DIR}/afs/util.a"
+- AFS_KTC_LIBS="-lauth ${AFS_LIB_DIR}/afs/libsys.a -lrx -llwp ${AFS_LIBDES} -lcom_err ${AFS_LIB_DIR}/afs/util.a"
+-
+- LIBS="$cmu_save_LIBS $AFS_CLIENT_LIBS ${LIB_SOCKET}"
+- AC_CHECK_FUNC(des_pcbc_init)
+- if test "X$ac_cv_func_des_pcbc_init" != "Xyes"; then
+- AC_CHECK_LIB(descompat, des_pcbc_init, AFS_DESCOMPAT_LIB="-ldescompat")
+- if test "X$AFS_DESCOMPAT_LIB" != "X" ; then
+- AFS_CLIENT_LIBS_STATIC="$AFS_CLIENT_LIBS_STATIC $AFS_DESCOMPAT_LIB"
+- AFS_KTC_LIBS_STATIC="$AFS_KTC_LIBS_STATIC $AFS_DESCOMPAT_LIB"
+- AFS_CLIENT_LIBS="$AFS_CLIENT_LIBS $AFS_DESCOMPAT_LIB"
+- AFS_KTC_LIBS="$AFS_KTC_LIBS $AFS_DESCOMPAT_LIB"
+- else
+-
+- AC_MSG_CHECKING([if rxkad needs des_pcbc_init])
+- AC_TRY_LINK(,[tkt_DecodeTicket();],RXKAD_PROBLEM=no,RXKAD_PROBLEM=maybe)
+- if test "$RXKAD_PROBLEM" = "maybe"; then
+- AC_TRY_LINK([int des_pcbc_init() { return 0;}],
+- [tkt_DecodeTicket();],RXKAD_PROBLEM=yes,RXKAD_PROBLEM=error)
+- if test "$RXKAD_PROBLEM" = "yes"; then
+- AC_MSG_RESULT([yes])
+- AC_MSG_ERROR([cannot use rxkad])
+- else
+- AC_MSG_RESULT([unknown])
+- AC_MSG_ERROR([Unknown error testing rxkad])
+- fi
+- else
+- AC_MSG_RESULT([no])
+- fi
+- fi
+- fi
+-
+- LIBS="$cmu_save_LIBS"
+- AC_CHECK_FUNC(flock)
+- LIBS="$cmu_save_LIBS ${AFS_CLIENT_LIBS} ${LIB_SOCKET}"
+- if test "X$ac_cv_func_flock" != "Xyes"; then
+- AC_MSG_CHECKING([if AFS needs flock])
+- AC_TRY_LINK([#include <afs/param.h>
+-#ifdef HAVE_AFS_STDS_H
+-#include <afs/stds.h>
+-#endif
+-#include <ubik.h>
+-#include <afs/cellconfig.h>
+-#include <afs/auth.h>
+-#include <afs/volser.h>
+-struct ubik_client * cstruct;
+-int sigvec() {return 0;}
+-extern int UV_SetSecurity();],
+- [vsu_ClientInit(1,"","",0,
+- &cstruct,UV_SetSecurity)],
+- AFS_FLOCK=no,AFS_FLOCK=yes)
+- if test $AFS_FLOCK = "no"; then
+- AC_MSG_RESULT([no])
+- else
+- AC_MSG_RESULT([yes])
+- LDFLAGS="$LDFLAGS -L/usr/ucblib"
+- AC_CHECK_LIB(ucb, flock,:, [AC_CHECK_LIB(BSD, flock)])
+- fi
+- fi
+- LIBS="$cmu_save_LIBS"
+- AC_CHECK_FUNC(sigvec)
+- LIBS="$cmu_save_LIBS ${AFS_CLIENT_LIBS} ${LIB_SOCKET}"
+- if test "X$ac_cv_func_sigvec" != "Xyes"; then
+- AC_MSG_CHECKING([if AFS needs sigvec])
+- AC_TRY_LINK([#include <afs/param.h>
+-#ifdef HAVE_AFS_STDS_H
+-#include <afs/stds.h>
+-#endif
+-#include <ubik.h>
+-#include <afs/cellconfig.h>
+-#include <afs/auth.h>
+-#include <afs/volser.h>
+-struct ubik_client * cstruct;
+-int flock() {return 0;}
+-extern int UV_SetSecurity();],
+- [vsu_ClientInit(1,"","",0,
+- &cstruct,UV_SetSecurity)],
+- AFS_SIGVEC=no,AFS_SIGVEC=yes)
+- if test $AFS_SIGVEC = "no"; then
+- AC_MSG_RESULT([no])
+- else
+- AC_MSG_RESULT([yes])
+- LDFLAGS="$LDFLAGS -L/usr/ucblib"
+- AC_CHECK_LIB(ucb, sigvec,:,[AC_CHECK_LIB(BSD, sigvec)])
+- fi
+- fi
+- if test "$ac_cv_lib_ucb_flock" = "yes" -o "$ac_cv_lib_ucb_sigvec" = "yes"; then
+- AFS_LIB_FLAGS="${AFS_LIB_FLAGS} -L/usr/ucblib -R/usr/ucblib"
+- fi
+- if test "$ac_cv_lib_ucb_flock" = "yes" -o "$ac_cv_lib_ucb_sigvec" = "yes"; then
+- AFS_BSD_LIB="-lucb"
+- elif test "$ac_cv_lib_BSD_flock" = "yes" -o "$ac_cv_lib_BSD_sigvec" = "yes"; then
+- AFS_BSD_LIB="-lBSD"
+- fi
+- if test "X$AFS_BSD_LIB" != "X" ; then
+- AFS_CLIENT_LIBS_STATIC="$AFS_CLIENT_LIBS_STATIC $AFS_BSD_LIB"
+- AFS_KTC_LIBS_STATIC="$AFS_KTC_LIBS_STATIC $AFS_BSD_LIB"
+- AFS_CLIENT_LIBS="$AFS_CLIENT_LIBS $AFS_BSD_LIB"
+- AFS_RX_LIBS="$AFS_CLIENT_LIBS $AFS_BSD_LIB"
+- AFS_KTC_LIBS="$AFS_KTC_LIBS $AFS_BSD_LIB"
+- fi
+-
+- AC_MSG_CHECKING([if libaudit is needed])
+- AFS_LIBAUDIT=""
+- LIBS="$cmu_save_LIBS $AFS_CLIENT_LIBS ${LIB_SOCKET}"
+- AC_TRY_LINK([#include <afs/param.h>
+-#ifdef HAVE_AFS_STDS_H
+-#include <afs/stds.h>
+-#endif
+-#include <afs/cellconfig.h>
+-#include <afs/auth.h>],
+- [afsconf_SuperUser();],AFS_AUDIT_LIB="",AFS_AUDIT_LIB="maybe")
+- if test "X$AFS_AUDIT_LIB" != "X"; then
+- LIBS="$cmu_save_LIBS -lvolser -lvldb -lkauth -lprot -lubik -lauth -laudit -lrxkad -lrx ${AFS_LIB_DIR}/afs/libsys.a -lrx -llwp ${AFS_LIBDES} -lcmd -lcom_err ${AFS_LIB_DIR}/afs/util.a $AFS_BSD_LIB $AFS_DESCOMPAT_LIB $LIB_SOCKET"
+- AC_TRY_LINK([#include <afs/param.h>
+-#ifdef HAVE_AFS_STDS_H
+-#include <afs/stds.h>
+-#endif
+-#include <afs/cellconfig.h>
+-#include <afs/auth.h>],
+- [afsconf_SuperUser();],AFS_AUDIT_LIB="yes")
+- if test "X$AFS_AUDIT_LIB" = "Xyes"; then
+- AC_MSG_RESULT([yes])
+- AFS_LIBAUDIT="-laudit"
+- AFS_CLIENT_LIBS_STATIC="${AFS_LIB_DIR}/afs/libvolser.a ${AFS_LIB_DIR}/afs/libvldb.a ${AFS_LIB_DIR}/afs/libkauth.a ${AFS_LIB_DIR}/afs/libprot.a ${AFS_LIB_DIR}/libubik.a ${AFS_LIB_DIR}/afs/libauth.a ${AFS_LIB_DIR}/afs/libaudit.a ${AFS_LIB_DIR}/librxkad.a ${AFS_LIB_DIR}/librx.a ${AFS_LIB_DIR}/afs/libsys.a ${AFS_LIB_DIR}/librx.a ${AFS_LIB_DIR}/liblwp.a ${AFS_LIBDESA} ${AFS_LIB_DIR}/afs/libcmd.a ${AFS_LIB_DIR}/afs/libcom_err.a ${AFS_LIB_DIR}/afs/util.a"
+- AFS_CLIENT_LIBS="-lvolser -lvldb -lkauth -lprot -lubik -lauth -laudit -lrxkad -lrx ${AFS_LIB_DIR}/afs/libsys.a -lrx -llwp ${AFS_LIBDES} -lcmd -lcom_err ${AFS_LIB_DIR}/afs/util.a $AFS_BSD_LIB $AFS_DESCOMPAT_LIB"
+- AFS_RX_LIBS="-lauth -laudit -lrxkad -lrx ${AFS_LIB_DIR}/afs/libsys.a -lrx -llwp ${AFS_LIBDES} -lcmd -lcom_err ${AFS_LIB_DIR}/afs/util.a $AFS_BSD_LIB $AFS_DESCOMPAT_LIB"
+- else
+- AC_MSG_RESULT([unknown])
+- AC_MSG_ERROR([Could not use -lauth while testing for -laudit])
+- fi
+- else
+- AC_MSG_RESULT([no])
+- fi
+-
+- AC_CHECK_FUNCS(VL_ProbeServer)
+- AC_MSG_CHECKING([if new-style afs_ integer types are defined])
+- AC_CACHE_VAL(ac_cv_afs_int32,
+-dnl The next few lines contain a quoted argument to egrep
+-dnl It is critical that there be no leading or trailing whitespace
+-dnl or newlines
+-[AC_EGREP_CPP(dnl
+-changequote(<<,>>)dnl
+-<<(^|[^a-zA-Z_0-9])afs_int32[^a-zA-Z_0-9]>>dnl
+-changequote([,]), [#include <afs/param.h>
+-#ifdef HAVE_AFS_STDS_H
+-#include <afs/stds.h>
+-#endif],
+-ac_cv_afs_int32=yes, ac_cv_afs_int32=no)])
+- AC_MSG_RESULT($ac_cv_afs_int32)
+- if test $ac_cv_afs_int32 = yes ; then
+- AC_DEFINE(HAVE_AFS_INT32,, [AFS provides new "unambiguous" type names])
+- else
+- AC_DEFINE(afs_int16, int16, [it's a type definition])
+- AC_DEFINE(afs_int32, int32, [it's a type definition])
+- AC_DEFINE(afs_uint16, u_int16, [it's a type definition])
+- AC_DEFINE(afs_uint32, u_int32, [it's a type definition])
+- fi
+-
+- CPPFLAGS="${cmu_save_CPPFLAGS}"
+- LDFLAGS="${cmu_save_LDFLAGS}"
+- LIBS="${cmu_save_LIBS}"
+- AC_DEFINE(AFS_ENV,, [Use AFS. (find what needs this and nuke it)])
+- AC_DEFINE(AFS,, [Use AFS. (find what needs this and nuke it)])
+- AC_SUBST(AFS_CLIENT_LIBS_STATIC)
+- AC_SUBST(AFS_KTC_LIBS_STATIC)
+- AC_SUBST(AFS_CLIENT_LIBS)
+- AC_SUBST(AFS_RX_LIBS)
+- AC_SUBST(AFS_KTC_LIBS)
+- AC_SUBST(AFS_INC_FLAGS)
+- AC_SUBST(AFS_LIB_FLAGS)
+- AC_SUBST(AFS_TOP_DIR)
+- AC_SUBST(AFS_LIBAUDIT)
+- AC_SUBST(AFS_LIBDES)
+- AC_SUBST(AFS_LIBDESA)
+- fi
+- ])
+-
+-AC_DEFUN([CMU_NEEDS_AFS],
+-[AC_REQUIRE([CMU_AFS])
+-if test "$ac_cv_found_afs" != "yes"; then
+- AC_ERROR([Cannot continue without AFS])
+-fi])
+-
+-dnl libssl.m4--Ssl libraries and includes
+-dnl Derrick Brashear
+-dnl from KTH kafs and Arla
+-dnl $Id: libssl.m4,v 1.9 2003/10/08 20:35:25 rjs3 Exp $
+-
+-AC_DEFUN([CMU_LIBSSL_INC_WHERE1], [
+-saved_CPPFLAGS=$CPPFLAGS
+-CPPFLAGS="$saved_CPPFLAGS -I$1"
+-CMU_CHECK_HEADER_NOCACHE(openssl/ssl.h,
+-ac_cv_found_libssl_inc=yes,
+-ac_cv_found_libssl_inc=no)
+-CPPFLAGS=$saved_CPPFLAGS
+-])
+-
+-AC_DEFUN([CMU_LIBSSL_INC_WHERE], [
+- for i in $1; do
+- AC_MSG_CHECKING(for libssl headers in $i)
+- CMU_LIBSSL_INC_WHERE1($i)
+- CMU_TEST_INCPATH($i, ssl)
+- if test "$ac_cv_found_libssl_inc" = "yes"; then
+- ac_cv_libssl_where_inc=$i
+- AC_MSG_RESULT(found)
+- break
+- else
+- AC_MSG_RESULT(not found)
+- fi
+- done
+-])
+-
+-AC_DEFUN([CMU_LIBSSL_LIB_WHERE1], [
+-saved_LIBS=$LIBS
+-LIBS="$saved_LIBS -L$1 -lssl -lcrypto $LIB_SOCKET"
+-AC_TRY_LINK(,
+-[SSL_write();],
+-[ac_cv_found_ssl_lib=yes],
+-ac_cv_found_ssl_lib=no)
+-LIBS=$saved_LIBS
+-])
+-
+-AC_DEFUN([CMU_LIBSSL_LIB_WHERE], [
+- for i in $1; do
+- AC_MSG_CHECKING(for libssl libraries in $i)
+- CMU_LIBSSL_LIB_WHERE1($i)
+- dnl deal with false positives from implicit link paths
+- CMU_TEST_LIBPATH($i, ssl)
+- if test "$ac_cv_found_ssl_lib" = "yes" ; then
+- ac_cv_libssl_where_lib=$i
+- AC_MSG_RESULT(found)
+- break
+- else
+- AC_MSG_RESULT(not found)
+- fi
+- done
+-])
+-
+-AC_DEFUN([CMU_LIBSSL], [
+-AC_REQUIRE([CMU_SOCKETS])
+-AC_ARG_WITH(libssl,
+- [ --with-libssl=PREFIX Compile with Libssl support],
+- [if test "X$with_libssl" = "X"; then
+- with_libssl=yes
+- fi])
+-AC_ARG_WITH(libssl-lib,
+- [ --with-libssl-lib=dir use libssl libraries in dir],
+- [if test "$withval" = "yes" -o "$withval" = "no"; then
+- AC_MSG_ERROR([No argument for --with-libssl-lib])
+- fi])
+-AC_ARG_WITH(libssl-include,
+- [ --with-libssl-include=dir use libssl headers in dir],
+- [if test "$withval" = "yes" -o "$withval" = "no"; then
+- AC_MSG_ERROR([No argument for --with-libssl-include])
+- fi])
+-
+- if test "X$with_libssl" != "X"; then
+- if test "$with_libssl" != "yes" -a "$with_libssl" != no; then
+- ac_cv_libssl_where_lib=$with_libssl/lib
+- ac_cv_libssl_where_inc=$with_libssl/include
+- fi
+- fi
+-
+- if test "$with_libssl" != "no"; then
+- if test "X$with_libssl_lib" != "X"; then
+- ac_cv_libssl_where_lib=$with_libssl_lib
+- fi
+- if test "X$ac_cv_libssl_where_lib" = "X"; then
+- CMU_LIBSSL_LIB_WHERE(/usr/local/lib/openssl /usr/lib/openssl /usr/local/lib /usr/lib)
+- fi
+-
+- if test "X$with_libssl_include" != "X"; then
+- ac_cv_libssl_where_inc=$with_libssl_include
+- fi
+- if test "X$ac_cv_libssl_where_inc" = "X"; then
+- CMU_LIBSSL_INC_WHERE(/usr/local/include /usr/include)
+- fi
+- fi
+-
+- AC_MSG_CHECKING(whether to include libssl)
+- if test "X$ac_cv_libssl_where_lib" = "X" -a "X$ac_cv_libssl_where_inc" = "X"; then
+- ac_cv_found_libssl=no
+- AC_MSG_RESULT(no)
+- else
+- ac_cv_found_libssl=yes
+- AC_MSG_RESULT(yes)
+- LIBSSL_INC_DIR=$ac_cv_libssl_where_inc
+- LIBSSL_LIB_DIR=$ac_cv_libssl_where_lib
+- LIBSSL_INC_FLAGS="-I${LIBSSL_INC_DIR}"
+- LIBSSL_LIB_FLAGS="-L${LIBSSL_LIB_DIR} -lssl -lcrypto"
+- if test "X$RPATH" = "X"; then
+- RPATH=""
+- fi
+- case "${host}" in
+- *-*-linux*)
+- if test "X$RPATH" = "X"; then
+- RPATH="-Wl,-rpath,${LIBSSL_LIB_DIR}"
+- else
+- RPATH="${RPATH}:${LIBSSL_LIB_DIR}"
+- fi
+- ;;
+- *-*-hpux*)
+- if test "X$RPATH" = "X"; then
+- RPATH="-Wl,+b${LIBSSL_LIB_DIR}"
+- else
+- RPATH="${RPATH}:${LIBSSL_LIB_DIR}"
+- fi
+- ;;
+- *-*-irix*)
+- if test "X$RPATH" = "X"; then
+- RPATH="-Wl,-rpath,${LIBSSL_LIB_DIR}"
+- else
+- RPATH="${RPATH}:${LIBSSL_LIB_DIR}"
+- fi
+- ;;
+- *-*-solaris2*)
+- if test "$ac_cv_prog_gcc" = yes; then
+- if test "X$RPATH" = "X"; then
+- RPATH="-Wl,-R${LIBSSL_LIB_DIR}"
+- else
+- RPATH="${RPATH}:${LIBSSL_LIB_DIR}"
+- fi
+- else
+- RPATH="${RPATH} -R${LIBSSL_LIB_DIR}"
+- fi
+- ;;
+- esac
+- AC_SUBST(RPATH)
+- fi
+- AC_SUBST(LIBSSL_INC_DIR)
+- AC_SUBST(LIBSSL_LIB_DIR)
+- AC_SUBST(LIBSSL_INC_FLAGS)
+- AC_SUBST(LIBSSL_LIB_FLAGS)
+- ])
+-
+-
+-dnl kerberos_v4.m4--Kerberos 4 libraries and includes
+-dnl Derrick Brashear
+-dnl from KTH krb and Arla
+-dnl $Id: kerberos_v4.m4,v 1.27 2004/02/05 18:28:47 cg2v Exp $
+-
+-AC_DEFUN([CMU_KRB_SENDAUTH_PROTO], [
+-AC_MSG_CHECKING(for krb_sendauth prototype)
+-AC_TRY_COMPILE(
+-[#include <krb.h>
+-int krb_sendauth (long options, int fd, KTEXT ktext, char *service,
+- char *inst, char *realm, u_long checksum,
+- MSG_DAT *msg_data, CREDENTIALS *cred,
+- Key_schedule schedule, struct sockaddr_in *laddr,
+- struct sockaddr_in *faddr, char *version);],
+-[int foo = krb_sendauth(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); ],
+-ac_cv_krb_sendauth_proto=no,
+-ac_cv_krb_sendauth_proto=yes)
+-AC_MSG_RESULT($ac_cv_krb_sendauth_proto)
+-if test "$ac_cv_krb_sendauth_proto" = yes; then
+- AC_DEFINE(HAVE_KRB_SENDAUTH_PROTO)dnl
+-fi
+-AC_MSG_RESULT($ac_cv_krb_sendauth_proto)
+-])
+-
+-AC_DEFUN([CMU_KRB_SET_KEY_PROTO], [
+-AC_MSG_CHECKING(for krb_set_key prototype)
+-AC_CACHE_VAL(ac_cv_krb_set_key_proto, [
+-cmu_save_CPPFLAGS="$CPPFLAGS"
+-CPPFLAGS="${CPPFLAGS} ${KRB_INC_FLAGS}"
+-AC_TRY_COMPILE(
+-[#include <krb.h>
+-int krb_set_key(char *key, int cvt);],
+-[int foo = krb_set_key(0, 0);],
+-ac_cv_krb_set_key_proto=no,
+-ac_cv_krb_set_key_proto=yes)
+-])
+-CPPFLAGS="${cmu_save_CPPFLAGS}"
+-if test "$ac_cv_krb_set_key_proto" = yes; then
+- AC_DEFINE(HAVE_KRB_SET_KEY_PROTO)dnl
+-fi
+-AC_MSG_RESULT($ac_cv_krb_set_key_proto)
+-])
+-
+-AC_DEFUN([CMU_KRB4_32_DEFN], [
+-AC_MSG_CHECKING(for KRB4_32 definition)
+-AC_CACHE_VAL(ac_cv_krb4_32_defn, [
+-cmu_save_CPPFLAGS="$CPPFLAGS"
+-CPPFLAGS="${CPPFLAGS} ${KRB_INC_FLAGS}"
+-AC_TRY_COMPILE(
+-[#include <krb.h>
+-],
+-[KRB4_32 foo = 1;],
+-ac_cv_krb4_32_defn=yes,
+-ac_cv_krb4_32_defn=no)
+-])
+-CPPFLAGS="${cmu_save_CPPFLAGS}"
+-if test "$ac_cv_krb4_32_defn" = yes; then
+- AC_DEFINE(HAVE_KRB4_32_DEFINE)dnl
+-fi
+-AC_MSG_RESULT($ac_cv_krb4_32_defn)
+-])
+-
+-AC_DEFUN([CMU_KRB_RD_REQ_PROTO], [
+-AC_MSG_CHECKING(for krb_rd_req prototype)
+-AC_CACHE_VAL(ac_cv_krb_rd_req_proto, [
+-cmu_save_CPPFLAGS="$CPPFLAGS"
+-CPPFLAGS="${CPPFLAGS} ${KRB_INC_FLAGS}"
+-AC_TRY_COMPILE(
+-[#include <krb.h>
+-int krb_rd_req(KTEXT authent, char *service, char *instance,
+-unsigned KRB_INT32 from_addr, AUTH_DAT *ad, char *fn);],
+-[int foo = krb_rd_req(0,0,0,0,0,0);],
+-ac_cv_krb_rd_req_proto=no,
+-ac_cv_krb_rd_req_proto=yes)
+-])
+-CPPFLAGS="${cmu_save_CPPFLAGS}"
+-if test "$ac_cv_krb_rd_req_proto" = yes; then
+- AC_DEFINE(HAVE_KRB_RD_REQ_PROTO)dnl
+-fi
+-AC_MSG_RESULT($ac_cv_krb_rd_req_proto)
+-])
+-
+-AC_DEFUN([CMU_KRB_INC_WHERE1], [
+-saved_CPPFLAGS=$CPPFLAGS
+-CPPFLAGS="$saved_CPPFLAGS -I$1"
+-AC_TRY_COMPILE([#include <krb.h>],
+-[struct ktext foo;],
+-ac_cv_found_krb_inc=yes,
+-ac_cv_found_krb_inc=no)
+-if test "$ac_cv_found_krb_inc" = "no"; then
+- CPPFLAGS="$saved_CPPFLAGS -I$1 -I$1/kerberosIV"
+- AC_TRY_COMPILE([#include <krb.h>],
+- [struct ktext foo;],
+- [ac_cv_found_krb_inc=yes],
+- ac_cv_found_krb_inc=no)
+-fi
+-CPPFLAGS=$saved_CPPFLAGS
+-])
+-
+-AC_DEFUN([CMU_KRB_INC_WHERE], [
+- for i in $1; do
+- AC_MSG_CHECKING(for kerberos headers in $i)
+- CMU_KRB_INC_WHERE1($i)
+- CMU_TEST_INCPATH($i, krb)
+- if test "$ac_cv_found_krb_inc" = "yes"; then
+- ac_cv_krb_where_inc=$i
+- AC_MSG_RESULT(found)
+- break
+- else
+- AC_MSG_RESULT(not found)
+- fi
+- done
+-])
+-
+-#
+-# Test for kerberos lib files
+-#
+-
+-AC_DEFUN([CMU_KRB_LIB_WHERE1], [
+-saved_LIBS=$LIBS
+-LIBS="$saved_LIBS -L$1 -lkrb ${KRB_LIBDES}"
+-AC_TRY_LINK(,
+-[dest_tkt();],
+-[ac_cv_found_krb_lib=yes],
+-ac_cv_found_krb_lib=no)
+-LIBS=$saved_LIBS
+-])
+-
+-AC_DEFUN([CMU_KRB_LIB_WHERE], [
+- for i in $1; do
+- AC_MSG_CHECKING(for kerberos libraries in $i)
+- CMU_KRB_LIB_WHERE1($i)
+- dnl deal with false positives from implicit link paths
+- CMU_TEST_LIBPATH($i, krb)
+- if test "$ac_cv_found_krb_lib" = "yes" ; then
+- ac_cv_krb_where_lib=$i
+- AC_MSG_RESULT(found)
+- break
+- else
+- AC_MSG_RESULT(not found)
+- fi
+- done
+-])
+-
+-AC_DEFUN([CMU_KRB4], [
+-AC_REQUIRE([CMU_SOCKETS])
+-AC_REQUIRE([CMU_LIBSSL])
+-AC_ARG_WITH(krb4,
+- [ --with-krb4=PREFIX Compile with Kerberos 4 support],
+- [if test "X$with_krb4" = "X"; then
+- with_krb4=yes
+- fi])
+-AC_ARG_WITH(krb4-lib,
+- [ --with-krb4-lib=dir use kerberos 4 libraries in dir],
+- [if test "$withval" = "yes" -o "$withval" = "no"; then
+- AC_MSG_ERROR([No argument for --with-krb4-lib])
+- fi])
+-AC_ARG_WITH(krb4-include,
+- [ --with-krb4-include=dir use kerberos 4 headers in dir],
+- [if test "$withval" = "yes" -o "$withval" = "no"; then
+- AC_MSG_ERROR([No argument for --with-krb4-include])
+- fi])
+-
+- if test "X$with_krb4" != "X"; then
+- if test "$with_krb4" != "yes" -a "$with_krb4" != "no"; then
+- ac_cv_krb_where_lib=$with_krb4/lib
+- ac_cv_krb_where_inc=$with_krb4/include
+- fi
+- fi
+-
+- if test "$with_krb4" != "no"; then
+- if test "X$with_krb4_lib" != "X"; then
+- ac_cv_krb_where_lib=$with_krb4_lib
+- fi
+- if test "X$with_krb4_include" != "X"; then
+- ac_cv_krb_where_inc=$with_krb4_include
+- fi
+- if test "X$ac_cv_krb_where_inc" = "X"; then
+- CMU_KRB_INC_WHERE(/usr/athena/include /usr/include/kerberosIV /usr/local/include /usr/include/kerberos)
+- fi
+-
+- AC_MSG_CHECKING([if libdes is needed])
+- AC_TRY_LINK([],[des_quad_cksum();],KRB_DES_LIB="",KRB_DES_LIB="maybe")
+- if test "X$KRB_DES_LIB" != "X"; then
+- LIBS="$cmu_save_LIBS -ldes"
+- AC_TRY_LINK([], [des_quad_cksum();],KRB_DES_LIB="yes")
+- if test "X$KRB_DES_LIB" = "Xyes"; then
+- AC_MSG_RESULT([yes])
+- KRB_LIBDES="-ldes"
+- KRB_LIBDESA='$(KRB_LIB_DIR)/libdes.a'
+- else
+- LIBS="$cmu_save_LIBS $LIBSSL_LIB_FLAGS"
+- AC_TRY_LINK([],
+- [des_quad_cksum();],KRB_DES_LIB="libcrypto")
+- if test "X$KRB_DES_LIB" = "Xlibcrypto"; then
+- AC_MSG_RESULT([libcrypto])
+- KRB_LIBDES="$LIBSSL_LIB_FLAGS"
+- KRB_LIBDESA="$LIBSSL_LIB_FLAGS"
+- else
+- AC_MSG_RESULT([unknown])
+- AC_MSG_ERROR([Could not use -ldes])
+- fi
+- fi
+- else
+- AC_MSG_RESULT([no])
+- fi
+- if test "X$ac_cv_krb_where_lib" = "X"; then
+- CMU_KRB_LIB_WHERE(/usr/athena/lib /usr/local/lib /usr/lib)
+- fi
+- fi
+- LIBS="${cmu_save_LIBS}"
+-
+-
+- AC_MSG_CHECKING([whether to include kerberos 4])
+- if test "X$ac_cv_krb_where_lib" = "X" -o "X$ac_cv_krb_where_inc" = "X"; then
+- ac_cv_found_krb=no
+- AC_MSG_RESULT(no)
+- else
+- ac_cv_found_krb=yes
+- AC_MSG_RESULT(yes)
+- KRB_INC_DIR=$ac_cv_krb_where_inc
+- KRB_LIB_DIR=$ac_cv_krb_where_lib
+- KRB_INC_FLAGS="-I${KRB_INC_DIR}"
+- KRB_LIB_FLAGS="-L${KRB_LIB_DIR} -lkrb ${KRB_LIBDES}"
+- LIBS="${cmu_save_LIBS} ${KRB_LIB_FLAGS}"
+- AC_CHECK_LIB(resolv, dns_lookup, KRB_LIB_FLAGS="${KRB_LIB_FLAGS} -lresolv",,"${KRB_LIB_FLAGS}")
+- AC_CHECK_LIB(crypt, crypt, KRB_LIB_FLAGS="${KRB_LIB_FLAGS} -lcrypt",,"${KRB_LIB_FLAGS}")
+- LIBS="${LIBS} ${KRB_LIB_FLAGS}"
+- AC_CHECK_FUNCS(krb_get_int krb_life_to_time)
+- AC_SUBST(KRB_INC_FLAGS)
+- AC_SUBST(KRB_LIB_FLAGS)
+- LIBS="${cmu_save_LIBS}"
+- AC_DEFINE(KERBEROS,,[Use kerberos 4. find out what needs this symbol])
+- if test "X$RPATH" = "X"; then
+- RPATH=""
+- fi
+- case "${host}" in
+- *-*-linux*)
+- if test "X$RPATH" = "X"; then
+- RPATH="-Wl,-rpath,${KRB_LIB_DIR}"
+- else
+- RPATH="${RPATH}:${KRB_LIB_DIR}"
+- fi
+- ;;
+- *-*-hpux*)
+- if test "X$RPATH" = "X"; then
+- RPATH="-Wl,+b${KRB_LIB_DIR}"
+- else
+- RPATH="${RPATH}:${KRB_LIB_DIR}"
+- fi
+- ;;
+- *-*-irix*)
+- if test "X$RPATH" = "X"; then
+- RPATH="-Wl,-rpath,${KRB_LIB_DIR}"
+- else
+- RPATH="${RPATH}:${KRB_LIB_DIR}"
+- fi
+- ;;
+- *-*-solaris2*)
+- if test "$ac_cv_prog_gcc" = yes; then
+- if test "X$RPATH" = "X"; then
+- RPATH="-Wl,-R${KRB_LIB_DIR}"
+- else
+- RPATH="${RPATH}:${KRB_LIB_DIR}"
+- fi
+- else
+- RPATH="${RPATH} -R${KRB_LIB_DIR}"
+- fi
+- ;;
+- esac
+- AC_SUBST(RPATH)
+- fi
+- ])
+-
+-
+-dnl sasl2.m4--sasl2 libraries and includes
+-dnl Rob Siemborski
+-dnl $Id: sasl2.m4,v 1.48 2004/09/13 21:06:34 shadow Exp $
+-
+-AC_DEFUN([SASL_GSSAPI_CHK],[
+- AC_ARG_ENABLE(gssapi, [ --enable-gssapi=<DIR> enable GSSAPI authentication [yes] ],
+- gssapi=$enableval,
+- gssapi=yes)
+- AC_ARG_WITH(gss_impl, [ --with-gss_impl={heimdal|mit|cybersafe|seam|auto} choose specific GSSAPI implementation [[auto]] ],
+- gss_impl=$withval,
+- gss_impl=auto)
+- AC_REQUIRE([SASL2_CRYPT_CHK])
+- AC_REQUIRE([CMU_SOCKETS])
+-
+- if test "$gssapi" != no; then
+- platform=
+- case "${host}" in
+- *-*-linux*)
+- platform=__linux
+- ;;
+- *-*-hpux*)
+- platform=__hpux
+- ;;
+- *-*-irix*)
+- platform=__irix
+- ;;
+- *-*-solaris2*)
+-# When should we use __sunos?
+- platform=__solaris
+- ;;
+- *-*-aix*)
+- platform=__aix
+- ;;
+- *)
+- AC_WARN([The system type is not recognized. If you believe that CyberSafe GSSAPI works on this platform, please update the configure script])
+- if test "$gss_impl" = "cybersafe"; then
+- AC_ERROR([CyberSafe was forced, cannot continue as platform is not supported])
+- fi
+- ;;
+- esac
+-
+- cmu_saved_CPPFLAGS=$CPPFLAGS
+-
+- if test -d ${gssapi}; then
+- CPPFLAGS="$CPPFLAGS -I$gssapi/include"
+-# We want to keep -I in our CPPFLAGS, but only if we succeed
+- cmu_saved_CPPFLAGS=$CPPFLAGS
+- LDFLAGS="$LDFLAGS -L$gssapi/lib"
+-
+- if test -n "$platform"; then
+- if test "$gss_impl" = "auto" -o "$gss_impl" = "cybersafe"; then
+- CPPFLAGS="$CPPFLAGS -D$platform"
+- if test -d "${gssapi}/appsec-sdk/include"; then
+- CPPFLAGS="$CPPFLAGS -I${gssapi}/appsec-sdk/include"
+- fi
+- fi
+- fi
+- fi
+- AC_CHECK_HEADER(gssapi.h, AC_DEFINE(HAVE_GSSAPI_H,,[Define if you have the gssapi.h header file]), [
+- AC_CHECK_HEADER(gssapi/gssapi.h,, AC_WARN(Disabling GSSAPI - no include files found); gssapi=no)])
+-
+- CPPFLAGS=$cmu_saved_CPPFLAGS
+-
+- fi
+-
+- if test "$gssapi" != no; then
+- dnl We need to find out which gssapi implementation we are
+- dnl using. Supported alternatives are: MIT Kerberos 5,
+- dnl Heimdal Kerberos 5 (http://www.pdc.kth.se/heimdal),
+- dnl CyberSafe Kerberos 5 (http://www.cybersafe.com/)
+- dnl and Sun SEAM (http://wwws.sun.com/software/security/kerberos/)
+- dnl
+- dnl The choice is reflected in GSSAPIBASE_LIBS
+-
+- AC_CHECK_LIB(resolv,res_search)
+- if test -d ${gssapi}; then
+- gssapi_dir="${gssapi}/lib"
+- GSSAPIBASE_LIBS="-L$gssapi_dir"
+- GSSAPIBASE_STATIC_LIBS="-L$gssapi_dir"
+- else
+- dnl FIXME: This is only used for building cyrus, and then only as
+- dnl a real hack. it needs to be fixed.
+- gssapi_dir="/usr/local/lib"
+- fi
+-
+- # Check a full link against the Heimdal libraries.
+- # If this fails, check a full link against the MIT libraries.
+- # If this fails, check a full link against the CyberSafe libraries.
+- # If this fails, check a full link against the Solaris 8 and up libgss.
+-
+- if test "$gss_impl" = "auto" -o "$gss_impl" = "heimdal"; then
+- gss_failed=0
+- AC_CHECK_LIB(gssapi,gss_unwrap,gss_impl="heimdal",gss_failed=1,$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err ${LIB_SOCKET})
+- if test "$gss_impl" != "auto" -a "$gss_failed" = "1"; then
+- gss_impl="failed"
+- fi
+- fi
+-
+- if test "$gss_impl" = "auto" -o "$gss_impl" = "mit"; then
+- 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})
+- if test "$gss_impl" != "auto" -a "$gss_failed" = "1"; then
+- gss_impl="failed"
+- fi
+- fi
+-
+- # For Cybersafe one has to set a platform define in order to make compilation work
+- if test "$gss_impl" = "auto" -o "$gss_impl" = "cybersafe"; then
+-
+- cmu_saved_CPPFLAGS=$CPPFLAGS
+- cmu_saved_GSSAPIBASE_LIBS=$GSSAPIBASE_LIBS
+-# FIX ME - Note that the libraries are in .../lib/64 for 64bit kernels
+- if test -d "${gssapi}/appsec-rt/lib"; then
+- GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -L${gssapi}/appsec-rt/lib"
+- fi
+- CPPFLAGS="$CPPFLAGS -D$platform"
+- if test -d "${gssapi}/appsec-sdk/include"; then
+- CPPFLAGS="$CPPFLAGS -I${gssapi}/appsec-sdk/include"
+- fi
+-
+- gss_failed=0
+-
+-# Check for CyberSafe with two libraries first, than fall back to a single
+-# library (older CyberSafe)
+-
+- unset ac_cv_lib_gss_csf_gss_acq_user
+- AC_CHECK_LIB(gss,csf_gss_acq_user,gss_impl="cybersafe03",[
+- unset ac_cv_lib_gss_csf_gss_acq_user;AC_CHECK_LIB(gss,csf_gss_acq_user,gss_impl="cybersafe",gss_failed=1,$GSSAPIBASE_LIBS -lgss)],$GSSAPIBASE_LIBS -lgss -lcstbk5)
+-
+- if test "$gss_failed" = "1"; then
+-# Restore variables
+- GSSAPIBASE_LIBS=$cmu_saved_GSSAPIBASE_LIBS
+- CPPFLAGS=$cmu_saved_CPPFLAGS
+-
+- if test "$gss_impl" != "auto"; then
+- gss_impl="failed"
+- fi
+- fi
+- fi
+-
+- if test "$gss_impl" = "auto" -o "$gss_impl" = "seam"; then
+- gss_failed=0
+- AC_CHECK_LIB(gss,gss_unwrap,gss_impl="seam",gss_failed=1,-lgss)
+- if test "$gss_impl" != "auto" -a "$gss_failed" = "1"; then
+- gss_impl="failed"
+- 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"
+- elif test "$gss_impl" = "heimdal"; then
+- CPPFLAGS="$CPPFLAGS -DKRB5_HEIMDAL"
+- GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err"
+- GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_STATIC_LIBS $gssapi_dir/libgssapi.a $gssapi_dir/libkrb5.a $gssapi_dir/libasn1.a $gssapi_dir/libroken.a $gssapi_dir/libcom_err.a ${LIB_CRYPT}"
+- elif test "$gss_impl" = "cybersafe03"; then
+-# Version of CyberSafe with two libraries
+- CPPFLAGS="$CPPFLAGS -D$platform -I${gssapi}/appsec-sdk/include"
+- GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgss -lcstbk5"
+- # there is no static libgss for CyberSafe
+- GSSAPIBASE_STATIC_LIBS=none
+- elif test "$gss_impl" = "cybersafe"; then
+- CPPFLAGS="$CPPFLAGS -D$platform -I${gssapi}/appsec-sdk/include"
+- GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgss"
+- # there is no static libgss for CyberSafe
+- GSSAPIBASE_STATIC_LIBS=none
+- elif test "$gss_impl" = "seam"; then
+- GSSAPIBASE_LIBS=-lgss
+- # there is no static libgss on Solaris 8 and up
+- GSSAPIBASE_STATIC_LIBS=none
+- elif test "$gss_impl" = "failed"; then
+- gssapi="no"
+- GSSAPIBASE_LIBS=
+- GSSAPIBASE_STATIC_LIBS=
+- AC_WARN(Disabling GSSAPI - specified library not found)
+- else
+- gssapi="no"
+- GSSAPIBASE_LIBS=
+- GSSAPIBASE_STATIC_LIBS=
+- AC_WARN(Disabling GSSAPI - no library)
+- fi
+- fi
+-
+-#
+-# Cybersafe defines both GSS_C_NT_HOSTBASED_SERVICE and GSS_C_NT_USER_NAME in gssapi\rfckrb5.h
+-#
+- if test "$gssapi" != "no"; then
+- if test "$gss_impl" = "cybersafe" -o "$gss_impl" = "cybersafe03"; then
+- AC_EGREP_CPP(hostbased_service_gss_nt_yes,
+- [#include <gssapi/gssapi.h>
+- #ifdef GSS_C_NT_HOSTBASED_SERVICE
+- hostbased_service_gss_nt_yes
+- #endif
+- ], AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE,,[Define if your GSSAPI implimentation defines GSS_C_NT_HOSTBASED_SERVICE]), AC_WARN(Cybersafe define not found))
+-
+- elif test "$ac_cv_header_gssapi_h" = "yes"; then
+- AC_EGREP_HEADER(GSS_C_NT_HOSTBASED_SERVICE, gssapi.h,
+- AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE,,[Define if your GSSAPI implimentation defines GSS_C_NT_HOSTBASED_SERVICE]))
+- elif test "$ac_cv_header_gssapi_gssapi_h"; then
+-
+- AC_EGREP_HEADER(GSS_C_NT_HOSTBASED_SERVICE, gssapi/gssapi.h,
+- AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE,,[Define if your GSSAPI implimentation defines GSS_C_NT_HOSTBASED_SERVICE]))
+- fi
+-
+- if test "$gss_impl" = "cybersafe" -o "$gss_impl" = "cybersafe03"; then
+- AC_EGREP_CPP(user_name_yes_gss_nt,
+- [#include <gssapi/gssapi.h>
+- #ifdef GSS_C_NT_USER_NAME
+- user_name_yes_gss_nt
+- #endif
+- ], AC_DEFINE(HAVE_GSS_C_NT_USER_NAME,,[Define if your GSSAPI implimentation defines GSS_C_NT_USER_NAME]), AC_WARN(Cybersafe define not found))
+- elif test "$ac_cv_header_gssapi_h" = "yes"; then
+- AC_EGREP_HEADER(GSS_C_NT_USER_NAME, gssapi.h,
+- AC_DEFINE(HAVE_GSS_C_NT_USER_NAME,,[Define if your GSSAPI implimentation defines GSS_C_NT_USER_NAME]))
+- elif test "$ac_cv_header_gssapi_gssapi_h"; then
+- AC_EGREP_HEADER(GSS_C_NT_USER_NAME, gssapi/gssapi.h,
+- AC_DEFINE(HAVE_GSS_C_NT_USER_NAME,,[Define if your GSSAPI implimentation defines GSS_C_NT_USER_NAME]))
+- fi
+- fi
+-
+- GSSAPI_LIBS=""
+- AC_MSG_CHECKING(GSSAPI)
+- if test "$gssapi" != no; then
+- AC_MSG_RESULT(with implementation ${gss_impl})
+- AC_CHECK_LIB(resolv,res_search,GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lresolv")
+- SASL_MECHS="$SASL_MECHS libgssapiv2.la"
+- SASL_STATIC_OBJS="$SASL_STATIC_OBJS ../plugins/gssapi.o"
+-
+- cmu_save_LIBS="$LIBS"
+- LIBS="$LIBS $GSSAPIBASE_LIBS"
+- AC_CHECK_FUNCS(gsskrb5_register_acceptor_identity)
+- LIBS="$cmu_save_LIBS"
+-else
+- AC_MSG_RESULT(disabled)
+-fi
+-AC_SUBST(GSSAPI_LIBS)
+-AC_SUBST(GSSAPIBASE_LIBS)
+-])
+-
+-AC_DEFUN([SASL_SET_GSSAPI_LIBS], [
+- SASL_GSSAPI_LIBS_SET="yes"
+-])
+-
+-dnl What we want to do here is setup LIB_SASL with what one would
+-dnl generally want to have (e.g. if static is requested, make it that,
+-dnl otherwise make it dynamic.
+-
+-dnl We also want to create LIB_DYN_SASL and DYNSASLFLAGS.
+-
+-dnl Also sets using_static_sasl to "no" "static" or "staticonly"
+-
+-AC_DEFUN([CMU_SASL2], [
+- AC_REQUIRE([SASL_GSSAPI_CHK])
+-
+-AC_ARG_WITH(sasl,
+- [ --with-sasl=DIR Compile with libsasl2 in <DIR>],
+- with_sasl="$withval",
+- with_sasl="yes")
+-
+-AC_ARG_WITH(staticsasl,
+- [ --with-staticsasl=DIR Compile with staticly linked libsasl2 in <DIR>],
+- with_staticsasl="$withval";
+- if test $with_staticsasl != "no"; then
+- using_static_sasl="static"
+- fi,
+- with_staticsasl="no"; using_static_sasl="no")
+-
+- SASLFLAGS=""
+- LIB_SASL=""
+-
+- cmu_saved_CPPFLAGS=$CPPFLAGS
+- cmu_saved_LDFLAGS=$LDFLAGS
+- cmu_saved_LIBS=$LIBS
+-
+- if test ${with_staticsasl} != "no"; then
+- if test -d ${with_staticsasl}; then
+- if test -d ${with_staticsasl}/lib64 ; then
+- ac_cv_sasl_where_lib=${with_staticsasl}/lib64
+- else
+- ac_cv_sasl_where_lib=${with_staticsasl}/lib
+- fi
+- ac_cv_sasl_where_lib=${with_staticsasl}/lib
+- ac_cv_sasl_where_inc=${with_staticsasl}/include
+-
+- SASLFLAGS="-I$ac_cv_sasl_where_inc"
+- LIB_SASL="-L$ac_cv_sasl_where_lib"
+- CPPFLAGS="${cmu_saved_CPPFLAGS} -I${ac_cv_sasl_where_inc}"
+- LDFLAGS="${cmu_saved_LDFLAGS} -L${ac_cv_sasl_where_lib}"
+- else
+- with_staticsasl="/usr"
+- fi
+-
+- AC_CHECK_HEADER(sasl/sasl.h, [
+- AC_CHECK_HEADER(sasl/saslutil.h, [
+- for i42 in lib64 lib; do
+- if test -r ${with_staticsasl}/$i42/libsasl2.a; then
+- ac_cv_found_sasl=yes
+- AC_MSG_CHECKING(for static libsasl)
+- LIB_SASL="$LIB_SASL ${with_staticsasl}/$i42/libsasl2.a"
+- fi
+- done
+- if test ! "$ac_cv_found_sasl" = "yes"; then
+- AC_MSG_CHECKING(for static libsasl)
+- AC_ERROR([Could not find ${with_staticsasl}/lib*/libsasl2.a])
+- fi
+- ])])
+-
+- AC_MSG_RESULT(found)
+-
+- if test "x$SASL_GSSAPI_LIBS_SET" = "x"; then
+- LIB_SASL="$LIB_SASL $GSSAPIBASE_STATIC_LIBS"
+- else
+- SASL_GSSAPI_LIBS_SET=""
+- cmu_saved_LIBS="$GSSAPIBASE_STATIC_LIBS $cmu_saved_LIBS"
+- fi
+- fi
+-
+- if test -d ${with_sasl}; then
+- ac_cv_sasl_where_lib=${with_sasl}/lib
+- ac_cv_sasl_where_inc=${with_sasl}/include
+-
+- DYNSASLFLAGS="-I$ac_cv_sasl_where_inc"
+- if test "$ac_cv_sasl_where_lib" != ""; then
+- CMU_ADD_LIBPATH_TO($ac_cv_sasl_where_lib, LIB_DYN_SASL)
+- fi
+- LIB_DYN_SASL="$LIB_DYN_SASL -lsasl2"
+- CPPFLAGS="${cmu_saved_CPPFLAGS} -I${ac_cv_sasl_where_inc}"
+- LDFLAGS="${cmu_saved_LDFLAGS} -L${ac_cv_sasl_where_lib}"
+- fi
+-
+- dnl be sure to check for a SASLv2 specific function
+- AC_CHECK_HEADER(sasl/sasl.h, [
+- AC_CHECK_HEADER(sasl/saslutil.h, [
+- AC_CHECK_LIB(sasl2, prop_get,
+- ac_cv_found_sasl=yes,
+- ac_cv_found_sasl=no)],
+- ac_cv_found_sasl=no)], ac_cv_found_sasl=no)
+-
+- if test "$ac_cv_found_sasl" = "yes"; then
+- if test "$ac_cv_sasl_where_lib" != ""; then
+- CMU_ADD_LIBPATH_TO($ac_cv_sasl_where_lib, DYNLIB_SASL)
+- fi
+- DYNLIB_SASL="$DYNLIB_SASL -lsasl2"
+- if test "$using_static_sasl" != "static"; then
+- LIB_SASL=$DYNLIB_SASL
+- SASLFLAGS=$DYNSASLFLAGS
+- fi
+- else
+- DYNLIB_SASL=""
+- DYNSASLFLAGS=""
+- using_static_sasl="staticonly"
+- fi
+-
+- if test "x$SASL_GSSAPI_LIBS_SET" != "x"; then
+- SASL_GSSAPI_LIBS_SET=""
+- cmu_saved_LIBS="$GSSAPIBASE_LIBS $cmu_saved_LIBS"
+- fi
+-
+- LIBS="$cmu_saved_LIBS"
+- LDFLAGS="$cmu_saved_LDFLAGS"
+- CPPFLAGS="$cmu_saved_CPPFLAGS"
+-
+- AC_SUBST(LIB_DYN_SASL)
+- AC_SUBST(DYNSASLFLAGS)
+- AC_SUBST(LIB_SASL)
+- AC_SUBST(SASLFLAGS)
+- ])
+-
+-AC_DEFUN([CMU_SASL2_REQUIRED],
+-[AC_REQUIRE([CMU_SASL2])
+-if test "$ac_cv_found_sasl" != "yes"; then
+- AC_ERROR([Cannot continue without libsasl2.
+-Get it from ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/.])
+-fi])
+-
+-AC_DEFUN([CMU_SASL2_REQUIRE_VER], [
+- AC_REQUIRE([CMU_SASL2_REQUIRED])
+-
+- cmu_saved_CPPFLAGS=$CPPFLAGS
+- CPPFLAGS="$CPPFLAGS $SASLFLAGS"
+-
+- AC_TRY_CPP([
+-#include <sasl/sasl.h>
+-
+-#ifndef SASL_VERSION_MAJOR
+-#error SASL_VERSION_MAJOR not defined
+-#endif
+-#ifndef SASL_VERSION_MINOR
+-#error SASL_VERSION_MINOR not defined
+-#endif
+-#ifndef SASL_VERSION_STEP
+-#error SASL_VERSION_STEP not defined
+-#endif
+-
+-#if SASL_VERSION_MAJOR < $1 || SASL_VERSION_MINOR < $2 || SASL_VERSION_STEP < $3
+-#error SASL version is less than $1.$2.$3
+-#endif
+- ],,AC_ERROR([Incorrect SASL headers found. This package requires SASL $1.$2.$3 or newer.]))
+-
+- CPPFLAGS=$cmu_saved_CPPFLAGS
+-])
+-
+-AC_DEFUN([CMU_SASL2_CHECKAPOP_REQUIRED], [
+- AC_REQUIRE([CMU_SASL2_REQUIRED])
+-
+- cmu_saved_LDFLAGS=$LDFLAGS
+-
+- LDFLAGS="$LDFLAGS $LIB_SASL"
+-
+- AC_CHECK_LIB(sasl2, sasl_checkapop, AC_DEFINE(HAVE_APOP,[],[Does SASL support APOP?]),
+- AC_MSG_ERROR([libsasl2 without working sasl_checkapop. Cannot continue.]))
+-
+- LDFLAGS=$cmu_saved_LDFLAGS
+-])
+-
+-AC_DEFUN([SASL2_CRYPT_CHK],[
+- AC_CHECK_FUNC(crypt, cmu_have_crypt=yes, [
+- AC_CHECK_LIB(crypt, crypt,
+- LIB_CRYPT="-lcrypt"; cmu_have_crypt=yes,
+- cmu_have_crypt=no)])
+- AC_SUBST(LIB_CRYPT)
+-])
+-
+-dnl libwrap.m4 --- do we have libwrap, the access control library?
+-dnl $Id: libwrap.m4,v 1.9 2003/10/22 18:50:02 rjs3 Exp $
+-
+-AC_DEFUN([CMU_LIBWRAP], [
+- AC_REQUIRE([CMU_SOCKETS])
+- AC_ARG_WITH(libwrap,
+- [ --with-libwrap=DIR use libwrap (rooted in DIR) [yes] ],
+- with_libwrap=$withval, with_libwrap=yes)
+- if test "$with_libwrap" != no; then
+- if test -d "$with_libwrap"; then
+- CPPFLAGS="$CPPFLAGS -I${with_libwrap}/include"
+- LDFLAGS="$LDFLAGS -L${with_libwrap}/lib"
+- fi
+- cmu_save_LIBS="$LIBS"
+- AC_CHECK_LIB(wrap, request_init, [
+- AC_CHECK_HEADER(tcpd.h,, with_libwrap=no)],
+- with_libwrap=no, ${LIB_SOCKET})
+- LIBS="$cmu_save_LIBS"
+- fi
+- AC_MSG_CHECKING(libwrap support)
+- AC_MSG_RESULT($with_libwrap)
+- LIB_WRAP=""
+- if test "$with_libwrap" != no; then
+- AC_DEFINE(HAVE_LIBWRAP,[],[Do we have TCP wrappers?])
+- LIB_WRAP="-lwrap"
+- AC_CHECK_LIB(nsl, yp_get_default_domain, LIB_WRAP="${LIB_WRAP} -lnsl")
+- fi
+- AC_SUBST(LIB_WRAP)
+-])
+-
+-dnl look for the (ucd|net)snmp libraries
+-dnl $Id: ucdsnmp.m4,v 1.10 2004/05/24 19:25:41 ken3 Exp $
+-
+-AC_DEFUN([CMU_UCDSNMP], [
+- AC_REQUIRE([CMU_SOCKETS])
+- AC_ARG_WITH(snmp,
+- [ --with-snmp=DIR use ucd|net snmp (rooted in DIR) [yes] ],
+- with_snmp=$withval, with_snmp=yes)
+-
+- dnl
+- dnl Maintain backwards compatibility with old --with-ucdsnmp option
+- dnl
+- AC_ARG_WITH(ucdsnmp,, with_snmp=$withval,)
+-
+-if test "$with_snmp" != "no"; then
+-
+- dnl
+- dnl Try net-snmp first
+- dnl
+- if test "$with_snmp" = "yes"; then
+- AC_PATH_PROG(SNMP_CONFIG,net-snmp-config,,[/usr/local/bin:$PATH])
+- else
+- SNMP_CONFIG="$with_snmp/bin/net-snmp-config"
+- fi
+-
+- if test -x "$SNMP_CONFIG"; then
+- AC_MSG_CHECKING(NET SNMP libraries)
+-
+- SNMP_LIBS=`$SNMP_CONFIG --agent-libs`
+- SNMP_PREFIX=`$SNMP_CONFIG --prefix`
+-
+- if test -n "$SNMP_LIBS" && test -n "$SNMP_PREFIX"; then
+- CPPFLAGS="$CPPFLAGS -I${SNMP_PREFIX}/include"
+- LIB_UCDSNMP=$SNMP_LIBS
+- AC_DEFINE(HAVE_NETSNMP,1,[Do we have Net-SNMP support?])
+- AC_SUBST(LIB_UCDSNMP)
+- AC_MSG_RESULT(yes)
+- else
+- AC_MSG_RESULT(no)
+- AC_MSG_WARN([Could not find the required paths. Please check your net-snmp installation.])
+- fi
+- else
+- dnl
+- dnl Try ucd-snmp if net-snmp test failed
+- dnl
+- if test "$with_snmp" != no; then
+- if test -d "$with_snmp"; then
+- CPPFLAGS="$CPPFLAGS -I${with_snmp}/include"
+- LDFLAGS="$LDFLAGS -L${with_snmp}/lib"
+- fi
+- cmu_save_LIBS="$LIBS"
+- AC_CHECK_LIB(snmp, sprint_objid, [
+- AC_CHECK_HEADER(ucd-snmp/version.h,, with_snmp=no)],
+- with_snmp=no, ${LIB_SOCKET})
+- LIBS="$cmu_save_LIBS"
+- fi
+- AC_MSG_CHECKING(UCD SNMP libraries)
+- AC_MSG_RESULT($with_snmp)
+- LIB_UCDSNMP=""
+- if test "$with_snmp" != no; then
+- AC_DEFINE(HAVE_UCDSNMP,1,[Do we have UCD-SNMP support?])
+- LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp"
+- AC_CHECK_LIB(rpm, rpmdbOpen,
+- LIB_UCDSNMP="${LIB_UCDSNMP} -lrpm -lpopt",,-lpopt)
+- fi
+- AC_SUBST(LIB_UCDSNMP)
+- fi
+-fi
+-
+-])
+-
++m4_include([cmulocal/berkdb.m4])
++m4_include([cmulocal/bsd_sockets.m4])
++m4_include([cmulocal/c-attribute.m4])
++m4_include([cmulocal/c-fpic.m4])
++m4_include([cmulocal/cyrus.m4])
++m4_include([cmulocal/ipv6.m4])
++m4_include([cmulocal/libwrap.m4])
++m4_include([cmulocal/sasl2.m4])
++m4_include([cmulocal/ucdsnmp.m4])
+diff -urNad complete.dpatch/configure.in /tmp/dpep.IJ03bC/complete.dpatch/configure.in
+--- complete.dpatch/configure.in 2005-01-19 00:46:00.000000000 +0100
++++ /tmp/dpep.IJ03bC/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__
+@@ -1216,7 +1223,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_ */
Property changes on: trunk/kolab-cyrus-imapd/experimental/debian/patches/07-update_aclocal_and_configure.in.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/kolab-cyrus-imapd/experimental/debian/patches/08-clean_socket_closes.dpatch
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/patches/08-clean_socket_closes.dpatch 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/patches/08-clean_socket_closes.dpatch 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,90 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 08-clean_socket_closes.dpatch by Sven Mueller <debian at incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Cleanly close sockets
+
+ at DPATCH@
+diff -urNad complete.dpatch/imap/backend.c /tmp/dpep.FbBq2t/complete.dpatch/imap/backend.c
+--- complete.dpatch/imap/backend.c 2005-02-14 07:39:55.000000000 +0100
++++ /tmp/dpep.FbBq2t/complete.dpatch/imap/backend.c 2005-11-11 00:01:15.843304837 +0100
+@@ -382,6 +382,7 @@
+ syslog(LOG_ERR, "couldn't authenticate to backend server: %s",
+ sasl_errstring(r, NULL, NULL));
+ free(ret);
++ shutdown(sock, SHUT_RDWR);
+ close(sock);
+ ret = NULL;
+ }
+diff -urNad complete.dpatch/imap/fud.c /tmp/dpep.FbBq2t/complete.dpatch/imap/fud.c
+--- complete.dpatch/imap/fud.c 2005-11-10 21:12:04.000000000 +0100
++++ /tmp/dpep.FbBq2t/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 /tmp/dpep.FbBq2t/complete.dpatch/imap/imapd.c
+--- complete.dpatch/imap/imapd.c 2005-11-10 21:12:04.000000000 +0100
++++ /tmp/dpep.FbBq2t/complete.dpatch/imap/imapd.c 2005-11-11 00:04:47.146591300 +0100
+@@ -765,6 +765,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 /tmp/dpep.FbBq2t/complete.dpatch/imap/lmtpd.c
+--- complete.dpatch/imap/lmtpd.c 2004-12-17 17:32:15.000000000 +0100
++++ /tmp/dpep.FbBq2t/complete.dpatch/imap/lmtpd.c 2005-11-11 00:02:48.172254190 +0100
+@@ -501,6 +501,9 @@
+
+ cyrus_done();
+
++ /* shutdown socket nicely */
++ cyrus_reset_stdio();
++
+ exit(code);
+ }
+
+diff -urNad complete.dpatch/imap/pop3d.c /tmp/dpep.FbBq2t/complete.dpatch/imap/pop3d.c
+--- complete.dpatch/imap/pop3d.c 2005-11-10 21:07:23.000000000 +0100
++++ /tmp/dpep.FbBq2t/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 /tmp/dpep.FbBq2t/complete.dpatch/imap/proxyd.c
+--- complete.dpatch/imap/proxyd.c 2005-11-10 21:12:04.000000000 +0100
++++ /tmp/dpep.FbBq2t/complete.dpatch/imap/proxyd.c 2005-11-11 00:04:04.761746266 +0100
+@@ -1443,6 +1443,9 @@
+ #endif
+
+ cyrus_done();
++ cyrus_close_sock(0);
++ cyrus_close_sock(1);
++ cyrus_close_sock(2);
+
+ exit(code);
+ }
Property changes on: trunk/kolab-cyrus-imapd/experimental/debian/patches/08-clean_socket_closes.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/kolab-cyrus-imapd/experimental/debian/patches/09-kerberos-ipv4-ipv6-kludge-removal.dpatch
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/patches/09-kerberos-ipv4-ipv6-kludge-removal.dpatch 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/patches/09-kerberos-ipv4-ipv6-kludge-removal.dpatch 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,53 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 09-kerberos-ipv4-ipv6-kludge-removal.dpatch by Sven Mueller <debian at 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.
+
+ at DPATCH@
+diff -urNad complete.dpatch/imap/pop3d.c /tmp/dpep.PeS97g/complete.dpatch/imap/pop3d.c
+--- complete.dpatch/imap/pop3d.c 2005-11-11 00:11:13.000000000 +0100
++++ /tmp/dpep.PeS97g/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
Property changes on: trunk/kolab-cyrus-imapd/experimental/debian/patches/09-kerberos-ipv4-ipv6-kludge-removal.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/kolab-cyrus-imapd/experimental/debian/patches/10-fix_potential_overflows.dpatch
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/patches/10-fix_potential_overflows.dpatch 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/patches/10-fix_potential_overflows.dpatch 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,198 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10-fix_potential_overflows.dpatch by Sven Mueller <debian at incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fix potential buffer overflows
+
+ at DPATCH@
+diff -urNad complete.dpatch/imap/ctl_mboxlist.c /tmp/dpep.8ZEecd/complete.dpatch/imap/ctl_mboxlist.c
+--- complete.dpatch/imap/ctl_mboxlist.c 2004-05-22 05:45:48.000000000 +0200
++++ /tmp/dpep.8ZEecd/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 /tmp/dpep.8ZEecd/complete.dpatch/imap/fud.c
+--- complete.dpatch/imap/fud.c 2004-12-17 17:32:07.000000000 +0100
++++ /tmp/dpep.8ZEecd/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 /tmp/dpep.8ZEecd/complete.dpatch/imap/global.c
+--- complete.dpatch/imap/global.c 2004-11-23 18:40:15.000000000 +0100
++++ /tmp/dpep.8ZEecd/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 /tmp/dpep.8ZEecd/complete.dpatch/imap/idle_idled.c
+--- complete.dpatch/imap/idle_idled.c 2003-10-22 22:05:11.000000000 +0200
++++ /tmp/dpep.8ZEecd/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 /tmp/dpep.8ZEecd/complete.dpatch/imap/index.c
+--- complete.dpatch/imap/index.c 2005-02-14 17:42:08.000000000 +0100
++++ /tmp/dpep.8ZEecd/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 /tmp/dpep.8ZEecd/complete.dpatch/imap/mboxlist.h
+--- complete.dpatch/imap/mboxlist.h 2004-03-17 19:07:49.000000000 +0100
++++ /tmp/dpep.8ZEecd/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 /tmp/dpep.8ZEecd/complete.dpatch/imap/message.c
+--- complete.dpatch/imap/message.c 2005-11-10 18:19:03.000000000 +0100
++++ /tmp/dpep.8ZEecd/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 /tmp/dpep.8ZEecd/complete.dpatch/imap/mupdate.h
+--- complete.dpatch/imap/mupdate.h 2003-12-10 17:07:03.000000000 +0100
++++ /tmp/dpep.8ZEecd/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 /tmp/dpep.8ZEecd/complete.dpatch/imap/proxyd.c
+--- complete.dpatch/imap/proxyd.c 2005-11-10 18:19:03.000000000 +0100
++++ /tmp/dpep.8ZEecd/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 /tmp/dpep.8ZEecd/complete.dpatch/imtest/imtest.c
+--- complete.dpatch/imtest/imtest.c 2005-11-10 18:19:03.000000000 +0100
++++ /tmp/dpep.8ZEecd/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 /tmp/dpep.8ZEecd/complete.dpatch/master/master.c
+--- complete.dpatch/master/master.c 2005-11-10 18:19:03.000000000 +0100
++++ /tmp/dpep.8ZEecd/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 /tmp/dpep.8ZEecd/complete.dpatch/master/masterconf.c
+--- complete.dpatch/master/masterconf.c 2003-11-25 18:37:19.000000000 +0100
++++ /tmp/dpep.8ZEecd/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 /tmp/dpep.8ZEecd/complete.dpatch/notifyd/notifyd.c
+--- complete.dpatch/notifyd/notifyd.c 2004-12-17 17:32:25.000000000 +0100
++++ /tmp/dpep.8ZEecd/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);
+ }
Property changes on: trunk/kolab-cyrus-imapd/experimental/debian/patches/10-fix_potential_overflows.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/kolab-cyrus-imapd/experimental/debian/patches/100-kolab-imapd.dpatch
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/patches/100-kolab-imapd.dpatch 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/patches/100-kolab-imapd.dpatch 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,83 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 100-kolab-imapd.dpatch by Steffen Joeris <steffen.joeris at skolelinux.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Include imapd.patch from kolab upstream
+
+
+ at DPATCH@
+--- cyrus22-imap-2.2.12.orig/et/com_err.c.orig 2003-06-04 05:27:50.000000000 +0200
++++ cyrus22-imap-2.2.12/et/com_err.c 2004-02-02 19:56:00.000000000 +0100
+@@ -50,7 +50,7 @@
+ #include <string.h>
+ #include "mit-sipb-copyright.h"
+
+-#if defined(HAVE_STDARG_H) || defined(_WINDOWS)
++#if defined(HAVE_STDARG_H) || defined(__STDC__) || defined(_WINDOWS)
+ #include <stdarg.h>
+ #else
+ #include <varargs.h>
+--- cyrus22-imapd-2.2.12.orig/lib/cyrusdb_skiplist.c.orig 2003-12-15 17:04:35.000000000 +0100
++++ cyrus22-imapd-2.2.12/lib/cyrusdb_skiplist.c 2004-02-02 19:56:00.000000000 +0100
+@@ -71,6 +71,11 @@
+
+ #define PROB (0.5)
+
++#ifdef __FreeBSD__
++/* #define fdatasync(fd) fsync(fd) */
++#define O_DSYNC 0
++#endif
++
+ /*
+ *
+ * disk format; all numbers in network byte order
+--- cyrus22-imapd-2.2.12.orig/lib/prot.h.orig 2003-10-22 20:50:12.000000000 +0200
++++ cyrus22-imapd-2.2.12/lib/prot.h 2004-02-02 19:58:47.000000000 +0100
+@@ -49,6 +49,7 @@
+ #include <time.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <sys/time.h>
+
+ #include <sasl/sasl.h>
+
+#--- cyrus22-imapd-2.2.12.orig/perl/sieve/lib/isieve.c.orig 2003-10-22 20:50:25.000000000 +0200
+#+++ cyrus22-imapd-2.2.12/perl/sieve/lib/isieve.c 2004-02-02 20:01:21.000000000 +0100
+#@@ -41,9 +41,7 @@
+#
+# /* $Id: imapd.patch,v 1.12 2004/11/13 14:53:34 rse Exp $ */
+#
+#-#ifdef HAVE_CONFIG_H
+#-#include <config.h>
+#-#endif
+#+#include "../../../config.h"
+#
+# #ifdef HAVE_UNISTD_H
+# #include <unistd.h>
+--- cyrus22-imapd-2.2.12.orig/imap/mboxname.c.orig 2004-03-17 10:03:40.000000000 +0200
++++ cyrus22-imapd-2.2.12/imap/mboxname.c 2004-03-17 10:03:40.000000000 +0200
+@@ -129,7 +129,11 @@
+ domainlen = strlen(result);
+ }
+ }
++#ifdef ATVDOM /* allow '@' being a regular character in mboxname even when using virtual domains */
++ else if ((cp = strrchr(name, '@'))) {
++#else
+ if ((cp = strrchr(name, '@'))) {
++#endif /* ATVDOM */
+ /* mailbox specified as mbox at domain */
+ namelen = cp - name;
+
+
+Index: lib/cyrusdb_berkeley.c
+--- cyrus22-imapd-2.2.12.orig/lib/cyrusdb_berkeley.c.orig 2004-03-11 19:36:44 +0100
++++ cyrus22-imapd-2.2.12/lib/cyrusdb_berkeley.c 2004-11-13 13:48:28 +0100
+@@ -104,7 +104,7 @@
+ exit(EC_TEMPFAIL);
+ }
+
+-static void db_err(const char *db_prfx, char *buffer)
++static void db_err(const DB_ENV *dbenv, const char *db_prfx, const char *buffer)
+ {
+ syslog(LOG_WARNING, "DBERROR %s: %s", db_prfx, buffer);
+ }
Property changes on: trunk/kolab-cyrus-imapd/experimental/debian/patches/100-kolab-imapd.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/kolab-cyrus-imapd/experimental/debian/patches/101-fix_Makefile.in.dpatch
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/patches/101-fix_Makefile.in.dpatch 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/patches/101-fix_Makefile.in.dpatch 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,46 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01-fix_Makefile.in.dpatch by Steffen Joeris <steffen.joeris at skolelinux.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix lib/Makefile.in
+
+ at DPATCH@
+--- cyrus22-imapd-2.2.12/lib/Makefile.in.orig 2006-01-02 12:05:52.000000000 +0100
++++ cyrus22-imapd-2.2.12/lib/Makefile.in 2006-01-02 12:07:49.000000000 +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
+@@ -85,7 +85,7 @@
+ $(srcdir)/lsort.h $(srcdir)/stristr.h \
+ $(srcdir)/util.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 \
+@@ -93,7 +93,7 @@
+ chartable.o imapurl.o nonblock_ at WITH_NONBLOCK@.o lock_ at WITH_LOCK@.o \
+ gmtoff_ at WITH_GMTOFF@.o map_ at WITH_MAP@.o $(ACL) $(AUTH) \
+ @LIBOBJS@ @CYRUSDB_OBJS@ \
+- iptostring.o xmalloc.o wildmat.o
++ iptostring.o xmalloc.o wildmat.o byteorder64.o
+
+ LIBCYRM_HDRS = $(srcdir)/hash.h $(srcdir)/mpool.h $(srcdir)/xmalloc.h \
+ $(srcdir)/strhash.o $(srcdir)/libconfig.h $(srcdir)/assert.h \
+@@ -153,8 +153,7 @@
+ $(CC) $(LDFLAGS) -o mkchartable mkchartable.o xmalloc.o assert.o
+
+ clean:
+- rm -f *.o *.a chartable.c Makefile.bak mkchartable makedepend.log \
+- $(BUILTSOURCES)
++ rm -f *.o *.a chartable.c Makefile.bak mkchartable makedepend.log
+
+ distclean: clean
+ rm -f Makefile
Property changes on: trunk/kolab-cyrus-imapd/experimental/debian/patches/101-fix_Makefile.in.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/kolab-cyrus-imapd/experimental/debian/patches/105-cyradm.sh.dpatch
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/patches/105-cyradm.sh.dpatch 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/patches/105-cyradm.sh.dpatch 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 105-cyradm.sh.dpatch by Steffen Joeris <steffen.joeris at skolelinux.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Add some stuff to scripts
+
+ at DPATCH@
+--- cyrus22-imapd-2.2.12/perl/imap/cyradm.sh.orig 2004-01-15 15:35:34.000000000 +0100
++++ cyrus22-imapd-2.2.12/perl/imap/cyradm.sh 2005-08-29 04:28:51.000000000 +0200
+@@ -225,6 +225,10 @@ Indicates that the mailbox should have a
+ Sets an email address to which messages injected into the server via NNTP
+ will be sent.
+
++=item C</explicit/annotation>
++
++Sets the annotation I</explicit/annotation> on I<mailbox> to I<value>.
++
+ =back
+
+ =item C<renamemailbox> [C<--partition> I<partition>] I<oldname> I<newname>
+
Property changes on: trunk/kolab-cyrus-imapd/experimental/debian/patches/105-cyradm.sh.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/kolab-cyrus-imapd/experimental/debian/patches/11-fix_syslog_prefix.dpatch
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/patches/11-fix_syslog_prefix.dpatch 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/patches/11-fix_syslog_prefix.dpatch 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,68 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 11-fix_syslog_prefix.dpatch by Sven Mueller <debian at 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.
+
+ at DPATCH@
+diff -urNad complete.dpatch/imap/global.c /tmp/dpep.rKpUur/complete.dpatch/imap/global.c
+--- complete.dpatch/imap/global.c 2005-11-11 13:12:47.000000000 +0100
++++ /tmp/dpep.rKpUur/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 /tmp/dpep.rKpUur/complete.dpatch/ptclient/ptexpire.c
+--- complete.dpatch/ptclient/ptexpire.c 2004-05-26 18:05:59.000000000 +0200
++++ /tmp/dpep.rKpUur/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 /tmp/dpep.rKpUur/complete.dpatch/ptclient/test.c
+--- complete.dpatch/ptclient/test.c 2003-10-22 20:50:29.000000000 +0200
++++ /tmp/dpep.rKpUur/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 /tmp/dpep.rKpUur/complete.dpatch/ptclient/test2.c
+--- complete.dpatch/ptclient/test2.c 2003-10-22 20:50:29.000000000 +0200
++++ /tmp/dpep.rKpUur/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 at club.cc.cmu.edu",cacheid))
+ printf ("Auth_memberof(cg2v,cg2v:me) is %d\n",
Property changes on: trunk/kolab-cyrus-imapd/experimental/debian/patches/11-fix_syslog_prefix.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/kolab-cyrus-imapd/experimental/debian/patches/110-Admin.pm.dpatch
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/patches/110-Admin.pm.dpatch 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/patches/110-Admin.pm.dpatch 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,35 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 110-Admin.pm.dpatch by Steffen Joeris <steffen.joeris at skolelinux.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Add lines from Kolab upstream
+
+ at DPATCH@
+--- cyrus22-imapd-2.2.12/perl/imap/IMAP/Admin.pm.orig 2006-01-02 13:43:38.000000000 +0100
++++ cyrus22-imapd-2.2.12/perl/imap/IMAP/Admin.pm 2006-01-02 13:46:49.000000000 +0100
+@@ -782,18 +782,20 @@
+ my %values = ( "comment" => "/comment",
+ "news2mail" => "/vendor/cmu/cyrus-imapd/news2mail",
+ "expire" => "/vendor/cmu/cyrus-imapd/expire",
+- "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 "/";
++ }
+
+ my ($rc, $msg);
+
Property changes on: trunk/kolab-cyrus-imapd/experimental/debian/patches/110-Admin.pm.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/kolab-cyrus-imapd/experimental/debian/patches/12-fix_timeout_handling.dpatch
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/patches/12-fix_timeout_handling.dpatch 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/patches/12-fix_timeout_handling.dpatch 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,457 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 12-fix_timeout_handling.dpatch by Sven Mueller <debian at incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fixes timeout handling
+
+ at DPATCH@
+diff -urNad complete.dpatch/imap/signals.c /tmp/dpep.9pxAsS/complete.dpatch/imap/signals.c
+--- complete.dpatch/imap/signals.c 2005-02-14 17:26:50.000000000 +0100
++++ /tmp/dpep.9pxAsS/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 /tmp/dpep.9pxAsS/complete.dpatch/lib/lock.h
+--- complete.dpatch/lib/lock.h 2003-02-13 21:15:40.000000000 +0100
++++ /tmp/dpep.9pxAsS/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 /tmp/dpep.9pxAsS/complete.dpatch/lib/lock_fcntl.c
+--- complete.dpatch/lib/lock_fcntl.c 2003-02-13 21:15:40.000000000 +0100
++++ /tmp/dpep.9pxAsS/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 /tmp/dpep.9pxAsS/complete.dpatch/lib/lock_flock.c
+--- complete.dpatch/lib/lock_flock.c 2003-02-13 21:15:41.000000000 +0100
++++ /tmp/dpep.9pxAsS/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;
+ }
+
Property changes on: trunk/kolab-cyrus-imapd/experimental/debian/patches/12-fix_timeout_handling.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/kolab-cyrus-imapd/experimental/debian/patches/120-kolab-Shell.pm.dpatch
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/patches/120-kolab-Shell.pm.dpatch 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/patches/120-kolab-Shell.pm.dpatch 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,54 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 120-Shell.pm.dpatch by Steffen Joeris <steffen.joeris at skolelinux.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Add small stuff from Kolab
+
+ at DPATCH@
+--- cyrus22-imapd-2.2.12/perl/imap/IMAP/Shell.pm.orig 2006-01-02 13:19:55.000000000 +0100
++++ cyrus22-imapd-2.2.12/perl/imap/IMAP/Shell.pm 2006-01-02 13:25:06.000000000 +0100
+@@ -126,7 +126,7 @@
+ [\&_sc_info, '[mailbox]',
+ 'display mailbox/server metadata'],
+ mboxcfg =>
+- [\&_sc_mboxcfg, 'mailbox [comment|news2mail|expire|squat] value',
++ [\&_sc_mboxcfg, 'mailbox [comment|news2mail|expire|squat|/<explicit annotation>] value',
+ 'configure mailbox'],
+ mboxconfig => 'mboxcfg',
+ reconstruct =>
+@@ -429,7 +429,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,
+@@ -459,7 +459,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) {
+@@ -1339,7 +1339,7 @@
+ while (defined ($opt = shift(@argv))) {
+ last if $opt eq '--';
+ if ($opt =~ /^-/) {
+- die "usage: mboxconfig mailbox [comment|news2mail|expire|squat] value\n";
++ die "usage: mboxconfig mailbox [comment|news2mail|expire|squat|/<explicit annotation>] value\n";
+ }
+ else {
+ push(@nargv, $opt);
+@@ -1348,7 +1348,7 @@
+ }
+ push(@nargv, @argv);
+ if (@nargv < 2) {
+- die "usage: mboxconfig mailbox [comment|news2mail|expire|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";
Property changes on: trunk/kolab-cyrus-imapd/experimental/debian/patches/120-kolab-Shell.pm.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/kolab-cyrus-imapd/experimental/debian/patches/13-master_process_handling.dpatch
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/patches/13-master_process_handling.dpatch 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/patches/13-master_process_handling.dpatch 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,245 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 13-master_process_handling.dpatch by Sven Mueller <debian at incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes process (child) handling in master process
+
+ at DPATCH@
+diff -urNad complete.dpatch/master/master.c /tmp/dpep.NKIIR9/complete.dpatch/master/master.c
+--- complete.dpatch/master/master.c 2005-11-11 17:03:04.000000000 +0100
++++ /tmp/dpep.NKIIR9/complete.dpatch/master/master.c 2005-11-11 17:04:39.273704930 +0100
+@@ -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;
+@@ -1392,8 +1424,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;
+@@ -1405,7 +1438,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 {
+@@ -1413,6 +1446,7 @@
+ if (prefork > 1) prefork = 1;
+ Services[i].desired_workers = prefork;
+ Services[i].max_workers = 1;
++ Services[i].babysit = 0;
+ }
+ free(max);
+
+@@ -1452,7 +1486,7 @@
+ if (!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 (ignore_err) {
+ syslog(LOG_WARNING, "WARNING: %s -- ignored", buf);
+@@ -1506,7 +1540,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
+@@ -1521,11 +1555,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 */
+@@ -1544,7 +1576,10 @@
+
+ /* disable all services -
+ they will be re-enabled if they appear in config file */
+- for (i = 0; i < nservices; i++) Services[i].exec = NULL;
++ for (i = 0; i < nservices; i++) {
++ if (Services[i].exec) free((void*)Services[i].exec);
++ Services[i].exec = NULL;
++ }
+
+ /* read services */
+ masterconf_getsection("SERVICES", &add_service, (void*) 1);
+@@ -1559,13 +1594,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++ ) {
+@@ -1648,9 +1688,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 */
+@@ -1683,8 +1723,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);
+@@ -2060,13 +2107,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 complete.dpatch/master/master.h /tmp/dpep.NKIIR9/complete.dpatch/master/master.h
+--- complete.dpatch/master/master.h 2005-11-11 17:03:03.000000000 +0100
++++ /tmp/dpep.NKIIR9/complete.dpatch/master/master.h 2005-11-11 17:03:04.650994659 +0100
+@@ -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
Property changes on: trunk/kolab-cyrus-imapd/experimental/debian/patches/13-master_process_handling.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/kolab-cyrus-imapd/experimental/debian/patches/130-kolab-imapd.c.dpatch
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/patches/130-kolab-imapd.c.dpatch 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/patches/130-kolab-imapd.c.dpatch 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 130-kolab-imapd.c.dpatch by Steffen Joeris <steffen.joeris at skolelinux.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix lib/Makefile.in
+
+ at DPATCH@
+--- cyrus22-imapd-2.2.12/imap/imapd.c.orig 2006-01-02 14:00:49.000000000 +0100
++++ cyrus22-imapd-2.2.12/imap/imapd.c 2006-01-02 14:01:36.000000000 +0100
+@@ -3923,10 +3923,12 @@
+ }
+ }
+
++ #ifdef notdef
+ /* verify that the mailbox doesn't have a wildcard in it */
+ for (p = oldmailboxname; !r && *p; p++) {
+ if (*p == '*' || *p == '%') r = IMAP_MAILBOX_BADNAME;
+ }
++ #endif
+
+ /* attempt to rename the base mailbox */
+ if (!r) {
Property changes on: trunk/kolab-cyrus-imapd/experimental/debian/patches/130-kolab-imapd.c.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/kolab-cyrus-imapd/experimental/debian/patches/14-xmalloc.dpatch
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/patches/14-xmalloc.dpatch 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/patches/14-xmalloc.dpatch 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 14-xmalloc.dpatch by Sven Mueller <debian at incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix xmalloc usage
+
+ at DPATCH@
+diff -urNad complete.dpatch/lib/map_stupidshared.c /tmp/dpep.1Bc5Yw/complete.dpatch/lib/map_stupidshared.c
+--- complete.dpatch/lib/map_stupidshared.c 2003-10-22 20:50:12.000000000 +0200
++++ /tmp/dpep.1Bc5Yw/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 /tmp/dpep.1Bc5Yw/complete.dpatch/lib/xmalloc.h
+--- complete.dpatch/lib/xmalloc.h 2003-10-22 20:50:12.000000000 +0200
++++ /tmp/dpep.1Bc5Yw/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 */
Property changes on: trunk/kolab-cyrus-imapd/experimental/debian/patches/14-xmalloc.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/kolab-cyrus-imapd/experimental/debian/patches/140-kolab-mbox.dpatch
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/patches/140-kolab-mbox.dpatch 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/patches/140-kolab-mbox.dpatch 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,39 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 140-kolab-mbox.dpatch by Steffen Joeris <steffen.joeris at skolelinux.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Add lines to mboxlist.c
+
+ at DPATCH@
+--- cyrus-imapd-2.2.12/imap/mboxlist.c.orig 2006-01-02 14:09:58.000000000 +0100
++++ cyrus-imapd-2.2.12/imap/mboxlist.c 2006-01-02 14:10:49.000000000 +0100
+@@ -476,10 +476,12 @@
+ free(acl);
+ return IMAP_PERMISSION_DENIED;
+ }
++ #ifdef notdef
+ /* disallow wildcards in userids with inboxes. */
+ if (strchr(mbox, '*') || strchr(mbox, '%') || strchr(mbox, '?')) {
+ return IMAP_MAILBOX_BADNAME;
+ }
++ #endif
+
+ /*
+ * Users by default have all access to their personal mailbox(es),
+--- cyrus-imapd-2.2.12/imap/mboxname.c.orig 2006-01-02 14:22:32.000000000 +0100
++++ cyrus-imapd-2.2.12/imap/mboxname.c 2006-01-02 14:24:02.000000000 +0100
+@@ -649,8 +649,13 @@
+ /*
+ * Apply site policy restrictions on mailbox names.
+ * Restrictions are hardwired for now.
+- */
++
++ * original definition
+ #define GOODCHARS " +,-.0123456789:=@ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz~"
++ */
++
++#define GOODCHARS " #$%'()*+,-.0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~"
++
+ int mboxname_policycheck(char *name)
+ {
+ unsigned i;
Property changes on: trunk/kolab-cyrus-imapd/experimental/debian/patches/140-kolab-mbox.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/kolab-cyrus-imapd/experimental/debian/patches/15-munge_8bit.dpatch
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/patches/15-munge_8bit.dpatch 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/patches/15-munge_8bit.dpatch 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,75 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 15_munge_8bit.dpatch by Sven Mueller <debian at incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Add support for munge8bit
+
+ at DPATCH@
+diff -urNad complete.dpatch/imap/message.c /tmp/dpep.sh0ZiZ/complete.dpatch/imap/message.c
+--- complete.dpatch/imap/message.c 2004-09-16 19:58:54.000000000 +0200
++++ /tmp/dpep.sh0ZiZ/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 /tmp/dpep.sh0ZiZ/complete.dpatch/imap/spool.c
+--- complete.dpatch/imap/spool.c 2004-10-27 22:40:50.000000000 +0200
++++ /tmp/dpep.sh0ZiZ/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 /tmp/dpep.sh0ZiZ/complete.dpatch/lib/imapoptions
+--- complete.dpatch/lib/imapoptions 2004-07-21 21:07:45.000000000 +0200
++++ /tmp/dpep.sh0ZiZ/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
Property changes on: trunk/kolab-cyrus-imapd/experimental/debian/patches/15-munge_8bit.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/kolab-cyrus-imapd/experimental/debian/patches/16-fix_mib.dpatch
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/patches/16-fix_mib.dpatch 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/patches/16-fix_mib.dpatch 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,30 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 16-fix_mib.dpatch by Sven Mueller <debian at incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix MIB file for cyrus
+
+ at DPATCH@
+diff -urNad complete.dpatch/master/CYRUS-MASTER.mib /tmp/dpep.McEbU0/complete.dpatch/master/CYRUS-MASTER.mib
+--- complete.dpatch/master/CYRUS-MASTER.mib 2001-08-14 18:11:26.000000000 +0200
++++ /tmp/dpep.McEbU0/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
Property changes on: trunk/kolab-cyrus-imapd/experimental/debian/patches/16-fix_mib.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/kolab-cyrus-imapd/experimental/debian/patches/17-fix_tail_syntax_in_xversion.h.dpatch
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/patches/17-fix_tail_syntax_in_xversion.h.dpatch 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/patches/17-fix_tail_syntax_in_xversion.h.dpatch 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,16 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 17-fix_tail_syntax_in_xversion.h.dpatch by Sven Mueller <debian at 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")
+
+ at DPATCH@
+diff -urNad complete.dpatch/imap/xversion.sh /tmp/dpep.gLdzBq/complete.dpatch/imap/xversion.sh
+--- complete.dpatch/imap/xversion.sh 2003-10-22 20:03:00.000000000 +0200
++++ /tmp/dpep.gLdzBq/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
Property changes on: trunk/kolab-cyrus-imapd/experimental/debian/patches/17-fix_tail_syntax_in_xversion.h.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/kolab-cyrus-imapd/experimental/debian/patches/18-fix_strlen_return_type.dpatch
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/patches/18-fix_strlen_return_type.dpatch 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/patches/18-fix_strlen_return_type.dpatch 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,606 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 18-fix_strlen_return_type.dpatch by Sven Mueller <debian at 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.
+
+ at DPATCH@
+diff -urNad complete.dpatch/imap/imapd.c /tmp/dpep.2wtF9E/complete.dpatch/imap/imapd.c
+--- complete.dpatch/imap/imapd.c 2005-11-11 16:17:00.000000000 +0100
++++ /tmp/dpep.2wtF9E/complete.dpatch/imap/imapd.c 2005-11-11 16:17:00.679913340 +0100
+@@ -6071,8 +6071,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);
+@@ -6122,9 +6122,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') {
+@@ -6199,11 +6199,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);
+@@ -6317,11 +6317,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",
+@@ -6355,7 +6355,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);
+@@ -6401,8 +6402,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,
+@@ -6441,8 +6442,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,
+@@ -6637,9 +6638,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, " \
+@@ -7183,7 +7185,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);
+ }
+@@ -7213,7 +7215,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 complete.dpatch/imap/mbdump.c /tmp/dpep.2wtF9E/complete.dpatch/imap/mbdump.c
+--- complete.dpatch/imap/mbdump.c 2005-11-11 16:16:59.000000000 +0100
++++ /tmp/dpep.2wtF9E/complete.dpatch/imap/mbdump.c 2005-11-11 16:17:00.679913340 +0100
+@@ -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 complete.dpatch/imap/message.c /tmp/dpep.2wtF9E/complete.dpatch/imap/message.c
+--- complete.dpatch/imap/message.c 2005-11-11 16:17:00.000000000 +0100
++++ /tmp/dpep.2wtF9E/complete.dpatch/imap/message.c 2005-11-11 16:17:00.681913145 +0100
+@@ -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 complete.dpatch/imap/mupdate-client.c /tmp/dpep.2wtF9E/complete.dpatch/imap/mupdate-client.c
+--- complete.dpatch/imap/mupdate-client.c 2005-11-11 16:16:59.000000000 +0100
++++ /tmp/dpep.2wtF9E/complete.dpatch/imap/mupdate-client.c 2005-11-11 16:17:00.681913145 +0100
+@@ -331,9 +331,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) {
+@@ -356,9 +358,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) {
+@@ -381,9 +384,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) {
+@@ -406,8 +410,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) {
+@@ -475,8 +479,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));
+
+@@ -508,8 +512,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 complete.dpatch/imap/mupdate.c /tmp/dpep.2wtF9E/complete.dpatch/imap/mupdate.c
+--- complete.dpatch/imap/mupdate.c 2005-11-11 16:16:59.000000000 +0100
++++ /tmp/dpep.2wtF9E/complete.dpatch/imap/mupdate.c 2005-11-11 16:17:00.682913047 +0100
+@@ -1589,20 +1589,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);
+@@ -1644,17 +1644,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 complete.dpatch/imap/proxyd.c /tmp/dpep.2wtF9E/complete.dpatch/imap/proxyd.c
+--- complete.dpatch/imap/proxyd.c 2005-11-11 16:17:00.000000000 +0100
++++ /tmp/dpep.2wtF9E/complete.dpatch/imap/proxyd.c 2005-11-11 16:17:00.685912753 +0100
+@@ -2888,7 +2888,8 @@
+ if (!s) r = IMAP_SERVER_UNAVAILABLE;
+ }
+ if (!r) {
+- 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 (!pipe_command(s, 16384)) {
+ pipe_until_tag(s, tag, 0);
+ }
+@@ -2961,8 +2962,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);
+@@ -3192,8 +3193,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];
+@@ -3346,7 +3348,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 */;;) {
+@@ -3576,8 +3579,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 */
+
+@@ -3617,8 +3620,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 */
+
+@@ -3719,17 +3722,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);
+@@ -3745,9 +3748,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 */
+
+@@ -3782,8 +3785,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 */
+@@ -3852,9 +3855,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 */
+@@ -3943,14 +3946,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 {
+@@ -4182,15 +4185,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 */
+@@ -4290,8 +4293,8 @@
+ if (!r) 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;
+@@ -4517,8 +4520,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);
+ }
+@@ -4658,7 +4661,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);
+ }
+@@ -4686,7 +4689,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 complete.dpatch/imtest/imtest.c /tmp/dpep.2wtF9E/complete.dpatch/imtest/imtest.c
+--- complete.dpatch/imtest/imtest.c 2005-11-11 16:17:00.000000000 +0100
++++ /tmp/dpep.2wtF9E/complete.dpatch/imtest/imtest.c 2005-11-11 17:01:17.683492575 +0100
+@@ -625,14 +625,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);
+ }
+@@ -1769,7 +1769,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 complete.dpatch/master/master.c /tmp/dpep.2wtF9E/complete.dpatch/master/master.c
+--- complete.dpatch/master/master.c 2005-11-11 16:17:00.000000000 +0100
++++ /tmp/dpep.2wtF9E/complete.dpatch/master/master.c 2005-11-11 16:17:00.688912460 +0100
+@@ -1889,7 +1889,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 complete.dpatch/timsieved/actions.c /tmp/dpep.2wtF9E/complete.dpatch/timsieved/actions.c
+--- complete.dpatch/timsieved/actions.c 2005-11-11 16:16:59.000000000 +0100
++++ /tmp/dpep.2wtF9E/complete.dpatch/timsieved/actions.c 2005-11-11 16:17:00.688912460 +0100
+@@ -353,7 +353,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);
Property changes on: trunk/kolab-cyrus-imapd/experimental/debian/patches/18-fix_strlen_return_type.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/kolab-cyrus-imapd/experimental/debian/patches/19-fix_tls_ssl.dpatch
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/patches/19-fix_tls_ssl.dpatch 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/patches/19-fix_tls_ssl.dpatch 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,78 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 19-fix_tls_errormessage.dpatch by Sven Mueller <debian at incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Make TLS/SSL error message more informative
+
+ at DPATCH@
+diff -urNad complete.dpatch/imap/tls.c /tmp/dpep.uKZhrg/complete.dpatch/imap/tls.c
+--- complete.dpatch/imap/tls.c 2005-11-11 15:31:40.000000000 +0100
++++ /tmp/dpep.uKZhrg/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 /tmp/dpep.uKZhrg/complete.dpatch/imtest/imtest.c
+--- complete.dpatch/imtest/imtest.c 2005-11-11 15:31:41.000000000 +0100
++++ /tmp/dpep.uKZhrg/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 /tmp/dpep.uKZhrg/complete.dpatch/lib/imclient.c
+--- complete.dpatch/lib/imclient.c 2005-11-11 15:31:40.000000000 +0100
++++ /tmp/dpep.uKZhrg/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);
Property changes on: trunk/kolab-cyrus-imapd/experimental/debian/patches/19-fix_tls_ssl.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/kolab-cyrus-imapd/experimental/debian/patches/20-drac_auth.dpatch
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/patches/20-drac_auth.dpatch 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/patches/20-drac_auth.dpatch 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,296 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 20_drac_auth.dpatch by Sven Mueller <debian at incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Enable DRAC (pop-before-smtp) authentication
+
+ at DPATCH@
+diff -urNad cyrus-imapd-2.2.12/configure.in /tmp/dpep.hL1Os6/cyrus-imapd-2.2.12/configure.in
+--- cyrus-imapd-2.2.12/configure.in 2005-11-17 04:23:45.000000000 +0100
++++ /tmp/dpep.hL1Os6/cyrus-imapd-2.2.12/configure.in 2005-11-17 04:23:46.955948052 +0100
+@@ -988,6 +988,19 @@
+ SNMP_SUBDIRS=""
+ AC_SUBST(SNMP_SUBDIRS)
+
++dnl
++dnl Test for DRAC
++dnl
++DRACLIBS=
++AC_ARG_WITH(drac, [ --with-drac=DIR use DRAC library in <DIR> [no] ],
++ if test -d "$withval"; then
++ LDFLAGS="$LDFLAGS -L${withval}"
++ AC_CHECK_LIB(drac, dracauth,
++ AC_DEFINE(DRAC_AUTH,[],[Build DRAC support?])
++ DRACLIBS="-ldrac")
++ fi)
++AC_SUBST(DRACLIBS)
++
+ CMU_LIBWRAP
+ CMU_UCDSNMP
+
+diff -urNad cyrus-imapd-2.2.12/imap/Makefile.in /tmp/dpep.hL1Os6/cyrus-imapd-2.2.12/imap/Makefile.in
+--- cyrus-imapd-2.2.12/imap/Makefile.in 2005-11-17 04:23:45.000000000 +0100
++++ /tmp/dpep.hL1Os6/cyrus-imapd-2.2.12/imap/Makefile.in 2005-11-17 04:23:46.955948052 +0100
+@@ -69,6 +69,7 @@
+ SIEVE_LIBS = @SIEVE_LIBS@
+ IMAP_COM_ERR_LIBS = @IMAP_COM_ERR_LIBS@
+ LIB_WRAP = @LIB_WRAP@
++DRAC_LIBS = @DRACLIBS@
+ LIBS = $(IMAP_LIBS) $(IMAP_COM_ERR_LIBS)
+ DEPLIBS = ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
+
+@@ -217,17 +218,17 @@
+ imapd: xversion $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
+ $(CC) $(LDFLAGS) -o imapd \
+ $(SERVICE) $(IMAPDOBJS) mutex_fake.o \
+- libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP)
++ libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(DRAC_LIBS)
+
+ imapd.pure: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
+ $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o imapd.pure \
+ $(SERVICE) $(IMAPDOBJS) mutex_fake.o libimap.a \
+- $(DEPLIBS) $(LIBS) $(LIB_WRAP)
++ $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(DRAC_LIBS)
+
+ imapd.quant: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
+ $(QUANTIFY) $(QUANTOPT) $(CC) $(LDFLAGS) -o imapd.quant \
+ $(SERVICE) $(IMAPDOBJS) mutex_fake.o libimap.a \
+- $(DEPLIBS) $(LIBS) $(LIB_WRAP)
++ $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(DRAC_LIBS) $(DRAC_LIBS)
+
+ proxyd: $(PROXYDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
+ $(CC) $(LDFLAGS) -o proxyd \
+@@ -254,7 +255,7 @@
+
+ pop3d: pop3d.o backend.o tls.o mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
+ $(CC) $(LDFLAGS) -o pop3d pop3d.o backend.o tls.o $(SERVICE) \
+- mutex_fake.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP)
++ mutex_fake.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(DRAC_LIBS)
+
+ nntpd: nntpd.o backend.o index.o smtpclient.o spool.o tls.o \
+ mutex_fake.o nntp_err.o libimap.a $(DEPLIBS) $(SERVICE)
+diff -urNad cyrus-imapd-2.2.12/imap/imapd.c /tmp/dpep.hL1Os6/cyrus-imapd-2.2.12/imap/imapd.c
+--- cyrus-imapd-2.2.12/imap/imapd.c 2005-11-17 04:23:45.000000000 +0100
++++ /tmp/dpep.hL1Os6/cyrus-imapd-2.2.12/imap/imapd.c 2005-11-17 04:23:46.958947759 +0100
+@@ -137,6 +137,18 @@
+ 1, 1, &imapd_authstate, &imapd_userisadmin, &imapd_userisproxyadmin
+ };
+
++#ifdef DRAC_AUTH
++static struct {
++ int interval; /* dracd "ping" interval; 0 = disabled */
++ unsigned long clientaddr;
++ struct prot_waitevent *event;
++} drac;
++
++extern int dracconn(char *server, char **errmsg);
++extern int dracsend(unsigned long userip, char **errmsg);
++extern int dracdisc(char **errmsg);
++#endif /* DRAC_AUTH */
++
+ /* current sub-user state */
+ static struct mailbox mboxstruct;
+ static struct mailbox *imapd_mailbox;
+@@ -558,6 +570,23 @@
+ /* setup for sending IMAP IDLE notifications */
+ idle_enabled();
+
++#ifdef DRAC_AUTH
++ /* setup for sending DRAC "pings" */
++ drac.event = NULL;
++ drac.interval = config_getint(IMAPOPT_DRACINTERVAL);
++ if (drac.interval < 0) drac.interval = 0;
++ if (drac.interval) {
++ char *err;
++
++ if (dracconn((char*) config_getstring(IMAPOPT_DRACHOST), &err) != 0) {
++ /* disable DRAC */
++ drac.interval = 0;
++ syslog(LOG_ERR, "dracconn: %s", err);
++ syslog(LOG_ERR, "DRAC notifications disabled");
++ }
++ }
++#endif /* DRAC_AUTH */
++
+ /* create connection to the SNMP listener, if available. */
+ snmp_connect(); /* ignore return code */
+ snmp_set_str(SERVER_NAME_VERSION,CYRUS_VERSION);
+@@ -650,6 +679,15 @@
+ imapd_haveaddr = 1;
+ }
+ }
++
++#ifdef DRAC_AUTH
++ if (((struct sockaddr *)&imapd_remoteaddr)->sa_family == AF_INET)
++ drac.clientaddr = ((struct sockaddr_in *)&imapd_remoteaddr)->sin_addr.s_addr;
++ else
++ drac.clientaddr = 0;
++ } else {
++ drac.clientaddr = 0;
++#endif /* DRAC_AUTH */
+ }
+
+ /* create the SASL connection */
+@@ -692,6 +730,11 @@
+ prot_flush(imapd_out);
+ snmp_increment(ACTIVE_CONNECTIONS, -1);
+
++#ifdef DRAC_AUTH
++ if (drac.event) prot_removewaitevent(imapd_in, drac.event);
++ drac.event = NULL;
++#endif /* DRAC_AUTH */
++
+ /* cleanup */
+ imapd_reset();
+
+@@ -772,6 +815,10 @@
+
+ cyrus_done();
+
++#ifdef DRAC_AUTH
++ if (drac.interval) (void) dracdisc((char **)NULL);
++#endif /* DRAC_AUTH */
++
+ exit(code);
+ }
+
+@@ -809,6 +856,35 @@
+ shut_down(code);
+ }
+
++#ifdef DRAC_AUTH
++/*
++ * Ping dracd every 'drac.interval' minutes
++ * to let it know that we are still connected
++ */
++struct prot_waitevent *drac_ping(struct protstream *s,
++ struct prot_waitevent *ev, void *rock)
++{
++ char *err;
++ static int nfailure = 0;
++
++ if (dracsend(drac.clientaddr, &err) != 0) {
++ syslog(LOG_ERR, "dracsend: %s", err);
++ if (++nfailure >= 3) {
++ /* can't contact dracd for 3 consecutive tries - disable DRAC */
++ prot_removewaitevent(s, ev);
++ drac.event = NULL;
++ syslog(LOG_ERR, "DRAC notifications disabled");
++ return NULL;
++ }
++ }
++ else
++ nfailure = 0;
++
++ ev->mark = time(NULL) + (drac.interval * 60);
++ return ev;
++}
++#endif /* DRAC_AUTH */
++
+ /*
+ * Top-level command loop parsing
+ */
+@@ -1836,6 +1912,11 @@
+
+ prot_printf(imapd_out, "%s OK %s\r\n", tag, reply);
+
++#ifdef DRAC_AUTH
++ if (drac.interval && drac.clientaddr)
++ drac.event = prot_addwaitevent(imapd_in, 0 /* now */, drac_ping, NULL);
++#endif /* DRAC_AUTH */
++
+ /* Create telemetry log */
+ imapd_logfd = telemetry_log(imapd_userid, imapd_in, imapd_out, 0);
+
+@@ -1982,6 +2063,11 @@
+ prot_setsasl(imapd_in, imapd_saslconn);
+ prot_setsasl(imapd_out, imapd_saslconn);
+
++#ifdef DRAC_AUTH
++ if (drac.interval && drac.clientaddr)
++ drac.event = prot_addwaitevent(imapd_in, 0 /* now */, drac_ping, NULL);
++#endif /* DRAC_AUTH */
++
+ /* Create telemetry log */
+ imapd_logfd = telemetry_log(imapd_userid, imapd_in, imapd_out, 0);
+
+diff -urNad cyrus-imapd-2.2.12/imap/pop3d.c /tmp/dpep.hL1Os6/cyrus-imapd-2.2.12/imap/pop3d.c
+--- cyrus-imapd-2.2.12/imap/pop3d.c 2005-11-17 04:23:45.000000000 +0100
++++ /tmp/dpep.hL1Os6/cyrus-imapd-2.2.12/imap/pop3d.c 2005-11-17 04:23:46.960947563 +0100
+@@ -44,6 +44,10 @@
+ */
+ #include <config.h>
+
++#ifdef DRAC_AUTH
++static int drac_enabled;
++extern int dracauth(char *server, unsigned long userip, char **errmsg);
++#endif /* DRAC_AUTH */
+
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+@@ -408,6 +412,10 @@
+ prot_settimeout(popd_in, timeout*60);
+ prot_setflushonread(popd_in, popd_out);
+
++#ifdef DRAC_AUTH
++ drac_enabled = (config_getint(IMAPOPT_DRACINTERVAL) > 0);
++#endif /* DRAC_AUTH */
++
+ if (kflag) kpop();
+
+ /* we were connected on pop3s port so we should do
+@@ -1439,6 +1447,21 @@
+ popd_mailbox = &mboxstruct;
+ proc_register("pop3d", popd_clienthost, popd_userid,
+ popd_mailbox->name);
++
++#ifdef DRAC_AUTH
++ if (drac_enabled &&
++ ((struct sockaddr *)&popd_remoteaddr)->sa_family == AF_INET) {
++ char *err;
++
++ if (dracauth((char*) config_getstring(IMAPOPT_DRACHOST),
++ ((struct sockaddr_in *)&popd_remoteaddr)->sin_addr.s_addr, &err) != 0) {
++ /* disable DRAC */
++ drac_enabled = 0;
++ syslog(LOG_ERR, "dracauth: %s", err);
++ syslog(LOG_ERR, "DRAC notifications disabled");
++ }
++ }
++#endif /* DRAC_AUTH */
+ }
+
+ /* Create telemetry log */
+diff -urNad cyrus-imapd-2.2.12/imap/version.c /tmp/dpep.hL1Os6/cyrus-imapd-2.2.12/imap/version.c
+--- cyrus-imapd-2.2.12/imap/version.c 2005-11-17 04:21:25.000000000 +0100
++++ /tmp/dpep.hL1Os6/cyrus-imapd-2.2.12/imap/version.c 2005-11-17 04:23:46.960947563 +0100
+@@ -151,6 +151,10 @@
+ snprintf(env_buf + strlen(env_buf), MAXIDVALUELEN - strlen(env_buf),
+ "; %s", SIEVE_VERSION);
+ #endif
++#ifdef DRAC_AUTH
++ snprintf(env_buf + strlen(env_buf), MAXIDVALUELEN - strlen(env_buf),
++ "; DRAC");
++#endif
+ #ifdef HAVE_LIBWRAP
+ snprintf(env_buf + strlen(env_buf), MAXIDVALUELEN - strlen(env_buf),
+ "; TCP Wrappers");
+diff -urNad cyrus-imapd-2.2.12/lib/imapoptions /tmp/dpep.hL1Os6/cyrus-imapd-2.2.12/lib/imapoptions
+--- cyrus-imapd-2.2.12/lib/imapoptions 2005-11-17 04:23:45.000000000 +0100
++++ /tmp/dpep.hL1Os6/cyrus-imapd-2.2.12/lib/imapoptions 2005-11-17 04:26:47.858267907 +0100
+@@ -196,6 +196,15 @@
+ { "deleteright", "c", STRING }
+ /* The right that a user needs to delete a mailbox. */
+
++{ "dracinterval", 0, INT }
++/* If nonzero, enables the use of DRAC (Dynamic Relay Authorization
++ Control) by the pop3d and imapd daemons. Also sets the interval
++ (in minutes) between re-authorization requests made by imapd.
++ Default is 0, sensible Value when enabling it is 5. */
++
++{ "drachost", "localhost", STRING }
++/* Hostname of the RPC dracd server. Default: localhost */
++
+ { "duplicate_db", "berkeley-nosync", STRINGLIST("berkeley", "berkeley-nosync", "skiplist")}
+ /* The cyrusdb backend to use for the duplicate delivery suppression
+ and sieve. */
Property changes on: trunk/kolab-cyrus-imapd/experimental/debian/patches/20-drac_auth.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/kolab-cyrus-imapd/experimental/debian/patches/21-fix_config-parsing.dpatch
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/patches/21-fix_config-parsing.dpatch 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/patches/21-fix_config-parsing.dpatch 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,37 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 21-fix_config-parsing.dpatch by Sven Mueller <debian at incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix parsing of master.conf
+
+ at DPATCH@
+diff -urNad complete.dpatch/master/masterconf.c /tmp/dpep.CfovCR/complete.dpatch/master/masterconf.c
+--- complete.dpatch/master/masterconf.c 2005-11-11 15:25:37.000000000 +0100
++++ /tmp/dpep.CfovCR/complete.dpatch/master/masterconf.c 2005-11-11 15:27:02.084797577 +0100
+@@ -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;
+ }
+
Property changes on: trunk/kolab-cyrus-imapd/experimental/debian/patches/21-fix_config-parsing.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/kolab-cyrus-imapd/experimental/debian/patches/22-imapd_index_check.dpatch
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/patches/22-imapd_index_check.dpatch 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/patches/22-imapd_index_check.dpatch 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,51 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 22-imapd_index_check.dpatch by Sven Mueller <debian at incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix usage of index_check()
+
+ at DPATCH@
+diff -urNad complete.dpatch/imap/imapd.c /tmp/dpep.SYrYMP/complete.dpatch/imap/imapd.c
+--- complete.dpatch/imap/imapd.c 2005-11-11 16:01:19.000000000 +0100
++++ /tmp/dpep.SYrYMP/complete.dpatch/imap/imapd.c 2005-11-11 16:01:37.190206572 +0100
+@@ -3175,8 +3175,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,
+@@ -3191,6 +3191,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,
+@@ -3309,7 +3312,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,
+@@ -3441,7 +3445,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);
+ }
+
Property changes on: trunk/kolab-cyrus-imapd/experimental/debian/patches/22-imapd_index_check.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/kolab-cyrus-imapd/experimental/debian/patches/25-update_install-sh.dpatch
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/patches/25-update_install-sh.dpatch 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/patches/25-update_install-sh.dpatch 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,530 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 25_update_install.sh.dpatch by Sven Mueller <debian at incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: update install-sh to a more recent version
+
+ at 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:
Property changes on: trunk/kolab-cyrus-imapd/experimental/debian/patches/25-update_install-sh.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/kolab-cyrus-imapd/experimental/debian/patches/30-update_perlcalling.sh.dpatch
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/patches/30-update_perlcalling.sh.dpatch 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/patches/30-update_perlcalling.sh.dpatch 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,494 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 30_update_perlcalling.sh.dpatch by Sven Mueller <debian at 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.
+
+ at DPATCH@
+diff -urNad cyrus-imapd-2.2.12/contrib/cyrus-graphtools.1.0/cgi-bin/cyrus_master.pl /tmp/dpep.36VuGh/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
++++ /tmp/dpep.36VuGh/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 at 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 /tmp/dpep.36VuGh/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
++++ /tmp/dpep.36VuGh/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 /tmp/dpep.36VuGh/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
++++ /tmp/dpep.36VuGh/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 at andrew.cmu.edu> 21 Sep 2000
+diff -urNad cyrus-imapd-2.2.12/contrib/mupdate-test.pl /tmp/dpep.36VuGh/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
++++ /tmp/dpep.36VuGh/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 /tmp/dpep.36VuGh/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
++++ /tmp/dpep.36VuGh/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 /tmp/dpep.36VuGh/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
++++ /tmp/dpep.36VuGh/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 /tmp/dpep.36VuGh/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
++++ /tmp/dpep.36VuGh/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 /tmp/dpep.36VuGh/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
++++ /tmp/dpep.36VuGh/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 /tmp/dpep.36VuGh/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
++++ /tmp/dpep.36VuGh/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 /tmp/dpep.36VuGh/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
++++ /tmp/dpep.36VuGh/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 /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/snmp/snmpgen
+--- cyrus-imapd-2.2.12/snmp/snmpgen 2005-05-24 22:13:05.000000000 +0200
++++ /tmp/dpep.36VuGh/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.17 2004/11/19 17:05:48 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 /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/arbitronsort.pl
+--- cyrus-imapd-2.2.12/tools/arbitronsort.pl 2005-05-24 22:13:04.000000000 +0200
++++ /tmp/dpep.36VuGh/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 /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/config2header
+--- cyrus-imapd-2.2.12/tools/config2header 2005-05-24 22:13:04.000000000 +0200
++++ /tmp/dpep.36VuGh/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.9 2004/06/22 19:02:31 rjs3 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 /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/config2man
+--- cyrus-imapd-2.2.12/tools/config2man 2005-05-24 22:13:04.000000000 +0200
++++ /tmp/dpep.36VuGh/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 /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/dohash
+--- cyrus-imapd-2.2.12/tools/dohash 2005-05-24 22:13:04.000000000 +0200
++++ /tmp/dpep.36VuGh/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,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 to upgrade from versions of imapd previous to 1.6.2
+ # make sure you run it as the cyrus user
+ # $Id: dohash,v 1.10 2001/02/23 04:43:01 leg 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 /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/masssievec
+--- cyrus-imapd-2.2.12/tools/masssievec 2005-05-24 22:13:04.000000000 +0200
++++ /tmp/dpep.36VuGh/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,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 for mass compilation of sieve scripts.
+-#
+-# $Id: masssievec,v 1.4 2004/06/21 18:44:11 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;
+
+ $| = 1;
+diff -urNad cyrus-imapd-2.2.12/tools/mkimap /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/mkimap
+--- cyrus-imapd-2.2.12/tools/mkimap 2005-05-24 22:13:04.000000000 +0200
++++ /tmp/dpep.36VuGh/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.16 2004/06/29 18:16:54 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;
+
+ $imapdconf = shift || "/etc/imapd.conf";
+diff -urNad cyrus-imapd-2.2.12/tools/mknewsgroups /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/mknewsgroups
+--- cyrus-imapd-2.2.12/tools/mknewsgroups 2005-05-24 22:13:04.000000000 +0200
++++ /tmp/dpep.36VuGh/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 /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/rehash
+--- cyrus-imapd-2.2.12/tools/rehash 2005-05-24 22:13:04.000000000 +0200
++++ /tmp/dpep.36VuGh/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 at 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.7 2003/10/22 18:50:32 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;
+
+ $| = 1;
+diff -urNad cyrus-imapd-2.2.12/tools/translatesieve /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/translatesieve
+--- cyrus-imapd-2.2.12/tools/translatesieve 2005-05-24 22:13:04.000000000 +0200
++++ /tmp/dpep.36VuGh/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 /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/undohash
+--- cyrus-imapd-2.2.12/tools/undohash 2005-05-24 22:13:04.000000000 +0200
++++ /tmp/dpep.36VuGh/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.7 2002/05/25 19:57:53 leg Exp $
+diff -urNad cyrus-imapd-2.2.12/tools/upgradesieve /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/upgradesieve
+--- cyrus-imapd-2.2.12/tools/upgradesieve 2005-05-24 22:13:04.000000000 +0200
++++ /tmp/dpep.36VuGh/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;
Property changes on: trunk/kolab-cyrus-imapd/experimental/debian/patches/30-update_perlcalling.sh.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/kolab-cyrus-imapd/experimental/debian/patches/35-masssievec_remove_unused_variable.dpatch
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/patches/35-masssievec_remove_unused_variable.dpatch 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/patches/35-masssievec_remove_unused_variable.dpatch 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 35_masssievec_remove_unused_variable.dpatch by Sven Mueller <debian at 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.
+
+ at DPATCH@
+diff -urNad cyrus-imapd-2.2.12/tools/masssievec /tmp/dpep.jwVgoT/cyrus-imapd-2.2.12/tools/masssievec
+--- cyrus-imapd-2.2.12/tools/masssievec 2005-05-24 22:52:49.000000000 +0200
++++ /tmp/dpep.jwVgoT/cyrus-imapd-2.2.12/tools/masssievec 2005-05-24 22:53:24.124865338 +0200
+@@ -72,7 +72,6 @@
+ open CONF, $imapdconf or die "can't open $imapdconf";
+ while (<CONF>) {
+ 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;
+ }
Property changes on: trunk/kolab-cyrus-imapd/experimental/debian/patches/35-masssievec_remove_unused_variable.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/kolab-cyrus-imapd/experimental/debian/patches/40-rehash_fix_pathes.dpatch
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/patches/40-rehash_fix_pathes.dpatch 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/patches/40-rehash_fix_pathes.dpatch 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,36 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 40_rehash_fix_pathes.dpatch by Sven Mueller <debian at incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix paths in tools/rehash
+
+ at DPATCH@
+diff -urNad cyrus-imapd-2.2.12/tools/rehash /tmp/dpep.cNgMuy/cyrus-imapd-2.2.12/tools/rehash
+--- cyrus-imapd-2.2.12/tools/rehash 2005-05-24 22:56:53.000000000 +0200
++++ /tmp/dpep.cNgMuy/cyrus-imapd-2.2.12/tools/rehash 2005-05-24 22:57:53.429121575 +0200
+@@ -130,7 +130,7 @@
+ $imapdconf = shift || "/etc/imapd.conf";
+
+ $yn = "y";
+-$sievedir = "/usr/sieve";
++$sievedir = "/var/spool/sieve";
+ $nosievedir = 0;
+ $hashispool = 0;
+ $virtdomains = 0;
+@@ -165,7 +165,7 @@
+ }
+ close CONF;
+
+-if (! $conf) { $conf = "/var/imap"; }
++if (! $conf) { $conf = "/var/lib/cyrus"; }
+
+ if ($interactive) {
+ print "upgrade $conf? ";
+@@ -539,6 +539,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";
Property changes on: trunk/kolab-cyrus-imapd/experimental/debian/patches/40-rehash_fix_pathes.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/kolab-cyrus-imapd/experimental/debian/patches/45-kolab2-annotations.dpatch
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/patches/45-kolab2-annotations.dpatch 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/patches/45-kolab2-annotations.dpatch 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,125 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 45-kolab2-annotations.dpatch by Sven Mueller <debian at incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Add kolab2 compatible annotation functionality
+
+ at DPATCH@
+diff -urNad cyrus22-imapd-2.2.12/imap/annotate.c /tmp/dpep.AQbIR0/cyrus22-imapd-2.2.12/imap/annotate.c
+--- cyrus22-imapd-2.2.12/imap/annotate.c 2005-03-12 23:09:22.000000000 +0100
++++ /tmp/dpep.AQbIR0/cyrus22-imapd-2.2.12/imap/annotate.c 2005-06-30 13:15:22.121300304 +0200
+@@ -1606,6 +1606,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,
+@@ -1618,6 +1623,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));
+@@ -1639,37 +1645,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;
+@@ -1679,7 +1703,7 @@
+ goto cleanup;
+ }
+ value = annotate_canon_value(av->value,
+- entries[entrycount].type);
++ working_entry->type);
+ if (!value) {
+ r = IMAP_ANNOTATION_BADVALUE;
+ goto cleanup;
+@@ -1705,7 +1729,7 @@
+ goto cleanup;
+ }
+ value = annotate_canon_value(av->value,
+- entries[entrycount].type);
++ working_entry->type);
+ if (!value) {
+ r = IMAP_ANNOTATION_BADVALUE;
+ goto cleanup;
+@@ -1807,6 +1831,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);
+ }
Property changes on: trunk/kolab-cyrus-imapd/experimental/debian/patches/45-kolab2-annotations.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/kolab-cyrus-imapd/experimental/debian/patches/50-FTBFS-gcc-4.0-fix.dpatch
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/patches/50-FTBFS-gcc-4.0-fix.dpatch 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/patches/50-FTBFS-gcc-4.0-fix.dpatch 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,27 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50-FTBFS-gcc-4.0-fix.dpatch by Ondřej Surý <ondrej at sury.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix FTBFS when compiling with gcc-4.0, there is imapopts is used before declared
+
+ at DPATCH@
+diff -urN cyrus22-imapd-2.2.12~/tools/config2header cyrus22-imapd-2.2.12/tools/config2header
+--- cyrus22-imapd-2.2.12~/tools/config2header 2004-06-22 21:02:31.000000000 +0200
++++ cyrus22-imapd-2.2.12/tools/config2header 2005-06-22 07:56:17.180293688 +0200
+@@ -214,7 +214,6 @@
+ print HFILE <<EOF
+ IMAPOPT_LAST
+ };
+-extern struct imapopt_s imapopts[];
+
+ enum enum_value {
+ IMAP_ENUM_ZERO = 0,
+@@ -260,6 +259,8 @@
+
+ print HFILE <<EOF
+ };
++extern struct imapopt_s imapopts[];
++
+ #endif /* INCLUDED_IMAPOPTIONS_H */
+ EOF
+ ;
Property changes on: trunk/kolab-cyrus-imapd/experimental/debian/patches/50-FTBFS-gcc-4.0-fix.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/kolab-cyrus-imapd/experimental/debian/patches/51-multiple_mupdate_err.h-fix.dpatch
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/patches/51-multiple_mupdate_err.h-fix.dpatch 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/patches/51-multiple_mupdate_err.h-fix.dpatch 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,29 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 51-multiple_mupdate_err.h-fix.dpatch by Ondřej Surý <ondrej at sury.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: mupdate_err.h is already included from mupdate.h
+
+ at DPATCH@
+diff -urN cyrus22-imapd-2.2.12~/imap/mupdate-client.c cyrus22-imapd-2.2.12/imap/mupdate-client.c
+--- cyrus22-imapd-2.2.12~/imap/mupdate-client.c 2004-08-25 17:35:41.000000000 +0200
++++ cyrus22-imapd-2.2.12/imap/mupdate-client.c 2005-06-22 08:00:58.383544296 +0200
+@@ -73,7 +73,6 @@
+ #include "imparse.h"
+ #include "iptostring.h"
+ #include "mupdate.h"
+-#include "mupdate_err.h"
+ #include "prot.h"
+ #include "protocol.h"
+ #include "xmalloc.h"
+diff -urN cyrus22-imapd-2.2.12~/imap/mupdate-slave.c cyrus22-imapd-2.2.12/imap/mupdate-slave.c
+--- cyrus22-imapd-2.2.12~/imap/mupdate-slave.c 2004-03-08 20:23:04.000000000 +0100
++++ cyrus22-imapd-2.2.12/imap/mupdate-slave.c 2005-06-22 08:00:52.971367072 +0200
+@@ -73,7 +73,6 @@
+ #include "imparse.h"
+ #include "iptostring.h"
+ #include "mupdate.h"
+-#include "mupdate_err.h"
+ #include "exitcodes.h"
+
+ /* Returns file descriptor of kick socket (or does not return) */
Property changes on: trunk/kolab-cyrus-imapd/experimental/debian/patches/51-multiple_mupdate_err.h-fix.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/kolab-cyrus-imapd/experimental/debian/patches/60-lower-poptimeout-minimum.dpatch
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/patches/60-lower-poptimeout-minimum.dpatch 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/patches/60-lower-poptimeout-minimum.dpatch 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,37 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 40-lower-poptimeout-minimum.dpatch by Sven Mueller <debian at incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Lower the minimum timeout for POP3 locks
+## DP: NOTE: Though this patch enables you to lower POP3 lock timeouts to
+## DP: less than 10 minutes, the corresponding RFC REQUIRES that the timeout
+## DP: is not shorter than 10 minutes. You may run into problems if you set
+## DP: Timeouts below that value.
+
+ at DPATCH@
+diff -urNad cyrus-imapd-2.2.12/imap/pop3d.c /tmp/dpep.6Vbjgo/cyrus-imapd-2.2.12/imap/pop3d.c
+--- cyrus-imapd-2.2.12/imap/pop3d.c 2005-05-25 00:07:42.000000000 +0200
++++ /tmp/dpep.6Vbjgo/cyrus-imapd-2.2.12/imap/pop3d.c 2005-07-15 16:53:38.168045663 +0200
+@@ -402,7 +402,7 @@
+
+ /* Set inactivity timer */
+ timeout = config_getint(IMAPOPT_POPTIMEOUT);
+- if (timeout < 10) timeout = 10;
++ if (timeout < 1) timeout = 1;
+ prot_settimeout(popd_in, timeout*60);
+ prot_setflushonread(popd_in, popd_out);
+
+diff -urNad cyrus-imapd-2.2.12/lib/imapoptions /tmp/dpep.6Vbjgo/cyrus-imapd-2.2.12/lib/imapoptions
+--- cyrus-imapd-2.2.12/lib/imapoptions 2005-05-25 00:07:42.000000000 +0200
++++ /tmp/dpep.6Vbjgo/cyrus-imapd-2.2.12/lib/imapoptions 2005-07-15 16:57:59.646502208 +0200
+@@ -601,7 +601,9 @@
+
+ { "poptimeout", 10, INT }
+ /* Set the length of the POP server's inactivity autologout timer,
+- in minutes. The minimum value is 10, the default. */
++ in minutes. The minimum value is 1, the default is 10.
++ NOTE: The standard (RFC1939) specifically states that this
++ value MUST NOT be lower than 10.*/
+
+ { "popuseacl", 0, SWITCH }
+ /* Enforce IMAP ACLs in the pop server. Due to the nature of the POP3
Added: trunk/kolab-cyrus-imapd/experimental/debian/patches/61-64bit-quota.dpatch
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/patches/61-64bit-quota.dpatch 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/patches/61-64bit-quota.dpatch 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,657 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 60-64bit-quota.dpatch by Ondrej Sury <ondrej at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Add support for 64-bit quotas
+
+ at DPATCH@
+diff -urN cyrus-imapd-2.2.12~/configure.in cyrus-imapd-2.2.12/configure.in
+--- cyrus-imapd-2.2.12~/configure.in 2005-01-19 00:46:00.000000000 +0100
++++ cyrus-imapd-2.2.12/configure.in 2005-08-30 12:09:28.000000000 +0200
+@@ -100,6 +100,15 @@
+ 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 -urN cyrus-imapd-2.2.12~/imap/append.c cyrus-imapd-2.2.12/imap/append.c
+--- cyrus-imapd-2.2.12~/imap/append.c 2004-05-22 05:45:48.000000000 +0200
++++ cyrus-imapd-2.2.12/imap/append.c 2005-08-30 12:09:28.000000000 +0200
+@@ -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 -urN cyrus-imapd-2.2.12~/imap/imapd.c cyrus-imapd-2.2.12/imap/imapd.c
+--- cyrus-imapd-2.2.12~/imap/imapd.c 2005-02-14 07:39:55.000000000 +0100
++++ cyrus-imapd-2.2.12/imap/imapd.c 2005-08-30 12:09:28.000000000 +0200
+@@ -2626,10 +2626,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));
+@@ -4626,7 +4626,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");
+@@ -4688,7 +4688,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 -urN cyrus-imapd-2.2.12~/imap/mailbox.c cyrus-imapd-2.2.12/imap/mailbox.c
+--- cyrus-imapd-2.2.12~/imap/mailbox.c 2005-02-14 07:39:57.000000000 +0100
++++ cyrus-imapd-2.2.12/imap/mailbox.c 2005-08-30 13:30:55.000000000 +0200
+@@ -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);
+@@ -1430,9 +1447,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);
+@@ -1608,7 +1634,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;
+@@ -1829,8 +1856,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);
+@@ -1862,7 +1894,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);
+ }
+ }
+@@ -2132,7 +2164,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
+@@ -2250,7 +2282,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;
+ }
+ }
+@@ -2464,7 +2496,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;
+ }
+ }
+@@ -2617,7 +2649,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 -urN cyrus-imapd-2.2.12~/imap/mailbox.h cyrus-imapd-2.2.12/imap/mailbox.h
+--- cyrus-imapd-2.2.12~/imap/mailbox.h 2004-01-22 22:17:09.000000000 +0100
++++ cyrus-imapd-2.2.12/imap/mailbox.h 2005-08-30 12:09:28.000000000 +0200
+@@ -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 -urN cyrus-imapd-2.2.12~/imap/mbdump.c cyrus-imapd-2.2.12/imap/mbdump.c
+--- cyrus-imapd-2.2.12~/imap/mbdump.c 2004-05-22 05:45:51.000000000 +0200
++++ cyrus-imapd-2.2.12/imap/mbdump.c 2005-08-30 12:09:28.000000000 +0200
+@@ -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 -urN cyrus-imapd-2.2.12~/imap/mbexamine.c cyrus-imapd-2.2.12/imap/mbexamine.c
+--- cyrus-imapd-2.2.12~/imap/mbexamine.c 2004-12-17 17:32:16.000000000 +0100
++++ cyrus-imapd-2.2.12/imap/mbexamine.c 2005-08-30 12:11:23.000000000 +0200
+@@ -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 -urN cyrus-imapd-2.2.12~/imap/mboxlist.c cyrus-imapd-2.2.12/imap/mboxlist.c
+--- cyrus-imapd-2.2.12~/imap/mboxlist.c 2004-07-26 20:08:03.000000000 +0200
++++ cyrus-imapd-2.2.12/imap/mboxlist.c 2005-08-30 12:09:28.000000000 +0200
+@@ -2540,7 +2540,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 -urN cyrus-imapd-2.2.12~/imap/quota.c cyrus-imapd-2.2.12/imap/quota.c
+--- cyrus-imapd-2.2.12~/imap/quota.c 2004-06-30 21:23:26.000000000 +0200
++++ cyrus-imapd-2.2.12/imap/quota.c 2005-08-30 12:09:28.000000000 +0200
+@@ -120,7 +120,7 @@
+ struct quota quota;
+ int refcount;
+ int deleted;
+- unsigned long newused;
++ uquota_t newused;
+ };
+
+ #define QUOTAGROW 300
+@@ -251,7 +251,7 @@
+ }
+ memset("a[quota_num], 0, sizeof(struct quotaentry));
+ quota[quota_num].quota.root = xstrndup(key, keylen);
+- sscanf(data, "%lu %d",
++ sscanf(data, UQUOTA_T_FMT " %d",
+ "a[quota_num].quota.used, "a[quota_num].quota.limit);
+
+ quota_num++;
+@@ -422,7 +422,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("a[thisquota].quota, tid);
+@@ -489,12 +489,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) {
+@@ -507,6 +507,6 @@
+ (*quota_namespace.mboxname_toexternal)("a_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 -urN cyrus-imapd-2.2.12~/imap/quota_db.c cyrus-imapd-2.2.12/imap/quota_db.c
+--- cyrus-imapd-2.2.12~/imap/quota_db.c 2004-05-22 05:45:52.000000000 +0200
++++ cyrus-imapd-2.2.12/imap/quota_db.c 2005-08-30 12:09:28.000000000 +0200
+@@ -89,7 +89,7 @@
+
+ switch (r) {
+ case CYRUSDB_OK:
+- sscanf(data, "%lu %d", "a->used, "a->limit);
++ sscanf(data, UQUOTA_T_FMT " %d", "a->used, "a->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 -urN cyrus-imapd-2.2.12~/imap/quota.h cyrus-imapd-2.2.12/imap/quota.h
+--- cyrus-imapd-2.2.12~/imap/quota.h 2004-02-27 18:44:56.000000000 +0100
++++ cyrus-imapd-2.2.12/imap/quota.h 2005-08-30 12:10:37.000000000 +0200
+@@ -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 -urN cyrus-imapd-2.2.12~/imap/reconstruct.c cyrus-imapd-2.2.12/imap/reconstruct.c
+--- cyrus-imapd-2.2.12~/imap/reconstruct.c 2004-10-11 16:01:24.000000000 +0200
++++ cyrus-imapd-2.2.12/imap/reconstruct.c 2005-08-30 12:09:28.000000000 +0200
+@@ -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);
+- *((bit32 *)(buf+OFFSET_QUOTA_MAILBOX_USED)) = htonl(new_quota);
++
++ /* 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_USED32)) = 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 -urN cyrus-imapd-2.2.12~/lib/byteorder64.c cyrus-imapd-2.2.12/lib/byteorder64.c
+--- cyrus-imapd-2.2.12~/lib/byteorder64.c 1970-01-01 01:00:00.000000000 +0100
++++ cyrus-imapd-2.2.12/lib/byteorder64.c 2005-08-30 12:19:49.000000000 +0200
+@@ -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 at 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 -urN cyrus-imapd-2.2.12~/lib/byteorder64.h cyrus-imapd-2.2.12/lib/byteorder64.h
+--- cyrus-imapd-2.2.12~/lib/byteorder64.h 1970-01-01 01:00:00.000000000 +0100
++++ cyrus-imapd-2.2.12/lib/byteorder64.h 2005-08-30 12:19:13.000000000 +0200
+@@ -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 at 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 -urN cyrus-imapd-2.2.12~/lib/prot.c cyrus-imapd-2.2.12/lib/prot.c
+--- cyrus-imapd-2.2.12~/lib/prot.c 2004-02-27 23:08:56.000000000 +0100
++++ cyrus-imapd-2.2.12/lib/prot.c 2005-08-30 12:09:28.000000000 +0200
+@@ -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();
+ }
Property changes on: trunk/kolab-cyrus-imapd/experimental/debian/patches/61-64bit-quota.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/kolab-cyrus-imapd/experimental/debian/patches/65-sieveshell-enhancements.dpatch
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/patches/65-sieveshell-enhancements.dpatch 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/patches/65-sieveshell-enhancements.dpatch 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,210 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 65-sieveshell-enhancements.dpatch by Sven Mueller <debian at incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Adds some enhancements to sieveshell and fixes some paths.
+
+ at DPATCH@
+diff -urNad cyrus-imapd-2.2.12/perl/sieve/lib/request.c /tmp/dpep.YFoauN/cyrus-imapd-2.2.12/perl/sieve/lib/request.c
+--- cyrus-imapd-2.2.12/perl/sieve/lib/request.c 2005-11-17 04:21:24.000000000 +0100
++++ /tmp/dpep.YFoauN/cyrus-imapd-2.2.12/perl/sieve/lib/request.c 2005-11-21 20:21:43.907367956 +0100
+@@ -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.12/perl/sieve/scripts/sieveshell.pl /tmp/dpep.YFoauN/cyrus-imapd-2.2.12/perl/sieve/scripts/sieveshell.pl
+--- cyrus-imapd-2.2.12/perl/sieve/scripts/sieveshell.pl 2005-11-21 20:21:42.000000000 +0100
++++ /tmp/dpep.YFoauN/cyrus-imapd-2.2.12/perl/sieve/scripts/sieveshell.pl 2005-11-21 20:22:58.422064261 +0100
+@@ -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
Property changes on: trunk/kolab-cyrus-imapd/experimental/debian/patches/65-sieveshell-enhancements.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/kolab-cyrus-imapd/experimental/debian/patches/98-use_Debian_config.guess_config.sub.dpatch
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/patches/98-use_Debian_config.guess_config.sub.dpatch 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/patches/98-use_Debian_config.guess_config.sub.dpatch 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,43 @@
+#!/bin/sh
+## 98_use_Debian_config.guess_config.sub.dpatch by Sven Mueller <debian at incase.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Update config.sub and config.guess from the autotools-dev package
+set -e
+
+case "$1" in
+ "-patch")
+ if [ ! -f /usr/share/misc/config.sub ] || [ ! -f /usr/share/misc/config.guess ] ; then
+ echo "config.sub and/or config.guess not found - are autotools-dev really installed?" >&2
+ exit 1
+ fi
+ if [ -f config.guess ] && [ ! -f config.guess.dpatch ]; then
+ # only move it if the destination doesn't already exist.
+ # after all, our backup should really be the copy from
+ # the orig.tar.gz
+ mv config.guess config.guess.dpatch || exit 1
+ fi
+ if [ -f config.sub ] && [ ! -f config.sub.dpatch ]; then
+ mv config.sub config.sub.dpatch || exit 1
+ fi
+ cp -f /usr/share/misc/config.guess config.guess || exit 1
+ cp -f /usr/share/misc/config.sub config.sub || exit 1
+ exit 0
+ ;;
+ "-unpatch")
+ if [ -f config.guess.dpatch ]; then
+ mv -f config.guess.dpatch config.guess || exit 1
+ fi
+ if [ -f config.sub.dpatch ]; then
+ mv -f config.sub.dpatch config.sub || exit 1
+ fi
+ exit 0
+ ;;
+ *)
+ echo "unknown dpatch command: $1" >&2
+ exit 1
+ ;;
+esac
+exit 0
+
+
Property changes on: trunk/kolab-cyrus-imapd/experimental/debian/patches/98-use_Debian_config.guess_config.sub.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/kolab-cyrus-imapd/experimental/debian/patches/99-update-autoconf.dpatch
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/patches/99-update-autoconf.dpatch 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/patches/99-update-autoconf.dpatch 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,9778 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 99-update-autoconf.dpatch by Ondrej Sury <ondrej at 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: (drac and 64bit-quota)
+
+ at DPATCH@
+diff -urNad cyrus-imapd-2.2.12/config.h.in /tmp/dpep.vVKcNy/cyrus-imapd-2.2.12/config.h.in
+--- cyrus-imapd-2.2.12/config.h.in 2005-11-11 19:21:57.000000000 +0100
++++ /tmp/dpep.vVKcNy/cyrus-imapd-2.2.12/config.h.in 2005-11-11 20:46:36.707433160 +0100
+@@ -55,6 +55,9 @@
+ /* What user will we run as? */
+ #undef CYRUS_USER
+
++/* Build DRAC support? */
++#undef DRAC_AUTH
++
+ /* Alternative to /dev/urandom? */
+ #undef EGD_SOCKET
+
+@@ -147,8 +150,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
+@@ -298,6 +301,12 @@
+ /* Directiory to use for service binaries */
+ #undef SERVICE_PATH
+
++/* The size of a `long long int', as computed by sizeof. */
++#undef SIZEOF_LONG_LONG_INT
++
++/* The size of a `unsigned long long int', as computed by sizeof. */
++#undef SIZEOF_UNSIGNED_LONG_LONG_INT
++
+ /* Do we already have setproctitle? */
+ #undef SPT_TYPE
+
+@@ -322,6 +331,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
+@@ -336,9 +349,11 @@
+ /* Define to empty if `const' does not conform to ANSI C. */
+ #undef const
+
+-/* Define as `__inline' if that's what the C compiler calls it, or to nothing
+- if it is not supported. */
++/* Define to `__inline__' or `__inline' if that's what the C compiler
++ calls it, or to nothing if 'inline' is not supported under any name. */
++#ifndef __cplusplus
+ #undef inline
++#endif
+
+
+ /* time.h */
+@@ -479,7 +494,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_ */
+diff -urNad cyrus-imapd-2.2.12/configure /tmp/dpep.vVKcNy/cyrus-imapd-2.2.12/configure
+--- cyrus-imapd-2.2.12/configure 2005-11-11 19:21:57.000000000 +0100
++++ /tmp/dpep.vVKcNy/cyrus-imapd-2.2.12/configure 2005-11-11 20:46:36.953409030 +0100
+@@ -1,9 +1,8 @@
+ #! /bin/sh
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by GNU Autoconf 2.57.
++# Generated by GNU Autoconf 2.59.
+ #
+-# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
+-# 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.
+ ## --------------------- ##
+@@ -20,9 +19,10 @@
+ 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 (FOO=FOO; unset FOO) >/dev/null 2>&1; then
++if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+ as_unset=unset
+ else
+ as_unset=false
+@@ -41,7 +41,7 @@
+ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
+ LC_TELEPHONE LC_TIME
+ do
+- if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
++ 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
+@@ -218,16 +218,17 @@
+ if mkdir -p . 2>/dev/null; then
+ as_mkdir_p=:
+ else
++ test -d ./-p && rmdir ./-p
+ as_mkdir_p=false
+ fi
+
+ as_executable_p="test -f"
+
+ # Sed expression to map a string onto a valid CPP name.
+-as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
++as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+
+ # Sed expression to map a string onto a valid variable name.
+-as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
++as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+
+ # IFS
+@@ -308,7 +309,7 @@
+ # 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 WITH_AUTH 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 WITH_PTS 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 LIB_WRAP SNMP_CONFIG LIB_UCDSNMP LIB_RT IMAP_COM_ERR_LIBS IMAP_LIBS PERL_SUBDIRS PERL_DEPSUBDIRS LTLIBOBJS'
++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 WARNERROR 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 WITH_AUTH 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 WITH_PTS 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 DRACLIBS LIB_WRAP SNMP_CONFIG LIB_UCDSNMP LIB_RT IMAP_COM_ERR_LIBS IMAP_LIBS PERL_SUBDIRS PERL_DEPSUBDIRS LTLIBOBJS'
+ ac_subst_files=''
+
+ # Initialize some variables set by options.
+@@ -667,7 +668,7 @@
+
+ # Be sure to have absolute paths.
+ for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
+- localstatedir libdir includedir oldincludedir infodir mandir
++ localstatedir libdir includedir oldincludedir infodir mandir
+ do
+ eval ac_val=$`echo $ac_var`
+ case $ac_val in
+@@ -707,10 +708,10 @@
+ # 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 ||
++ X"$0" : 'X\(//\)[^/]' \| \
++ X"$0" : 'X\(//\)$' \| \
++ X"$0" : 'X\(/\)' \| \
++ . : '\(.\)' 2>/dev/null ||
+ echo X"$0" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+@@ -802,9 +803,9 @@
+ 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
+@@ -843,6 +844,7 @@
+ Optional Features:
+ --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
+@@ -892,6 +894,7 @@
+ --with-sasl=DIR Compile with libsasl2 in <DIR>
+ --with-staticsasl=DIR Compile with staticly linked libsasl2 in <DIR>
+ --with-perl=PERL use PERL for perl
++ --with-drac=DIR use DRAC library in <DIR> no
+ --with-libwrap=DIR use libwrap (rooted in DIR) yes
+ --with-snmp=DIR use ucd|net snmp (rooted in DIR) yes
+
+@@ -940,12 +943,45 @@
+ ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+ ac_top_srcdir=$ac_top_builddir$srcdir ;;
+ esac
+-# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
+-# absolute.
+-ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
+-ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
+-ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
+-ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
++
++# 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.
+@@ -956,13 +992,13 @@
+ echo
+ $SHELL $ac_srcdir/configure --help=recursive
+ elif test -f $ac_srcdir/configure.ac ||
+- test -f $ac_srcdir/configure.in; then
++ test -f $ac_srcdir/configure.in; then
+ echo
+ $ac_configure --help
+ else
+ echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+ fi
+- cd $ac_popdir
++ cd "$ac_popdir"
+ done
+ fi
+
+@@ -970,8 +1006,7 @@
+ if $ac_init_version; then
+ cat <<\_ACEOF
+
+-Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
+-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.
+ _ACEOF
+@@ -983,7 +1018,7 @@
+ running configure, to aid debugging if configure makes a mistake.
+
+ It was created by $as_me, which was
+-generated by GNU Autoconf 2.57. Invocation command line was
++generated by GNU Autoconf 2.59. Invocation command line was
+
+ $ $0 $@
+
+@@ -1060,19 +1095,19 @@
+ 2)
+ ac_configure_args1="$ac_configure_args1 '$ac_arg'"
+ if test $ac_must_keep_next = true; then
+- ac_must_keep_next=false # Got value, back to normal.
++ ac_must_keep_next=false # Got value, back to normal.
+ else
+- case $ac_arg in
+- *=* | --config-cache | -C | -disable-* | --disable-* \
+- | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
+- | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
+- | -with-* | --with-* | -without-* | --without-* | --x)
+- case "$ac_configure_args0 " in
+- "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
+- esac
+- ;;
+- -* ) ac_must_keep_next=true ;;
+- esac
++ case $ac_arg in
++ *=* | --config-cache | -C | -disable-* | --disable-* \
++ | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
++ | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
++ | -with-* | --with-* | -without-* | --without-* | --x)
++ case "$ac_configure_args0 " in
++ "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
++ esac
++ ;;
++ -* ) ac_must_keep_next=true ;;
++ esac
+ fi
+ ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
+ # Get rid of the leading space.
+@@ -1106,12 +1141,12 @@
+ case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
+ *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"
++ "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+ ;;
+ esac;
+ }
+@@ -1140,7 +1175,7 @@
+ for ac_var in $ac_subst_files
+ do
+ eval ac_val=$`echo $ac_var`
+- echo "$ac_var='"'"'$ac_val'"'"'"
++ echo "$ac_var='"'"'$ac_val'"'"'"
+ done | sort
+ echo
+ fi
+@@ -1159,7 +1194,7 @@
+ echo "$as_me: caught signal $ac_signal"
+ echo "$as_me: exit $exit_status"
+ } >&5
+- rm -f core core.* *.core &&
++ rm -f core *.core &&
+ rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
+ exit $exit_status
+ ' 0
+@@ -1239,7 +1274,7 @@
+ # 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
++ sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; 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"
+@@ -1256,13 +1291,13 @@
+ ,);;
+ *)
+ 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:$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:$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:$LINENO: current value: $ac_new_val" >&5
+ echo "$as_me: current value: $ac_new_val" >&2;}
+- ac_cache_corrupted=:
++ ac_cache_corrupted=:
+ fi;;
+ esac
+ # Pass precious variables to config.status.
+@@ -1393,6 +1428,14 @@
+
+
+
++WARNERROR=-W
++# Check whether --enable-warnings-are-errors or --disable-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
+@@ -1853,7 +1896,6 @@
+ (exit $ac_status); }
+
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -1873,8 +1915,8 @@
+ # 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" >&5
+-echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
++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
+@@ -1894,23 +1936,23 @@
+ 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.
+- ;;
++ # This is the source file.
++ ;;
+ [ab].out )
+- # We found the default executable, but exeext='' is most
+- # certainly right.
+- break;;
++ # 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
+- 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
++ break;;
+ * )
+- break;;
++ break;;
+ esac
+ done
+ else
+@@ -1984,8 +2026,8 @@
+ case $ac_file in
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
+ *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+- export ac_cv_exeext
+- break;;
++ export ac_cv_exeext
++ break;;
+ * ) break;;
+ esac
+ done
+@@ -2010,7 +2052,6 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -2061,7 +2102,6 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -2081,11 +2121,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>&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 -s conftest.$ac_objext'
++ { 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=$?
+@@ -2098,7 +2147,7 @@
+
+ ac_compiler_gnu=no
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cv_c_compiler_gnu=$ac_compiler_gnu
+
+ fi
+@@ -2114,7 +2163,6 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -2131,11 +2179,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>&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 -s conftest.$ac_objext'
++ { 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=$?
+@@ -2148,7 +2205,7 @@
+
+ ac_cv_prog_cc_g=no
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++rm -f 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
+@@ -2175,7 +2232,6 @@
+ ac_cv_prog_cc_stdc=no
+ ac_save_CC=$CC
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -2203,6 +2259,16 @@
+ va_end (v);
+ return s;
+ }
++
++/* 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
++ 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. */
++int osf4_cc_array ['\x00' == 0 ? 1 : -1];
++
+ int test (int i, double x);
+ struct s1 {int (*f) (int a);};
+ struct s2 {int (*f) (double a);};
+@@ -2229,11 +2295,20 @@
+ CC="$ac_save_CC $ac_arg"
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>&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 -s conftest.$ac_objext'
++ { 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=$?
+@@ -2246,7 +2321,7 @@
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ fi
+-rm -f conftest.$ac_objext
++rm -f conftest.err conftest.$ac_objext
+ done
+ rm -f conftest.$ac_ext conftest.$ac_objext
+ CC=$ac_save_CC
+@@ -2274,19 +2349,27 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>&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 -s conftest.$ac_objext'
++ { 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 \
+- ''\
+- '#include <stdlib.h>' \
++ '' \
+ '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 ();' \
+@@ -2294,14 +2377,13 @@
+ 'void exit (int);'
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+-#include <stdlib.h>
+ $ac_declaration
++#include <stdlib.h>
+ int
+ main ()
+ {
+@@ -2312,11 +2394,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>&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 -s conftest.$ac_objext'
++ { 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=$?
+@@ -2329,9 +2420,8 @@
+
+ continue
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -2348,11 +2438,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>&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 -s conftest.$ac_objext'
++ { 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=$?
+@@ -2364,7 +2463,7 @@
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ rm -f conftest*
+ if test -n "$ac_declaration"; then
+@@ -2378,7 +2477,7 @@
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++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'
+@@ -2467,7 +2566,7 @@
+
+ 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_,'`
++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
+ else
+@@ -2505,6 +2604,7 @@
+ # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
+ # AFS /usr/afsws/bin/install, which mishandles nonexistent args
+ # 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
+@@ -2521,6 +2621,7 @@
+ case $as_dir/ in
+ ./ | .// | /cC/* | \
+ /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
++ ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
+ /usr/ucb/* ) ;;
+ *)
+ # OSF1 and SCO ODT 3.0 have their own names for install.
+@@ -2528,20 +2629,20 @@
+ # 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 $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.
+- :
+- elif test $ac_prog = install &&
+- grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+- # 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
+- fi
+- fi
++ if $as_executable_p "$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.
++ :
++ elif test $ac_prog = install &&
++ grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
++ # 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
++ fi
++ fi
+ done
+ done
+ ;;
+@@ -2600,7 +2701,6 @@
+ # 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
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -2611,7 +2711,7 @@
+ #else
+ # include <assert.h>
+ #endif
+- Syntax error
++ Syntax error
+ _ACEOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+@@ -2623,6 +2723,7 @@
+ (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
+@@ -2643,7 +2744,6 @@
+ # OK, works on sane cases. Now check whether non-existent headers
+ # can be detected and how.
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -2661,6 +2761,7 @@
+ (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
+@@ -2707,7 +2808,6 @@
+ # 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
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -2718,7 +2818,7 @@
+ #else
+ # include <assert.h>
+ #endif
+- Syntax error
++ Syntax error
+ _ACEOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+@@ -2730,6 +2830,7 @@
+ (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
+@@ -2750,7 +2851,6 @@
+ # OK, works on sane cases. Now check whether non-existent headers
+ # can be detected and how.
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -2768,6 +2868,7 @@
+ (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
+@@ -2826,7 +2927,6 @@
+ echo "$as_me:$LINENO: checking for AIX" >&5
+ echo $ECHO_N "checking for AIX... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -2852,16 +2952,14 @@
+ rm -f conftest*
+
+
+-
+- echo "$as_me:$LINENO: checking for strerror in -lcposix" >&5
+-echo $ECHO_N "checking for strerror in -lcposix... $ECHO_C" >&6
+-if test "${ac_cv_lib_cposix_strerror+set}" = set; then
++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
+ else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lcposix $LIBS"
++ ac_func_search_save_LIBS=$LIBS
++ac_cv_search_strerror=no
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -2885,33 +2983,98 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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_cposix_strerror=yes
++ ac_cv_search_strerror="none required"
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_lib_cposix_strerror=no
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
++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. */
++_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 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="-l$ac_lib"
++break
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_cposix_strerror" >&5
+-echo "${ECHO_T}$ac_cv_lib_cposix_strerror" >&6
+-if test $ac_cv_lib_cposix_strerror = yes; then
+- LIBS="$LIBS -lcposix"
++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_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"
+
+-
++fi
+
+ for ac_prog in gawk mawk nawk awk
+ do
+@@ -2959,7 +3122,6 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -3022,11 +3184,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>&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 -s conftest.$ac_objext'
++ { 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=$?
+@@ -3039,7 +3210,7 @@
+
+ ac_cv_c_const=no
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++rm -f 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
+@@ -3051,60 +3222,6 @@
+
+ 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
+-
+-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
+@@ -3113,7 +3230,6 @@
+ ac_cv_c_inline=no
+ for ac_kw in inline __inline__ __inline; do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -3128,11 +3244,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>&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 -s conftest.$ac_objext'
++ { 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=$?
+@@ -3144,119 +3269,442 @@
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+
+ fi
+ echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
+ echo "${ECHO_T}$ac_cv_c_inline" >&6
++
++
+ case $ac_cv_c_inline in
+ inline | yes) ;;
+- no)
+-cat >>confdefs.h <<\_ACEOF
+-#define inline
+-_ACEOF
+- ;;
+- *) cat >>confdefs.h <<_ACEOF
+-#define inline $ac_cv_c_inline
++ *)
++ case $ac_cv_c_inline in
++ no) ac_val=;;
++ *) ac_val=$ac_cv_c_inline;;
++ esac
++ cat >>confdefs.h <<_ACEOF
++#ifndef __cplusplus
++#define inline $ac_val
++#endif
+ _ACEOF
+- ;;
++ ;;
+ esac
+
+
+-
+-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 "$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
+ else
+-
+-cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
++ 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 ()
+ {
+
+-static void foo(void) __attribute__ ((noreturn));
+-
+-static void
+-foo(void)
+-{
+- exit(1);
+-}
+-
+ ;
+ return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>&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 -s conftest.$ac_objext'
++ { 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___attribute__=yes
++ ac_cv_header_stdc=yes
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv___attribute__=no
++ac_cv_header_stdc=no
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++rm -f 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 >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#include <string.h>
++
++_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*
+
+-if test "$ac_cv___attribute__" = "yes"; then
++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>
++
++_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 >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* 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
++
++#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);
++}
++_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
++ :
++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
++fi
++rm -f core *.core gmon.out bb.out conftest$ac_exeext 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 HAVE___ATTRIBUTE__ 1
++#define STDC_HEADERS 1
+ _ACEOF
+
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv___attribute__" >&5
+-echo "${ECHO_T}$ac_cv___attribute__" >&6
+
++# On IRIX 5.3, sys/types and inttypes.h are conflicting.
+
+-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
++
++
++
++
++
++
++
++
++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
+ 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
+
+-save_CFLAGS=$CFLAGS
+-CFLAGS="${CFLAGS} -fPIC"
+-cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
++#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
++ eval "$as_ac_Header=yes"
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_Header=no"
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++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
++
++fi
++
++done
++
++
++echo "$as_me:$LINENO: checking for long long int" >&5
++echo $ECHO_N "checking for long long int... $ECHO_C" >&6
++if test "${ac_cv_type_long_long_int+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 long int *) 0)
++ return 0;
++if (sizeof (long long int))
++ 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_long_int=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
+-#include <stdlib.h>
++ac_cv_type_long_long_int=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_type_long_long_int" >&5
++echo "${ECHO_T}$ac_cv_type_long_long_int" >&6
+
++echo "$as_me:$LINENO: checking size of long long int" >&5
++echo $ECHO_N "checking size of long long int... $ECHO_C" >&6
++if test "${ac_cv_sizeof_long_long_int+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ if test "$ac_cv_type_long_long_int" = 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 long int))) >= 0)];
++test_array [0] = 0
+
+-static void
+-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
++ 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 ()
+ {
+- exit(1);
++static int test_array [1 - 2 * !(((long) (sizeof (long long int))) <= $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 long int))) < 0)];
++test_array [0] = 0
+
+ ;
+ return 0;
+@@ -3264,148 +3712,509 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>&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 -s conftest.$ac_objext'
++ { 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_fpic=yes
++ 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 long int))) >= $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_cv_fpic=no
++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.$ac_objext conftest.$ac_ext
+-CFLAGS=$save_CFLAGS
++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 long int))) <= $ac_mid)];
++test_array [0] = 0
+
+-if test "$ac_cv_fpic" = "yes"; then
+- FPIC_CFLAGS="-fPIC"
++ ;
++ 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
+- FPIC_CFLAGS=""
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_lo=`expr '(' $ac_mid ')' + 1`
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_fpic" >&5
+-echo "${ECHO_T}$ac_cv_fpic" >&6
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++done
++case $ac_lo in
++?*) ac_cv_sizeof_long_long_int=$ac_lo;;
++'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long int), 77
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute sizeof (long long int), 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: internal error: not reached in cross-compile" >&5
++echo "$as_me: error: internal error: not reached in cross-compile" >&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 long int)); }
++unsigned long ulongval () { return (long) (sizeof (long long int)); }
++#include <stdio.h>
++#include <stdlib.h>
++int
++main ()
++{
+
++ FILE *f = fopen ("conftest.val", "w");
++ if (! f)
++ exit (1);
++ if (((long) (sizeof (long long int))) < 0)
++ {
++ long i = longval ();
++ if (i != ((long) (sizeof (long long int))))
++ exit (1);
++ fprintf (f, "%ld\n", i);
++ }
++ else
++ {
++ unsigned long i = ulongval ();
++ if (i != ((long) (sizeof (long long int))))
++ exit (1);
++ fprintf (f, "%lu\n", i);
++ }
++ exit (ferror (f) || fclose (f) != 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
++ ac_cv_sizeof_long_long_int=`cat conftest.val`
++else
++ echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
+- # 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
++( exit $ac_status )
++{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long long int), 77
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute sizeof (long long int), 77
++See \`config.log' for more details." >&2;}
++ { (exit 1); exit 1; }; }
++fi
++rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++fi
++fi
++rm -f conftest.val
++else
++ ac_cv_sizeof_long_long_int=0
++fi
++fi
++echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long_int" >&5
++echo "${ECHO_T}$ac_cv_sizeof_long_long_int" >&6
++cat >>confdefs.h <<_ACEOF
++#define SIZEOF_LONG_LONG_INT $ac_cv_sizeof_long_long_int
++_ACEOF
++
++
++echo "$as_me:$LINENO: checking for unsigned long long int" >&5
++echo $ECHO_N "checking for unsigned long long int... $ECHO_C" >&6
++if test "${ac_cv_type_unsigned_long_long_int+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 ((unsigned long long int *) 0)
++ return 0;
++if (sizeof (unsigned long long int))
++ 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_unsigned_long_long_int=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
+- # first, try -R
+- SAVE_LDFLAGS="${LDFLAGS}"
+- LDFLAGS="-R /usr/lib"
+- cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
++ac_cv_type_unsigned_long_long_int=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long_long_int" >&5
++echo "${ECHO_T}$ac_cv_type_unsigned_long_long_int" >&6
++
++echo "$as_me:$LINENO: checking size of unsigned long long int" >&5
++echo $ECHO_N "checking size of unsigned long long int... $ECHO_C" >&6
++if test "${ac_cv_sizeof_unsigned_long_long_int+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ if test "$ac_cv_type_unsigned_long_long_int" = 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 (unsigned long long int))) >= 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 (unsigned long long int))) <= $ac_mid)];
++test_array [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>&5
++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 -s conftest$ac_exeext'
++ { 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
+- andrew_runpath_switch="-R"
++ 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
+
+- LDFLAGS="-Wl,-rpath,/usr/lib"
+- cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
++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 (unsigned long long int))) < 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 (unsigned long long int))) >= $ac_mid)];
++test_array [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>&5
++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 -s conftest$ac_exeext'
++ { 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
+- andrew_runpath_switch="-Wl,-rpath,"
++ ac_lo=$ac_mid; break
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-andrew_runpath_switch="none"
++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.$ac_objext conftest$ac_exeext conftest.$ac_ext
++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.$ac_objext conftest$ac_exeext conftest.$ac_ext
+- LDFLAGS="${SAVE_LDFLAGS}"
+-
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $andrew_runpath_switch" >&5
+-echo "${ECHO_T}$andrew_runpath_switch" >&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
+-else
++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
+-#line $LINENO "configure"
+ /* 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>
+-
++$ac_includes_default
+ int
+ main ()
+ {
++static int test_array [1 - 2 * !(((long) (sizeof (unsigned long long int))) <= $ac_mid)];
++test_array [0] = 0
+
+ ;
+ return 0;
+@@ -3413,103 +4222,313 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>&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 -s conftest.$ac_objext'
++ { 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
++ ac_hi=$ac_mid
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_header_stdc=no
++ac_lo=`expr '(' $ac_mid ')' + 1`
+ fi
+-rm -f 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.
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++done
++case $ac_lo in
++?*) ac_cv_sizeof_unsigned_long_long_int=$ac_lo;;
++'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long long int), 77
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute sizeof (unsigned long long int), 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: internal error: not reached in cross-compile" >&5
++echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
++ { (exit 1); exit 1; }; }
++else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+-#include <string.h>
++$ac_includes_default
++long longval () { return (long) (sizeof (unsigned long long int)); }
++unsigned long ulongval () { return (long) (sizeof (unsigned long long int)); }
++#include <stdio.h>
++#include <stdlib.h>
++int
++main ()
++{
++
++ FILE *f = fopen ("conftest.val", "w");
++ if (! f)
++ exit (1);
++ if (((long) (sizeof (unsigned long long int))) < 0)
++ {
++ long i = longval ();
++ if (i != ((long) (sizeof (unsigned long long int))))
++ exit (1);
++ fprintf (f, "%ld\n", i);
++ }
++ else
++ {
++ unsigned long i = ulongval ();
++ if (i != ((long) (sizeof (unsigned long long int))))
++ exit (1);
++ fprintf (f, "%lu\n", i);
++ }
++ exit (ferror (f) || fclose (f) != 0);
+
++ ;
++ return 0;
++}
+ _ACEOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+- $EGREP "memchr" >/dev/null 2>&1; then
+- :
++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_unsigned_long_long_int=`cat conftest.val`
+ else
+- ac_cv_header_stdc=no
+-fi
+-rm -f conftest*
++ 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 (unsigned long long int), 77
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute sizeof (unsigned long long int), 77
++See \`config.log' for more details." >&2;}
++ { (exit 1); exit 1; }; }
++fi
++rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++fi
++fi
++rm -f conftest.val
++else
++ ac_cv_sizeof_unsigned_long_long_int=0
++fi
+ fi
++echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long_long_int" >&5
++echo "${ECHO_T}$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_header_stdc = yes; then
+- # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+- cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
++
++if test "$ac_cv_sizeof_long_long_int" -eq 8 -a \
++ "$ac_cv_sizeof_unsigned_long_long_int" -eq 8; then
++
++cat >>confdefs.h <<\_ACEOF
++#define HAVE_LONG_LONG_INT
++_ACEOF
++
++ echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
++echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6
++if test "${ac_cv_c_bigendian+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ # See if sys/param.h defines the BYTE_ORDER macro.
++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 <sys/types.h>
++#include <sys/param.h>
+
++int
++main ()
++{
++#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
++ bogus endian macros
++#endif
++
++ ;
++ return 0;
++}
+ _ACEOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+- $EGREP "free" >/dev/null 2>&1; then
+- :
++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
++ # It does; now see whether it defined to BIG_ENDIAN or not.
++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/param.h>
++
++int
++main ()
++{
++#if BYTE_ORDER != BIG_ENDIAN
++ not big endian
++#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
++ ac_cv_c_bigendian=yes
+ else
+- ac_cv_header_stdc=no
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_c_bigendian=no
+ fi
+-rm -f conftest*
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
++# It does not; compile a test program.
++if test "$cross_compiling" = yes; then
++ # try to guess the endianness by grepping values into an object file
++ ac_cv_c_bigendian=unknown
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
++short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
++void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
++short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
++short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
++void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
++int
++main ()
++{
++ _ascii (); _ebcdic ();
++ ;
++ 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 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
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
+-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
+- :
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* 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
+-
+-#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);
++ /* Are we little or big endian? From Harbison&Steele. */
++ union
++ {
++ long l;
++ char c[sizeof (long)];
++ } u;
++ u.l = 1;
++ exit (u.c[sizeof (long) - 1] == 1);
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+@@ -3523,90 +4542,191 @@
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+- :
++ ac_cv_c_bigendian=no
+ 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
++ac_cv_c_bigendian=yes
+ fi
+-rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ 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
++echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
++echo "${ECHO_T}$ac_cv_c_bigendian" >&6
++case $ac_cv_c_bigendian in
++ yes)
+
+ cat >>confdefs.h <<\_ACEOF
+-#define STDC_HEADERS 1
++#define WORDS_BIGENDIAN 1
+ _ACEOF
++ ;;
++ no)
++ ;;
++ *)
++ { { echo "$as_me:$LINENO: error: unknown endianness
++presetting ac_cv_c_bigendian=no (or yes) will help" >&5
++echo "$as_me: error: unknown endianness
++presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
++ { (exit 1); exit 1; }; } ;;
++esac
+
+ fi
+
+-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
+
++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
++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>
+
++int
++main ()
++{
+
++static void foo(void) __attribute__ ((noreturn));
+
++static void
++foo(void)
++{
++ exit(1);
++}
+
++ ;
++ 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___attribute__=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv___attribute__=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
+
++if test "$ac_cv___attribute__" = "yes"; then
+
+-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
++cat >>confdefs.h <<\_ACEOF
++#define HAVE___ATTRIBUTE__ 1
++_ACEOF
++
++fi
++echo "$as_me:$LINENO: result: $ac_cv___attribute__" >&5
++echo "${ECHO_T}$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
+ else
+- cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
++
++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
+ /* end confdefs.h. */
+-$ac_includes_default
+
+-#include <$ac_header>
++#include <stdlib.h>
++
++int
++main ()
++{
++
++static void
++foo(void)
++{
++ exit(1);
++}
++
++ ;
++ return 0;
++}
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>&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 -s conftest.$ac_objext'
++ { 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"
++ ac_cv_fpic=yes
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-eval "$as_ac_Header=no"
++ac_cv_fpic=no
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++CFLAGS=$save_CFLAGS
++
+ 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
+
++if test "$ac_cv_fpic" = "yes"; then
++ FPIC_CFLAGS="-fPIC"
++else
++ FPIC_CFLAGS=""
+ fi
++echo "$as_me:$LINENO: result: $ac_cv_fpic" >&5
++echo "${ECHO_T}$ac_cv_fpic" >&6
+
+-done
++
++
++ # CMU GUESS RUNPATH SWITCH
++ andrew_runpath_switch="none"
+
+
+
+@@ -3629,7 +4749,6 @@
+ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+ echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -3640,11 +4759,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>&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 -s conftest.$ac_objext'
++ { 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=$?
+@@ -3657,7 +4785,7 @@
+
+ ac_header_compiler=no
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++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
+
+@@ -3665,7 +4793,6 @@
+ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+ echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -3683,6 +4810,7 @@
+ (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
+@@ -3702,33 +4830,32 @@
+ echo "${ECHO_T}$ac_header_preproc" >&6
+
+ # So? What about this header?
+-case $ac_header_compiler:$ac_header_preproc in
+- yes:no )
++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 preprocessor's result" >&5
+-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+- (
+- cat <<\_ASBOX
+-## ------------------------------------ ##
+-## Report this to bug-autoconf at gnu.org. ##
+-## ------------------------------------ ##
+-_ASBOX
+- ) |
+- sed "s/^/$as_me: WARNING: /" >&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 )
++ 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: 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 bug-autoconf at gnu.org. ##
+-## ------------------------------------ ##
++## ------------------------------------------ ##
++## Report this to the AC_PACKAGE_NAME lists. ##
++## ------------------------------------------ ##
+ _ASBOX
+ ) |
+ sed "s/^/$as_me: WARNING: /" >&2
+@@ -3739,7 +4866,7 @@
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- eval "$as_ac_Header=$ac_header_preproc"
++ 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
+@@ -3767,21 +4894,28 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* 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"
+@@ -3812,11 +4946,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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=$?
+@@ -3829,7 +4972,8 @@
+
+ eval "$as_ac_var=no"
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++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
+@@ -3839,7 +4983,14 @@
+ _ACEOF
+
+ else
+- LIBOBJS="$LIBOBJS $ac_func.$ac_objext"
++ 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
++
+ fi
+ done
+
+@@ -3855,21 +5006,28 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* 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"
+@@ -3900,11 +5058,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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=$?
+@@ -3917,7 +5084,8 @@
+
+ eval "$as_ac_var=no"
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++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
+@@ -3943,7 +5111,6 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -3963,11 +5130,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>&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 -s conftest.$ac_objext'
++ { 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=$?
+@@ -3980,7 +5156,7 @@
+
+ eval "$as_ac_Header=no"
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+@@ -4003,7 +5179,6 @@
+ ac_func_search_save_LIBS=$LIBS
+ ac_cv_search_opendir=no
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -4027,11 +5202,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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=$?
+@@ -4043,12 +5227,12 @@
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++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
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -4072,11 +5256,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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=$?
+@@ -4089,7 +5282,8 @@
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++rm -f conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ done
+ fi
+ LIBS=$ac_func_search_save_LIBS
+@@ -4110,7 +5304,6 @@
+ ac_func_search_save_LIBS=$LIBS
+ ac_cv_search_opendir=no
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -4134,11 +5327,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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=$?
+@@ -4150,12 +5352,12 @@
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++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
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -4179,11 +5381,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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=$?
+@@ -4196,7 +5407,8 @@
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++rm -f conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ done
+ fi
+ LIBS=$ac_func_search_save_LIBS
+@@ -4220,21 +5432,28 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* 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
++
+ /* 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
++
++#undef connect
++
+ /* Override any gcc2 internal prototype to avoid an error. */
+ #ifdef __cplusplus
+ extern "C"
+@@ -4265,11 +5484,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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=$?
+@@ -4282,7 +5510,8 @@
+
+ ac_cv_func_connect=no
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++rm -f conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ fi
+ echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
+ echo "${ECHO_T}$ac_cv_func_connect" >&6
+@@ -4297,7 +5526,6 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lnsl $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -4321,11 +5549,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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=$?
+@@ -4338,7 +5575,8 @@
+
+ ac_cv_lib_nsl_gethostbyname=no
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++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
+@@ -4355,7 +5593,6 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsocket $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -4379,11 +5616,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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=$?
+@@ -4396,7 +5642,8 @@
+
+ ac_cv_lib_socket_connect=no
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++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
+@@ -4415,21 +5662,28 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* 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"
+@@ -4460,11 +5714,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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=$?
+@@ -4477,7 +5740,8 @@
+
+ ac_cv_func_res_search=no
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++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
+@@ -4492,7 +5756,6 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lresolv $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -4516,11 +5779,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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=$?
+@@ -4533,7 +5805,8 @@
+
+ ac_cv_lib_resolv_res_search=no
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++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
+@@ -4557,21 +5830,28 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* 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"
+@@ -4602,11 +5882,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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=$?
+@@ -4619,7 +5908,8 @@
+
+ eval "$as_ac_var=no"
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++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
+@@ -4644,21 +5934,28 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* 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"
+@@ -4689,11 +5986,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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=$?
+@@ -4706,7 +6012,8 @@
+
+ ac_cv_func_getaddrinfo=no
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++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
+@@ -4723,7 +6030,6 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsocket $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -4747,11 +6053,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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=$?
+@@ -4764,7 +6079,8 @@
+
+ ac_cv_lib_socket_getaddrinfo=no
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++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
+@@ -4803,7 +6119,6 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-linet6 $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -4827,11 +6142,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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=$?
+@@ -4844,7 +6168,8 @@
+
+ ac_cv_lib_inet6_getaddrinfo=no
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++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
+@@ -4872,7 +6197,6 @@
+ if test getaddrinfo = getaddrinfo; then
+ for ipv6_cv_pfx in o n; do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -4890,21 +6214,28 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* 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"
+@@ -4935,11 +6266,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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=$?
+@@ -4952,7 +6292,8 @@
+
+ eval "$as_ac_var=no"
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++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
+@@ -4980,21 +6321,28 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* 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"
+@@ -5025,11 +6373,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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=$?
+@@ -5042,7 +6399,8 @@
+
+ ac_cv_func_gai_strerror=no
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++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
+@@ -5059,7 +6417,6 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsocket $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -5083,11 +6440,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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=$?
+@@ -5100,7 +6466,8 @@
+
+ ac_cv_lib_socket_gai_strerror=no
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++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
+@@ -5139,7 +6506,6 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-linet6 $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -5163,11 +6529,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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=$?
+@@ -5180,7 +6555,8 @@
+
+ ac_cv_lib_inet6_gai_strerror=no
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++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
+@@ -5208,7 +6584,6 @@
+ if test gai_strerror = getaddrinfo; then
+ for ipv6_cv_pfx in o n; do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -5226,21 +6601,28 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* 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"
+@@ -5271,11 +6653,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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=$?
+@@ -5288,7 +6679,8 @@
+
+ eval "$as_ac_var=no"
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++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
+@@ -5333,21 +6725,28 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* 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"
+@@ -5378,11 +6777,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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=$?
+@@ -5395,7 +6803,8 @@
+
+ ac_cv_func_getnameinfo=no
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++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
+@@ -5412,7 +6821,6 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsocket $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -5436,11 +6844,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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=$?
+@@ -5453,7 +6870,8 @@
+
+ ac_cv_lib_socket_getnameinfo=no
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++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
+@@ -5492,7 +6910,6 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-linet6 $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -5516,11 +6933,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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=$?
+@@ -5533,7 +6959,8 @@
+
+ ac_cv_lib_inet6_getnameinfo=no
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++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
+@@ -5561,7 +6988,6 @@
+ if test getnameinfo = getaddrinfo; then
+ for ipv6_cv_pfx in o n; do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -5579,21 +7005,28 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* 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"
+@@ -5624,11 +7057,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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=$?
+@@ -5641,7 +7083,8 @@
+
+ eval "$as_ac_var=no"
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++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
+@@ -5682,7 +7125,6 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -5700,11 +7142,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>&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 -s conftest.$ac_objext'
++ { 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=$?
+@@ -5717,7 +7168,7 @@
+
+ ipv6_cv_ss_family=no
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ if test $ipv6_cv_ss_family = yes; then
+
+@@ -5737,7 +7188,6 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -5755,11 +7205,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>&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 -s conftest.$ac_objext'
++ { 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=$?
+@@ -5772,7 +7231,7 @@
+
+ ipv6_cv_sa_len=no
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ if test $ipv6_cv_sa_len = yes; then
+
+@@ -5805,7 +7264,6 @@
+ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+ echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -5816,11 +7274,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>&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 -s conftest.$ac_objext'
++ { 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=$?
+@@ -5833,7 +7300,7 @@
+
+ ac_header_compiler=no
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++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
+
+@@ -5841,7 +7308,6 @@
+ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+ echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -5859,6 +7325,7 @@
+ (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
+@@ -5878,33 +7345,32 @@
+ echo "${ECHO_T}$ac_header_preproc" >&6
+
+ # So? What about this header?
+-case $ac_header_compiler:$ac_header_preproc in
+- yes:no )
++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 preprocessor's result" >&5
+-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+- (
+- cat <<\_ASBOX
+-## ------------------------------------ ##
+-## Report this to bug-autoconf at gnu.org. ##
+-## ------------------------------------ ##
+-_ASBOX
+- ) |
+- sed "s/^/$as_me: WARNING: /" >&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 )
++ 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: 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 bug-autoconf at gnu.org. ##
+-## ------------------------------------ ##
++## ------------------------------------------ ##
++## Report this to the AC_PACKAGE_NAME lists. ##
++## ------------------------------------------ ##
+ _ASBOX
+ ) |
+ sed "s/^/$as_me: WARNING: /" >&2
+@@ -5915,7 +7381,7 @@
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- eval "$as_ac_Header=$ac_header_preproc"
++ 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
+@@ -5936,7 +7402,6 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -5957,11 +7422,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>&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 -s conftest.$ac_objext'
++ { 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=$?
+@@ -5974,7 +7448,7 @@
+
+ ac_cv_header_time=no
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++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
+@@ -5992,7 +7466,6 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -6011,11 +7484,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>&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 -s conftest.$ac_objext'
++ { 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=$?
+@@ -6028,7 +7510,7 @@
+
+ ac_cv_struct_tm=sys/time.h
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++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
+@@ -6046,7 +7528,6 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -6068,11 +7549,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>&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 -s conftest.$ac_objext'
++ { 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=$?
+@@ -6084,7 +7574,6 @@
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -6106,11 +7595,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>&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 -s conftest.$ac_objext'
++ { 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=$?
+@@ -6123,9 +7621,9 @@
+
+ ac_cv_member_struct_tm_tm_zone=no
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++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
+@@ -6151,7 +7649,6 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -6172,11 +7669,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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=$?
+@@ -6189,7 +7695,8 @@
+
+ ac_cv_var_tzname=no
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++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
+@@ -6218,21 +7725,28 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* 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"
+@@ -6263,11 +7777,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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=$?
+@@ -6280,7 +7803,8 @@
+
+ eval "$as_ac_var=no"
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++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
+@@ -6295,21 +7819,28 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* 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"
+@@ -6340,11 +7871,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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=$?
+@@ -6357,7 +7897,8 @@
+
+ ac_cv_func__doprnt=no
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++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
+@@ -6470,7 +8011,6 @@
+ echo "$as_me:$LINENO: checking db.h usability" >&5
+ echo $ECHO_N "checking db.h usability... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -6481,11 +8021,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>&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 -s conftest.$ac_objext'
++ { 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=$?
+@@ -6498,7 +8047,7 @@
+
+ ac_header_compiler=no
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++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
+
+@@ -6506,7 +8055,6 @@
+ echo "$as_me:$LINENO: checking db.h presence" >&5
+ echo $ECHO_N "checking db.h presence... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -6524,6 +8072,7 @@
+ (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
+@@ -6543,33 +8092,32 @@
+ echo "${ECHO_T}$ac_header_preproc" >&6
+
+ # So? What about this header?
+-case $ac_header_compiler:$ac_header_preproc in
+- yes:no )
++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 preprocessor's result" >&5
+-echo "$as_me: WARNING: db.h: proceeding with the preprocessor's result" >&2;}
+- (
+- cat <<\_ASBOX
+-## ------------------------------------ ##
+-## Report this to bug-autoconf at gnu.org. ##
+-## ------------------------------------ ##
+-_ASBOX
+- ) |
+- sed "s/^/$as_me: WARNING: /" >&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 )
++ 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: 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 bug-autoconf at gnu.org. ##
+-## ------------------------------------ ##
++## ------------------------------------------ ##
++## Report this to the AC_PACKAGE_NAME lists. ##
++## ------------------------------------------ ##
+ _ASBOX
+ ) |
+ sed "s/^/$as_me: WARNING: /" >&2
+@@ -6616,7 +8164,6 @@
+ do
+ LIBS="$saved_LIBS -l$dbname"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -6633,11 +8180,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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=$?
+@@ -6650,13 +8206,13 @@
+
+ dblib="no"
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++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
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -6673,11 +8229,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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=$?
+@@ -6690,7 +8255,8 @@
+
+ dblib="no"
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++rm -f conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ fi
+ LIBS=$saved_LIBS
+
+@@ -6858,7 +8424,6 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lfl $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -6882,11 +8447,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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=$?
+@@ -6899,7 +8473,8 @@
+
+ ac_cv_lib_fl_yywrap=no
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++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
+@@ -6915,7 +8490,6 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ll $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -6939,11 +8513,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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=$?
+@@ -6956,7 +8539,8 @@
+
+ ac_cv_lib_l_yywrap=no
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++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
+@@ -7018,11 +8602,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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=$?
+@@ -7034,7 +8627,8 @@
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++rm -f conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_save_LIBS
+ rm -f "${LEX_OUTPUT_ROOT}.c"
+
+@@ -7059,7 +8653,6 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lfl $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -7077,11 +8670,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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=$?
+@@ -7094,7 +8696,8 @@
+
+ ac_cv_lib_fl_main=no
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++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
+@@ -7117,7 +8720,6 @@
+ ac_func_search_save_LIBS=$LIBS
+ ac_cv_search_regcomp=no
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -7141,11 +8743,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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=$?
+@@ -7157,12 +8768,12 @@
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++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
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -7186,11 +8797,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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=$?
+@@ -7203,7 +8823,8 @@
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++rm -f conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ done
+ fi
+ LIBS=$ac_func_search_save_LIBS
+@@ -7231,7 +8852,6 @@
+ echo "$as_me:$LINENO: checking rxposix.h usability" >&5
+ echo $ECHO_N "checking rxposix.h usability... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -7242,11 +8862,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>&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 -s conftest.$ac_objext'
++ { 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=$?
+@@ -7259,7 +8888,7 @@
+
+ ac_header_compiler=no
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++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
+
+@@ -7267,7 +8896,6 @@
+ echo "$as_me:$LINENO: checking rxposix.h presence" >&5
+ echo $ECHO_N "checking rxposix.h presence... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -7285,6 +8913,7 @@
+ (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
+@@ -7304,33 +8933,32 @@
+ echo "${ECHO_T}$ac_header_preproc" >&6
+
+ # So? What about this header?
+-case $ac_header_compiler:$ac_header_preproc in
+- yes:no )
++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 preprocessor's result" >&5
+-echo "$as_me: WARNING: rxposix.h: proceeding with the preprocessor's result" >&2;}
+- (
+- cat <<\_ASBOX
+-## ------------------------------------ ##
+-## Report this to bug-autoconf at gnu.org. ##
+-## ------------------------------------ ##
+-_ASBOX
+- ) |
+- sed "s/^/$as_me: WARNING: /" >&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 )
++ 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: 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 bug-autoconf at gnu.org. ##
+-## ------------------------------------ ##
++## ------------------------------------------ ##
++## Report this to the AC_PACKAGE_NAME lists. ##
++## ------------------------------------------ ##
+ _ASBOX
+ ) |
+ sed "s/^/$as_me: WARNING: /" >&2
+@@ -7372,21 +9000,28 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* 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
++
+ /* 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
++
+ /* Override any gcc2 internal prototype to avoid an error. */
+ #ifdef __cplusplus
+ extern "C"
+@@ -7417,11 +9052,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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=$?
+@@ -7434,7 +9078,8 @@
+
+ ac_cv_func_strerror=no
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++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
+@@ -7470,7 +9115,6 @@
+ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+ echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -7481,11 +9125,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>&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 -s conftest.$ac_objext'
++ { 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=$?
+@@ -7498,7 +9151,7 @@
+
+ ac_header_compiler=no
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++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
+
+@@ -7506,7 +9159,6 @@
+ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+ echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -7524,6 +9176,7 @@
+ (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
+@@ -7543,33 +9196,32 @@
+ echo "${ECHO_T}$ac_header_preproc" >&6
+
+ # So? What about this header?
+-case $ac_header_compiler:$ac_header_preproc in
+- yes:no )
++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 preprocessor's result" >&5
+-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+- (
+- cat <<\_ASBOX
+-## ------------------------------------ ##
+-## Report this to bug-autoconf at gnu.org. ##
+-## ------------------------------------ ##
+-_ASBOX
+- ) |
+- sed "s/^/$as_me: WARNING: /" >&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 )
++ 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: 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 bug-autoconf at gnu.org. ##
+-## ------------------------------------ ##
++## ------------------------------------------ ##
++## Report this to the AC_PACKAGE_NAME lists. ##
++## ------------------------------------------ ##
+ _ASBOX
+ ) |
+ sed "s/^/$as_me: WARNING: /" >&2
+@@ -7580,7 +9232,7 @@
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- eval "$as_ac_Header=$ac_header_preproc"
++ 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
+@@ -7605,21 +9257,28 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* 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"
+@@ -7650,11 +9309,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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=$?
+@@ -7667,7 +9335,8 @@
+
+ eval "$as_ac_var=no"
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++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
+@@ -7689,21 +9358,28 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* 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"
+@@ -7734,11 +9410,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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=$?
+@@ -7751,7 +9436,8 @@
+
+ eval "$as_ac_var=no"
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++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
+@@ -7775,21 +9461,28 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* 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"
+@@ -7820,11 +9513,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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=$?
+@@ -7837,7 +9539,8 @@
+
+ eval "$as_ac_var=no"
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++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
+@@ -7860,21 +9563,28 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* 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"
+@@ -7905,11 +9615,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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=$?
+@@ -7922,7 +9641,8 @@
+
+ eval "$as_ac_var=no"
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++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
+@@ -7936,7 +9656,6 @@
+
+
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -7956,7 +9675,6 @@
+ rm -f conftest*
+
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -7976,7 +9694,6 @@
+ rm -f conftest*
+
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -8003,21 +9720,28 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* 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"
+@@ -8048,11 +9772,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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=$?
+@@ -8065,7 +9798,8 @@
+
+ ac_cv_func_setproctitle=no
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++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
+@@ -8082,7 +9816,6 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lutil $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -8106,11 +9839,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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=$?
+@@ -8123,7 +9865,8 @@
+
+ ac_cv_lib_util_setproctitle=no
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++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_util_setproctitle" >&5
+@@ -8148,7 +9891,6 @@
+ 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
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -8159,11 +9901,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>&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 -s conftest.$ac_objext'
++ { 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=$?
+@@ -8176,7 +9927,7 @@
+
+ ac_header_compiler=no
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++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
+
+@@ -8184,7 +9935,6 @@
+ 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
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -8202,6 +9952,7 @@
+ (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
+@@ -8221,33 +9972,32 @@
+ echo "${ECHO_T}$ac_header_preproc" >&6
+
+ # So? What about this header?
+-case $ac_header_compiler:$ac_header_preproc in
+- yes:no )
++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 preprocessor's result" >&5
+-echo "$as_me: WARNING: sys/pstat.h: proceeding with the preprocessor's result" >&2;}
+- (
+- cat <<\_ASBOX
+-## ------------------------------------ ##
+-## Report this to bug-autoconf at gnu.org. ##
+-## ------------------------------------ ##
+-_ASBOX
+- ) |
+- sed "s/^/$as_me: WARNING: /" >&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 )
++ 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: 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 bug-autoconf at gnu.org. ##
+-## ------------------------------------ ##
++## ------------------------------------------ ##
++## Report this to the AC_PACKAGE_NAME lists. ##
++## ------------------------------------------ ##
+ _ASBOX
+ ) |
+ sed "s/^/$as_me: WARNING: /" >&2
+@@ -8284,7 +10034,6 @@
+ 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
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -8295,11 +10044,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>&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 -s conftest.$ac_objext'
++ { 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=$?
+@@ -8312,7 +10070,7 @@
+
+ ac_header_compiler=no
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++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
+
+@@ -8320,7 +10078,6 @@
+ 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
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -8338,6 +10095,7 @@
+ (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
+@@ -8357,33 +10115,32 @@
+ echo "${ECHO_T}$ac_header_preproc" >&6
+
+ # So? What about this header?
+-case $ac_header_compiler:$ac_header_preproc in
+- yes:no )
++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 preprocessor's result" >&5
+-echo "$as_me: WARNING: sys/sysnews.h: proceeding with the preprocessor's result" >&2;}
+- (
+- cat <<\_ASBOX
+-## ------------------------------------ ##
+-## Report this to bug-autoconf at gnu.org. ##
+-## ------------------------------------ ##
+-_ASBOX
+- ) |
+- sed "s/^/$as_me: WARNING: /" >&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 )
++ 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: 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 bug-autoconf at gnu.org. ##
+-## ------------------------------------ ##
++## ------------------------------------------ ##
++## Report this to the AC_PACKAGE_NAME lists. ##
++## ------------------------------------------ ##
+ _ASBOX
+ ) |
+ sed "s/^/$as_me: WARNING: /" >&2
+@@ -8413,7 +10170,6 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -8436,6 +10192,7 @@
+ (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
+@@ -8466,7 +10223,6 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -8487,6 +10243,7 @@
+ (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
+@@ -8517,7 +10274,6 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -8538,6 +10294,7 @@
+ (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
+@@ -8575,7 +10332,6 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -8597,11 +10353,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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=$?
+@@ -8614,7 +10379,8 @@
+
+ cyrus_cv_sys_nonblock=ioctl
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++rm -f conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ fi
+
+ WITH_NONBLOCK=$cyrus_cv_sys_nonblock
+@@ -8628,7 +10394,6 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -8648,11 +10413,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>&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 -s conftest.$ac_objext'
++ { 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=$?
+@@ -8665,7 +10439,7 @@
+
+ cyrus_cv_struct_sys_gmtoff=gmtime
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+
+ WITH_GMTOFF=$cyrus_cv_struct_sys_gmtoff
+@@ -8681,7 +10455,6 @@
+ cyrus_cv_func_mmap_shared=no
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -8733,7 +10506,7 @@
+ ( exit $ac_status )
+ cyrus_cv_func_mmap_shared=no
+ fi
+-rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ fi
+
+@@ -8751,7 +10524,6 @@
+ cyrus_cv_func_mmap_stupidshared=no
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -8804,7 +10576,7 @@
+ ( exit $ac_status )
+ cyrus_cv_func_mmap_stupidshared=no
+ fi
+-rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ fi
+
+@@ -8835,21 +10607,28 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* 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"
+@@ -8880,11 +10659,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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=$?
+@@ -8897,7 +10685,8 @@
+
+ ac_cv_func_fcntl=no
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++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
+@@ -8911,21 +10700,28 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* 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"
+@@ -8956,11 +10752,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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=$?
+@@ -8973,7 +10778,8 @@
+
+ ac_cv_func_flock=no
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++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
+@@ -9002,21 +10808,28 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* 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"
+@@ -9047,11 +10860,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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=$?
+@@ -9064,7 +10886,8 @@
+
+ ac_cv_func_fdatasync=no
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++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
+@@ -9084,7 +10907,6 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lrt $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -9108,11 +10930,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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=$?
+@@ -9125,7 +10956,8 @@
+
+ ac_cv_lib_rt_fdatasync=no
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++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_rt_fdatasync" >&5
+@@ -9156,21 +10988,28 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* 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"
+@@ -9201,11 +11040,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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=$?
+@@ -9218,7 +11066,8 @@
+
+ ac_cv_func_sigvec=no
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++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
+@@ -9236,7 +11085,6 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lBSD $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -9260,11 +11108,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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=$?
+@@ -9277,7 +11134,8 @@
+
+ ac_cv_lib_BSD_sigvec=no
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++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_BSD_sigvec" >&5
+@@ -9296,7 +11154,6 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lucb $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -9320,11 +11177,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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=$?
+@@ -9337,7 +11203,8 @@
+
+ ac_cv_lib_ucb_sigvec=no
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++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_ucb_sigvec" >&5
+@@ -9444,7 +11311,6 @@
+ 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
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -9461,11 +11327,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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=$?
+@@ -9486,7 +11361,8 @@
+ cyrus_afs_sigvec="yes"
+
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++rm -f conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+
+ fi
+
+@@ -9530,7 +11406,6 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lldap -llber $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -9554,11 +11429,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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=$?
+@@ -9571,7 +11455,8 @@
+
+ ac_cv_lib_ldap_ldap_initialize=no
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++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_ldap_ldap_initialize" >&5
+@@ -9651,7 +11536,6 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lresolv $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -9675,11 +11559,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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=$?
+@@ -9692,7 +11585,8 @@
+
+ ac_cv_lib_resolv_res_search=no
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++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
+@@ -9730,7 +11624,6 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldes $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -9754,11 +11647,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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=$?
+@@ -9771,7 +11673,8 @@
+
+ ac_cv_lib_des_des_ecb_encrypt=no
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++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_des_des_ecb_encrypt" >&5
+@@ -9842,7 +11745,6 @@
+ echo "$as_me:$LINENO: checking krb.h usability" >&5
+ echo $ECHO_N "checking krb.h usability... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -9853,11 +11755,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>&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 -s conftest.$ac_objext'
++ { 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=$?
+@@ -9870,7 +11781,7 @@
+
+ ac_header_compiler=no
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++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
+
+@@ -9878,7 +11789,6 @@
+ echo "$as_me:$LINENO: checking krb.h presence" >&5
+ echo $ECHO_N "checking krb.h presence... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -9896,6 +11806,7 @@
+ (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
+@@ -9915,33 +11826,32 @@
+ echo "${ECHO_T}$ac_header_preproc" >&6
+
+ # So? What about this header?
+-case $ac_header_compiler:$ac_header_preproc in
+- yes:no )
++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 preprocessor's result" >&5
+-echo "$as_me: WARNING: krb.h: proceeding with the preprocessor's result" >&2;}
+- (
+- cat <<\_ASBOX
+-## ------------------------------------ ##
+-## Report this to bug-autoconf at gnu.org. ##
+-## ------------------------------------ ##
+-_ASBOX
+- ) |
+- sed "s/^/$as_me: WARNING: /" >&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 )
++ 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: 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 bug-autoconf at gnu.org. ##
+-## ------------------------------------ ##
++## ------------------------------------------ ##
++## Report this to the AC_PACKAGE_NAME lists. ##
++## ------------------------------------------ ##
+ _ASBOX
+ ) |
+ sed "s/^/$as_me: WARNING: /" >&2
+@@ -9968,7 +11878,6 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l${KRBLIB} $KRB_LIBS $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -9992,11 +11901,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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=$?
+@@ -10009,7 +11927,8 @@
+
+ eval "$as_ac_Lib=no"
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++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: `eval echo '${'$as_ac_Lib'}'`" >&5
+@@ -10080,7 +11999,6 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lrsaref $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -10104,11 +12022,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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=$?
+@@ -10121,7 +12048,8 @@
+
+ ac_cv_lib_rsaref_RSAPublicEncrypt=no
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++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_rsaref_RSAPublicEncrypt" >&5
+@@ -10142,7 +12070,6 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lcrypto $LIB_RSAREF $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -10166,11 +12093,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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=$?
+@@ -10183,7 +12119,8 @@
+
+ ac_cv_lib_crypto_BIO_accept=no
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++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_crypto_BIO_accept" >&5
+@@ -10202,7 +12139,6 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lssl -lcrypto $LIB_RSAREF $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -10226,11 +12162,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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=$?
+@@ -10243,7 +12188,8 @@
+
+ ac_cv_lib_ssl_SSL_CTX_new=no
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++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_ssl_SSL_CTX_new" >&5
+@@ -10335,7 +12281,6 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lzephyr $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -10359,11 +12304,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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=$?
+@@ -10376,7 +12330,8 @@
+
+ ac_cv_lib_zephyr_ZInitialize=no
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++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_zephyr_ZInitialize" >&5
+@@ -10468,7 +12423,6 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lcom_err $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -10492,11 +12446,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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=$?
+@@ -10509,7 +12472,8 @@
+
+ ac_cv_lib_com_err_com_err=no
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++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
+@@ -10533,7 +12497,6 @@
+ 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
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -10544,11 +12507,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>&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 -s conftest.$ac_objext'
++ { 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=$?
+@@ -10561,7 +12533,7 @@
+
+ ac_header_compiler=no
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++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
+
+@@ -10569,7 +12541,6 @@
+ 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
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -10587,6 +12558,7 @@
+ (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
+@@ -10606,33 +12578,32 @@
+ echo "${ECHO_T}$ac_header_preproc" >&6
+
+ # So? What about this header?
+-case $ac_header_compiler:$ac_header_preproc in
+- yes:no )
++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 preprocessor's result" >&5
+-echo "$as_me: WARNING: et/com_err.h: proceeding with the preprocessor's result" >&2;}
+- (
+- cat <<\_ASBOX
+-## ------------------------------------ ##
+-## Report this to bug-autoconf at gnu.org. ##
+-## ------------------------------------ ##
+-_ASBOX
+- ) |
+- sed "s/^/$as_me: WARNING: /" >&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 )
++ 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: 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 bug-autoconf at gnu.org. ##
+-## ------------------------------------ ##
++## ------------------------------------------ ##
++## Report this to the AC_PACKAGE_NAME lists. ##
++## ------------------------------------------ ##
+ _ASBOX
+ ) |
+ sed "s/^/$as_me: WARNING: /" >&2
+@@ -10669,7 +12640,6 @@
+ 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
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -10680,11 +12650,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>&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 -s conftest.$ac_objext'
++ { 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=$?
+@@ -10697,7 +12676,7 @@
+
+ ac_header_compiler=no
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++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
+
+@@ -10705,7 +12684,6 @@
+ 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
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -10723,6 +12701,7 @@
+ (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
+@@ -10742,33 +12721,32 @@
+ echo "${ECHO_T}$ac_header_preproc" >&6
+
+ # So? What about this header?
+-case $ac_header_compiler:$ac_header_preproc in
+- yes:no )
++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 preprocessor's result" >&5
+-echo "$as_me: WARNING: com_err.h: proceeding with the preprocessor's result" >&2;}
+- (
+- cat <<\_ASBOX
+-## ------------------------------------ ##
+-## Report this to bug-autoconf at gnu.org. ##
+-## ------------------------------------ ##
+-_ASBOX
+- ) |
+- sed "s/^/$as_me: WARNING: /" >&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 )
++ 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: 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 bug-autoconf at gnu.org. ##
+-## ------------------------------------ ##
++## ------------------------------------------ ##
++## Report this to the AC_PACKAGE_NAME lists. ##
++## ------------------------------------------ ##
+ _ASBOX
+ ) |
+ sed "s/^/$as_me: WARNING: /" >&2
+@@ -10984,7 +12962,6 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -11005,6 +12982,7 @@
+ (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
+@@ -11060,21 +13038,28 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* 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"
+@@ -11105,11 +13090,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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=$?
+@@ -11122,7 +13116,8 @@
+
+ eval "$as_ac_var=no"
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++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
+@@ -11132,7 +13127,14 @@
+ _ACEOF
+
+ else
+- LIBOBJS="$LIBOBJS $ac_func.$ac_objext"
++ 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
++
+ fi
+ done
+
+@@ -11198,21 +13200,28 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* 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. */
++
+ #ifdef __STDC__
+ # include <limits.h>
+ #else
+ # include <assert.h>
+ #endif
++
++#undef dlopen
++
+ /* Override any gcc2 internal prototype to avoid an error. */
+ #ifdef __cplusplus
+ extern "C"
+@@ -11243,11 +13252,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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=$?
+@@ -11260,7 +13278,8 @@
+
+ ac_cv_func_dlopen=no
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++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
+@@ -11276,7 +13295,6 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldl $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -11300,11 +13318,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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=$?
+@@ -11317,7 +13344,8 @@
+
+ ac_cv_lib_dl_dlopen=no
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++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_dl_dlopen" >&5
+@@ -11340,21 +13368,28 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* 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"
+@@ -11385,11 +13420,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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=$?
+@@ -11402,7 +13446,8 @@
+
+ ac_cv_func_crypt=no
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++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
+@@ -11418,7 +13463,6 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lcrypt $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -11442,11 +13486,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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=$?
+@@ -11459,7 +13512,8 @@
+
+ ac_cv_lib_crypt_crypt=no
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++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_crypt_crypt" >&5
+@@ -11510,6 +13564,7 @@
+ platform=__solaris
+ ;;
+ *-*-aix*)
++###_AIX
+ platform=__aix
+ ;;
+ *)
+@@ -11529,6 +13584,8 @@
+ CPPFLAGS="$CPPFLAGS -I$gssapi/include"
+ # We want to keep -I in our CPPFLAGS, but only if we succeed
+ cmu_saved_CPPFLAGS=$CPPFLAGS
++### I am not sure how useful is this (and whether this is required at all
++### especially when we have to provide two -L flags for new CyberSafe
+ LDFLAGS="$LDFLAGS -L$gssapi/lib"
+
+ if test -n "$platform"; then
+@@ -11553,7 +13610,6 @@
+ echo "$as_me:$LINENO: checking gssapi.h usability" >&5
+ echo $ECHO_N "checking gssapi.h usability... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -11564,11 +13620,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>&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 -s conftest.$ac_objext'
++ { 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=$?
+@@ -11581,7 +13646,7 @@
+
+ ac_header_compiler=no
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++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
+
+@@ -11589,7 +13654,6 @@
+ echo "$as_me:$LINENO: checking gssapi.h presence" >&5
+ echo $ECHO_N "checking gssapi.h presence... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -11607,6 +13671,7 @@
+ (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
+@@ -11626,33 +13691,32 @@
+ echo "${ECHO_T}$ac_header_preproc" >&6
+
+ # So? What about this header?
+-case $ac_header_compiler:$ac_header_preproc in
+- yes:no )
++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 preprocessor's result" >&5
+-echo "$as_me: WARNING: gssapi.h: proceeding with the preprocessor's result" >&2;}
+- (
+- cat <<\_ASBOX
+-## ------------------------------------ ##
+-## Report this to bug-autoconf at gnu.org. ##
+-## ------------------------------------ ##
+-_ASBOX
+- ) |
+- sed "s/^/$as_me: WARNING: /" >&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 )
++ 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: 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 bug-autoconf at gnu.org. ##
+-## ------------------------------------ ##
++## ------------------------------------------ ##
++## Report this to the AC_PACKAGE_NAME lists. ##
++## ------------------------------------------ ##
+ _ASBOX
+ ) |
+ sed "s/^/$as_me: WARNING: /" >&2
+@@ -11690,7 +13754,6 @@
+ 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
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -11701,11 +13764,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>&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 -s conftest.$ac_objext'
++ { 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=$?
+@@ -11718,7 +13790,7 @@
+
+ ac_header_compiler=no
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++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
+
+@@ -11726,7 +13798,6 @@
+ 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
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -11744,6 +13815,7 @@
+ (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
+@@ -11763,33 +13835,32 @@
+ echo "${ECHO_T}$ac_header_preproc" >&6
+
+ # So? What about this header?
+-case $ac_header_compiler:$ac_header_preproc in
+- yes:no )
++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 preprocessor's result" >&5
+-echo "$as_me: WARNING: gssapi/gssapi.h: proceeding with the preprocessor's result" >&2;}
+- (
+- cat <<\_ASBOX
+-## ------------------------------------ ##
+-## Report this to bug-autoconf at gnu.org. ##
+-## ------------------------------------ ##
+-_ASBOX
+- ) |
+- sed "s/^/$as_me: WARNING: /" >&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 )
++ 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: 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 bug-autoconf at gnu.org. ##
+-## ------------------------------------ ##
++## ------------------------------------------ ##
++## Report this to the AC_PACKAGE_NAME lists. ##
++## ------------------------------------------ ##
+ _ASBOX
+ ) |
+ sed "s/^/$as_me: WARNING: /" >&2
+@@ -11833,7 +13904,6 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lresolv $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -11857,11 +13927,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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=$?
+@@ -11874,7 +13953,8 @@
+
+ ac_cv_lib_resolv_res_search=no
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++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
+@@ -11911,7 +13991,6 @@
+ 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
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -11935,11 +14014,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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=$?
+@@ -11952,7 +14040,8 @@
+
+ ac_cv_lib_gssapi_gss_unwrap=no
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++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_gssapi_gss_unwrap" >&5
+@@ -11978,7 +14067,6 @@
+ 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
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -12002,11 +14090,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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=$?
+@@ -12019,7 +14116,8 @@
+
+ ac_cv_lib_gssapi_krb5_gss_unwrap=no
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++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_gssapi_krb5_gss_unwrap" >&5
+@@ -12063,7 +14161,6 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgss $GSSAPIBASE_LIBS -lgss -lcstbk5 $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -12087,11 +14184,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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=$?
+@@ -12104,7 +14210,8 @@
+
+ ac_cv_lib_gss_csf_gss_acq_user=no
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++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_gss_csf_gss_acq_user" >&5
+@@ -12121,7 +14228,6 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgss $GSSAPIBASE_LIBS -lgss $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -12145,11 +14251,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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=$?
+@@ -12162,7 +14277,8 @@
+
+ ac_cv_lib_gss_csf_gss_acq_user=no
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++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_gss_csf_gss_acq_user" >&5
+@@ -12197,7 +14313,6 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lgss -lgss $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -12221,11 +14336,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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=$?
+@@ -12238,7 +14362,8 @@
+
+ ac_cv_lib_gss_gss_unwrap=no
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++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_gss_gss_unwrap" >&5
+@@ -12297,7 +14422,6 @@
+ if test "$gssapi" != "no"; then
+ if test "$gss_impl" = "cybersafe" -o "$gss_impl" = "cybersafe03"; then
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -12325,7 +14449,6 @@
+
+ elif test "$ac_cv_header_gssapi_h" = "yes"; then
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -12347,7 +14470,6 @@
+ elif test "$ac_cv_header_gssapi_gssapi_h"; then
+
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -12370,7 +14492,6 @@
+
+ if test "$gss_impl" = "cybersafe" -o "$gss_impl" = "cybersafe03"; then
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -12397,7 +14518,6 @@
+
+ elif test "$ac_cv_header_gssapi_h" = "yes"; then
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -12418,7 +14538,6 @@
+
+ elif test "$ac_cv_header_gssapi_gssapi_h"; then
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -12454,7 +14573,6 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lresolv $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -12478,11 +14596,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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=$?
+@@ -12495,7 +14622,8 @@
+
+ ac_cv_lib_resolv_res_search=no
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++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
+@@ -12519,21 +14647,28 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* 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"
+@@ -12564,11 +14699,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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=$?
+@@ -12581,7 +14725,8 @@
+
+ eval "$as_ac_var=no"
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++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
+@@ -12663,7 +14808,6 @@
+ 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
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -12674,11 +14818,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>&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 -s conftest.$ac_objext'
++ { 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=$?
+@@ -12691,7 +14844,7 @@
+
+ ac_header_compiler=no
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++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
+
+@@ -12699,7 +14852,6 @@
+ 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
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -12717,6 +14869,7 @@
+ (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
+@@ -12736,33 +14889,32 @@
+ echo "${ECHO_T}$ac_header_preproc" >&6
+
+ # So? What about this header?
+-case $ac_header_compiler:$ac_header_preproc in
+- yes:no )
++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 preprocessor's result" >&5
+-echo "$as_me: WARNING: sasl/sasl.h: proceeding with the preprocessor's result" >&2;}
+- (
+- cat <<\_ASBOX
+-## ------------------------------------ ##
+-## Report this to bug-autoconf at gnu.org. ##
+-## ------------------------------------ ##
+-_ASBOX
+- ) |
+- sed "s/^/$as_me: WARNING: /" >&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 )
++ 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: 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 bug-autoconf at gnu.org. ##
+-## ------------------------------------ ##
++## ------------------------------------------ ##
++## Report this to the AC_PACKAGE_NAME lists. ##
++## ------------------------------------------ ##
+ _ASBOX
+ ) |
+ sed "s/^/$as_me: WARNING: /" >&2
+@@ -12794,7 +14946,6 @@
+ 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
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -12805,11 +14956,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>&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 -s conftest.$ac_objext'
++ { 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=$?
+@@ -12822,7 +14982,7 @@
+
+ ac_header_compiler=no
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++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
+
+@@ -12830,7 +14990,6 @@
+ 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
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -12848,6 +15007,7 @@
+ (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
+@@ -12867,33 +15027,32 @@
+ echo "${ECHO_T}$ac_header_preproc" >&6
+
+ # So? What about this header?
+-case $ac_header_compiler:$ac_header_preproc in
+- yes:no )
++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 preprocessor's result" >&5
+-echo "$as_me: WARNING: sasl/saslutil.h: proceeding with the preprocessor's result" >&2;}
+- (
+- cat <<\_ASBOX
+-## ------------------------------------ ##
+-## Report this to bug-autoconf at gnu.org. ##
+-## ------------------------------------ ##
+-_ASBOX
+- ) |
+- sed "s/^/$as_me: WARNING: /" >&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 )
++ 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: 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 bug-autoconf at gnu.org. ##
+-## ------------------------------------ ##
++## ------------------------------------------ ##
++## Report this to the AC_PACKAGE_NAME lists. ##
++## ------------------------------------------ ##
+ _ASBOX
+ ) |
+ sed "s/^/$as_me: WARNING: /" >&2
+@@ -12979,7 +15138,6 @@
+ 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
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -12990,11 +15148,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>&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 -s conftest.$ac_objext'
++ { 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=$?
+@@ -13007,7 +15174,7 @@
+
+ ac_header_compiler=no
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++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
+
+@@ -13015,7 +15182,6 @@
+ 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
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -13033,6 +15199,7 @@
+ (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
+@@ -13052,33 +15219,32 @@
+ echo "${ECHO_T}$ac_header_preproc" >&6
+
+ # So? What about this header?
+-case $ac_header_compiler:$ac_header_preproc in
+- yes:no )
++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 preprocessor's result" >&5
+-echo "$as_me: WARNING: sasl/sasl.h: proceeding with the preprocessor's result" >&2;}
+- (
+- cat <<\_ASBOX
+-## ------------------------------------ ##
+-## Report this to bug-autoconf at gnu.org. ##
+-## ------------------------------------ ##
+-_ASBOX
+- ) |
+- sed "s/^/$as_me: WARNING: /" >&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 )
++ 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: 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 bug-autoconf at gnu.org. ##
+-## ------------------------------------ ##
++## ------------------------------------------ ##
++## Report this to the AC_PACKAGE_NAME lists. ##
++## ------------------------------------------ ##
+ _ASBOX
+ ) |
+ sed "s/^/$as_me: WARNING: /" >&2
+@@ -13110,7 +15276,6 @@
+ 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
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -13121,11 +15286,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>&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 -s conftest.$ac_objext'
++ { 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=$?
+@@ -13138,7 +15312,7 @@
+
+ ac_header_compiler=no
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++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
+
+@@ -13146,7 +15320,6 @@
+ 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
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -13164,6 +15337,7 @@
+ (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
+@@ -13183,33 +15357,32 @@
+ echo "${ECHO_T}$ac_header_preproc" >&6
+
+ # So? What about this header?
+-case $ac_header_compiler:$ac_header_preproc in
+- yes:no )
++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 preprocessor's result" >&5
+-echo "$as_me: WARNING: sasl/saslutil.h: proceeding with the preprocessor's result" >&2;}
+- (
+- cat <<\_ASBOX
+-## ------------------------------------ ##
+-## Report this to bug-autoconf at gnu.org. ##
+-## ------------------------------------ ##
+-_ASBOX
+- ) |
+- sed "s/^/$as_me: WARNING: /" >&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 )
++ 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: 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 bug-autoconf at gnu.org. ##
+-## ------------------------------------ ##
++## ------------------------------------------ ##
++## Report this to the AC_PACKAGE_NAME lists. ##
++## ------------------------------------------ ##
+ _ASBOX
+ ) |
+ sed "s/^/$as_me: WARNING: /" >&2
+@@ -13236,7 +15409,6 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsasl2 $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -13260,11 +15432,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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=$?
+@@ -13277,7 +15458,8 @@
+
+ ac_cv_lib_sasl2_prop_get=no
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++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_sasl2_prop_get" >&5
+@@ -13350,7 +15532,6 @@
+ CPPFLAGS="$CPPFLAGS $SASLFLAGS"
+
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -13384,6 +15565,7 @@
+ (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
+@@ -13419,7 +15601,6 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsasl2 $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -13443,11 +15624,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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=$?
+@@ -13460,7 +15650,8 @@
+
+ ac_cv_lib_sasl2_sasl_checkapop=no
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++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_sasl2_sasl_checkapop" >&5
+@@ -13570,21 +15761,28 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* 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"
+@@ -13615,11 +15813,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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=$?
+@@ -13632,7 +15839,8 @@
+
+ ac_cv_func_MD5Init=no
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++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
+@@ -13647,7 +15855,6 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmd $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -13671,11 +15878,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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=$?
+@@ -13688,7 +15904,8 @@
+
+ ac_cv_lib_md_MD5Init=no
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++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
+@@ -13706,6 +15923,89 @@
+ SNMP_SUBDIRS=""
+
+
++DRACLIBS=
++
++# Check whether --with-drac or --without-drac was given.
++if test "${with_drac+set}" = set; then
++ withval="$with_drac"
++ if test -d "$withval"; then
++ LDFLAGS="$LDFLAGS -L${withval}"
++ echo "$as_me:$LINENO: checking for dracauth in -ldrac" >&5
++echo $ECHO_N "checking for dracauth in -ldrac... $ECHO_C" >&6
++if test "${ac_cv_lib_drac_dracauth+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ ac_check_lib_save_LIBS=$LIBS
++LIBS="-ldrac $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 dracauth ();
++int
++main ()
++{
++dracauth ();
++ ;
++ 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_drac_dracauth=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_drac_dracauth=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_drac_dracauth" >&5
++echo "${ECHO_T}$ac_cv_lib_drac_dracauth" >&6
++if test $ac_cv_lib_drac_dracauth = yes; then
++
++cat >>confdefs.h <<\_ACEOF
++#define DRAC_AUTH
++_ACEOF
++
++ DRACLIBS="-ldrac"
++fi
++
++ fi
++fi;
++
++
+
+
+
+@@ -13730,7 +16030,6 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lwrap ${LIB_SOCKET} $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -13754,11 +16053,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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=$?
+@@ -13771,7 +16079,8 @@
+
+ ac_cv_lib_wrap_request_init=no
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++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_wrap_request_init" >&5
+@@ -13791,7 +16100,6 @@
+ echo "$as_me:$LINENO: checking tcpd.h usability" >&5
+ echo $ECHO_N "checking tcpd.h usability... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -13802,11 +16110,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>&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 -s conftest.$ac_objext'
++ { 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=$?
+@@ -13819,7 +16136,7 @@
+
+ ac_header_compiler=no
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++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
+
+@@ -13827,7 +16144,6 @@
+ echo "$as_me:$LINENO: checking tcpd.h presence" >&5
+ echo $ECHO_N "checking tcpd.h presence... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -13845,6 +16161,7 @@
+ (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
+@@ -13864,33 +16181,32 @@
+ echo "${ECHO_T}$ac_header_preproc" >&6
+
+ # So? What about this header?
+-case $ac_header_compiler:$ac_header_preproc in
+- yes:no )
++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 preprocessor's result" >&5
+-echo "$as_me: WARNING: tcpd.h: proceeding with the preprocessor's result" >&2;}
+- (
+- cat <<\_ASBOX
+-## ------------------------------------ ##
+-## Report this to bug-autoconf at gnu.org. ##
+-## ------------------------------------ ##
+-_ASBOX
+- ) |
+- sed "s/^/$as_me: WARNING: /" >&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 )
++ 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: 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 bug-autoconf at gnu.org. ##
+-## ------------------------------------ ##
++## ------------------------------------------ ##
++## Report this to the AC_PACKAGE_NAME lists. ##
++## ------------------------------------------ ##
+ _ASBOX
+ ) |
+ sed "s/^/$as_me: WARNING: /" >&2
+@@ -13940,7 +16256,6 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lnsl $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -13964,11 +16279,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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=$?
+@@ -13981,7 +16305,8 @@
+
+ ac_cv_lib_nsl_yp_get_default_domain=no
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++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_yp_get_default_domain" >&5
+@@ -14097,7 +16422,6 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsnmp ${LIB_SOCKET} $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -14121,11 +16445,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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=$?
+@@ -14138,7 +16471,8 @@
+
+ ac_cv_lib_snmp_sprint_objid=no
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++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_snmp_sprint_objid" >&5
+@@ -14158,7 +16492,6 @@
+ 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
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -14169,11 +16502,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>&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 -s conftest.$ac_objext'
++ { 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=$?
+@@ -14186,7 +16528,7 @@
+
+ ac_header_compiler=no
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++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
+
+@@ -14194,7 +16536,6 @@
+ 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
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -14212,6 +16553,7 @@
+ (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
+@@ -14231,33 +16573,32 @@
+ echo "${ECHO_T}$ac_header_preproc" >&6
+
+ # So? What about this header?
+-case $ac_header_compiler:$ac_header_preproc in
+- yes:no )
++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 preprocessor's result" >&5
+-echo "$as_me: WARNING: ucd-snmp/version.h: proceeding with the preprocessor's result" >&2;}
+- (
+- cat <<\_ASBOX
+-## ------------------------------------ ##
+-## Report this to bug-autoconf at gnu.org. ##
+-## ------------------------------------ ##
+-_ASBOX
+- ) |
+- sed "s/^/$as_me: WARNING: /" >&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 )
++ 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: 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 bug-autoconf at gnu.org. ##
+-## ------------------------------------ ##
++## ------------------------------------------ ##
++## Report this to the AC_PACKAGE_NAME lists. ##
++## ------------------------------------------ ##
+ _ASBOX
+ ) |
+ sed "s/^/$as_me: WARNING: /" >&2
+@@ -14307,7 +16648,6 @@
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lrpm -lpopt $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -14331,11 +16671,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&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 -s conftest$ac_exeext'
++ { 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=$?
+@@ -14348,7 +16697,8 @@
+
+ ac_cv_lib_rpm_rpmdbOpen=no
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++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_rpm_rpmdbOpen" >&5
+@@ -14440,13 +16790,13 @@
+ # `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"
++ "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"
++ "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+ ;;
+ esac;
+ } |
+@@ -14476,13 +16826,13 @@
+ # 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[ ]*=/{
++ ac_vpsub='/^[ ]*VPATH[ ]*=/{
+ s/:*\$(srcdir):*/:/;
+ s/:*\${srcdir}:*/:/;
+ s/:*@srcdir@:*/:/;
+-s/^\([^=]*=[ ]*\):*/\1/;
++s/^\([^=]*=[ ]*\):*/\1/;
+ s/:*$//;
+-s/^[^=]*=[ ]*$//;
++s/^[^=]*=[ ]*$//;
+ }'
+ fi
+
+@@ -14493,7 +16843,7 @@
+ 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$//'`
++ 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'
+@@ -14537,9 +16887,10 @@
+ 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 (FOO=FOO; unset FOO) >/dev/null 2>&1; then
++if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+ as_unset=unset
+ else
+ as_unset=false
+@@ -14558,7 +16909,7 @@
+ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
+ LC_TELEPHONE LC_TIME
+ do
+- if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
++ 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
+@@ -14737,16 +17088,17 @@
+ if mkdir -p . 2>/dev/null; then
+ as_mkdir_p=:
+ else
++ test -d ./-p && rmdir ./-p
+ as_mkdir_p=false
+ fi
+
+ as_executable_p="test -f"
+
+ # Sed expression to map a string onto a valid CPP name.
+-as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
++as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+
+ # Sed expression to map a string onto a valid variable name.
+-as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
++as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+
+ # IFS
+@@ -14773,7 +17125,7 @@
+ cat >&5 <<_CSEOF
+
+ This file was extended by $as_me, which was
+-generated by GNU Autoconf 2.57. Invocation command line was
++generated by GNU Autoconf 2.59. Invocation command line was
+
+ CONFIG_FILES = $CONFIG_FILES
+ CONFIG_HEADERS = $CONFIG_HEADERS
+@@ -14817,9 +17169,9 @@
+ -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
++ instantiate the configuration file FILE
+ --header=FILE[:TEMPLATE]
+- instantiate the configuration header FILE
++ instantiate the configuration header FILE
+
+ Configuration files:
+ $config_files
+@@ -14833,11 +17185,10 @@
+ cat >>$CONFIG_STATUS <<_ACEOF
+ ac_cs_version="\\
+ config.status
+-configured by $0, generated by GNU Autoconf 2.57,
++configured by $0, generated by GNU Autoconf 2.59,
+ with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
+
+-Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
+-Free Software Foundation, Inc.
++Copyright (C) 2003 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
+@@ -15038,6 +17389,7 @@
+ s, at host_cpu@,$host_cpu,;t t
+ s, at host_vendor@,$host_vendor,;t t
+ s, at host_os@,$host_os,;t t
++s, at WARNERROR@,$WARNERROR,;t t
+ s, at MAKEDEPEND@,$MAKEDEPEND,;t t
+ s, at cyrus_prefix@,$cyrus_prefix,;t t
+ s, at service_path@,$service_path,;t t
+@@ -15111,6 +17463,7 @@
+ s, at PERL_CCCDLFLAGS@,$PERL_CCCDLFLAGS,;t t
+ s, at MD5OBJ@,$MD5OBJ,;t t
+ s, at SNMP_SUBDIRS@,$SNMP_SUBDIRS,;t t
++s, at DRACLIBS@,$DRACLIBS,;t t
+ s, at LIB_WRAP@,$LIB_WRAP,;t t
+ s, at SNMP_CONFIG@,$SNMP_CONFIG,;t t
+ s, at LIB_UCDSNMP@,$LIB_UCDSNMP,;t t
+@@ -15149,9 +17502,9 @@
+ (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"
++ 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"
++ 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
+@@ -15169,21 +17522,21 @@
+ # 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,:.*,,'` ;;
++ 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=`echo "$ac_file" | sed 's,:.*,,'` ;;
+ * ) ac_file_in=$ac_file.in ;;
+ esac
+
+ # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
+ 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 ||
++ 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; }
+@@ -15199,10 +17552,10 @@
+ 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 ||
++ 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; }
+@@ -15240,12 +17593,45 @@
+ ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+ ac_top_srcdir=$ac_top_builddir$srcdir ;;
+ esac
+-# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
+-# absolute.
+-ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
+-ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
+-ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
+-ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
++
++# 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 $INSTALL in
+@@ -15253,11 +17639,6 @@
+ *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
+ esac
+
+- 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. */
+@@ -15267,7 +17648,7 @@
+ configure_input="$ac_file. "
+ fi
+ configure_input=$configure_input"Generated from `echo $ac_file_in |
+- sed 's,.*/,,'` by configure."
++ sed 's,.*/,,'` by configure."
+
+ # First look for the input files in the build tree, otherwise in the
+ # src tree.
+@@ -15276,26 +17657,32 @@
+ 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
++ # 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;;
++ 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
++ 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;;
++ fi;;
+ esac
+ done` || { (exit 1); exit 1; }
++
++ 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
+ _ACEOF
+ cat >>$CONFIG_STATUS <<_ACEOF
+ sed "$ac_vpsub
+@@ -15335,12 +17722,12 @@
+ # 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_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_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)'
+ ac_uB='$,\1#\2define\3'
+ ac_uC=' '
+ ac_uD=',;t'
+@@ -15349,11 +17736,11 @@
+ # 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,:.*,,'` ;;
++ 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=`echo "$ac_file" | sed 's,:.*,,'` ;;
+ * ) ac_file_in=$ac_file.in ;;
+ esac
+
+@@ -15367,28 +17754,29 @@
+ 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
++ # 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;;
++ # 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
++ 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;;
++ fi;;
+ esac
+ done` || { (exit 1); exit 1; }
+ # Remove the trailing spaces.
+- sed 's/[ ]*$//' $ac_file_inputs >$tmp/in
++ sed 's/[ ]*$//' $ac_file_inputs >$tmp/in
+
+ _ACEOF
+
+@@ -15411,9 +17799,9 @@
+ s,[\\$`],\\&,g
+ t clear
+ : clear
+-s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
++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
++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
+@@ -15427,13 +17815,13 @@
+ # 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]*,/* & */,
++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 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
+@@ -15442,7 +17830,7 @@
+ # 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
++ echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS
+ # Work around the forget-to-reset-the-flag bug.
+ echo 't clr' >>$CONFIG_STATUS
+ echo ': clr' >>$CONFIG_STATUS
+@@ -15469,7 +17857,7 @@
+ # 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
++ echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS
+ # Work around the forget-to-reset-the-flag bug.
+ echo 't clr' >>$CONFIG_STATUS
+ echo ': clr' >>$CONFIG_STATUS
+@@ -15503,10 +17891,10 @@
+ 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 ||
++ 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; }
+@@ -15522,10 +17910,10 @@
+ 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 ||
++ 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; }
Property changes on: trunk/kolab-cyrus-imapd/experimental/debian/patches/99-update-autoconf.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/kolab-cyrus-imapd/experimental/debian/po/POTFILES.in
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/po/POTFILES.in 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/po/POTFILES.in 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1 @@
+[type: gettext/rfc822deb] cyrus22-common.templates
Added: trunk/kolab-cyrus-imapd/experimental/debian/po/de.po
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/po/de.po 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/po/de.po 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,95 @@
+# translation of cyrus22-imapd_2.1.16-6_de.po to German
+# translation of cyrus22-imapd_2.1.16-6_templates.po to German
+#
+# 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.
+# Erik Schanze <mail at erikschanze.de>, 2004.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: cyrus22-imapd_2.2.12-1_de\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-05-20 00:16+0200\n"
+"PO-Revision-Date: 2004-05-29 22:44+0200\n"
+"Last-Translator: Erik Schanze <mail at erikschanze.de>\n"
+"Language-Team: German <debian-l10n-german at 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.0.2\n"
+
+#. Type: note
+#. Description
+#: ../cyrus22-common.templates:3
+msgid "Database backends have changed!"
+msgstr "Datenbankanbindung hat sich geändert!"
+
+#. Type: note
+#. Description
+#: ../cyrus22-common.templates:3
+msgid ""
+"Comparation 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 ""
+"Wenn Sie die Dateien /usr/lib/cyrus/cyrus-db-types.txt und /usr/lib/cyrus/"
+"cyrus-db-types.active vergleichen, sehen Sie, dass die Datenbankanbindung "
+"des Cyrus IMAPd geändert wurde."
+
+#. Type: note
+#. Description
+#: ../cyrus22-common.templates:3
+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üssenmit dem "
+"Hilfsprogramm cvt_cyrusdb(8) manuell in das neue Format überführt werden."
+
+#. Type: note
+#. Description
+#: ../cyrus22-common.templates:3
+msgid ""
+"Please refer to /usr/share/doc/cyrus22-common/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/cyrus22-common/"
+"README.Debian.database. Starten Sie keinesfalls cyrmaster, bevor Sie die "
+"Datenbank in das neue Format überführt haben."
+
+#. Type: boolean
+#. Description
+#: ../cyrus22-common.templates:19
+msgid "Remove the Cyrus spools, and user sieve scripts?"
+msgstr "Cyrus-Spool und Filterskripte der Benutzer löschen?"
+
+#. Type: boolean
+#. Description
+#: ../cyrus22-common.templates:19
+msgid ""
+"Should I remove the Cyrus mail and news spools, as well as the user's sieve "
+"scripts, when the package is purged ?"
+msgstr ""
+"Sollen die Cyrus Email- bzw. News-Spools und die Filterskripte der Benutzer "
+"gelöscht werden, wenn das Paket restlos entfernt wird (purge)?"
+
+#. Type: boolean
+#. Description
+#: ../cyrus22-common.templates:19
+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-Spools und -Filterskriptverzeichnisse "
+"in /var. Wenn Sie deren Ort in der Datei imapd.conf geändert haben, werden "
+"sie an der neuen Stelle nicht gelöscht, nur die alten im Verzeichnis /var."
Added: trunk/kolab-cyrus-imapd/experimental/debian/po/fr.po
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/po/fr.po 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/po/fr.po 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,82 @@
+# PO-DEBCONF TEMPLATE FOR cyrus22-imapd.
+# Copyright (C) 2002 Henrique de Moraes Holschuh <hmh at debian.org>
+# This file is distributed under the same license as the cyrus22-imapd package.
+# $Id: fr.po 142 2005-05-19 22:22:28Z sven $
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: cyrus22-imapd 2.2.12-1\n"
+"POT-Creation-Date: 2003-03-03 10:24-0300\n"
+"PO-Revision-Date: 2002-10-22 10:33+0200\n"
+"Last-Translator: Philippe Batailler <pbatailler at teaser.fr>\n"
+"Language-Team: French <debian-l10n-french at lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Description
+#: ../cyrus22-common.templates:3
+msgid "Database backends have changed!"
+msgstr "L'interfaçage avec les bases de données a changé !"
+
+#. Description
+#: ../cyrus22-common.templates:3
+msgid ""
+"Comparation 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'interfaçage de Cyrus IMAPd avec les bases "
+"de données a changé."
+
+#. Description
+#: ../cyrus22-common.templates:3
+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'interfaçage a "
+"changé peuvent nécessiter une conversion manuelle au nouveau format. On peut "
+"se servir de l'utilitaire cvt_cyrusdb (8)."
+
+#. Description
+#: ../cyrus22-common.templates:3
+msgid ""
+"Please refer to /usr/share/doc/cyrus22-common/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/cyrus22-common/README.Debian.database pour "
+"des informations supplémentaires. Ne lancez pas cyrmaster avant d'avoir mis "
+"les bases de données au nouveau format."
+
+#. Description
+#: ../cyrus22-common.templates:19
+msgid "Remove the Cyrus spools, and user sieve scripts?"
+msgstr ""
+"Faut-il supprimer les répertoires de spool propres à Cyrus, ainsi que les "
+"filtres des utilisateurs ?"
+
+#. Description
+#: ../cyrus22-common.templates:19
+msgid ""
+"Should I remove the Cyrus mail and news spools, as well as the user's sieve "
+"scripts, when the package is purged ?"
+msgstr ""
+"Dois-je supprimer les répertoires de spool pour le courrier et les "
+"nouvelles, ainsi que les filtres des utilisateurs, quand le système est "
+"purgé du paquet ?"
+
+#. Description
+#: ../cyrus22-common.templates:19
+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. Si vous aviez modifié leurs "
+"emplacements grâce au fichier imapd.conf, ces emplacements ne seront pas "
+"supprimés ; seuls les anciens, dans /var, le seront."
Added: trunk/kolab-cyrus-imapd/experimental/debian/po/it.po
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/po/it.po 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/po/it.po 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,82 @@
+# Traduzione italiana di cyrus22-imapd
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# Cristian Rigamonti <cri at linux.it>, 2004.
+msgid ""
+msgstr ""
+"Project-Id-Version: cyrus22-imapd 2.2.12-1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-05-20 00:16+0200\n"
+"PO-Revision-Date: 2004-03-28 20:17+0200\n"
+"Last-Translator: Cristian Rigamonti <cri at linux.it>\n"
+"Language-Team: Italian <tp at lists.linux.it>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: note
+#. Description
+#: ../cyrus22-common.templates:3
+msgid "Database backends have changed!"
+msgstr "I backend del database sono cambiati!"
+
+#. Type: note
+#. Description
+#: ../cyrus22-common.templates:3
+msgid ""
+"Comparation 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: note
+#. Description
+#: ../cyrus22-common.templates:3
+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: note
+#. Description
+#: ../cyrus22-common.templates:3
+msgid ""
+"Please refer to /usr/share/doc/cyrus22-common/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/cyrus22-common/README.Debian.database per maggiori "
+"informazioni. Non avviare cyrmaster prima di aver convertito i database al "
+"nuovo formato."
+
+#. Type: boolean
+#. Description
+#: ../cyrus22-common.templates:19
+msgid "Remove the Cyrus spools, and user sieve scripts?"
+msgstr "Rimuovere gli spool di Cyrus e gli script sieve degli utenti?"
+
+#. Type: boolean
+#. Description
+#: ../cyrus22-common.templates:19
+msgid ""
+"Should I remove the Cyrus mail and news spools, as well as the user's sieve "
+"scripts, when the package is purged ?"
+msgstr ""
+"Si desidera rimuovere gli spool di posta e news di Cyrus, oltre agli script "
+"sieve degli utenti, quando il pacchetto sarà rimosso?"
+
+#. Type: boolean
+#. Description
+#: ../cyrus22-common.templates:19
+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 loro posizione è stata modificata in "
+"imapd.conf, non saranno rimosse le nuove posizioni, ma solo quelle in /var."
Added: trunk/kolab-cyrus-imapd/experimental/debian/po/ja.po
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/po/ja.po 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/po/ja.po 2006-01-02 14:48:54 UTC (rev 58)
@@ -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: cyrus22-imapd 2.2.12-1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-05-20 00:16+0200\n"
+"PO-Revision-Date: 2004-03-01 03:04+0900\n"
+"Last-Translator: Hideki Yamane <henrich at samba.gr.jp>\n"
+"Language-Team: Japanese <debian-japanese at lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=EUC-JP\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: note
+#. Description
+#: ../cyrus22-common.templates:3
+msgid "Database backends have changed!"
+msgstr "¥Ð¥Ã¥¯¥¨¥ó¥É¤Î¥Ç¡¼¥¿¥Ù¡¼¥¹¤¬Êѹ¹¤µ¤ì¤Þ¤·¤¿!"
+
+#. Type: note
+#. Description
+#: ../cyrus22-common.templates:3
+msgid ""
+"Comparation 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: note
+#. Description
+#: ../cyrus22-common.templates:3
+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: note
+#. Description
+#: ../cyrus22-common.templates:3
+msgid ""
+"Please refer to /usr/share/doc/cyrus22-common/README.Debian.database for "
+"more information. Do not start cyrmaster until you have converted the "
+"databases to the new format."
+msgstr ""
+"¤è¤ê¾ÜºÙ¤Ë¤Ä¤¤¤Æ¤Ï /usr/share/doc/cyrus22-common/README.Debian.database ¤ò»²"
+"¾È¤·¤Æ¤¯¤À¤µ¤¤¡£¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò¿·¤·¤¤·Á¼°¤ËÊÑ´¹¤¹¤ë¤Þ¤Ç cyrmaster ¤òµ¯Æ°¤·¤Ê¤¤"
+"¤Ç¤¯¤À¤µ¤¤¡£"
+
+#. Type: boolean
+#. Description
+#: ../cyrus22-common.templates:19
+msgid "Remove the Cyrus spools, and user sieve scripts?"
+msgstr "Cyrus ¥¹¥×¡¼¥ë¤È¡¢¥æ¡¼¥¶¤Î sieve ¥¹¥¯¥ê¥×¥È¤òºï½ü¤·¤Þ¤¹¤«?"
+
+#. Type: boolean
+#. Description
+#: ../cyrus22-common.templates:19
+msgid ""
+"Should I remove the Cyrus mail and news spools, as well as the user's sieve "
+"scripts, when the package is purged ?"
+msgstr ""
+"¥Ñ¥Ã¥±¡¼¥¸¤¬´°Á´¤Ëºï½ü¤µ¤ì¤¿ºÝ¡¢sieve ¥¹¥¯¥ê¥×¥È¤ÈƱÍÍ¤Ë Cyrus ¥á¡¼¥ë¡¦¥Ë¥å¡¼"
+"¥¹¥¹¥×¡¼¥ë¤òºï½ü¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¤«?"
+
+#. Type: boolean
+#. Description
+#: ../cyrus22-common.templates:19
+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 ¤Ë¤¢¤ë¸Å¤¤¤â¤Î¤À¤±¤Ç¤¹¡£"
Added: trunk/kolab-cyrus-imapd/experimental/debian/po/nl.po
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/po/nl.po 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/po/nl.po 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,94 @@
+#
+# 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 2.2.12-1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-05-20 00:16+0200\n"
+"PO-Revision-Date: 2004-03-29 10:57+0100\n"
+"Last-Translator: Luk Claes <luk.claes at ugent.be>\n"
+"Language-Team: Debian l10n Dutch <debian-l10n-dutch at lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: note
+#. Description
+#: ../cyrus22-common.templates:3
+msgid "Database backends have changed!"
+msgstr "Databank-backends zijn gewijzigd!"
+
+#. Type: note
+#. Description
+#: ../cyrus22-common.templates:3
+msgid ""
+"Comparation 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 ""
+"Vergelijking tussen /usr/lib/cyrus/cyrus-db-types.txt en /usr/lib/cyrus/"
+"cyrus-db-types.active leert ons dat de databank-backends voor Cyrus IMAPd "
+"gewijzigd zijn."
+
+#. Type: note
+#. Description
+#: ../cyrus22-common.templates:3
+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 databanken, waarvan de databank-backends gewijzigd "
+"zijn, mogelijk handmatig geconverteerd moeten worden naar het nieuwe "
+"formaat, gebruik makend van het cvt_cyrusdb(8)-hulpmiddel."
+
+#. Type: note
+#. Description
+#: ../cyrus22-common.templates:3
+msgid ""
+"Please refer to /usr/share/doc/cyrus22-common/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/cyrus22-common/README.Debian.database voor meer "
+"informatie. Start cyrmaster niet vooraleer u de databanken naar het nieuwe "
+"formaat geconverteerd hebt."
+
+#. Type: boolean
+#. Description
+#: ../cyrus22-common.templates:19
+msgid "Remove the Cyrus spools, and user sieve scripts?"
+msgstr "De Cyrus-spools, en gebruikers-sieve-scripts verwijderen?"
+
+#. Type: boolean
+#. Description
+#: ../cyrus22-common.templates:19
+msgid ""
+"Should I remove the Cyrus mail and news spools, as well as the user's sieve "
+"scripts, when the package is purged ?"
+msgstr ""
+"Moeten de Cyrus-mail- en -nieuws-spools verwijderd worden, alsook de "
+"gebruikers-sieve-scripts, wanneer het pakket wordt gewist (purged)?"
+
+#. Type: boolean
+#. Description
+#: ../cyrus22-common.templates:19
+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 verwijderd worden; enkel de oude in /var."
Added: trunk/kolab-cyrus-imapd/experimental/debian/po/pt_BR.po
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/po/pt_BR.po 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/po/pt_BR.po 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,87 @@
+# PO-DEBCONF TEMPLATE FOR cyrus22-imapd.
+# Copyright (C) 2002 Henrique de Moraes Holschuh <hmh at debian.org>
+# This file is distributed under the same license as the cyrus22-imapd package.
+# $Id: pt_BR.po 142 2005-05-19 22:22:28Z sven $
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: cyrus22-imapd 2.1.12-1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-05-20 00:16+0200\n"
+"PO-Revision-Date: 2003-03-03 10:45-0300\n"
+"Last-Translator: Henrique de Moraes Holschuh <hmh at debian.org>\n"
+"Language-Team: pt_BR <pt_BR at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: note
+#. Description
+#: ../cyrus22-common.templates:3
+msgid "Database backends have changed!"
+msgstr "Mudança de sistema nas bases de dados!"
+
+#. Type: note
+#. Description
+#: ../cyrus22-common.templates:3
+msgid ""
+"Comparation 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: note
+#. Description
+#: ../cyrus22-common.templates:3
+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: note
+#. Description
+#: ../cyrus22-common.templates:3
+msgid ""
+"Please refer to /usr/share/doc/cyrus22-common/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/cyrus22-common/"
+"README.Debian.database. Não inicie cyrmaster até ter convertido o "
+"formatodas bases de dados."
+
+#. Type: boolean
+#. Description
+#: ../cyrus22-common.templates:19
+msgid "Remove the Cyrus spools, and user sieve scripts?"
+msgstr "Removo as spools do Cyrus e os scripts sieve?"
+
+#. Type: boolean
+#. Description
+#: ../cyrus22-common.templates:19
+msgid ""
+"Should I remove the Cyrus mail and news spools, as well as the user's sieve "
+"scripts, when the package is purged ?"
+msgstr ""
+"Devo remover as áreas de armazenagem (spools) usadas pelo Cyrus, assim como "
+"as áreas usadas para armazenar os scripts sieve dos usuários quando o pacote "
+"for eliminado (purge) do sistema ?"
+
+#. Type: boolean
+#. Description
+#: ../cyrus22-common.templates:19
+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."
Added: trunk/kolab-cyrus-imapd/experimental/debian/po/templates.pot
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/po/templates.pot 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/po/templates.pot 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,73 @@
+#
+# 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.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2003-03-03 10:24-0300\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Description
+#: ../cyrus22-common.templates:3
+msgid "Database backends have changed!"
+msgstr ""
+
+#. Description
+#: ../cyrus22-common.templates:3
+msgid ""
+"Comparation 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 ""
+
+#. Description
+#: ../cyrus22-common.templates:3
+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 ""
+
+#. Description
+#: ../cyrus22-common.templates:3
+msgid ""
+"Please refer to /usr/share/doc/cyrus22-common/README.Debian.database for "
+"more information. Do not start cyrmaster until you have converted the "
+"databases to the new format."
+msgstr ""
+
+#. Description
+#: ../cyrus22-common.templates:19
+msgid "Remove the Cyrus spools, and user sieve scripts?"
+msgstr ""
+
+#. Description
+#: ../cyrus22-common.templates:19
+msgid ""
+"Should I remove the Cyrus mail and news spools, as well as the user's sieve "
+"scripts, when the package is purged ?"
+msgstr ""
+
+#. Description
+#: ../cyrus22-common.templates:19
+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 ""
Added: trunk/kolab-cyrus-imapd/experimental/debian/pop.pam
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/pop.pam 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/pop.pam 2006-01-02 14:48:54 UTC (rev 58)
@@ -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.
+#
+
+ at include common-auth
+ at include common-account
Added: trunk/kolab-cyrus-imapd/experimental/debian/rules
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/rules 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/rules 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,350 @@
+#!/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 at debian.org>,
+# David Parker <david at neongoat.com>
+#
+
+# DebHelper control
+export DH_ALWAYS_EXCLUDE=CVS
+
+export MAINPKG=cyrus22-common
+export DOCPKG=cyrus22-doc
+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)
+
+# enable dpatch usage
+include /usr/share/dpatch/dpatch.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.2
+
+DEBUGFLAGS=-g
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ DEBUGFLAGS += -O0
+else
+ DEBUGFLAGS += -O2
+endif
+
+# 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: clean-patched unpatch
+clean-patched: configure
+ 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
+ -$(MAKE) -i distclean
+ -rm -f config.h config.cache config.status config.log stamp-config confdefs.h
+ -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
+ -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
+
+configure:
+ # ./autogen.sh
+
+build: build-arch build-indep
+
+configure-stamp: patch
+ dh_testdir
+ -rm -f config.sub config.guess
+ 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 \
+ --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-idle=poll --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 \
+ --with-ucdsnmp=/usr
+ 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
+ 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 -E 'CONFIG_DB_[A-Z]+[[:space:]]+[(]' config.h |\
+ sed -e 's/&cyrusdb_//' -e 's/.*CONFIG_DB_//' -e 's/(//' -e 's/)//' \
+ >>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
+ 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
+ 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; 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/cyrus22
+ install -m 644 debian/logcheck.ignore \
+ $(PKGDIR)/etc/logcheck/violations.ignore.d/cyrus22
+
+ # 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/cyrus22-clients/usr/bin
+ for i in $(TMPPKG)/usr/bin/*test ; do \
+ rm -f "$$i" || true ;\
+ (cd $(CURDIR)/debian/cyrus22-clients/usr/bin &&\
+ ln -s imtest `basename $$i`) ;\
+ done
+
+ # Lintian and Linda overrides
+ cd debian ; \
+ for i in *.linda ; do \
+ mkdir -p "$${i%%.linda}/usr/share/linda/overrides" ;\
+ install -m 644 "$$i" "$${i%%.linda}/usr/share/linda/overrides/$${i%%.linda}" ;\
+ done ;\
+ 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_movefiles -a
+ 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 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/cyrus22-common.contrib -rti cp -r '{}' $(DOCDIR)/contrib
+
+ dh_movefiles -i
+
+binary-indep: install-indep
+ dh_testdir -i
+ dh_testroot -i
+# dh_installdebconf -i
+ dh_installdocs -p cyrus22-admin -p cyrus22-doc
+ dh_installexamples -p cyrus22-admin
+ dh_installmenu -i
+# dh_installlogrotate -i
+# dh_installpam -i
+# dh_installmime -i
+# dh_installcron -i
+ dh_installman -i
+ dh_installchangelogs -p cyrus22-admin doc/changes.html
+ dh_installchangelogs -p cyrus22-doc
+ 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 cyrus22-clients -p libcyrus-imap-perl22
+ dh_installexamples -p $(MAINPKG) -p libcyrus-imap-perl22 -p cyrus22-clients
+ dh_installmenu -a
+# dh_installlogrotate -a
+# dh_installpam -a
+# dh_installmime -a
+ dh_installinit -p $(MAINPKG) --noscripts --name=cyrus22
+ dh_installcron -a
+ dh_installman -a
+# dh_installinfo -a
+ dh_installchangelogs -p $(MAINPKG) -p cyrus22-clients 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 clean-patched
Property changes on: trunk/kolab-cyrus-imapd/experimental/debian/rules
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/kolab-cyrus-imapd/experimental/debian/sieve.pam
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/sieve.pam 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/sieve.pam 2006-01-02 14:48:54 UTC (rev 58)
@@ -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.
+#
+
+ at include common-auth
+ at include common-account
Added: trunk/kolab-cyrus-imapd/experimental/debian/watch
===================================================================
--- trunk/kolab-cyrus-imapd/experimental/debian/watch 2005-12-31 11:07:18 UTC (rev 57)
+++ trunk/kolab-cyrus-imapd/experimental/debian/watch 2006-01-02 14:48:54 UTC (rev 58)
@@ -0,0 +1,2 @@
+version=2
+ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-imapd-(2\.2\..*).tar.(?:gz|bz2)
Added: trunk/kolab-cyrus-imapd/experimental/upstream/cyrus22-imapd_2.2.12.orig.tar.gz
===================================================================
(Binary files differ)
Property changes on: trunk/kolab-cyrus-imapd/experimental/upstream/cyrus22-imapd_2.2.12.orig.tar.gz
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
More information about the pkg-kolab-devel
mailing list